mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: Jon Kohler <jon@nutanix.com>, Nikunj A Dadhania <nikunj@amd.com>,
	Amit Shah <amit.shah@amd.com>,
	Sean Christopherson <seanjc@google.com>,
	Marcelo Tosatti <mtosatti@redhat.com>
Subject: [PATCH 10/27] KVM: x86/mmu: pass PFERR_GUEST_PAGE/FINAL_MASK to kvm_translate_gpa
Date: Wed,  8 Apr 2026 11:42:00 -0400	[thread overview]
Message-ID: <20260408154217.458420-11-pbonzini@redhat.com> (raw)
In-Reply-To: <20260408154217.458420-1-pbonzini@redhat.com>

The XS/XU bit for EPT are only applied to final accesses, and use the
U bit from the page walk itself.  While strictly speaking not necessary
(any value of PFERR_USER_MASK would be the same for page table accesses,
because they're reads and writes only), it is clearer and less hackish
to only apply MBEC to PFERR_GUEST_FINAL_MASK.  Allow kvm-intel.ko to
distinguish the two cases.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 arch/x86/kvm/hyperv.c          | 3 ++-
 arch/x86/kvm/mmu/mmu.c         | 3 ++-
 arch/x86/kvm/mmu/paging_tmpl.h | 7 +++++--
 arch/x86/kvm/x86.c             | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c
index 9b140bbdc1d8..cf9dd565b894 100644
--- a/arch/x86/kvm/hyperv.c
+++ b/arch/x86/kvm/hyperv.c
@@ -2041,7 +2041,8 @@ static u64 kvm_hv_flush_tlb(struct kvm_vcpu *vcpu, struct kvm_hv_hcall *hc)
 	 * read with kvm_read_guest().
 	 */
 	if (!hc->fast && is_guest_mode(vcpu)) {
-		hc->ingpa = translate_nested_gpa(vcpu, hc->ingpa, 0, NULL);
+		hc->ingpa = translate_nested_gpa(vcpu, hc->ingpa,
+					PFERR_GUEST_FINAL_MASK, NULL);
 		if (unlikely(hc->ingpa == INVALID_GPA))
 			return HV_STATUS_INVALID_HYPERCALL_INPUT;
 	}
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index a26514124fe5..a459177c0480 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -4339,7 +4339,8 @@ static gpa_t nonpaging_gva_to_gpa(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
 {
 	if (exception)
 		exception->error_code = 0;
-	return kvm_translate_gpa(vcpu, mmu, vaddr, access, exception);
+	return kvm_translate_gpa(vcpu, mmu, vaddr, access | PFERR_GUEST_FINAL_MASK,
+				 exception);
 }
 
 static bool mmio_info_in_cache(struct kvm_vcpu *vcpu, u64 addr, bool direct)
diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h
index fb1b5d8b23e5..567f8b77ffe0 100644
--- a/arch/x86/kvm/mmu/paging_tmpl.h
+++ b/arch/x86/kvm/mmu/paging_tmpl.h
@@ -376,7 +376,8 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
 		walker->pte_gpa[walker->level - 1] = pte_gpa;
 
 		real_gpa = kvm_translate_gpa(vcpu, mmu, gfn_to_gpa(table_gfn),
-					     nested_access, &walker->fault);
+					     nested_access | PFERR_GUEST_PAGE_MASK,
+					     &walker->fault);
 
 		/*
 		 * FIXME: This can happen if emulation (for of an INS/OUTS
@@ -444,7 +445,9 @@ static int FNAME(walk_addr_generic)(struct guest_walker *walker,
 		gfn += pse36_gfn_delta(pte);
 #endif
 
-	real_gpa = kvm_translate_gpa(vcpu, mmu, gfn_to_gpa(gfn), access, &walker->fault);
+	real_gpa = kvm_translate_gpa(vcpu, mmu, gfn_to_gpa(gfn),
+				     access | PFERR_GUEST_FINAL_MASK,
+				     &walker->fault);
 	if (real_gpa == INVALID_GPA)
 		return 0;
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fd1c4a36b593..bbafd10fd72c 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1070,7 +1070,8 @@ int load_pdptrs(struct kvm_vcpu *vcpu, unsigned long cr3)
 	 * to an L1 GPA.
 	 */
 	real_gpa = kvm_translate_gpa(vcpu, mmu, gfn_to_gpa(pdpt_gfn),
-				     PFERR_USER_MASK | PFERR_WRITE_MASK, NULL);
+				     PFERR_USER_MASK | PFERR_WRITE_MASK |
+				     PFERR_GUEST_PAGE_MASK, NULL);
 	if (real_gpa == INVALID_GPA)
 		return 0;
 
