From: Sean Christopherson <sean.j.christopherson@intel.com>
To: "Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"Borislav Petkov" <bp@alien8.de>,
x86@kernel.org, "Peter Zijlstra" <peterz@infradead.org>,
"Arnaldo Carvalho de Melo" <acme@kernel.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Tony Luck" <tony.luck@intel.com>,
"Tony W Wang-oc" <TonyWWang-oc@zhaoxin.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Wanpeng Li <wanpengli@tencent.com>,
Jim Mattson <jmattson@google.com>, Joerg Roedel <joro@8bytes.org>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
linux-edac@vger.kernel.org, Borislav Petkov <bp@suse.de>,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Subject: [PATCH 06/16] x86/cpu: Clear VMX feature flag if VMX is not fully enabled
Date: Fri, 4 Oct 2019 14:56:05 -0700 [thread overview]
Message-ID: <20191004215615.5479-7-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20191004215615.5479-1-sean.j.christopherson@intel.com>
Now that the IA32_FEATURE_CONTROL MSR is guaranteed to be configured and
locked, clear the VMX capability flag if the IA32_FEATURE_CONTROL MSR is
not supported or if BIOS disabled VMX, i.e. locked IA32_FEATURE_CONTROL
and did not set the appropriate VMX enable bit.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/feature_control.c | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/cpu/feature_control.c b/arch/x86/kernel/cpu/feature_control.c
index 57b928e64cf5..74c76159a046 100644
--- a/arch/x86/kernel/cpu/feature_control.c
+++ b/arch/x86/kernel/cpu/feature_control.c
@@ -7,13 +7,19 @@
void init_feature_control_msr(struct cpuinfo_x86 *c)
{
+ bool tboot = tboot_enabled();
u64 msr;
- if (rdmsrl_safe(MSR_IA32_FEATURE_CONTROL, &msr))
+ if (rdmsrl_safe(MSR_IA32_FEATURE_CONTROL, &msr)) {
+ if (cpu_has(c, X86_FEATURE_VMX)) {
+ pr_err_once("x86/cpu: VMX disabled, IA32_FEATURE_CONTROL MSR unsupported\n");
+ clear_cpu_cap(c, X86_FEATURE_VMX);
+ }
return;
+ }
if (msr & FEATURE_CONTROL_LOCKED)
- return;
+ goto update_caps;
/*
* Ignore whatever value BIOS left in the MSR to avoid enabling random
@@ -23,8 +29,19 @@ void init_feature_control_msr(struct cpuinfo_x86 *c)
if (cpu_has(c, X86_FEATURE_VMX)) {
msr |= FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;
- if (tboot_enabled())
+ if (tboot)
msr |= FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX;
}
wrmsrl(MSR_IA32_FEATURE_CONTROL, msr);
+
+update_caps:
+ if (!cpu_has(c, X86_FEATURE_VMX))
+ return;
+
+ if ((tboot && !(msr & FEATURE_CONTROL_VMXON_ENABLED_INSIDE_SMX)) ||
+ (!tboot && !(msr & FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX))) {
+ pr_err_once("x86/cpu: VMX disabled by BIOS (TXT %s)\n",
+ tboot ? "enabled" : "disabled");
+ clear_cpu_cap(c, X86_FEATURE_VMX);
+ }
}
--
2.22.0
next prev parent reply other threads:[~2019-10-04 21:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-04 21:55 [PATCH 00/16] x86/cpu: Clean up handling of VMX features Sean Christopherson
2019-10-04 21:56 ` [PATCH 01/16] x86/intel: Initialize IA32_FEATURE_CONTROL MSR at boot Sean Christopherson
2019-10-07 17:05 ` Paolo Bonzini
2019-10-07 17:10 ` Sean Christopherson
2019-10-04 21:56 ` [PATCH 02/16] x86/mce: WARN once if IA32_FEATURE_CONTROL MSR is left unlocked Sean Christopherson
2019-10-04 21:56 ` [PATCH 03/16] x86/centaur: Use common IA32_FEATURE_CONTROL MSR initialization Sean Christopherson
2019-10-04 21:56 ` [PATCH 04/16] x86/zhaoxin: " Sean Christopherson
2019-10-04 21:56 ` [PATCH 05/16] KVM: VMX: Drop initialization of IA32_FEATURE_CONTROL MSR Sean Christopherson
2019-10-04 23:24 ` Jim Mattson
2019-10-04 21:56 ` Sean Christopherson [this message]
2019-10-04 21:56 ` [PATCH 07/16] KVM: VMX: Use VMX feature flag to query BIOS enabling Sean Christopherson
2019-10-04 23:26 ` Jim Mattson
2019-10-04 21:56 ` [PATCH 08/16] KVM: VMX: Check for full VMX support when verifying CPU compatibility Sean Christopherson
2019-10-04 23:35 ` Jim Mattson
2019-10-04 21:56 ` [PATCH 09/16] x86/vmx: Introduce VMX_FEATURES_* Sean Christopherson
2019-10-07 17:08 ` Paolo Bonzini
2019-10-07 17:13 ` Sean Christopherson
2019-10-04 21:56 ` [PATCH 10/16] x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs Sean Christopherson
2019-10-07 17:11 ` Paolo Bonzini
2019-10-07 19:54 ` Sean Christopherson
2019-10-08 6:55 ` Paolo Bonzini
2019-10-04 21:56 ` [PATCH 11/16] x86/cpu: Print VMX features as separate line item in /proc/cpuinfo Sean Christopherson
2019-10-07 17:12 ` Paolo Bonzini
2019-10-07 19:56 ` Sean Christopherson
2019-10-08 6:57 ` Paolo Bonzini
2019-10-08 16:53 ` Jim Mattson
2019-10-09 19:16 ` Sean Christopherson
2019-10-09 21:13 ` Paolo Bonzini
2019-10-04 21:56 ` [PATCH 12/16] x86/cpufeatures: Drop synthetic VMX feature flags Sean Christopherson
2019-10-04 21:56 ` [PATCH 13/16] KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits Sean Christopherson
2019-10-04 21:56 ` [PATCH 14/16] x86/cpufeatures: Clean up synthetic virtualization flags Sean Christopherson
2019-10-04 21:56 ` [PATCH 15/16] perf/x86: Provide stubs of KVM helpers for non-Intel CPUs Sean Christopherson
2019-10-04 21:56 ` [PATCH 16/16] KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191004215615.5479-7-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=TonyWWang-oc@zhaoxin.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=jmattson@google.com \
--cc=jolsa@redhat.com \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=pbonzini@redhat.com \
--cc=peterz@infradead.org \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=vkuznets@redhat.com \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).