From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Cooper <Andrew.Cooper3@citrix.com>,
Kai Huang <kai.huang@intel.com>, Chao Gao <chao.gao@intel.com>
Subject: [PATCH v3 15/18] KVM: VMX: Ensure CPU is stable when probing basic VMX support
Date: Fri, 12 May 2023 16:50:23 -0700 [thread overview]
Message-ID: <20230512235026.808058-16-seanjc@google.com> (raw)
In-Reply-To: <20230512235026.808058-1-seanjc@google.com>
Disable migration when probing VMX support during module load to ensure
the CPU is stable, mostly to match similar SVM logic, where allowing
migration effective requires deliberately writing buggy code. As a bonus,
KVM won't report the wrong CPU to userspace if VMX is unsupported, but in
practice that is a very, very minor bonus as the only way that reporting
the wrong CPU would actually matter is if hardware is broken or if the
system is misconfigured, i.e. if KVM gets migrated from a CPU that _does_
support VMX to a CPU that does _not_ support VMX.
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kvm/vmx/vmx.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index e00dba166a9e..008914396180 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -2740,9 +2740,9 @@ static int setup_vmcs_config(struct vmcs_config *vmcs_conf,
return 0;
}
-static bool kvm_is_vmx_supported(void)
+static bool __kvm_is_vmx_supported(void)
{
- int cpu = raw_smp_processor_id();
+ int cpu = smp_processor_id();
if (!(cpuid_ecx(1) & feature_bit(VMX))) {
pr_err("VMX not supported by CPU %d\n", cpu);
@@ -2758,13 +2758,24 @@ static bool kvm_is_vmx_supported(void)
return true;
}
+static bool kvm_is_vmx_supported(void)
+{
+ bool supported;
+
+ migrate_disable();
+ supported = __kvm_is_vmx_supported();
+ migrate_enable();
+
+ return supported;
+}
+
static int vmx_check_processor_compat(void)
{
int cpu = raw_smp_processor_id();
struct vmcs_config vmcs_conf;
struct vmx_capability vmx_cap;
- if (!kvm_is_vmx_supported())
+ if (!__kvm_is_vmx_supported())
return -EIO;
if (setup_vmcs_config(&vmcs_conf, &vmx_cap) < 0) {
--
2.40.1.606.ga4b1b128d6-goog
next prev parent reply other threads:[~2023-05-12 23:52 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 23:50 [PATCH v3 00/18] x86/reboot: KVM: Clean up "emergency" virt code Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 01/18] x86/reboot: VMCLEAR active VMCSes before emergency reboot Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 02/18] x86/reboot: Harden virtualization hooks for " Sean Christopherson
2023-05-22 12:46 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 03/18] x86/reboot: KVM: Handle VMXOFF in KVM's reboot callback Sean Christopherson
2023-05-22 12:55 ` Huang, Kai
2023-05-22 17:58 ` Sean Christopherson
2023-05-22 23:11 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 04/18] x86/reboot: KVM: Disable SVM during reboot via virt/KVM " Sean Christopherson
2023-05-22 12:56 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 05/18] x86/reboot: Disable virtualization during reboot iff callback is registered Sean Christopherson
2023-05-22 13:04 ` Huang, Kai
2023-05-22 17:51 ` Sean Christopherson
2023-05-22 23:13 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 06/18] x86/reboot: Assert that IRQs are disabled when turning off virtualization Sean Christopherson
2023-05-22 13:05 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 07/18] x86/reboot: Hoist "disable virt" helpers above "emergency reboot" path Sean Christopherson
2023-05-22 13:11 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 08/18] x86/reboot: Expose VMCS crash hooks if and only if KVM_{INTEL,AMD} is enabled Sean Christopherson
2023-05-22 13:11 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 09/18] x86/virt: KVM: Open code cpu_has_vmx() in KVM VMX Sean Christopherson
2023-05-22 23:41 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 10/18] x86/virt: KVM: Move VMXOFF helpers into " Sean Christopherson
2023-05-22 13:15 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 11/18] KVM: SVM: Make KVM_AMD depend on CPU_SUP_AMD or CPU_SUP_HYGON Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 12/18] x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm() Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 13/18] x86/virt: KVM: Open code cpu_has_svm() into kvm_is_svm_supported() Sean Christopherson
2023-05-22 23:44 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 14/18] KVM: SVM: Check that the current CPU supports SVM in kvm_is_svm_supported() Sean Christopherson
2023-05-22 23:18 ` Huang, Kai
2023-05-12 23:50 ` Sean Christopherson [this message]
2023-05-22 23:30 ` [PATCH v3 15/18] KVM: VMX: Ensure CPU is stable when probing basic VMX support Huang, Kai
2023-05-12 23:50 ` [PATCH v3 16/18] x86/virt: KVM: Move "disable SVM" helper into KVM SVM Sean Christopherson
2023-05-22 23:26 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 17/18] KVM: x86: Force kvm_rebooting=true during emergency reboot/crash Sean Christopherson
2023-05-22 23:25 ` Huang, Kai
2023-05-23 2:02 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 18/18] KVM: SVM: Use "standard" stgi() helper when disabling SVM 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=20230512235026.808058-16-seanjc@google.com \
--to=seanjc@google.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=chao.gao@intel.com \
--cc=kai.huang@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/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