KVM: x86: Ignore cpuid faulting in SMM
PATCH 1/1 KVM: x86: Ignore cpuid faulting in SMM
The Intel Virtualization Technology FlexMigration Application Note says, "When CPUID faulting is enabled, all executions of the CPUID instruction outside system-management mode (SMM) cause a general-protection exception (#GP(0)) if the current privilege level (CPL) is greater than 0."
Always allow the execution of CPUID in SMM.
--- arch/x86/kvm/cpuid.c | 3 ++- arch/x86/kvm/emulate.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
arch/x86/kvm/cpuid.c +2 -1
@@ -2157,7 +2157,8 @@ int kvm_emulate_cpuid(struct kvm_vcpu *vcpu) {u32 eax, ebx, ecx, edx; -if (cpuid_fault_enabled (vcpu) && !kvm_require_cpl (vcpu,0 )) +if (!is_smm (vcpu) &&cpuid_fault_enabled (vcpu) && + !kvm_require_cpl (vcpu,0 ))return 1 ; eax =kvm_rax_read (vcpu);
arch/x86/kvm/emulate.c +3 -3
@@ -3583,10 +3583,10 @@ static int em_cpuid(struct x86_emulate_ctxt *ctxt)u64 msr =0 ; ctxt->ops->get_msr (ctxt,MSR_MISC_FEATURES_ENABLES , &msr); -if (msr &MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && - ctxt->ops->cpl (ctxt)) { +if (!ctxt->ops->is_smm (ctxt) && + (msr &MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && + ctxt->ops->cpl (ctxt)))return emulate_gp (ctxt,0 ); - } eax =reg_read (ctxt,VCPU_REGS_RAX ); ecx =reg_read (ctxt,VCPU_REGS_RCX );
Signature · 1 line
2.53.0.239.g8d8fc8a987-goog
Sean Christopherson
maintainerQuoted 8 lines · Jim Mattson
The Intel Virtualization Technology FlexMigration Application Note says, "When CPUID faulting is enabled, all executions of the CPUID instruction outside system-management mode (SMM) cause a general-protection exception (#GP(0)) if the current privilege level (CPL) is greater than 0."
Always allow the execution of CPUID in SMM.
Fixes db2336a80489 ("KVM: x86: virtualize cpuid faulting")
I feel like we need a Technically-fixes-but-really-just-a-bad-spec tag for things like this. MISC_ENABLES and MSR_K7_HWCR in particular are a bizarre game of "Hold my beer!".
Quoted 25 lines
Signed-off-by Jim Mattson <[email protected]>--- arch/x86/kvm/cpuid.c | 3 ++- arch/x86/kvm/emulate.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)arch/x86/kvm/cpuid.c +2
-1@@ -2157,7 +2157,8 @@ int kvm_emulate_cpuid(struct kvm_vcpu *vcpu) {u32 eax, ebx, ecx, edx; -if (cpuid_fault_enabled (vcpu) && !kvm_require_cpl (vcpu,0 )) +if (!is_smm (vcpu) &&cpuid_fault_enabled (vcpu) && + !kvm_require_cpl (vcpu,0 ))return 1 ; eax =kvm_rax_read (vcpu);arch/x86/kvm/emulate.c +0
-0
arch/x86/kvm/emulate.c static int em_cpuid(struct x86_emulate_ctxt *ctxt) · line 3588
Quoted 8 lines
arch/x86/kvm/emulate.c +3
-2@@ -3583,10 +3583,10 @@ static int em_cpuid(struct x86_emulate_ctxt *ctxt)u64 msr =0 ; ctxt->ops->get_msr (ctxt,MSR_MISC_FEATURES_ENABLES , &msr); -if (msr &MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && - ctxt->ops->cpl (ctxt)) { +if (!ctxt->ops->is_smm (ctxt) && + (msr &MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && + ctxt->ops->cpl (ctxt)))
I assume you intended the parentheses to wrap the bitwise-AND. I'll fixup to this when applying.
if (!ctxt->ops->is_smm(ctxt) && (msr & MSR_MISC_FEATURES_ENABLES_CPUID_FAULT) && ctxt->ops->cpl(ctxt))
Quoted 15 lines · Sean Christopherson
arch/x86/kvm/emulate.c static int em_cpuid(struct x86_emulate_ctxt *ctxt) · line 3588
Quoted 11 lines
arch/x86/kvm/emulate.c +3
-2@@ -3583,10 +3583,10 @@ static int em_cpuid(struct x86_emulate_ctxt *ctxt)u64 msr =0 ; ctxt->ops->get_msr (ctxt,MSR_MISC_FEATURES_ENABLES , &msr); -if (msr &MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && - ctxt->ops->cpl (ctxt)) { +if (!ctxt->ops->is_smm (ctxt) && + (msr &MSR_MISC_FEATURES_ENABLES_CPUID_FAULT && + ctxt->ops->cpl (ctxt)))I assume you intended the parentheses to wrap the bitwise-AND. I'll fixup to this when applying.
Quoted 3 lines
if (!ctxt->ops->is_smm(ctxt) &&
(msr & MSR_MISC_FEATURES_ENABLES_CPUID_FAULT) &&
ctxt->ops->cpl(ctxt))Yes, thanks. /facepalm
Quoted 8 lines · Jim Mattson
The Intel Virtualization Technology FlexMigration Application Note says, "When CPUID faulting is enabled, all executions of the CPUID instruction outside system-management mode (SMM) cause a general-protection exception (#GP(0)) if the current privilege level (CPL) is greater than 0."
Always allow the execution of CPUID in SMM.
[...]
Applied to kvm-x86 misc, thanks!
[1/1] KVM: x86: Ignore cpuid faulting in SMM
https://github.com/kvm-x86/linux/commit/690dc03859e7