From patchwork Thu Dec 7 10:54:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10098487 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 8A28E60325 for ; Thu, 7 Dec 2017 11:34:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73D4D2A442 for ; Thu, 7 Dec 2017 11:34:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 67B502A447; Thu, 7 Dec 2017 11:34:30 +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=unavailable 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 AF6212A442 for ; Thu, 7 Dec 2017 11:34:29 +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=RRlXTgOdPUbqCbJ97QgCXml+1kblfIEFC9wlPj7/3v4=; b=I8hjK59AvSBMoAhxiTAmQ9mtBi U29SbAQmfrJ5DROegwkGJ9Cl9u28ysXqqZr8t+hXWXNOAEPOQk9SmpCnI7eh5ul+urSDJDamSKMIX 0dDB5duNzMytpiTeLkPIRpuU2h++ZZkIji43c4LVGY7wrabN593Na0amNAt1qSNpiK017XSRu2CBH eHy+5tjExhD1EHQfh94TyVMQKqCHdXM9Fu/PfIj0nBOaBYbKc3KQiRuzO8ohifS6LhC2WJ/G6n0He RilHlP2qnZ7quxdnj9fKN+wLvnmErWAamZPIIsXK7b938MUxOYa+OgadpyT7QBgxHxr76V1uag/Of ahsOPkWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eMuRh-0006fj-Ad; Thu, 07 Dec 2017 11:34:29 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMuRe-0006e6-Vp for linux-arm-kernel@bombadil.infradead.org; Thu, 07 Dec 2017 11:34:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5ZD/ikNojDl9S5eG8NfmMa+KCAqX86Zgl8jaBVTisdA=; b=xKP89S3ZGQzDM0ichgfhU/zr0 OcveEVPQH0U0+rt8tteCckt1lHXxormkFJ+u++2M+87Tt4Nz8/fjmoAUTz1YIvGWqbQ83EV2k1wgt L/n+khtPBjqVg/laXpW84VWQAEMWmKvJy1dfd8GHv2wBVuih/gnoRIKzODwMiOm2HDW3Dv/k+gqJI 02tL6YXDSS8D3jEmCc5vYbTR40p6KItt9sUnJ/H38GzZcQcK2rWpMtetwT5Xqybr3eUXwXibbTfAx 2qIBeFblfxRNZj4d46wzwdLmfGjeen2DZI77rhpNw6BMA7+pXKt80UnNrjQjMbUCjsy6f/uggtUa1 mb42aOfmA==; Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eMtpV-0006KD-Ny for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2017 10:55:05 +0000 Received: by mail-wm0-x242.google.com with SMTP id l141so12257015wmg.1 for ; Thu, 07 Dec 2017 02:54:41 -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=5ZD/ikNojDl9S5eG8NfmMa+KCAqX86Zgl8jaBVTisdA=; b=UYoZG1R1DIayN87dEe5au0ACi+vbmDyK0H365gg+n39hpX/k9ClO5nQvPvoA3H7Tx3 uRXKXqELzZaY8zd5zF7HY2oitYBCu2irhYoe6GbRnWI933rwxuOeICJQwQBeI/bUhs/h LlbKgCYz1e4sHh7psaxgy9q0yED5bonexGbHU= 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=5ZD/ikNojDl9S5eG8NfmMa+KCAqX86Zgl8jaBVTisdA=; b=giT88TYcjIy1+cQ4jE5jgr30q24Iy9mIcnwe04ol1IXbMReCg/j0z6U9Zc9XPZxVJi jVJDzs4ojmzmsHxkpiV9EiSc61HyiJ0poNTY6Y0B5VPZj/dLorkuVh0oIe9aq4Kkh+Bw ZAS8d4dZcwEb1p6lU4EDIt9gyxw44W2wmvzOLokg9LeFPuUtA/wUEPEXTDSUdE40/vUi 94Sr9lA5zouTyAmjtLkV2mhC4GRNpZDfBMSY2aA2YrU+dQvyJ2fZo4v1PJPwuynymAg7 CF8mSOFyXvNgo3YV6YvCt9LTx3q2t1imyXqs0ISt5UuNPpKNEH74FxNyYnyBLOmKRyMS zB4A== X-Gm-Message-State: AJaThX5NEbcp3HhuMatmjILtwNvqHkbEirVCCQ4Qk18Xz919ey0q8vQt J6Ff6t6VmSQs4zY4X43328VLDw== X-Google-Smtp-Source: AGs4zMYNO/FutS46XCiRN7/AjE9qHOripn/nZhJp6IB7yPMLtLHLCEp5PHntWn5+iMXMFiPhCnMLNQ== X-Received: by 10.80.163.7 with SMTP id 7mr44829409edn.100.1512644079749; Thu, 07 Dec 2017 02:54:39 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id t23sm2233671edb.70.2017.12.07.02.54.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 02:54:38 -0800 (PST) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v7 7/8] KVM: arm/arm64: Provide a get_input_level for the arch timer Date: Thu, 7 Dec 2017 11:54:17 +0100 Message-Id: <20171207105418.22428-8-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171207105418.22428-1-christoffer.dall@linaro.org> References: <20171207105418.22428-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: kvm@vger.kernel.org, Marc Zyngier , Andre Przywara , Eric Auger , linux-arm-kernel@lists.infradead.org, Christoffer Dall 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 VGIC can now support the life-cycle of mapped level-triggered interrupts, and we no longer have to read back the timer state on every exit from the VM if we had an asserted timer interrupt signal, because the VGIC already knows if we hit the unlikely case where the guest disables the timer without ACKing the virtual timer interrupt. This means we rework a bit of the code to factor out the functionality to snapshot the timer state from vtimer_save_state(), and we can reuse this functionality in the sync path when we have an irqchip in userspace, and also to support our implementation of the get_input_level() function for the timer. This change also means that we can no longer rely on the timer's view of the interrupt line to set the active state, because we no longer maintain this state for mapped interrupts when exiting from the guest. Instead, we only set the active state if the virtual interrupt is active, and otherwise we simply let the timer fire again and raise the virtual interrupt from the ISR. Signed-off-by: Christoffer Dall Reviewed-by: Eric Auger --- include/kvm/arm_arch_timer.h | 2 ++ virt/kvm/arm/arch_timer.c | 75 +++++++++++++++++++++----------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index 01ee473517e2..f57f795d704c 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -90,6 +90,8 @@ void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu); void kvm_timer_init_vhe(void); +bool kvm_arch_timer_get_input_level(int vintid); + #define vcpu_vtimer(v) (&(v)->arch.timer_cpu.vtimer) #define vcpu_ptimer(v) (&(v)->arch.timer_cpu.ptimer) diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index e78ba5e20f74..82d4963f63b8 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -343,6 +343,12 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) phys_timer_emulate(vcpu); } +static void __timer_snapshot_state(struct arch_timer_context *timer) +{ + timer->cnt_ctl = read_sysreg_el0(cntv_ctl); + timer->cnt_cval = read_sysreg_el0(cntv_cval); +} + static void vtimer_save_state(struct kvm_vcpu *vcpu) { struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; @@ -354,10 +360,8 @@ static void vtimer_save_state(struct kvm_vcpu *vcpu) if (!vtimer->loaded) goto out; - if (timer->enabled) { - vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl); - vtimer->cnt_cval = read_sysreg_el0(cntv_cval); - } + if (timer->enabled) + __timer_snapshot_state(vtimer); /* Disable the virtual timer */ write_sysreg_el0(0, cntv_ctl); @@ -454,8 +458,7 @@ static void kvm_timer_vcpu_load_vgic(struct kvm_vcpu *vcpu) bool phys_active; int ret; - phys_active = vtimer->irq.level || - kvm_vgic_map_is_active(vcpu, vtimer->irq.irq); + phys_active = kvm_vgic_map_is_active(vcpu, vtimer->irq.irq); ret = irq_set_irqchip_state(host_vtimer_irq, IRQCHIP_STATE_ACTIVE, @@ -541,27 +544,19 @@ void kvm_timer_vcpu_put(struct kvm_vcpu *vcpu) set_cntvoff(0); } -static void unmask_vtimer_irq(struct kvm_vcpu *vcpu) +/* + * With a userspace irqchip we have to check if the guest de-asserted the + * timer and if so, unmask the timer irq signal on the host interrupt + * controller to ensure that we see future timer signals. + */ +static void unmask_vtimer_irq_user(struct kvm_vcpu *vcpu) { struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); if (unlikely(!irqchip_in_kernel(vcpu->kvm))) { - kvm_vtimer_update_mask_user(vcpu); - return; - } - - /* - * If the guest disabled the timer without acking the interrupt, then - * we must make sure the physical and virtual active states are in - * sync by deactivating the physical interrupt, because otherwise we - * wouldn't see the next timer interrupt in the host. - */ - if (!kvm_vgic_map_is_active(vcpu, vtimer->irq.irq)) { - int ret; - ret = irq_set_irqchip_state(host_vtimer_irq, - IRQCHIP_STATE_ACTIVE, - false); - WARN_ON(ret); + __timer_snapshot_state(vtimer); + if (!kvm_timer_should_fire(vtimer)) + kvm_vtimer_update_mask_user(vcpu); } } @@ -574,21 +569,7 @@ static void unmask_vtimer_irq(struct kvm_vcpu *vcpu) */ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) { - struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); - - /* - * If we entered the guest with the vtimer output asserted we have to - * check if the guest has modified the timer so that we should lower - * the line at this point. - */ - if (vtimer->irq.level) { - vtimer->cnt_ctl = read_sysreg_el0(cntv_ctl); - vtimer->cnt_cval = read_sysreg_el0(cntv_cval); - if (!kvm_timer_should_fire(vtimer)) { - kvm_timer_update_irq(vcpu, false, vtimer); - unmask_vtimer_irq(vcpu); - } - } + unmask_vtimer_irq_user(vcpu); } int kvm_timer_vcpu_reset(struct kvm_vcpu *vcpu) @@ -819,6 +800,22 @@ static bool timer_irqs_are_valid(struct kvm_vcpu *vcpu) return true; } +bool kvm_arch_timer_get_input_level(int vintid) +{ + struct kvm_vcpu *vcpu = kvm_arm_get_running_vcpu(); + struct arch_timer_context *timer; + + if (vintid == vcpu_vtimer(vcpu)->irq.irq) + timer = vcpu_vtimer(vcpu); + else + BUG(); /* We only map the vtimer so far */ + + if (timer->loaded) + __timer_snapshot_state(timer); + + return kvm_timer_should_fire(timer); +} + int kvm_timer_enable(struct kvm_vcpu *vcpu) { struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; @@ -841,7 +838,7 @@ int kvm_timer_enable(struct kvm_vcpu *vcpu) } ret = kvm_vgic_map_phys_irq(vcpu, host_vtimer_irq, vtimer->irq.irq, - NULL); + kvm_arch_timer_get_input_level); if (ret) return ret;