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 0ECFA10A88E3 for ; Thu, 26 Mar 2026 15:35:54 +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=FFuH7BmG5RQW11/LkSlpyGY27ZRZu+XIfl3HJv+ZFhc=; b=dU8huDQtfJqGMDSxfd6kfs6/Jg f2xpJFLK9Zm35hElGn/8mrMiKzC1+fVSJL9w9cwBtHnNXoBjrD6J8w8Tge+dZ3rADEB/uMxUjrEYq lYK6KsFr7XpzbWGANJLeeUz2AewlmkRZZPTgFkkSZwp25RBlw108Yj92EMXdw+Ly+H9qVjN075w91 sVH4FGQUd3Xe53PqncbpUL/4ycawC1iWMilLng9Gl5dgNdYUKvw9uic7Su8UKoFguWOc0WN8ur+mR d8dsGGH67taKtO4feg0HDdC5xK+Qcr9zUXHwN8RvUTWurWiAv0oIo+kTp1S1OO8hbGReD1gOf1Ehq hTbRCvrg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1w5mkO-00000005lCB-2HeT; Thu, 26 Mar 2026 15:35:48 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1w5mkD-00000005l2P-2qnO for linux-arm-kernel@lists.infradead.org; Thu, 26 Mar 2026 15:35:40 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id BF96044581; Thu, 26 Mar 2026 15:35:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9EB4BC2BCB4; Thu, 26 Mar 2026 15:35:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774539336; bh=L1mSvPjSIYoG8LtAIHtXZGudc3PJdk/BtNGgyIfZ3nY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bfoV327fJ0oy9O00rrNJkeQYzD5b3uvDehN/+psrdwR157578h7h9M+lGiPGSvKVP sQamcXC5qi8JdRKa5DeY9bDyT1wQDUvUUG+DNm9fIA98P9rBAI/sOo8zjBkMZtC+s7 ntLMPbqbi37po59lYuAAxE2qqzzWi+4zsxjDK0LyPLCb6E7a5K2H7Itum3VCSJCTMf SQPAwLUa2e/uwUiPzd2idLPowOxP3ewf/OW2LCxEDY+mJQE5VTm8xx6neq7trcHRMa 7lFAB2aYj/cljuE8w+1rK/q00wbltrTT3jGRUJdgGV6XPGvhjCWsyvYDacZrzbPs0c kNsFL2VGUbxeg== 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.98.2) (envelope-from ) id 1w5mkA-000000060II-1qbh; Thu, 26 Mar 2026 15:35:34 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Sascha Bischoff , Mark Brown Subject: [PATCH 01/15] KVM: arm64: vgic: Don't reset cpuif/redist addresses at finalize time Date: Thu, 26 Mar 2026 15:35:16 +0000 Message-ID: <20260326153530.3981879-2-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260326153530.3981879-1-maz@kernel.org> References: <20260326153530.3981879-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, sascha.bischoff@arm.com, broonie@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-20260326_083537_747429_2C5989A7 X-CRM114-Status: GOOD ( 11.40 ) 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 Although we are OK with rewriting idregs at finalize time, resetting the guest's cpuif (GICv3) or redistributor (GICv3) addresses once we start running the guest is a pretty bad idea. Move back this initialisation to vgic creation time. Fixes: a258a383b9177 ("KVM: arm64: gic-v5: Sanitize ID_AA64PFR2_EL1.GCIE") Link: https://patch.msgid.link/20260323174713.3183111-1-maz@kernel.org Signed-off-by: Marc Zyngier --- 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 47169604100f2..fd872079f2a24 100644 --- a/arch/arm64/kvm/vgic/vgic-init.c +++ b/arch/arm64/kvm/vgic/vgic-init.c @@ -147,6 +147,15 @@ int kvm_vgic_create(struct kvm *kvm, u32 type) kvm->arch.vgic.implementation_rev = KVM_VGIC_IMP_REV_LATEST; kvm->arch.vgic.vgic_dist_base = VGIC_ADDR_UNDEF; + switch (type) { + case KVM_DEV_TYPE_ARM_VGIC_V2: + kvm->arch.vgic.vgic_cpu_base = VGIC_ADDR_UNDEF; + break; + case KVM_DEV_TYPE_ARM_VGIC_V3: + INIT_LIST_HEAD(&kvm->arch.vgic.rd_regions); + break; + } + /* * We've now created the GIC. Update the system register state * to accurately reflect what we've created. @@ -684,10 +693,8 @@ void kvm_vgic_finalize_idregs(struct kvm *kvm) switch (type) { case KVM_DEV_TYPE_ARM_VGIC_V2: - kvm->arch.vgic.vgic_cpu_base = VGIC_ADDR_UNDEF; break; case KVM_DEV_TYPE_ARM_VGIC_V3: - INIT_LIST_HEAD(&kvm->arch.vgic.rd_regions); aa64pfr0 |= SYS_FIELD_PREP_ENUM(ID_AA64PFR0_EL1, GIC, IMP); pfr1 |= SYS_FIELD_PREP_ENUM(ID_PFR1_EL1, GIC, GICv3); break; -- 2.47.3