x86: switch default MSR behavior
v4 cover x86: switch default MSR behavior
Hello,
The current series attempts to change the current MSR default handling behavior, which is to silently drop writes to writable MSRs, and allow reading any MSR not explicitly handled.
After this series access to MSRs not explicitly handled will trigger a #GP fault. I've tested this series with osstest and it doesn't introduce any regression, at least on the boxes selected for testing:
http://logs.test-lab.xenproject.org/osstest/logs/153697/
Thanks, Roger.
Andrew Cooper (2):
x86/hvm: Disallow access to unknown MSRs
x86/msr: Drop compatibility #GP handling in guest_{rd,wr}msr()
Roger Pau Monne (3):
x86/svm: handle BU_CFG and BU_CFG2 with cases
x86/pv: allow reading FEATURE_CONTROL MSR
x86/pv: disallow access to unknown MSRs
xen/arch/x86/hvm/svm/svm.c | 53 ++++++++++++++++++++------------ xen/arch/x86/hvm/vmx/vmx.c | 24 +++------------ xen/arch/x86/msr.c | 56 +++++++--------------------------- xen/arch/x86/pv/emul-priv-op.c | 18 ++++++----- 4 files changed, 60 insertions(+), 91 deletions(-)
Signature · 1 line
2.28.0
PATCH v4 1/5 x86/svm: handle BU_CFG and BU_CFG2 with cases
Move the special handling of reads to it's own switch case, and also add support for BU_CFG2. On the write side ignore writes if the MSR is readable, otherwise return a #GP.
This is in preparation for changing the default MSR read/write behavior, which will instead return #GP on not explicitly handled cases.
---
Changes since v3:
- Adjust comment to match code.
- Remove leading zeros from MSR value.
Changes since v2:
- Move the handling of reads to it's own case.
- Drop writes if the MSR is readable, else return a #GP.
Changes since v1:
- New in this version.
--- xen/arch/x86/hvm/svm/svm.c | 43 ++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 13 deletions(-)
xen/arch/x86/hvm/svm/svm.c +30 -13
@@ -1864,6 +1864,30 @@ static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content) *msr_content =1ULL <<61 ;/* MC4_MISC.Locked */ break ; +case MSR_F10_BU_CFG : +if ( !rdmsr_safe (msr, *msr_content) ) +break ; + +if ( boot_cpu_data.x86 ==0xf ) + { +/* +* Win2k8 x64 reads this MSR on revF chips, where it wasn't +* publically available; it uses a magic constant in %rdi as a +* password, which we don't have in rdmsr_safe(). Since we'll +* throw a #GP for later writes, just use a plausible value here +* (the reset value from rev10h chips) if the real CPU didn't +* provide one. +*/ + *msr_content =0x10200020 ; +break ; + } + goto gpf; + +case MSR_F10_BU_CFG2 : +if (rdmsr_safe (msr, *msr_content) ) + goto gpf; +break ; +case MSR_IA32_EBC_FREQUENCY_ID :/* * This Intel-only register may be accessed if this HVM guest
@@ -1942,19 +1966,6 @@ static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content)default :if (rdmsr_safe (msr, *msr_content) ==0 )break ; - -if ( boot_cpu_data.x86 ==0xf && msr ==MSR_F10_BU_CFG ) - { -/* Win2k8 x64 reads this MSR on revF chips, where it -* wasn't publically available; it uses a magic constant -* in %rdi as a password, which we don't have in -* rdmsr_safe(). Since we'll ignore the later writes, -* just use a plausible value here (the reset value from -* rev10h chips) if the real CPU didn't provide one. */ - *msr_content =0x0000000010200020ull ; -break ; - } - goto gpf; }
@@ -2110,6 +2121,12 @@ static int svm_msr_write_intercept(unsigned int msr, uint64_t msr_content) nsvm->ns_msr_hsavepa = msr_content;break ; +case MSR_F10_BU_CFG : +case MSR_F10_BU_CFG2 : +if (rdmsr_safe (msr, msr_content) ) + goto gpf; +break ; +case MSR_AMD64_TSC_RATIO :if ( msr_content &TSC_RATIO_RSVD_BITS ) goto gpf;
Signature · 1 line
2.28.0
Re: [PATCH v4 1/5] x86/svm: handle BU_CFG and BU_CFG2 with cases
Quoted 9 lines · Roger Pau Monne
Move the special handling of reads to it's own switch case, and also add support for
BU_CFG2. On the write side ignore writes if the MSR is readable, otherwise return a #GP.This is in preparation for changing the default MSR read/write behavior, which will instead return #GP on not explicitly handled cases.
Signed-off-by Roger Pau Monné <[email protected]>
PATCH v4 2/5 x86/pv: allow reading FEATURE_CONTROL MSR
In reply to Roger Pau MonneLinux 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.
Note that there's a slight behavior change and attempting to read the MSR when no features are available will result in a fault.
---
Changes since v3:
- Only allow reading the MSR when there are bits available (different than bit 0).
Changes from v1:
- Move the VMX implementation into guest_rdmsr.
--- xen/arch/x86/hvm/vmx/vmx.c | 8 +------- xen/arch/x86/msr.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-)
xen/arch/x86/hvm/vmx/vmx.c +1 -7
@@ -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;
xen/arch/x86/msr.c +12 -0
@@ -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,17 @@ 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->basic.vmx && !vmce_has_lmce (v) ) + goto gp_fault; + + *val =IA32_FEATURE_CONTROL_LOCK ; +if (vmce_has_lmce (v) ) + *val |=IA32_FEATURE_CONTROL_LMCE_ON ; +if ( cp->basic.vmx ) + *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 ) )
Signature · 1 line
2.28.0
Re: [PATCH v4 2/5] x86/pv: allow reading FEATURE_CONTROL MSR
Quoted 8 lines · Roger Pau Monne
Linux PV guests will attempt to read the
FEATURE_CONTROLMSR, so move the handling done in VMX code intoguest_rdmsras it can be shared between PV and HVM guests that way.Note that there's a slight behavior change and attempting to read the MSR when no features are available will result in a fault.
Signed-off-by Roger Pau Monné <[email protected]>
RE: [PATCH v4 2/5] x86/pv: allow reading FEATURE_CONTROL MSR
In reply to Roger Pau MonneQuoted 11 lines
From: Roger Pau Monne <[email protected]>
Sent: Monday, September 7, 2020 6:32 PMLinux PV guests will attempt to read the
FEATURE_CONTROLMSR, so move the handling done in VMX code intoguest_rdmsras it can be shared between PV and HVM guests that way.Note that there's a slight behavior change and attempting to read the MSR when no features are available will result in a fault.
Signed-off-by Roger Pau Monné <[email protected]>
Quoted 66 lines
---
Changes since v3:
- Only allow reading the MSR when there are bits available (different than bit 0).Changes from v1:
- Move the VMX implementation intoguest_rdmsr.--- xen/arch/x86/hvm/vmx/vmx.c | 8 +------- xen/arch/x86/msr.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 7 deletions(-)xen/arch/x86/hvm/vmx/vmx.c +1
-7@@ -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) )
gotogp_fault;xen/arch/x86/msr.c +12
-0@@ -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,17 @@ 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->basic.vmx && !vmce_has_lmce (v) ) + goto gp_fault; + + *val =IA32_FEATURE_CONTROL_LOCK ; +if (vmce_has_lmce (v) ) + *val |=IA32_FEATURE_CONTROL_LMCE_ON ; +if ( cp->basic.vmx ) + *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
PATCH v4 3/5 x86/pv: disallow access to unknown MSRs
In reply to Roger Pau MonneChange the catch-all behavior for MSR not explicitly handled. Instead of allow full read-access to the MSR space and silently dropping writes return an exception when the MSR is not explicitly handled.
---
Changes since v2:
- Added missing 0x prefix.
--- xen/arch/x86/pv/emul-priv-op.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
xen/arch/x86/pv/emul-priv-op.c +10 -8
@@ -972,9 +972,10 @@ static int read_msr(unsigned int reg, uint64_t *val, }/* fall through */ default : +gdprintk (XENLOG_WARNING ,"RDMSR 0x%08x unimplemented\n" , reg); +break ; + normal: -/* Everyone can read the MSR space. */ -/* gdprintk(XENLOG_WARNING, "Domain attempted RDMSR %08x\n", reg); */ if (rdmsr_safe (reg, *val) )break ;return X86EMUL_OKAY ;
@@ -1141,14 +1142,15 @@ static int write_msr(unsigned int reg, uint64_t val, }/* fall through */ default : -if (rdmsr_safe (reg, temp) ) -break ; +gdprintk (XENLOG_WARNING , +"WRMSR 0x%08x val 0x%016" PRIx64" unimplemented\n" , + reg, val); +break ; -if ( val != temp ) invalid: -gdprintk (XENLOG_WARNING , -"Domain attempted WRMSR %08x from 0x%016" PRIx64" to 0x%016" PRIx64"\n" , - reg, temp, val); +gdprintk (XENLOG_WARNING , +"Domain attempted WRMSR 0x%08x from 0x%016" PRIx64" to 0x%016" PRIx64"\n" , + reg, temp, val);return X86EMUL_OKAY ; }
Signature · 1 line
2.28.0
PATCH v4 4/5 x86/hvm: Disallow access to unknown MSRs
In reply to Roger Pau MonneFrom: Andrew Cooper <[email protected]>
Change the catch-all behavior for MSR not explicitly handled. Instead of allow full read-access to the MSR space and silently dropping writes return an exception when the MSR is not explicitly handled.
---
Changes since v1:
- Fold chunk to remove explicit write handling of VMX MSRs just to #GP.
- Remove catch-all rdmsr_safe in svm_msr_read_intercept.
--- xen/arch/x86/hvm/svm/svm.c | 10 ++++------ xen/arch/x86/hvm/vmx/vmx.c | 16 ++++------------ 2 files changed, 8 insertions(+), 18 deletions(-)
xen/arch/x86/hvm/svm/svm.c +4 -6
@@ -1964,8 +1964,7 @@ static int svm_msr_read_intercept(unsigned int msr, uint64_t *msr_content)break ;default : -if (rdmsr_safe (msr, *msr_content) ==0 ) -break ; +gdprintk (XENLOG_WARNING ,"RDMSR 0x%08x unimplemented\n" , msr); goto gpf; }
@@ -2150,10 +2149,9 @@ static int svm_msr_write_intercept(unsigned int msr, uint64_t msr_content)break ;default : -/* Match up with the RDMSR side; ultimately this should go away. */ -if (rdmsr_safe (msr, msr_content) ==0 ) -break ; - +gdprintk (XENLOG_WARNING , +"WRMSR 0x%08x val 0x%016" PRIx64" unimplemented\n" , + msr, msr_content); goto gpf; }
xen/arch/x86/hvm/vmx/vmx.c +4 -12
@@ -3015,9 +3015,7 @@ static int vmx_msr_read_intercept(unsigned int msr, uint64_t *msr_content)break ; } -if (rdmsr_safe (msr, *msr_content) ==0 ) -break ; - +gdprintk (XENLOG_WARNING ,"RDMSR 0x%08x unimplemented\n" , msr); goto gp_fault; }
@@ -3290,11 +3288,6 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content)__vmwrite (GUEST_IA32_DEBUGCTL , msr_content);break ; -case MSR_IA32_FEATURE_CONTROL : - case MSR_IA32_VMX_BASIC ... MSR_IA32_VMX_VMFUNC: -/* None of these MSRs are writeable. */ - goto gp_fault; -case MSR_IA32_MISC_ENABLE :/* * Silently drop writes that don't change the reported value: At least
@@ -3324,10 +3317,9 @@ static int vmx_msr_write_intercept(unsigned int msr, uint64_t msr_content) is_last_branch_msr(msr) )break ; -/* Match up with the RDMSR side; ultimately this should go away. */ -if (rdmsr_safe (msr, msr_content) ==0 ) -break ; - +gdprintk (XENLOG_WARNING , +"WRMSR 0x%08x val 0x%016" PRIx64" unimplemented\n" , + msr, msr_content); goto gp_fault; }
Signature · 1 line
2.28.0
PATCH v4 5/5 x86/msr: Drop compatibility #GP handling in guest_{rd, wr}msr()
In reply to Roger Pau MonneFrom: Andrew Cooper <[email protected]>
Now that the main PV/HVM MSR handlers raise #GP for all unknown MSRs, there is no need to special case these MSRs any more.
---
Changes since v1:
- New in this version.
--- xen/arch/x86/msr.c | 46 ---------------------------------------------- 1 file changed, 46 deletions(-)
xen/arch/x86/msr.c +0 -46
@@ -175,29 +175,6 @@ int guest_rdmsr(struct vcpu *v, uint32_t msr, uint64_t *val)switch ( msr ) { -case MSR_AMD_PATCHLOADER : -case MSR_IA32_UCODE_WRITE : -case MSR_PRED_CMD : -case MSR_FLUSH_CMD : -/* Write-only */ -case MSR_TEST_CTRL : -case MSR_CORE_CAPABILITIES : -case MSR_TSX_FORCE_ABORT : -case MSR_TSX_CTRL : -case MSR_MCU_OPT_CTRL : - case MSR_RTIT_OUTPUT_BASE ... MSR_RTIT_ADDR_B(7): -case MSR_U_CET : -case MSR_S_CET : - case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: -case MSR_AMD64_LWP_CFG : -case MSR_AMD64_LWP_CBADDR : -case MSR_PPIN_CTL : -case MSR_PPIN : -case MSR_AMD_PPIN_CTL : -case MSR_AMD_PPIN : -/* Not offered to guests. */ - goto gp_fault; -case MSR_IA32_FEATURE_CONTROL :if ( !cp->basic.vmx && !vmce_has_lmce (v) ) goto gp_fault;
@@ -364,29 +341,6 @@ int guest_wrmsr(struct vcpu *v, uint32_t msr, uint64_t val) {uint64_t rsvd; -case MSR_IA32_PLATFORM_ID : -case MSR_CORE_CAPABILITIES : -case MSR_INTEL_CORE_THREAD_COUNT : -case MSR_INTEL_PLATFORM_INFO : -case MSR_ARCH_CAPABILITIES : -/* Read-only */ -case MSR_TEST_CTRL : -case MSR_TSX_FORCE_ABORT : -case MSR_TSX_CTRL : -case MSR_MCU_OPT_CTRL : - case MSR_RTIT_OUTPUT_BASE ... MSR_RTIT_ADDR_B(7): -case MSR_U_CET : -case MSR_S_CET : - case MSR_PL0_SSP ... MSR_INTERRUPT_SSP_TABLE: -case MSR_AMD64_LWP_CFG : -case MSR_AMD64_LWP_CBADDR : -case MSR_PPIN_CTL : -case MSR_PPIN : -case MSR_AMD_PPIN_CTL : -case MSR_AMD_PPIN : -/* Not offered to guests. */ - goto gp_fault; -case MSR_AMD_PATCHLEVEL :BUILD_BUG_ON (MSR_IA32_UCODE_REV !=MSR_AMD_PATCHLEVEL );/*
Signature · 1 line
2.28.0