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 Cc: "H. Peter Anvin" <hpa@zytor.com>, "Peter Zijlstra" <peterz@infradead.org>, "Arnaldo Carvalho de Melo" <acme@kernel.org>, "Mark Rutland" <mark.rutland@arm.com>, "Alexander Shishkin" <alexander.shishkin@linux.intel.com>, "Jiri Olsa" <jolsa@redhat.com>, "Namhyung Kim" <namhyung@kernel.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "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>, "Tony Luck" <tony.luck@intel.com>, "Tony W Wang-oc" <TonyWWang-oc@zhaoxin.com>, "Len Brown" <lenb@kernel.org>, "Shuah Khan" <shuah@kernel.org>, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, linux-edac@vger.kernel.org, linux-pm@vger.kernel.org, linux-kselftest@vger.kernel.org, "Borislav Petkov" <bp@suse.de>, "Jarkko Sakkinen" <jarkko.sakkinen@linux.intel.com> Subject: [PATCH v4 15/19] KVM: VMX: Use VMX feature flag to query BIOS enabling Date: Wed, 27 Nov 2019 17:40:12 -0800 Message-ID: <20191128014016.4389-16-sean.j.christopherson@intel.com> (raw) In-Reply-To: <20191128014016.4389-1-sean.j.christopherson@intel.com> Replace KVM's manual checks on IA32_FEAT_CTL with a query on the boot CPU's MSR_IA32_FEAT_CTL and VMX feature flags. The MSR_IA32_FEAT_CTL indicates that IA32_FEAT_CTL has been configured and that dependent features are accurately reflected in cpufeatures, e.g. the VMX flag is now cleared during boot if VMX isn't fully enabled via IA32_FEAT_CTL, including the case where the MSR isn't supported. Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> --- arch/x86/kvm/vmx/vmx.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 50dd8026e718..6020f04fe1a8 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -2204,31 +2204,8 @@ static __init int cpu_has_kvm_support(void) static __init int vmx_disabled_by_bios(void) { - u64 msr; - - rdmsrl(MSR_IA32_FEAT_CTL, msr); - - if (unlikely(!(msr & FEAT_CTL_LOCKED))) - return 1; - - /* launched w/ TXT and VMX disabled */ - if (!(msr & FEAT_CTL_VMX_ENABLED_INSIDE_SMX) && - tboot_enabled()) - return 1; - /* launched w/o TXT and VMX only enabled w/ TXT */ - if (!(msr & FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX) && - (msr & FEAT_CTL_VMX_ENABLED_INSIDE_SMX) && - !tboot_enabled()) { - pr_warn("kvm: disable TXT in the BIOS or " - "activate TXT before enabling KVM\n"); - return 1; - } - /* launched w/o TXT and VMX disabled */ - if (!(msr & FEAT_CTL_VMX_ENABLED_OUTSIDE_SMX) && - !tboot_enabled()) - return 1; - - return 0; + return !boot_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) || + !boot_cpu_has(X86_FEATURE_VMX); } static void kvm_cpu_vmxon(u64 addr) -- 2.24.0
next prev parent reply index Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-28 1:39 [PATCH v4 00/19] x86/cpu: Clean up handling of VMX features Sean Christopherson 2019-11-28 1:39 ` [PATCH v4 01/19] x86/msr-index: Clean up bit defines for IA32_FEATURE_CONTROL MSR Sean Christopherson 2019-11-28 21:07 ` kbuild test robot 2019-11-30 20:52 ` kbuild test robot 2019-12-02 19:06 ` Sean Christopherson 2019-12-12 9:25 ` Borislav Petkov 2019-12-12 17:48 ` Sean Christopherson 2019-12-12 18:19 ` Borislav Petkov 2019-11-28 1:39 ` [PATCH v4 02/19] selftests: kvm: Replace manual MSR defs with common msr-index.h Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 03/19] tools arch x86: Sync msr-index.h from kernel sources Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 04/19] x86/intel: Initialize IA32_FEAT_CTL MSR at boot Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 05/19] x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 06/19] x86/centaur: Use common IA32_FEAT_CTL MSR initialization Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 07/19] x86/zhaoxin: " Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 08/19] x86/cpu: Clear VMX feature flag if VMX is not fully enabled Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 09/19] x86/vmx: Introduce VMX_FEATURES_* Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 10/19] x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs Sean Christopherson 2019-12-12 11:38 ` Borislav Petkov 2019-12-12 17:55 ` Sean Christopherson 2019-12-12 18:24 ` Borislav Petkov 2019-11-28 1:40 ` [PATCH v4 11/19] x86/cpu: Print VMX flags in /proc/cpuinfo using VMX_FEATURES_* Sean Christopherson 2019-12-12 12:26 ` Borislav Petkov 2019-12-12 14:13 ` Paolo Bonzini 2019-12-12 15:52 ` Liran Alon 2019-12-12 15:57 ` Paolo Bonzini 2019-12-12 17:43 ` Sean Christopherson 2019-12-12 17:47 ` Paolo Bonzini 2019-12-12 17:52 ` Liran Alon 2019-12-12 17:57 ` Jim Mattson 2019-12-12 18:04 ` Liran Alon 2019-12-12 18:27 ` Sean Christopherson 2019-12-12 18:32 ` Borislav Petkov 2019-12-12 17:47 ` Liran Alon 2019-12-12 18:18 ` Sean Christopherson 2019-12-12 18:23 ` Paolo Bonzini 2019-12-21 3:48 ` Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 12/19] x86/cpu: Set synthetic VMX cpufeatures during init_ia32_feat_ctl() Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 13/19] x86/cpufeatures: Add flag to track whether MSR IA32_FEAT_CTL is configured Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 14/19] KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR Sean Christopherson 2019-11-28 1:40 ` Sean Christopherson [this message] 2019-11-28 1:40 ` [PATCH v4 16/19] KVM: VMX: Check for full VMX support when verifying CPU compatibility Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 17/19] KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 18/19] perf/x86: Provide stubs of KVM helpers for non-Intel CPUs Sean Christopherson 2019-11-28 1:40 ` [PATCH v4 19/19] KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs Sean Christopherson 2019-12-12 14:07 ` [PATCH v4 00/19] x86/cpu: Clean up handling of VMX features Borislav Petkov 2019-12-21 3:44 ` 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=20191128014016.4389-16-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=lenb@kernel.org \ --cc=linux-edac@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-kselftest@vger.kernel.org \ --cc=linux-pm@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=shuah@kernel.org \ --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
Linux-EDAC Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-edac/0 linux-edac/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-edac linux-edac/ https://lore.kernel.org/linux-edac \ linux-edac@vger.kernel.org public-inbox-index linux-edac Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-edac AGPL code for this site: git clone https://public-inbox.org/public-inbox.git