From patchwork Sat Sep 23 00:41:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9967345 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 F3990600C5 for ; Sat, 23 Sep 2017 00:49:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E52F6299CE for ; Sat, 23 Sep 2017 00:49:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9F3D299D0; Sat, 23 Sep 2017 00:49:12 +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 7617D299CE for ; Sat, 23 Sep 2017 00:49:12 +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=OBqHbVCAgEoxegalz0NHgSuFj7Jpew9rJB9iJmu2diI=; b=KreBhBwGQu9Gn4GunxYD/6+gF6 yHKDfrTd6dDOmojLnOAKPoAsqb/wWTBYWicUBffswfaQg8IhOX5IduPIer4Ct4H+mUbWzYA16ZNpO MFbMB3+rgnzIc8Ght8TS7Gpn+KV/OPORFkHVoWnLbtlTdsIeUl8kQzlZ4B9h8EHWp0TvrbypPP9F+ Q42ozQt4jOyPRqdi67Cm5Pz/SYRBzn4ClfSydSidHYRgt6IZ08SqxsUEm5TVNUmwJrdchWpLPCCfy kSM/SK9+YYHIoncmIN0vsg2k2cxUUIdTfQceonemqPfjd07a47T2PxDLFhkDWLY6zSW8bYV0qqMs5 GtZI2Fcw==; 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 1dvYc7-0000Jx-Bu; Sat, 23 Sep 2017 00:48:11 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dvYWj-0003nP-2O for linux-arm-kernel@lists.infradead.org; Sat, 23 Sep 2017 00:42:45 +0000 Received: by mail-wm0-x22b.google.com with SMTP id r74so7645963wme.4 for ; Fri, 22 Sep 2017 17:42:18 -0700 (PDT) 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=7frvHj8Ks/CAnwGSe5toUzTWor2DyNyyLKU+Zu+b2Qc=; b=ehLTulgsHbttP15nzDzIaP1DyZl/3Wm0OS4HR2eo56SEdZp6R7C1nAEU7p8YqJN0fb s3BNSeaAKzzUarUXCrp4y7FBr3jmmLzrgxhyfmZH/9+i+9igst3SV3fzYcZdvWWAFBUm AifzhpnIrRPqFFSVufhB9SDXVD6cnKz1R0lEs= 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=7frvHj8Ks/CAnwGSe5toUzTWor2DyNyyLKU+Zu+b2Qc=; b=ZYgTCby2yfoWZ7MTLR2xQHpJGOo/MJoAF0qzreCR0/mO2Uqp6q5gg0f348gBp93qd0 TdyqHwsDi45hZFPhheV5AwwF2YKeSbtGijJacNFnEmPsW9CFGeEpKPnsxCdoJji4zsJ6 ZlxmDNeXsZcpTye9ZHIf05Zl3B2+ZGZwxS3DMGLj6zE7MavgDxDV8QP3ycZRX5bJqoW+ gs/EToXZ5g4whdcCRnZvtavIA0an0qREVXVqkj4//XaO2RJgk89fJtgI9A2WolOJgX6c cyYXguE+59r4DlqJF/Bcvxu7w6A7S0jS5yrCXrSRDq5CCz3xammsw1lASOsXecofeqP7 OXQA== X-Gm-Message-State: AHPjjUgQIoqcJ9AED7PDO9OTBtJqoN2tUC5FuQZi4GFrtvSONrS4ohsz t0daUfvaBHTMPnSf4jZRJNAJtA== X-Google-Smtp-Source: AOwi7QAfjjJ+bD7uw9IhBgUXT3e48Fs82nhAwwEke3r4B4fb4QEOPb0ceKdtmcOGmU+gokh7yzffJw== X-Received: by 10.80.179.247 with SMTP id t52mr6342671edd.237.1506127337521; Fri, 22 Sep 2017 17:42:17 -0700 (PDT) Received: from localhost.localdomain (xd93dd96b.cust.hiper.dk. [217.61.217.107]) by smtp.gmail.com with ESMTPSA id c25sm646085edb.57.2017.09.22.17.42.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 22 Sep 2017 17:42:16 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 09/20] KVM: arm/arm64: Use separate timer for phys timer emulation Date: Sat, 23 Sep 2017 02:41:56 +0200 Message-Id: <20170923004207.22356-10-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170923004207.22356-1-cdall@linaro.org> References: <20170923004207.22356-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170922_174238_770006_8E0110F7 X-CRM114-Status: GOOD ( 15.76 ) 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 , Catalin Marinas , Will Deacon , kvm@vger.kernel.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 We were using the same hrtimer for emulating the physical timer and for making sure a blocking VCPU thread would be eventually woken up. That worked fine in the previous arch timer design, but as we are about to actually use the soft timer expire function for the physical timer emulation, change the logic to use a dedicated hrtimer. This has the added benefit of not having to cancel any work in the sync path, which in turn allows us to run the flush and sync with IRQs disabled. Signed-off-by: Christoffer Dall --- include/kvm/arm_arch_timer.h | 3 +++ virt/kvm/arm/arch_timer.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/include/kvm/arm_arch_timer.h b/include/kvm/arm_arch_timer.h index dcbb2e1..16887c0 100644 --- a/include/kvm/arm_arch_timer.h +++ b/include/kvm/arm_arch_timer.h @@ -47,6 +47,9 @@ struct arch_timer_cpu { /* Work queued with the above timer expires */ struct work_struct expired; + /* Physical timer emulation */ + struct hrtimer phys_timer; + /* Background timer active */ bool armed; diff --git a/virt/kvm/arm/arch_timer.c b/virt/kvm/arm/arch_timer.c index c2e8326..7f87099 100644 --- a/virt/kvm/arm/arch_timer.c +++ b/virt/kvm/arm/arch_timer.c @@ -178,6 +178,12 @@ static enum hrtimer_restart kvm_bg_timer_expire(struct hrtimer *hrt) return HRTIMER_NORESTART; } +static enum hrtimer_restart kvm_phys_timer_expire(struct hrtimer *hrt) +{ + WARN(1, "Timer only used to ensure guest exit - unexpected event."); + return HRTIMER_NORESTART; +} + bool kvm_timer_should_fire(struct arch_timer_context *timer_ctx) { u64 cval, now; @@ -255,7 +261,7 @@ static void kvm_timer_update_state(struct kvm_vcpu *vcpu) } /* Schedule the background timer for the emulated timer. */ -static void kvm_timer_emulate(struct kvm_vcpu *vcpu, +static void phys_timer_emulate(struct kvm_vcpu *vcpu, struct arch_timer_context *timer_ctx) { struct arch_timer_cpu *timer = &vcpu->arch.timer_cpu; @@ -267,7 +273,7 @@ static void kvm_timer_emulate(struct kvm_vcpu *vcpu, return; /* The timer has not yet expired, schedule a background timer */ - soft_timer_start(&timer->bg_timer, kvm_timer_compute_delta(timer_ctx)); + soft_timer_start(&timer->phys_timer, kvm_timer_compute_delta(timer_ctx)); } /* @@ -424,7 +430,7 @@ void kvm_timer_flush_hwstate(struct kvm_vcpu *vcpu) kvm_timer_update_state(vcpu); /* Set the background timer for the physical timer emulation. */ - kvm_timer_emulate(vcpu, vcpu_ptimer(vcpu)); + phys_timer_emulate(vcpu, vcpu_ptimer(vcpu)); if (unlikely(!irqchip_in_kernel(vcpu->kvm))) kvm_timer_flush_hwstate_user(vcpu); @@ -447,7 +453,7 @@ void kvm_timer_sync_hwstate(struct kvm_vcpu *vcpu) * This is to cancel the background timer for the physical timer * emulation if it is set. */ - soft_timer_cancel(&timer->bg_timer, &timer->expired); + soft_timer_cancel(&timer->phys_timer, NULL); /* * The guest could have modified the timer registers or the timer @@ -507,6 +513,9 @@ void kvm_timer_vcpu_init(struct kvm_vcpu *vcpu) hrtimer_init(&timer->bg_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); timer->bg_timer.function = kvm_bg_timer_expire; + hrtimer_init(&timer->phys_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); + timer->phys_timer.function = kvm_phys_timer_expire; + vtimer->irq.irq = default_vtimer_irq.irq; ptimer->irq.irq = default_ptimer_irq.irq; } @@ -615,6 +624,7 @@ void kvm_timer_vcpu_terminate(struct kvm_vcpu *vcpu) struct arch_timer_context *vtimer = vcpu_vtimer(vcpu); soft_timer_cancel(&timer->bg_timer, &timer->expired); + soft_timer_cancel(&timer->phys_timer, NULL); kvm_vgic_unmap_phys_irq(vcpu, vtimer->irq.irq); }