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 79686C5DF81 for ; Mon, 24 Aug 2026 07:43:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0SX6si3Dgs28McQJmQqgM6rt4jTSrxmbiQtjlfX7MYY=; b=m7HsEIeZzfMEomffO5S7br4Hcm I9Qvt8EAKdxCT+D0aqZfdOLzCYaR8AtZG/pli/dK86Mz8iKIEpTKNf95xKQCXd+UC2o8dTMwmqnGR tOJL/HASM0RdCHN93FBRczFDDwFEbI/+W1RQBHCYK3HsDEumGgLPgyNlbvaoTh6hZG4/KK+pYBHWY LBFDAbyA2RiKvfin1F8IUUv6VKLM7vQX75mCxHv5GYbU9prAwU6eNqQD2ypoy6RUUSHG7Fis8S3Zl Hc9ssueEhS7eR1lNr+cOJYk8Ycww+HtsMeYpYjUcgIKKt6fCOiidozGEI5UM7mE93r/TphNyEkYEg Syzz2Tcg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wyPKy-0000000G7dA-0xvF; Mon, 24 Aug 2026 07:43:20 +0000 Received: from out-119.mta0.migadu.com ([2001:41d0:1004:224b::77] helo=mta0.migadu.com) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wyPKj-0000000G7Ky-3dRv for linux-arm-kernel@lists.infradead.org; Mon, 24 Aug 2026 07:43:11 +0000 X-Envelope-To: linux-arm-kernel@lists.infradead.org DKIM-Signature: a=rsa-sha256; bh=9SM9EZpFWctk2TqtGWCIMwkbHqGpteu/BtNVjcuXB8k=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1787557384; v=1; x=1788162184; b=vAQiKIT0UOWNY9Mw7xmNPO4xArsPj47tElYH+KKwb9ZZt9hiakbENrM7pjY0blzzBksXH+RQ nwNUAANQ6l7qoPxgeZfEQII1hWx2vV2Lg5ROHqo0AcIeYqsk7gFKg+Ai7gHdlU2Rn1rl4mkGWqV QHWHTOXwev36YuMZJ+JgdgoY= X-Envelope-To: linux-arm-kernel@lists.infradead.org Received: from claudy.local (2a01:4b00:ad36:1d00:3a05:25ff:fe33:35a9) by smtp.migadu.com with ESMTPS id ff7716c927965831; Mon, 24 Aug 2026 07:43:03 +0000 X-Mizu-Trace-ID: ff7716c927965831 X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton Cc: Thomas Gleixner , Eric Auger , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Will Deacon , Sascha Bischoff , Sebastian Ene , Fuad Tabba , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] KVM: arm64: vgic: Tear down what vgic_init() created when it fails Date: Mon, 24 Aug 2026 08:42:44 +0100 Message-Id: <20260824074245.710955-4-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260824074245.710955-1-fuad.tabba@linux.dev> References: <20260824074245.710955-1-fuad.tabba@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260824_004309_386981_2932494E X-CRM114-Status: GOOD ( 11.15 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Once kvm_vgic_dist_init() has succeeded, every later failure in vgic_init() returns with the SPI array still allocated. A failure after vgic_v4_init() has also succeeded, which today means only kvm_vgic_setup_default_irq_routing(), leaves the vPE array behind as well. A failed vgic_init() leaves kvm_arch_vcpu_precreate() admitting new vCPUs, so a retry of KVM_DEV_ARM_VGIC_CTRL_INIT reaches vgic_v4_init()'s early return with an array that no longer covers every vCPU, and vgic_v3_load()'s WARN_ON(vgic_v4_load()) fires on the first one it misses. Release both on the two paths that can reach them, so the ioctl is all or nothing and a retry starts from scratch. dist->nr_spis stays frozen, since the SPI count cannot change once vgic_init() has supplied it. Fixes: 180ae7b11823 ("KVM: arm/arm64: Enable irqchip routing") Fixes: 74fe55dc9ab7 ("KVM: arm/arm64: GICv4: Add init/teardown of the per-VM vPE irq domain") Reported-by: Sashiko Closes: https://lore.kernel.org/all/20260807105558.73D701F000E9@smtp.kernel.org/ Signed-off-by: Fuad Tabba --- arch/arm64/kvm/vgic/vgic-init.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-init.c b/arch/arm64/kvm/vgic/vgic-init.c index 4012df6002ea6..7493fded53acc 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -462,7 +462,7 @@ int vgic_init(struct kvm *kvm) if (vgic_supports_direct_irqs(kvm)) { ret = vgic_v4_init(kvm); if (ret) - return ret; + goto out_teardown; } } else { ret = vgic_v5_init(kvm); @@ -475,12 +475,19 @@ int vgic_init(struct kvm *kvm) ret = kvm_vgic_setup_default_irq_routing(kvm); if (ret) - return ret; + goto out_teardown; vgic_debug_init(kvm); dist->initialized = true; return 0; + +out_teardown: + vgic_v4_teardown(kvm); + kfree(dist->spis); + dist->spis = NULL; + + return ret; } static void kvm_vgic_dist_destroy(struct kvm *kvm) -- 2.39.5