diff options
| author | Sean Christopherson <seanjc@google.com> | 2024-02-27 18:41:39 -0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-05-07 11:59:20 -0400 |
| commit | 07702e5a6d6d62266e5f156f23b00a272af64c8e (patch) | |
| tree | fe388f07fa2824076363d3c4d975d8f861e25d90 /arch/x86 | |
| parent | cd389f50700343774ae6b25b08e16247b3c7fa4c (diff) | |
| download | linux-stable-07702e5a6d6d62266e5f156f23b00a272af64c8e.tar.gz linux-stable-07702e5a6d6d62266e5f156f23b00a272af64c8e.tar.bz2 linux-stable-07702e5a6d6d62266e5f156f23b00a272af64c8e.zip | |
KVM: x86/mmu: WARN and skip MMIO cache on private, reserved page faults
WARN and skip the emulated MMIO fastpath if a private, reserved page fault
is encountered, as private+reserved should be an impossible combination
(KVM should never create an MMIO SPTE for a private access).
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-ID: <20240228024147.41573-9-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/mmu/mmu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 4bb121b5f58e..9560fca3a6cf 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -5818,6 +5818,9 @@ int noinline kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 err r = RET_PF_INVALID; if (unlikely(error_code & PFERR_RSVD_MASK)) { + if (WARN_ON_ONCE(error_code & PFERR_PRIVATE_ACCESS)) + return -EFAULT; + r = handle_mmio_page_fault(vcpu, cr2_or_gpa, direct); if (r == RET_PF_EMULATE) goto emulate; |