diff options
| author | Sean Christopherson <sean.j.christopherson@intel.com> | 2020-01-14 12:25:45 -0800 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-01-15 13:26:50 +0100 |
| commit | bb02e2cb715a3f3552dbe765ea4a07799e4dff43 (patch) | |
| tree | 959af97c94a0c43d1e8b9cc2b0a83eb49dcbe56f | |
| parent | 8f63aaf5c493c6502a058585cdfa3c71cdf8c44a (diff) | |
| download | linux-bb02e2cb715a3f3552dbe765ea4a07799e4dff43.tar.bz2 | |
x86/cpu: Print "VMX disabled" error message iff KVM is enabled
Don't print an error message about VMX being disabled by BIOS if KVM,
the sole user of VMX, is disabled. E.g. if KVM is disabled and the MSR
is unlocked, the kernel will intentionally disable VMX when locking
feature control and then complain that "BIOS" disabled VMX.
Fixes: ef4d3bf19855 ("x86/cpu: Clear VMX feature flag if VMX is not fully enabled")
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200114202545.20296-1-sean.j.christopherson@intel.com
| -rw-r--r-- | arch/x86/kernel/cpu/feat_ctl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/feat_ctl.c b/arch/x86/kernel/cpu/feat_ctl.c index 24a4fdc1ab51..0268185bef94 100644 --- a/arch/x86/kernel/cpu/feat_ctl.c +++ b/arch/x86/kernel/cpu/feat_ctl.c @@ -133,8 +133,9 @@ update_caps: if ( (tboot && !(msr & FEAT_CTL_VMX_ENABLED_INSIDE_SMX)) || (!tboot && !(msr & FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX))) { - pr_err_once("VMX (%s TXT) disabled by BIOS\n", - tboot ? "inside" : "outside"); + if (IS_ENABLED(CONFIG_KVM_INTEL)) + pr_err_once("VMX (%s TXT) disabled by BIOS\n", + tboot ? "inside" : "outside"); clear_cpu_cap(c, X86_FEATURE_VMX); } else { #ifdef CONFIG_X86_VMX_FEATURE_NAMES |