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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2A41C4167B for ; Thu, 7 Dec 2023 15:12:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XDkDz33PZtoTLrVMLYLcCw8WOw8mZas4HjgvXgS5XGE=; b=psyv9vT8LA9IQx HHhfJO5DYuIHblqTgcVjVm3burrucgjPjtSBmTemiaDmNbmtEGWEdE8D8x5qoEU59aNR9omwhx4Wg 2SWHEKP9773ZPszeuSZLDdkQXHw/JdNHeqPTT+f9rW/UbMYdOOWG5/8WEai0iMEpFEVaQlBG5ClbW QKBy2zEAUhT1XjYgUbzIAt2ndh1kmDMXzI4H6wOpqPjAvdnl1DNLM4aby4cPUFuNHfgwOX6jakwyM WlKjD/n9tKDk+LrH65sejRZnE0cCKBQ4vQiglpl3KLprQw7nYUm3RzCPuezmwJvOtkUJ5pB5DxUvZ QD22FP/0sYfFijIj5bCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rBG34-00D9II-0K; Thu, 07 Dec 2023 15:12:22 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rBG2y-00D9ES-2h for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2023 15:12:18 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4058F6216C; Thu, 7 Dec 2023 15:12:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E33E7C433CA; Thu, 7 Dec 2023 15:12:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701961935; bh=9DwyeeOFDy6a1ZMT+28RG+1vcydLrWW/k+tdC7nSpJo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uj115eZEedKdopVE1F8DmyQlGIIaHBbl3Fq4UMZux6rlw02bKLeaaWPnf01lNc/Kr h64K0o5ZbZIq/W+6nWTzsim2u11IICidrF1yEYZzHNcXHkH/bjCO1qY47sGLv4gPCm ukRz8YqtEbSAC5KYhBi5xhEAaMpEYVe3sJBMpCLeF0BhmuR+lh/2oALRZyNdNEjUxn 4Map0mi2841QiJp16RoJRGymsCeXPxxGoyqYPhFDEuvmrfiBqM/X6hUrezqECD59vo tTWaYFy7iH1iDHUO4991TBr8bqT1q9izAEB3c6ULJo9I0McScdcXBQQ75sPW6OtxXX /nMXT5/HXPD2Q== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rBG2v-002FcG-L7; Thu, 07 Dec 2023 15:12:13 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Will Deacon , vdonnefort@google.com, stable@vger.kernel.org Subject: [PATCH 2/5] KVM: arm64: vgic: Add a non-locking primitive for kvm_vgic_vcpu_destroy() Date: Thu, 7 Dec 2023 15:11:58 +0000 Message-Id: <20231207151201.3028710-3-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207151201.3028710-1-maz@kernel.org> References: <20231207151201.3028710-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, will@kernel.org, vdonnefort@google.com, stable@vger.kernel.org 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-20231207_071216_915506_A7C452AE X-CRM114-Status: GOOD ( 12.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org As we are going to need to call into kvm_vgic_vcpu_destroy() without prior holding of the slots_lock, introduce __kvm_vgic_vcpu_destroy() as a non-locking primitive of kvm_vgic_vcpu_destroy(). Cc: stable@vger.kernel.org Signed-off-by: Marc Zyngier --- arch/arm64/kvm/vgic/vgic-init.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index ad7e86879eb9..a86f300321a7 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -368,7 +368,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; @@ -382,6 +382,15 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF; } +void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) +{ + struct kvm *kvm = vcpu->kvm; + + mutex_lock(&kvm->slots_lock); + __kvm_vgic_vcpu_destroy(vcpu); + mutex_unlock(&kvm->slots_lock); +} + void kvm_vgic_destroy(struct kvm *kvm) { struct kvm_vcpu *vcpu; @@ -392,7 +401,7 @@ void kvm_vgic_destroy(struct kvm *kvm) vgic_debug_destroy(kvm); kvm_for_each_vcpu(i, vcpu, kvm) - kvm_vgic_vcpu_destroy(vcpu); + __kvm_vgic_vcpu_destroy(vcpu); mutex_lock(&kvm->arch.config_lock); -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel