From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2018B606EEBA for ; Mon, 9 Nov 2026 08:32:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=S/N8oMts; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=jHloTWne 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-Unsubscribe-Post: List-Owner; bh=hftCpCAdlJ74ejU7FOFHBms3FRju+VPXbTEzSLCodYg=; b=S/N8oMtsQesIpy 6TzSnP6UHIPQsPmyyO2TGxq5BqMB4fze7Q1LK6xuOvquXXV1elFZA6LcSIpCTua1heCe4ss4mxmGt w9vcHMgcaz6uL3EPfKrJvFp7hR406qXglLQsU2sks/fdaESGPdljpC0DWrGzdCnOthiRFml4cMIZC ozghZ3wEGh2HGcgMai+aHocve2Y/xU4MeT9ajk6KrJ45JGnsjcl1mSGr/YfNNlIJF0399B+jgwp8y nHy2ULeNinW8wuGbSOAQSnHn3LHq/6HMyJn1t8E2ffW5oqwANv362gagqicLSEN91Z1dZTSOxy8Ju C6kR0VuJcDIazTdnnwLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xQKnv-000000004He-1Ezb; Mon, 09 Nov 2026 08:32:39 +0000 Received: from out-192.mta1.migadu.com ([95.215.58.192] helo=mta1.migadu.com) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xQKnk-0000000046g-3WQz for linux-arm-kernel@lists.infradead.org; Mon, 09 Nov 2026 08:32:30 +0000 X-Envelope-To: linux-arm-kernel@lists.infradead.org DKIM-Signature: a=rsa-sha256; bh=QsSbmCD+3/uBmYWuVNria8OBeV9bpscEqdiAWZ9SMbk=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1794213147; v=1; x=1794817947; b=jHloTWneoYNsBuPXagmsLZ/TU+l7ejcVfdHJQrCjT3p5B4sxX2k5vqaLwb0gv62abilMhoGS lRBkT/6S9mlpU9oG1SwmmSGlzTFcAW+6MXdvOPH3bIP/4gAQNsWrIaKkymMzo+idKD1Da6YAAWa LgoEA3C8gGxW2VyXcP3hWy1Q= X-Envelope-To: linux-arm-kernel@lists.infradead.org Received: by smtp.migadu.com with ESMTPS id e594ab08fa32c2ea; Mon, 09 Nov 2026 08:32:27 +0000 X-Mizu-Trace-ID: e594ab08fa32c2ea X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Joey Gouly , Suzuki K Poulose , Zenghui Yu , Steffen Eiden , Catalin Marinas , Will Deacon , Mark Rutland , Vincent Donnefort , Fuad Tabba , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/16] KVM: arm64: Compute a protected vCPU's fine-grained traps at EL2 Date: Mon, 9 Nov 2026 08:31:56 +0000 Message-ID: <20261109083205.806619-8-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261109083205.806619-1-fuad.tabba@linux.dev> References: <20261109083205.806619-1-fuad.tabba@linux.dev> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261109_003229_030313_F278D7F5 X-CRM114-Status: GOOD ( 14.67 ) X-Spam-Score: -2.1 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 pKVM sets a protected vCPU's HCR_EL2, MDCR_EL2 and HCRX_EL2 at EL2 from the VM's ID registers, but never computes its fine-grained traps, which stay 0. That traps every register with a negative-polarity trap bit, so a feature such as S1PIE can't be advertised to a protected VM: EL2 would inject an UNDEF for the guest's accesses to PIR_EL1. Link config.c into the nVHE hyp and compute the VM's FGU masks and the vCPU's fine-grained traps there, under vm_table_lock, once the ID registers are set. The init-time check of the feature maps stays out of the hyp, since it prints and the host runs it anyway. A protected vCPU then traps the registers of the features it doesn't support, as a non-protected vCPU does. Its TCR_EL1 writes also get the AmpereOne AC03_CPU_38 masking again, which protected vCPUs lost when the erratum's trap moved into the per-vCPU fine-grained traps. Fixes: fb10ddf35c1cc ("KVM: arm64: Compute per-vCPU FGTs at vcpu_load()") Signed-off-by: Fuad Tabba --- arch/arm64/kvm/config.c | 12 +++++++----- arch/arm64/kvm/hyp/nvhe/Makefile | 1 + arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c index c65cf1dd27330..27ee8188fd76d 100644 --- a/arch/arm64/kvm/config.c +++ b/arch/arm64/kvm/config.c @@ -1395,6 +1395,12 @@ static const struct reg_bits_to_feat_map ich_hfgitr_feat_map[] = { static const DECLARE_FEAT_MAP_FGT(ich_hfgitr_desc, ich_hfgitr_masks, ich_hfgitr_feat_map, FEAT_GCIE); +static u64 reg_feat_map_bits(const struct reg_bits_to_feat_map *map) +{ + return map->flags & MASKS_POINTER ? (map->masks->mask | map->masks->nmask) : map->bits; +} + +#ifndef __KVM_NVHE_HYPERVISOR__ static void __init check_feat_map(const struct reg_bits_to_feat_map *map, int map_size, u64 resx, const char *str) { @@ -1414,11 +1420,6 @@ static void __init check_feat_map(const struct reg_bits_to_feat_map *map, str, mask ^ ~resx); } -static u64 reg_feat_map_bits(const struct reg_bits_to_feat_map *map) -{ - return map->flags & MASKS_POINTER ? (map->masks->mask | map->masks->nmask) : map->bits; -} - static void __init check_reg_desc(const struct reg_feat_map_desc *r) { check_feat_map(r->bit_feat_map, r->bit_feat_map_sz, @@ -1451,6 +1452,7 @@ void __init check_feature_map(void) check_reg_desc(&ich_hfgwtr_desc); check_reg_desc(&ich_hfgitr_desc); } +#endif static const struct reg_feat_map_desc *idreg_feat_maps[] = { &id_aa64mmfr3_el1_desc, diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 56a7e2c05f73a..06d7d8618d89f 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -27,6 +27,7 @@ hyp-obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o host.o cache.o setup.o mm.o mem_protect.o sys_regs.o pkvm.o stacktrace.o ffa.o hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../hyp-entry.o ../exception.o ../pgtable.o ../vgic-v5-sr.o +hyp-obj-y += ../../config.o hyp-obj-y += ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) += list_debug.o hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o trace.o events.o diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index fba8dfe6389d6..465d963d6ff57 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -206,6 +206,8 @@ static int pkvm_vcpu_init_traps(struct pkvm_hyp_vcpu *hyp_vcpu) pvm_init_traps_hcr(vcpu); pvm_init_traps_mdcr(vcpu); vcpu_set_hcrx(vcpu); + kvm_init_fgu(vcpu->kvm); + kvm_vcpu_load_fgt(vcpu); return 0; } -- 2.47.3