-- 
2.52.0



  parent reply	other threads:[~2026-04-08 15:42 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-08 15:41 [PATCH v3 00/27] KVM: combined patchset for MBEC/GMET support Paolo Bonzini
2026-04-08 15:41 ` [PATCH 01/27] KVM: TDX/VMX: rework EPT_VIOLATION_EXEC_FOR_RING3_LIN into PROT_MASK Paolo Bonzini
2026-04-08 15:41 ` [PATCH 02/27] KVM: x86/mmu: remove SPTE_PERM_MASK Paolo Bonzini
2026-04-08 15:41 ` [PATCH 03/27] KVM: x86/mmu: free up bit 10 of PTEs in preparation for MBEC Paolo Bonzini
2026-04-08 21:29   ` Huang, Kai
2026-04-08 15:41 ` [PATCH 04/27] KVM: x86/mmu: shuffle high bits of SPTEs " Paolo Bonzini
2026-04-17  1:23   ` Jon Kohler
2026-04-08 15:41 ` [PATCH 05/27] KVM: x86/mmu: remove SPTE_EPT_* Paolo Bonzini
2026-04-08 15:41 ` [PATCH 06/27] KVM: x86/mmu: merge make_spte_{non,}executable Paolo Bonzini
2026-04-08 15:41 ` [PATCH 07/27] KVM: x86/mmu: rename and clarify BYTE_MASK Paolo Bonzini
2026-04-08 15:41 ` [PATCH 08/27] KVM: x86/mmu: introduce ACC_READ_MASK Paolo Bonzini
2026-04-08 15:41 ` [PATCH 09/27] KVM: x86/mmu: separate more EPT/non-EPT permission_fault() Paolo Bonzini
2026-04-08 15:42 ` Paolo Bonzini [this message]
2026-04-08 15:42 ` [PATCH 11/27] KVM: x86/mmu: pass pte_access for final nGPA->GPA walk Paolo Bonzini
2026-04-08 15:42 ` [PATCH 12/27] KVM: x86: make translate_nested_gpa vendor-specific Paolo Bonzini
2026-04-08 15:42 ` [PATCH 13/27] KVM: x86/mmu: split XS/XU bits for EPT Paolo Bonzini
2026-04-08 15:42 ` [PATCH 14/27] KVM: x86/mmu: move cr4_smep to base role Paolo Bonzini
2026-04-08 15:42 ` [PATCH 15/27] KVM: VMX: enable use of MBEC Paolo Bonzini
2026-04-17  1:19   ` Jon Kohler
2026-04-08 15:42 ` [PATCH 16/27] KVM: nVMX: pass advanced EPT violation vmexit info to guest Paolo Bonzini
2026-04-17  1:18   ` Jon Kohler
2026-04-08 15:42 ` [PATCH 17/27] KVM: nVMX: pass PFERR_USER_MASK to MMU on EPT violations Paolo Bonzini
2026-04-08 15:42 ` [PATCH 18/27] KVM: x86/mmu: add support for MBEC to EPT page table walks Paolo Bonzini
2026-04-08 15:42 ` [PATCH 19/27] KVM: nVMX: advertise MBEC to nested guests Paolo Bonzini
2026-04-08 15:42 ` [PATCH 20/27] KVM: nVMX: allow MBEC with EVMCS Paolo Bonzini
2026-04-08 15:42 ` [PATCH 21/27] KVM: x86/mmu: propagate access mask from root pages down Paolo Bonzini
2026-04-08 15:42 ` [PATCH 22/27] KVM: x86/mmu: introduce cpu_role bit for availability of PFEC.I/D Paolo Bonzini
2026-04-08 15:42 ` [PATCH 23/27] KVM: SVM: add GMET bit definitions Paolo Bonzini
2026-04-08 15:42 ` [PATCH 24/27] KVM: x86/mmu: add support for GMET to NPT page table walks Paolo Bonzini
2026-04-08 15:42 ` [PATCH 25/27] KVM: SVM: enable GMET and set it in MMU role Paolo Bonzini
2026-04-08 15:42 ` [PATCH 26/27] KVM: SVM: work around errata 1218 Paolo Bonzini
2026-04-08 15:42 ` [PATCH 27/27] KVM: nSVM: enable GMET for guests Paolo Bonzini
2026-04-15  7:06 ` [PATCH v3 00/27] KVM: combined patchset for MBEC/GMET support David Riley
2026-04-21  2:07   ` Jon Kohler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260408154217.458420-11-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=amit.shah@amd.com \
    --cc=jon@nutanix.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    --cc=nikunj@amd.com \
    --cc=seanjc@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®