Commit f2e91e87 authored by Sean Christopherson's avatar Sean Christopherson

KVM: selftests: Add x86 helpers to play nice with x2APIC MSR #GPs

Add helpers to allow and expect #GP on x2APIC MSRs, and opportunistically
have the existing helper spit out a more useful error message if an
unexpected exception occurs.

Link: https://lore.kernel.org/r/20240719235107.3023592-7-seanjc@google.comSigned-off-by: default avatarSean Christopherson <seanjc@google.com>
parent ed24ba6c
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <stdint.h> #include <stdint.h>
#include "processor.h" #include "processor.h"
#include "ucall_common.h"
#define APIC_DEFAULT_GPA 0xfee00000ULL #define APIC_DEFAULT_GPA 0xfee00000ULL
...@@ -93,9 +94,27 @@ static inline uint64_t x2apic_read_reg(unsigned int reg) ...@@ -93,9 +94,27 @@ static inline uint64_t x2apic_read_reg(unsigned int reg)
return rdmsr(APIC_BASE_MSR + (reg >> 4)); return rdmsr(APIC_BASE_MSR + (reg >> 4));
} }
static inline uint8_t x2apic_write_reg_safe(unsigned int reg, uint64_t value)
{
return wrmsr_safe(APIC_BASE_MSR + (reg >> 4), value);
}
static inline void x2apic_write_reg(unsigned int reg, uint64_t value) static inline void x2apic_write_reg(unsigned int reg, uint64_t value)
{ {
wrmsr(APIC_BASE_MSR + (reg >> 4), value); uint8_t fault = x2apic_write_reg_safe(reg, value);
__GUEST_ASSERT(!fault, "Unexpected fault 0x%x on WRMSR(%x) = %lx\n",
fault, APIC_BASE_MSR + (reg >> 4), value);
} }
static inline void x2apic_write_reg_fault(unsigned int reg, uint64_t value)
{
uint8_t fault = x2apic_write_reg_safe(reg, value);
__GUEST_ASSERT(fault == GP_VECTOR,
"Wanted #GP on WRMSR(%x) = %lx, got 0x%x\n",
APIC_BASE_MSR + (reg >> 4), value, fault);
}
#endif /* SELFTEST_KVM_APIC_H */ #endif /* SELFTEST_KVM_APIC_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment