Linux PV guests will attempt to read the FEATURE_CONTROL MSR, so move
the handling done in VMX code into guest_rdmsr as it can be shared
between PV and HVM guests that way.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
Changes from v1:
- Move the VMX implementation into guest_rdmsr.
---
xen/arch/x86/hvm/vmx/vmx.c | 8 +-------
xen/arch/x86/msr.c | 13 +++++++++++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 4717e50d4a..f6657af923 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -2980,13 +2980,7 @@ static int vmx_msr_read_intercept(unsigned int msr,
uint64_t *msr_content)
case MSR_IA32_DEBUGCTLMSR:
__vmread(GUEST_IA32_DEBUGCTL, msr_content);
break;
- case MSR_IA32_FEATURE_CONTROL:
- *msr_content = IA32_FEATURE_CONTROL_LOCK;
- if ( vmce_has_lmce(curr) )
- *msr_content |= IA32_FEATURE_CONTROL_LMCE_ON;
- if ( nestedhvm_enabled(curr->domain) )
- *msr_content |= IA32_FEATURE_CONTROL_ENABLE_VMXON_OUTSIDE_SMX;
- break;
+
case MSR_IA32_VMX_BASIC...MSR_IA32_VMX_VMFUNC:
if ( !nvmx_msr_read_intercept(msr, msr_content) )
goto gp_fault;
diff --git a/xen/arch/x86/msr.c b/xen/arch/x86/msr.c
index e84107ac7b..cc2f111a90 100644
--- a/xen/arch/x86/msr.c
+++ b/xen/arch/x86/msr.c
@@ -25,6 +25,7 @@
#include <xen/sched.h>
#include <asm/debugreg.h>
+#include <asm/hvm/nestedhvm.h>
#include <asm/hvm/viridian.h>
#include <asm/msr.h>
#include <asm/setup.h>
@@ -197,6 +198,18 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t
*val)
/* Not offered to guests. */
goto gp_fault;
+ case MSR_IA32_FEATURE_CONTROL:
+ if ( !(cp->x86_vendor & X86_VENDOR_INTEL) )
+ goto gp_fault;
+
+ *val = IA32_FEATURE_CONTROL_LOCK;
+ if ( vmce_has_lmce(v) )
+ *val |= IA32_FEATURE_CONTROL_LMCE_ON;
+ if ( nestedhvm_enabled(d) )
+ *val |= IA32_FEATURE_CONTROL_ENABLE_VMXON_OUTSIDE_SMX;
+ break;
+
+
case MSR_IA32_PLATFORM_ID:
if ( !(cp->x86_vendor & X86_VENDOR_INTEL) ||
!(boot_cpu_data.x86_vendor & X86_VENDOR_INTEL) )
--
2.28.0
