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 ACB66CD98D0 for ; Thu, 13 Nov 2025 20:10:31 +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-Type:MIME-Version: References:In-Reply-To:Subject:Cc:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=EFwl4Y2wbAVkdHEBtOXUcw2R/Z9Gq47i14JCtpCPnis=; b=eu9W+ePCGBBHsc9EAmwkUlTduq kC8n16zYSqMOWF0E5Z1DjvqnTbmngWV7XvBN6sAfvq2BHmZvtSpVJIfjHmNq0gpxJcDb6jsg87WOS wTnbzKuI066WtskScnpqqUhtVSN8ZR1yIFb2q2qMjxBYFKJFP7iNR6IJuuN4m8j8A0pYHFhU4IUmI RUIHDTQV/kkvc+9Q1rcOVI59CKK89sviBw6+9RmfmQlSUERVf2GzgNnvH/UqJSk5w7sLQ0Nu/kdVQ P7Tf0xIG1GjXC/1qql/sssFyui7unNambEkVVtiWUUA8yKiC1LlmoaQobrEBRaBv7+fp4CYfc3H2g rB3XeUDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vJdeC-0000000B44v-3MMe; Thu, 13 Nov 2025 20:10:25 +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 1vJdeA-0000000B44D-2z1Y for linux-arm-kernel@lists.infradead.org; Thu, 13 Nov 2025 20:10:23 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id F035640AB7; Thu, 13 Nov 2025 20:10:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 884A4C4CEFB; Thu, 13 Nov 2025 20:10:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763064621; bh=XhW7cUeN8WBhvszpm+5UwRt9sdZlZPSmEzfCXizuFPU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=uFR0yht4IbiXsgAESdOfYzJ4m/HcgROH6oLpQ+yKbpqYYNFSZn2HxN26zEJT4NQgD rqqc9gif+X6AN/mSMbaJ8vtL28nHq3gG/BxuP1qZHOIZu5PPsRuzEqHa9IMOGJI18o 3KinGzRd3xvz+XQI9txqamOo6ErdJKo58oItGiFTjIjDPcXR8P+dplgaPfYC/ytQh9 rvUm3zOhrTxJ+6NnQp5PF+PeRrdVuiD3LTu7EH+N1Y4A/B+y0zm9Tl1EPPt8bcdABd 9Q+haHBl06AraG5BsT99BI4Vdqz73hQ6QFuKePG1Ghx4oWVW3pBd4QrePubi7F6+kN 2993WUen4SDPQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) 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 1vJde7-0000000503W-11X2; Thu, 13 Nov 2025 20:10:19 +0000 Date: Thu, 13 Nov 2025 20:10:18 +0000 Message-ID: <86frahu21h.wl-maz@kernel.org> From: Marc Zyngier To: Mark Brown Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Christoffer Dall , Volodymyr Babchuk , Yao Yuan , Aishwarya.TCV@arm.com, Fuad Tabba Subject: Re: [PATCH v2 05/45] KVM: arm64: GICv3: Detect and work around the lack of ICV_DIR_EL1 trapping In-Reply-To: <7ea5c49d-b093-475e-9f27-ad92dcc4b560@sirena.org.uk> References: <20251109171619.1507205-1-maz@kernel.org> <20251109171619.1507205-6-maz@kernel.org> <7ae5874e-366f-4abd-9142-ffbe21fed3a8@sirena.org.uk> <86ikfdu7cu.wl-maz@kernel.org> <7ea5c49d-b093-475e-9f27-ad92dcc4b560@sirena.org.uk> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/30.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: broonie@kernel.org, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, christoffer.dall@arm.com, Volodymyr_Babchuk@epam.com, yaoyuan@linux.alibaba.com, Aishwarya.TCV@arm.com, tabba@google.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-20251113_121022_790520_4E42411B X-CRM114-Status: GOOD ( 20.13 ) 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 +Fuad On Thu, 13 Nov 2025 19:06:31 +0000, Mark Brown wrote: > > [1 ] > On Thu, Nov 13, 2025 at 06:15:29PM +0000, Marc Zyngier wrote: > > Mark Brown wrote: > > > > The arch_timer case bisects to this patch in -next, regular nVHE mode > > > runs this test happily. > > > My hunch is that we're missing something like the hack below, but I > > haven't tried it yet. > > > I'll probably get to it tomorrow. > > That still fails FWIW. Yup, this has uncovered yet another pKVM bug, which doesn't preserve the vgic_model in its private kvm structure. I'm able to make it work with this: diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 43bde061b65de..8911338961c5b 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -337,6 +337,9 @@ static void pkvm_init_features_from_host(struct pkvm_hyp_vm *hyp_vm, const struc /* CTR_EL0 is always under host control, even for protected VMs. */ hyp_vm->kvm.arch.ctr_el0 = host_kvm->arch.ctr_el0; + /* Preserve the vgic model so that GICv3 emulation works */ + hyp_vm->kvm.arch.vgic.vgic_model = host_kvm->arch.vgic.vgic_model; + if (test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &host_kvm->arch.flags)) set_bit(KVM_ARCH_FLAG_MTE_ENABLED, &kvm->arch.flags); diff --git a/arch/arm64/kvm/hyp/nvhe/sys_regs.c b/arch/arm64/kvm/hyp/nvhe/sys_regs.c index 82da9b03692d4..3108b5185c204 100644 --- a/arch/arm64/kvm/hyp/nvhe/sys_regs.c +++ b/arch/arm64/kvm/hyp/nvhe/sys_regs.c @@ -444,6 +444,8 @@ static const struct sys_reg_desc pvm_sys_reg_descs[] = { /* Scalable Vector Registers are restricted. */ + HOST_HANDLED(SYS_ICC_PMR_EL1), + RAZ_WI(SYS_ERRIDR_EL1), RAZ_WI(SYS_ERRSELR_EL1), RAZ_WI(SYS_ERXFR_EL1), @@ -457,9 +459,12 @@ static const struct sys_reg_desc pvm_sys_reg_descs[] = { /* Limited Ordering Regions Registers are restricted. */ + HOST_HANDLED(SYS_ICC_DIR_EL1), + HOST_HANDLED(SYS_ICC_RPR_EL1), HOST_HANDLED(SYS_ICC_SGI1R_EL1), HOST_HANDLED(SYS_ICC_ASGI1R_EL1), HOST_HANDLED(SYS_ICC_SGI0R_EL1), + HOST_HANDLED(SYS_ICC_CTLR_EL1), { SYS_DESC(SYS_ICC_SRE_EL1), .access = pvm_gic_read_sre, }, HOST_HANDLED(SYS_CCSIDR_EL1), Thanks, M. -- Without deviation from the norm, progress is not possible.