Skip to content

Commit 7bdbb82

Browse files
sean-jcbonzini
authored andcommitted
KVM: x86/mmu: WARN if upper 32 bits of legacy #PF error code are non-zero
WARN if bits 63:32 are non-zero when handling an intercepted legacy #PF, as the error code for #PF is limited to 32 bits (and in practice, 16 bits on Intel CPUS). This behavior is architectural, is part of KVM's ABI (see kvm_vcpu_events.error_code), and is explicitly documented as being preserved for intecerpted #PF in both the APM: The error code saved in EXITINFO1 is the same as would be pushed onto the stack by a non-intercepted #PF exception in protected mode. and even more explicitly in the SDM as VMCS.VM_EXIT_INTR_ERROR_CODE is a 32-bit field. Simply drop the upper bits if hardware provides garbage, as spurious information should do no harm (though in all likelihood hardware is buggy and the kernel is doomed). Handling all upper 32 bits in the #PF path will allow moving the sanity check on synthetic checks from kvm_mmu_page_fault() to npf_interception(), which in turn will allow deriving PFERR_PRIVATE_ACCESS from AMD's PFERR_GUEST_ENC_MASK without running afoul of the sanity check. Note, this is also why Intel uses bit 15 for SGX (highest bit on Intel CPUs) and AMD uses bit 31 for RMP (highest bit on AMD CPUs); using the highest bit minimizes the probability of a collision with the "other" vendor, without needing to plumb more bits through microcode. Signed-off-by: Sean Christopherson <seanjc@google.com> Reviewed-by: Kai Huang <kai.huang@intel.com> Message-ID: <20240228024147.41573-7-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent c971013 commit 7bdbb82

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

arch/x86/kvm/mmu/mmu.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4500,6 +4500,13 @@ int kvm_handle_page_fault(struct kvm_vcpu *vcpu, u64 error_code,
45004500
if (WARN_ON_ONCE(fault_address >> 32))
45014501
return -EFAULT;
45024502
#endif
4503+
/*
4504+
* Legacy #PF exception only have a 32-bit error code. Simply drop the
4505+
* upper bits as KVM doesn't use them for #PF (because they are never
4506+
* set), and to ensure there are no collisions with KVM-defined bits.
4507+
*/
4508+
if (WARN_ON_ONCE(error_code >> 32))
4509+
error_code = lower_32_bits(error_code);
45034510

45044511
/* Ensure the above sanity check also covers KVM-defined flags. */
45054512
BUILD_BUG_ON(lower_32_bits(PFERR_SYNTHETIC_MASK));

0 commit comments

Comments
 (0)