x86/msr: don't inject #GP when trying to read FEATURE_CONTROL
PATCH v2 1/1 x86/msr: don't inject #GP when trying to read FEATURE_CONTROL
Windows 10 will triple fault if #GP is injected when attempting to read the FEATURE_CONTROL MSR on Intel or compatible hardware. Fix this by injecting a #GP only when the vendor doesn't support the MSR, even if there are no features to expose.
Fixes 39ab598c50a2 ('x86/pv: allow reading FEATURE_CONTROL MSR')
Signed-off-by Roger Pau Monné <[email protected]>
Acked-by Jan Beulich <[email protected]>
---
Changes since v1:
- Allow Shanghai CPUs to access FEATURE_CONTROL without #GP.
--- xen/arch/x86/msr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
xen/arch/x86/msr.c +2 -1
@@ -176,7 +176,8 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val)switch ( msr ) {case MSR_IA32_FEATURE_CONTROL : -if ( !cp->basic.vmx && !vmce_has_lmce (v) ) +if ( !(cp->x86_vendor & (X86_VENDOR_INTEL |X86_VENDOR_CENTAUR | +X86_VENDOR_SHANGHAI )) ) goto gp_fault; *val =IA32_FEATURE_CONTROL_LOCK ;
Signature · 1 line
2.29.2