KVM: x86/mmu: Exempt nested EPT page tables from !USER, CR0.WP=0 logic
Sean Christopherson
maintainerPATCH 1/1 KVM: x86/mmu: Exempt nested EPT page tables from !USER, CR0.WP=0 logic
Exempt nested EPT shadow pages tables from the CR0.WP=0 handling of supervisor writes, as EPT doesn't have a U/S bit and isn't affected by CR0.WP (or CR4.SMEP in the exception to the exception).
Opportunistically refresh the comment to explain what KVM is doing, as the only record of why KVM shoves in WRITE and drops USER is buried in years-old changelogs.
--- arch/x86/kvm/mmu/paging_tmpl.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
arch/x86/kvm/mmu/paging_tmpl.h +6 -2
@@ -804,9 +804,12 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *faultif (r !=RET_PF_CONTINUE )return r; +#if PTTYPE !=PTTYPE_EPT /* -* Do not change pte_access if the pfn is a mmio page, otherwise -* we will cache the incorrect access into mmio spte. +* Treat the guest PTE protections as writable, supervisor-only if this +* is a supervisor write fault and CR0.WP=0 (supervisor accesses ignore +* PTE.W if CR0.WP=0). Don't change the access type for emulated MMIO, +* otherwise KVM will cache incorrect access information in the SPTE. */ if (fault->write && !(walker.pte_access &ACC_WRITE_MASK ) && !is_cr0_wp (vcpu->arch.mmu) && !fault->user && fault->slot) {
@@ -822,6 +825,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *faultif (is_cr4_smep (vcpu->arch.mmu)) walker.pte_access &= ~ACC_EXEC_MASK; } +#endif r =RET_PF_RETRY ;write_lock (&vcpu->kvm->mmu_lock);
base-commit: 3f7b307757ecffc1c18ede9ee3cf9ce8101f3cc9
Signature · 1 line
2.49.0.1204.g71687c7c1d-goog
Quoted 11 lines · Sean Christopherson
Exempt nested EPT shadow pages tables from the CR0.WP=0 handling of supervisor writes, as EPT doesn't have a U/S bit and isn't affected by CR0.WP (or CR4.SMEP in the exception to the exception).
Opportunistically refresh the comment to explain what KVM is doing, as the only record of why KVM shoves in WRITE and drops USER is buried in years-old changelogs.
Cc Jon Kohler <[email protected]>Cc Sergey Dyasli <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Thank you for the patch, LGTM.
Sergey
Quoted 47 lines · Sean Christopherson
Exempt nested EPT shadow pages tables from the CR0.WP=0 handling of supervisor writes, as EPT doesn't have a U/S bit and isn't affected by CR0.WP (or CR4.SMEP in the exception to the exception).
Opportunistically refresh the comment to explain what KVM is doing, as the only record of why KVM shoves in WRITE and drops USER is buried in years-old changelogs.
Cc Jon Kohler <[email protected]>Cc Sergey Dyasli <[email protected]>Signed-off-by Sean Christopherson <[email protected]>---
arch/x86/kvm/mmu/paging_tmpl.h| 8 ++++++--1 file changed, 6 insertions(+), 2 deletions(-)arch/x86/kvm/mmu/paging_tmpl.h +5
-2@@ -804,9 +804,12 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *faultif (r !=RET_PF_CONTINUE )return r; +#if PTTYPE !=PTTYPE_EPT /* -* Do not change pte_access if the pfn is a mmio page, otherwise -* we will cache the incorrect access into mmio spte. +* Treat the guest PTE protections as writable, supervisor-only if this +* is a supervisor write fault and CR0.WP=0 (supervisor accesses ignore +* PTE.W if CR0.WP=0). Don't change the access type for emulated MMIO, +* otherwise KVM will cache incorrect access information in the SPTE. */ if (
fault->write&& !(walker.pte_access &ACC_WRITE_MASK) &&
!is_cr0_wp(vcpu->arch.mmu) && !fault->user &&fault->slot) {arch/x86/kvm/mmu/paging_tmpl.h +1
-0@@ -822,6 +825,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *faultif (is_cr4_smep (vcpu->arch.mmu)) walker.pte_access &= ~ACC_EXEC_MASK; } +#endif r =RET_PF_RETRY ;write_lock (&vcpu->kvm->mmu_lock);
Quoted 4 lines
base-commit:
3f7b307757ecffc1c18ede9ee3cf9ce8101f3cc9Signature · 1 line
2.49.0.1204.g71687c7c1d-goog
Thanks, I’ll give it a go, but LGTM in general
Quoted 9 lines · Sean Christopherson
Exempt nested EPT shadow pages tables from the CR0.WP=0 handling of supervisor writes, as EPT doesn't have a U/S bit and isn't affected by CR0.WP (or CR4.SMEP in the exception to the exception).
Opportunistically refresh the comment to explain what KVM is doing, as the only record of why KVM shoves in WRITE and drops USER is buried in years-old changelogs.
[...]
Applied to kvm-x86 mmu, thanks!
[1/1] KVM: x86/mmu: Exempt nested EPT page tables from !USER, CR0.WP=0 logic
https://github.com/kvm-x86/linux/commit/ffced8922050