From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A1010C43461 for ; Thu, 3 Sep 2020 15:26:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FAA92072A for ; Thu, 3 Sep 2020 15:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599146817; bh=lgvTIsBwIP9Y/PcN/yqslqFkcX9YiCZ8blsuaMOPDkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X/OdpQT/kTfs4MzE+F7QE1Tf9YD3+JWgDwIveefkH6OLw/c1DBl5iNafJkP1tYQ6o lRZILDqqqBzhlhiljZNAY7ccuQNtz8DWxcl7Z9U5JqcjVR+mD20M3uTzgIb7JSbQZS EJTVGMlKnD19+/2432cEE8vp5i/FBIh3FET2EB5g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728610AbgICP04 (ORCPT ); Thu, 3 Sep 2020 11:26:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:42522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728506AbgICP03 (ORCPT ); Thu, 3 Sep 2020 11:26:29 -0400 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 70AD420BED; Thu, 3 Sep 2020 15:26:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1599146787; bh=lgvTIsBwIP9Y/PcN/yqslqFkcX9YiCZ8blsuaMOPDkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i8RlzDHlKY+D5mo66/XjpZhjegAirCBEbltXSFY7q09KIP73f/eVVTF/+d6GXF7k5 eDwoBUVS13yui6Ckq1GknNgOl1viwaPwbHiAV4XAwItt/Q+CPhTpjUAbVXZVql9cUB IU8J9yvDyDsLNeouqZlgn0M3anr9xt17Hp/phbuA= 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 1kDr85-008vT9-RB; Thu, 03 Sep 2020 16:26:25 +0100 From: Marc Zyngier To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org Cc: kernel-team@android.com, Christoffer Dall , Lorenzo Pieralisi , James Morse , Julien Thierry , Suzuki K Poulose Subject: [PATCH 08/23] KVM: arm64: Move kvm_vgic_destroy to kvm_irqchip_flow Date: Thu, 3 Sep 2020 16:25:55 +0100 Message-Id: <20200903152610.1078827-9-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 Content-Transfer-Encoding: 8bit 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 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Let's start the VGIC split by moving the act of destroying it, as it is simple and doesn't require much effort. Whilst we're at it, make kvm_vgic_vcpu_destroy() static, as it isn't called from anywhere else. Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/kvm_irq.h | 4 ++++ arch/arm64/kvm/arm.c | 2 +- arch/arm64/kvm/vgic/vgic-init.c | 7 +++++-- include/kvm/arm_vgic.h | 2 -- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_irq.h b/arch/arm64/include/asm/kvm_irq.h index 7a70bb803560..f83594257bc4 100644 --- a/arch/arm64/include/asm/kvm_irq.h +++ b/arch/arm64/include/asm/kvm_irq.h @@ -18,6 +18,7 @@ enum kvm_irqchip_type { #define irqchip_is_gic_v3(k) ((k)->arch.irqchip_type == IRQCHIP_GICv3) struct kvm_irqchip_flow { + void (*irqchip_destroy)(struct kvm *); }; /* @@ -46,4 +47,7 @@ struct kvm_irqchip_flow { #define __vcpu_irqchip_action_ret(v, ...) \ __kvm_irqchip_action_ret((v)->kvm, __VA_ARGS__) +#define kvm_irqchip_destroy(k) \ + __kvm_irqchip_action((k), destroy, (k)) + #endif diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 41f98564f507..09b4bcb2c805 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -143,7 +143,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) { int i; - kvm_vgic_destroy(kvm); + kvm_irqchip_destroy(kvm); for (i = 0; i < KVM_MAX_VCPUS; ++i) { if (kvm->vcpus[i]) { diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index 6b8f0518c074..4e2c23a7dab1 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -12,7 +12,10 @@ #include #include "vgic.h" +static void kvm_vgic_destroy(struct kvm *kvm); + static struct kvm_irqchip_flow vgic_irqchip_flow = { + .irqchip_destroy = kvm_vgic_destroy, }; /* @@ -341,7 +344,7 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) vgic_v4_teardown(kvm); } -void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) +static void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) { struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu; @@ -368,7 +371,7 @@ static void __kvm_vgic_destroy(struct kvm *kvm) kvm_vgic_dist_destroy(kvm); } -void kvm_vgic_destroy(struct kvm *kvm) +static void kvm_vgic_destroy(struct kvm *kvm) { mutex_lock(&kvm->lock); __kvm_vgic_destroy(kvm); diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index 8d30fc645148..e8bdc304ec9b 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -337,8 +337,6 @@ extern struct static_key_false vgic_v3_cpuif_trap; int kvm_vgic_addr(struct kvm *kvm, unsigned long type, u64 *addr, bool write); int kvm_vgic_vcpu_init(struct kvm_vcpu *vcpu); int kvm_vgic_create(struct kvm *kvm, u32 type); -void kvm_vgic_destroy(struct kvm *kvm); -void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu); int kvm_vgic_map_resources(struct kvm *kvm); int kvm_vgic_hyp_init(void); void kvm_vgic_init_cpu_hardware(void); -- 2.27.0