From patchwork Thu Sep 3 15:26:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11754231 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DE3901575 for ; Thu, 3 Sep 2020 15:57:58 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4DFA2072A for ; Thu, 3 Sep 2020 15:57:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="3QgGu711"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="07CUHzAc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4DFA2072A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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=HwKCs+gLEtMxxPbiPfcM17VevKXnvbZHTPuHmB39ZZ0=; b=3QgGu711hCHnZEHNKSwPAgCC7 uD614Z6KR6FfmYonuHrEFicsFMVMFopyuVSLtChDePn670+iteTIl9G3qt8+f4FcLelF55Zh+vO5W pbm51JkNiSs6CsMtPX7opQydIB49cl773lC2fc+MUkGQPzJ/MaUdBW2syrxxm3BsRWvDCGm0LP1nL iSUODHqpmSQQpdqDdGjLfe+4InxI8mJhwNK8wtUOVZHoQhpOODMFpKTHDchvXH2gIieBT9B5FUlI7 axTLHq+IHY1b6vF9U2JyJwLxLDuqgbb9JYssnPHW7rHVonXbOGFeBiXhvtXIp/TE3g0rbzF7EvVZz K16zsoGvA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDrat-0000rY-52; Thu, 03 Sep 2020 15:56:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDrai-0000nu-Li for linux-arm-kernel@lists.infradead.org; Thu, 03 Sep 2020 15:56:02 +0000 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EAB2020775; Thu, 3 Sep 2020 15:55:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599148560; bh=Zmy7IjMeRTgXirbjiJ59TU+qyqamGmOSjVIBZBkIHO8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=07CUHzAcH4m+iOTvLUkUCCUoc1GUB1B/Co2s6UdlcDCK8y/Of12EkqkU//5hsUsf8 JlwLNMJR1jTVsWolMtZbaqa8oJGS8KoQUNVg1n5qHJ327TiHnR9hE2sK1eZrXcUx0N iEsR5rnTossPGBlrPly7fgnnTeJiwvHH1pRp96z0= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kDr89-008vT9-GE; Thu, 03 Sep 2020 16:26:29 +0100 From: Marc Zyngier To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Subject: [PATCH 14/23] KVM: arm64: Move kvm_vgic_vcpu_{sync, flush}_hwstate() to irqchip_flow Date: Thu, 3 Sep 2020 16:26:01 +0100 Message-Id: <20200903152610.1078827-15-maz@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200903152610.1078827-1-maz@kernel.org> References: <20200903152610.1078827-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, Christoffer.Dall@arm.com, lorenzo.pieralisi@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200903_115600_956026_6E79A765 X-CRM114-Status: GOOD ( 17.63 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lorenzo Pieralisi , Suzuki K Poulose , Christoffer Dall , James Morse , kernel-team@android.com, Julien Thierry Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Abstract the calls to kvm_vgic_vcpu_({sync,flush}_hwstate) via the irqchip_flow structure. No functional change. Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/kvm_irq.h | 8 ++++++++ arch/arm64/kvm/arm.c | 6 +++--- arch/arm64/kvm/vgic/vgic-init.c | 2 ++ include/kvm/arm_vgic.h | 2 -- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h index 7d888f10aabe..92aaec05ee75 100644 --- a/arch/arm64/include/asm/kvm_irq.h +++ b/arch/arm64/include/asm/kvm_irq.h @@ -26,6 +26,8 @@ struct kvm_irqchip_flow { void (*irqchip_vcpu_put)(struct kvm_vcpu *); int (*irqchip_vcpu_pending_irq)(struct kvm_vcpu *); int (*irqchip_vcpu_first_run)(struct kvm_vcpu *); + void (*irqchip_vcpu_flush_hwstate)(struct kvm_vcpu *); + void (*irqchip_vcpu_sync_hwstate)(struct kvm_vcpu *); }; /* @@ -78,4 +80,10 @@ struct kvm_irqchip_flow { #define kvm_irqchip_vcpu_first_run(v) \ __vcpu_irqchip_action_ret((v), vcpu_first_run, (v)) +#define kvm_irqchip_vcpu_flush_hwstate(v) \ + __vcpu_irqchip_action((v), vcpu_flush_hwstate, (v)) + +#define kvm_irqchip_vcpu_sync_hwstate(v) \ + __vcpu_irqchip_action((v), vcpu_sync_hwstate, (v)) + #endif diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 0db71d2a38a4..875e68514661 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -661,7 +661,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) local_irq_disable(); - kvm_vgic_flush_hwstate(vcpu); + kvm_irqchip_vcpu_flush_hwstate(vcpu); /* * Exit if we have a signal pending so that we can deliver the @@ -702,7 +702,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) kvm_pmu_sync_hwstate(vcpu); if (static_branch_unlikely(&userspace_irqchip_in_use)) kvm_timer_sync_user(vcpu); - kvm_vgic_sync_hwstate(vcpu); + kvm_irqchip_vcpu_sync_hwstate(vcpu); local_irq_enable(); preempt_enable(); continue; @@ -738,7 +738,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) * the timer code needs to know if the virtual timer * interrupts are active. */ - kvm_vgic_sync_hwstate(vcpu); + kvm_irqchip_vcpu_sync_hwstate(vcpu); /* * Sync the timer hardware state before enabling interrupts as diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index 8ec8064467a7..53fadbf4ca89 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -25,6 +25,8 @@ static struct kvm_irqchip_flow vgic_irqchip_flow = { .irqchip_vcpu_put = kvm_vgic_put, .irqchip_vcpu_pending_irq = kvm_vgic_vcpu_pending_irq, .irqchip_vcpu_first_run = kvm_vgic_vcpu_first_run, + .irqchip_vcpu_flush_hwstate = kvm_vgic_flush_hwstate, + .irqchip_vcpu_sync_hwstate = kvm_vgic_sync_hwstate, }; /* diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index fad523007e2b..4b3a334185fa 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -350,8 +350,6 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int vintid); #define vgic_valid_spi(k, i) (((i) >= VGIC_NR_PRIVATE_IRQS) && \ ((i) < (k)->arch.vgic.nr_spis + VGIC_NR_PRIVATE_IRQS)) -void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu); -void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu); void kvm_vgic_reset_mapped_irq(struct kvm_vcpu *vcpu, u32 vintid); void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg, bool allow_group1);