From patchwork Wed Jan 31 09:34:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10193633 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79999603EE for ; Wed, 31 Jan 2018 09:37:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60F64201BC for ; Wed, 31 Jan 2018 09:37:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5578A285FC; Wed, 31 Jan 2018 09:37:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BF6D0201BC for ; Wed, 31 Jan 2018 09:37:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=9M09ubJgWV48fXGJ953yvXeXYkqRmR3UYgDc9kyBiCw=; b=AoXfdpYO/BVsC7uot9c1enzUgd YFtBJOFDEoVxmGX1YOP8LGGzEj+bQNYZSQXZZCAqp9zsFSeXC1eHfKwGs35nXHB+LI8oCfuTXp/AM qJ3j9PWs7W5ygdAnJ/jEXqDnFfQynrlk5y252c1XxnNC/DONUZo4GGjHZYXNHdZegy/Gsj63kGomE 9DN6/29e8o2qwtNJG3rfbUabMiOYa64QvQKPC5iW3WVEQO2WClWANKWDpFRu8t0dZIZjtNEypsGpk oBdU6Wg+HumxLSiNk+aex5fsUs7Wr7Cah0ODFO9/6cCDSpjZ6HxX82KKys8AXsxhTACGXOWv85Q7z s5OaonIQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1egopI-0007CJ-0X; Wed, 31 Jan 2018 09:37:08 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1egoni-0005YN-OV for linux-arm-kernel@lists.infradead.org; Wed, 31 Jan 2018 09:35:41 +0000 Received: by mail-wm0-x242.google.com with SMTP id r71so6728430wmd.1 for ; Wed, 31 Jan 2018 01:35:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u3RqKC0/+9wUEE4dMyUff8jAybQZs1qeG9RnYLH7G6E=; b=ARtCWY70rAoyuVcnPF6ZWZBOzDzz09PuJBXbQp20zpGWr8jCpSs3QcJLrGR6F9gbTx msTJmQVeeikJKvXLJ+BPbCBjUtEDA16o05kcojP8hgehL7GuVjFxvM5Px1K/aMgzPkG/ BYj8HUz2DpVZRo/8VHV30U1ktL37CWebysRAg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u3RqKC0/+9wUEE4dMyUff8jAybQZs1qeG9RnYLH7G6E=; b=pbOO5pRN1iAH/9fGFDE037SezqIdIiKPnwYG3IgQ3Vj0tlM7NlXQxsu4elwewGgp8u Cd0bAfRBOJXFL8qEuNNG2eQVRVKi0Ur7LzVWCR/kFzRG7ZgzwLhPCGSSKHi02VEra14g N0i3aj/BUFQ9oed2fNv3aOq6HH1STRvZ4K+V91zn4ghSktIR1srBRUDOhHGXDg3W/dvF uzN/Dafl/DesOOzkzyFSNzxWTqgJEGvxNjittwAsjWWaYmojhpMdwreEY6QmlaKmpqUW tZwnE4ycwHPRO5OWPABDxj2PX+Bw6rB0kamA7IMkEWACdHOVmEp9i+6wyTs35qC4U4oJ akTw== X-Gm-Message-State: AKwxytfL2fQ58JAQjmyTGw15PByThjK6Y+aQP3uKZ14Fs7qKEkFfnrtr 2/PTGfSZB6RcCe76j6GZ9aOQtQ== X-Google-Smtp-Source: AH8x224zJj5lkhAiuEgcBJazlenM+Ek4dPgGwOXou39YZU8vfzLTGxGhzNE9mGmgNIIBxGdgThankg== X-Received: by 10.80.144.92 with SMTP id z28mr22902400edz.235.1517391320337; Wed, 31 Jan 2018 01:35:20 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id z2sm10247837edc.50.2018.01.31.01.35.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 01:35:19 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 05/28] KVM: arm/arm64: Don't cache the timer IRQ level Date: Wed, 31 Jan 2018 10:34:44 +0100 Message-Id: <20180131093507.22219-6-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180131093507.22219-1-christoffer.dall@linaro.org> References: <20180131093507.22219-1-christoffer.dall@linaro.org> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The timer logic was designed after a strict idea of modeling an interrupt line level in software, meaning that only transitions in the level need to be reported to the VGIC. This works well for the timer, because the arch timer code is in complete control of the device and can track the transitions of the line. However, as we are about to support using the HW bit in the VGIC not just for the timer, but also for VFIO which cannot track transitions of the interrupt line, we have to decide on an interface between the GIC and other subsystems for level triggered mapped interrupts, which both the timer and VFIO can use. VFIO only sees an asserting transition of the physical interrupt line, and tells the VGIC when that happens. That means that part of the interrupt flow is offloaded to the hardware. To use the same interface for VFIO devices and the timer, we therefore have to change the timer (we cannot change VFIO because it doesn't know the details of the device it is assigning to a VM). Luckily, changing the timer is simple, we just need to stop 'caching' the line level, but instead let the VGIC know the state of the timer every time there is a potential change in the line level, and when the line level should be asserted from the timer ISR. The VGIC can ignore extra notifications using its validate mechanism. Reviewed-by: Marc Zyngier Reviewed-by: Andre Przywara Reviewed-by: Julien Thierry Signed-off-by: Christoffer Dall --- virt/kvm/arm/arch_timer.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index f9555b1e7f15..9376fe03bf2e 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -99,11 +99,9 @@ static irqreturn_t kvm_arch_timer_handler(int irq, void *dev_id) } vtimer = vcpu_vtimer(vcpu); - if (!vtimer->irq.level) { - vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl); - if (kvm_timer_irq_can_fire(vtimer)) - kvm_timer_update_irq(vcpu, true, vtimer); - } + vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl); + if (kvm_timer_irq_can_fire(vtimer)) + kvm_timer_update_irq(vcpu, true, vtimer); if (unlikely(!irqchip_in_kernel(vcpu->kvm))) kvm_vtimer_update_mask_user(vcpu); @@ -324,12 +322,20 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); struct arch_timer_context *ptimer = vcpu_ptimer(vcpu); + bool level; if (unlikely(!timer->enabled)) return; - if (kvm_timer_should_fire(vtimer) != vtimer->irq.level) - kvm_timer_update_irq(vcpu, !vtimer->irq.level, vtimer); + /* + * The vtimer virtual interrupt is a 'mapped' interrupt, meaning part + * of its lifecycle is offloaded to the hardware, and we therefore may + * not have lowered the irq.level value before having to signal a new + * interrupt, but have to signal an interrupt every time the level is + * asserted. + */ + level = kvm_timer_should_fire(vtimer); + kvm_timer_update_irq(vcpu, level, vtimer); if (kvm_timer_should_fire(ptimer) != ptimer->irq.level) kvm_timer_update_irq(vcpu, !ptimer->irq.level, ptimer);