KVM: VMX: Initialize TDX during KVM module load
Subsystems (4)
Paolo Bonzini
maintainerv3 cover KVM: VMX: Initialize TDX during KVM module load
This is a slightly reviewed version of Kai's same-titled series. The changes in patch 4 I include rewording the comments, adding a check that enable_virt_at_load=1, and an error message for !cpu_feature_enabled(X86_FEATURE_TDX_HOST_PLATFORM).
Paolo
Kai Huang (3):
KVM: Export hardware virtualization enabling/disabling functions
KVM: VMX: Refactor VMX module init/exit functions
KVM: VMX: Initialize TDX during KVM module load
arch/x86/kvm/Kconfig | 10 +++ arch/x86/kvm/Makefile | 1 + arch/x86/kvm/vmx/main.c | 41 ++++++++++ arch/x86/kvm/vmx/tdx.c | 160 +++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/tdx.h | 13 ++++ arch/x86/kvm/vmx/vmx.c | 23 +----- arch/x86/kvm/vmx/vmx.h | 3 + include/linux/kvm_host.h | 9 +++ virt/kvm/kvm_main.c | 21 ++--- 9 files changed, 245 insertions(+), 36 deletions(-) create mode 100644 arch/x86/kvm/vmx/tdx.c create mode 100644 arch/x86/kvm/vmx/tdx.h
Signature · 1 line
2.43.5
Paolo Bonzini
maintainerPATCH v3 1/3 KVM: Export hardware virtualization enabling/disabling functions
From: Kai Huang <[email protected]>
To support TDX, KVM will need to enable TDX during KVM module loading time. Enabling TDX requires enabling hardware virtualization first so that all online CPUs (and the new CPU going online) are in post-VMXON state.
KVM by default enables hardware virtualization but that is done in kvm_init(), which must be the last step after all initialization is done thus is too late for enabling TDX.
Export functions to enable/disable hardware virtualization so that TDX code can use them to handle hardware virtualization enabling before kvm_init().
Message-ID: <dfe17314c0d9978b7bc3b0833dff6f167fbd28f5.1731664295.git.kai.huang@intel.com>
--- include/linux/kvm_host.h | 8 ++++++++ virt/kvm/kvm_main.c | 18 ++++-------------- 2 files changed, 12 insertions(+), 14 deletions(-)
include/linux/kvm_host.h +8 -0
@@ -2559,4 +2559,12 @@ long kvm_arch_vcpu_pre_fault_memory(struct kvm_vcpu *vcpu, struct kvm_pre_fault_memory *range);#endif +#ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING +int kvm_enable_virtualization (void ); +void kvm_disable_virtualization (void ); +#else +static inline int kvm_enable_virtualization (void ) {return 0 ; } +static inline void kvm_disable_virtualization (void ) { } +#endif +#endif
virt/kvm/kvm_main.c +4 -14
@@ -143,8 +143,6 @@ static int kvm_no_compat_open(struct inode *inode, struct file *file)#define KVM_COMPAT (c) .compat_ioctl = kvm_no_compat_ioctl, \ .open = kvm_no_compat_open#endif -static int kvm_enable_virtualization (void ); -static void kvm_disable_virtualization (void );static void kvm_io_bus_destroy (struct kvm_io_bus *bus);
@@ -5552,7 +5550,7 @@ static struct syscore_ops kvm_syscore_ops = { .shutdown = kvm_shutdown, }; -static int kvm_enable_virtualization (void ) +int kvm_enable_virtualization (void ) {int r;
@@ -5597,8 +5595,9 @@ static int kvm_enable_virtualization(void) --kvm_usage_count;return r; } +EXPORT_SYMBOL_GPL (kvm_enable_virtualization); -static void kvm_disable_virtualization (void ) +void kvm_disable_virtualization (void ) {guard (mutex)(&kvm_usage_lock);
@@ -5609,6 +5608,7 @@ static void kvm_disable_virtualization(void)cpuhp_remove_state (CPUHP_AP_KVM_ONLINE );kvm_arch_disable_virtualization (); } +EXPORT_SYMBOL_GPL (kvm_disable_virtualization);static int kvm_init_virtualization (void ) {
@@ -5624,21 +5624,11 @@ static void kvm_uninit_virtualization(void) kvm_disable_virtualization(); }#else /* CONFIG_KVM_GENERIC_HARDWARE_ENABLING */ -static int kvm_enable_virtualization (void ) -{ -return 0 ; -} -static int kvm_init_virtualization (void ) {return 0 ; } -static void kvm_disable_virtualization (void ) -{ - -} -static void kvm_uninit_virtualization (void ) {
Signature · 1 line
2.43.5
Paolo Bonzini
maintainerPATCH v3 2/3 KVM: VMX: Refactor VMX module init/exit functions
In reply to Paolo BonziniFrom: Kai Huang <[email protected]>
Add vt_init() and vt_exit() as the new module init/exit functions and refactor existing vmx_init()/vmx_exit() as helper to make room for TDX specific initialization and teardown.
To support TDX, KVM will need to enable TDX during KVM module loading time. Enabling TDX requires enabling hardware virtualization first so that all online CPUs (and the new CPU going online) are in post-VMXON state.
Currently, the vmx_init() flow is:
1) hv_init_evmcs(),
2) kvm_x86_vendor_init(),
3) Other VMX specific initialization,
4) kvm_init()
The kvm_x86_vendor_init() invokes kvm_x86_init_ops::hardware_setup() to do VMX specific hardware setup and calls kvm_update_ops() to initialize kvm_x86_ops to VMX's version.
TDX will have its own version for most of kvm_x86_ops callbacks. It would be nice if kvm_x86_init_ops::hardware_setup() could also be used for TDX, but in practice it cannot. The reason is, as mentioned above, TDX initialization requires hardware virtualization having been enabled, which must happen after kvm_update_ops(), but hardware_setup() is done before that.
Also, TDX is based on VMX, and it makes sense to only initialize TDX after VMX has been initialized. If VMX fails to initialize, TDX is likely broken anyway.
So the new flow of KVM module init function will be:
1) Current VMX initialization code in vmx_init() before kvm_init(),
2) TDX initialization,
3) kvm_init()
Split vmx_init() into two parts based on above 1) and 3) so that TDX initialization can fit in between. Make part 1) as the new helper vmx_init(). Introduce vt_init() as the new module init function which calls vmx_init() and kvm_init(). TDX initialization will be added later.
Do the same thing for vmx_exit()/vt_exit().
Message-ID: <3f23f24098bdcf42e213798893ffff7cdc7103be.1731664295.git.kai.huang@intel.com>
--- arch/x86/kvm/vmx/main.c | 32 ++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 23 ++--------------------- arch/x86/kvm/vmx/vmx.h | 3 +++ 3 files changed, 37 insertions(+), 21 deletions(-)
arch/x86/kvm/vmx/main.c +32 -0
@@ -167,3 +167,35 @@ struct kvm_x86_init_ops vt_init_ops __initdata = { .runtime_ops = &vt_x86_ops, .pmu_ops = &intel_pmu_ops, }; + +static void vt_exit (void ) +{ +kvm_exit (); +vmx_exit (); +} +module_exit (vt_exit); + +static int __init vt_init (void ) +{ +int r; + + r =vmx_init (); +if (r) +return r; + +/* +* Common KVM initialization _must_ come last, after this, /dev/kvm is +* exposed to userspace! +*/ + r =kvm_init (sizeof (struct vcpu_vmx ), __alignof__(struct vcpu_vmx ), +THIS_MODULE ); +if (r) + goto err_kvm_init; + +return 0 ; + +err_kvm_init: +vmx_exit (); +return r; +} +module_init (vt_init);
arch/x86/kvm/vmx/vmx.c +2 -21
@@ -8590,23 +8590,16 @@ static void vmx_cleanup_l1d_flush(void) l1tf_vmx_mitigation =VMENTER_L1D_FLUSH_AUTO ; } -static void __vmx_exit (void ) +void vmx_exit (void ) { allow_smaller_maxphyaddr = false;vmx_cleanup_l1d_flush (); -} -static void vmx_exit (void ) -{ -kvm_exit (); -__vmx_exit ();kvm_x86_vendor_exit (); - } -module_exit (vmx_exit); -static int __init vmx_init (void ) +int __init vmx_init (void ) {int r, cpu;
@@ -8650,21 +8643,9 @@ static int __init vmx_init(void)if (!enable_ept) allow_smaller_maxphyaddr = true; -/* -* Common KVM initialization _must_ come last, after this, /dev/kvm is -* exposed to userspace! -*/ - r =kvm_init (sizeof (struct vcpu_vmx ), __alignof__(struct vcpu_vmx ), -THIS_MODULE ); -if (r) - goto err_kvm_init; -return 0 ; -err_kvm_init: -__vmx_exit (); err_l1d_flush:kvm_x86_vendor_exit ();return r; } -module_init (vmx_init);
arch/x86/kvm/vmx/vmx.h +3 -0
@@ -756,4 +756,7 @@ static inline void vmx_segment_cache_clear(struct vcpu_vmx *vmx) vmx->segment_cache.bitmask = 0; } +int vmx_init (void ); +void vmx_exit (void ); +#endif /* __KVM_X86_VMX_H */
Signature · 1 line
2.43.5
Paolo Bonzini
maintainerPATCH v3 3/3 KVM: VMX: Initialize TDX during KVM module load
In reply to Paolo BonziniFrom: Kai Huang <[email protected]>
Before KVM can use TDX to create and run TDX guests, TDX needs to be initialized from two perspectives: 1) TDX module must be initialized properly to a working state; 2) A per-cpu TDX initialization, a.k.a the TDH.SYS.LP.INIT SEAMCALL must be done on any logical cpu before it can run any other TDX SEAMCALLs.
The TDX host core-kernel provides two functions to do the above two
respectively: tdx_enable() and tdx_cpu_enable().
There are two options in terms of when to initialize TDX: initialize TDX at KVM module loading time, or when creating the first TDX guest.
Choose to initialize TDX during KVM module loading time:
Initializing TDX module is both memory and CPU time consuming: 1) the kernel needs to allocate a non-trivial size(~1/256) of system memory as metadata used by TDX module to track each TDX-usable memory page's status; 2) the TDX module needs to initialize this metadata, one entry for each TDX-usable memory page.
Also, the kernel uses alloc_contig_pages() to allocate those metadata chunks, because they are large and need to be physically contiguous. alloc_contig_pages() can fail. If initializing TDX when creating the first TDX guest, then there's chance that KVM won't be able to run any TDX guests albeit KVM _declares_ to be able to support TDX.
This isn't good for the user.
On the other hand, initializing TDX at KVM module loading time can make sure KVM is providing a consistent view of whether KVM can support TDX to the user.
Always only try to initialize TDX after VMX has been initialized. TDX is based on VMX, and if VMX fails to initialize then TDX is likely to be broken anyway. Also, in practice, supporting TDX will require part of VMX and common x86 infrastructure in working order, so TDX cannot be enabled alone w/o VMX support.
There are two cases that can result in failure to initialize TDX: 1) TDX cannot be supported (e.g., because of TDX is not supported or enabled by hardware, or module is not loaded, or missing some dependency in KVM's configuration); 2) Any unexpected error during TDX bring-up. For the first case only mark TDX is disabled but still allow KVM module to be loaded. For the second case just fail to load the KVM module so that the user can be aware.
Because TDX costs additional memory, don't enable TDX by default. Add a new module parameter 'enable_tdx' to allow the user to opt-in.
Note, the name tdx_init() has already been taken by the early boot code. Use tdx_bringup() for initializing TDX (and tdx_cleanup() since KVM doesn't actually teardown TDX). They don't match vt_init()/vt_exit(), vmx_init()/vmx_exit() etc but it's not end of the world.
Also, once initialized, the TDX module cannot be disabled and enabled again w/o the TDX module runtime update, which isn't supported by the kernel. After TDX is enabled, nothing needs to be done when KVM disables hardware virtualization, e.g., when offlining CPU, or during suspend/resume. TDX host core-kernel code internally tracks TDX status and can handle "multiple enabling" scenario.
Similar to KVM_AMD_SEV, add a new KVM_INTEL_TDX Kconfig to guide KVM TDX code. Make it depend on INTEL_TDX_HOST but not replace INTEL_TDX_HOST because in the longer term there's a use case that requires making SEAMCALLs w/o KVM as mentioned by Dan [1].
Message-ID: <162f9dee05c729203b9ad6688db1ca2960b4b502.1731664295.git.kai.huang@intel.com>
--- arch/x86/kvm/Kconfig | 10 +++ arch/x86/kvm/Makefile | 1 + arch/x86/kvm/vmx/main.c | 9 +++ arch/x86/kvm/vmx/tdx.c | 160 +++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/tdx.h | 13 ++++ include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 3 +- 7 files changed, 196 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kvm/vmx/tdx.c create mode 100644 arch/x86/kvm/vmx/tdx.h
arch/x86/kvm/Kconfig +10 -0
@@ -128,6 +128,16 @@ config X86_SGX_KVM If unsure, say N. +config KVM_INTEL_TDX + bool "Intel Trust Domain Extensions (TDX) support" + default y + depends on INTEL_TDX_HOST + help + Provides support for launching Intel Trust Domain Extensions (TDX) + confidential VMs on Intel processors. + + If unsure, say N. + config KVM_AMD tristate "KVM for AMD processors support" depends on KVM && (CPU_SUP_AMD || CPU_SUP_HYGON)
arch/x86/kvm/Makefile +1 -0
@@ -20,6 +20,7 @@ kvm-intel-y += vmx/vmx.o vmx/vmenter.o vmx/pmu_intel.o vmx/vmcs12.o \ kvm-intel-$(CONFIG_X86_SGX_KVM) += vmx/sgx.o kvm-intel-$(CONFIG_KVM_HYPERV) += vmx/hyperv.o vmx/hyperv_evmcs.o +kvm-intel-$(CONFIG_KVM_INTEL_TDX) += vmx/tdx.o kvm-amd-y += svm/svm.o svm/vmenter.o svm/pmu.o svm/nested.o svm/avic.o
arch/x86/kvm/vmx/main.c +9 -0
@@ -6,6 +6,7 @@#include "nested.h" #include "pmu.h" #include "posted_intr.h" +#include "tdx.h" #define VMX_REQUIRED_APICV_INHIBITS \ (BIT(APICV_INHIBIT_REASON_DISABLED) | \
@@ -171,6 +172,7 @@ struct kvm_x86_init_ops vt_init_ops __initdata = {static void vt_exit (void ) {kvm_exit (); +tdx_cleanup ();vmx_exit (); }module_exit (vt_exit);
@@ -183,6 +185,11 @@ static int __init vt_init(void)if (r)return r; +/* tdx_init() has been taken */ + r =tdx_bringup (); +if (r) + goto err_tdx_bringup; +/* * Common KVM initialization _must_ come last, after this, /dev/kvm is * exposed to userspace!
@@ -195,6 +202,8 @@ static int __init vt_init(void)return 0 ; err_kvm_init: +tdx_cleanup (); +err_tdx_bringup:vmx_exit ();return r; }
arch/x86/kvm/vmx/tdx.c new file +160 -0
160 lines not on this page · raw message
arch/x86/kvm/vmx/tdx.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __KVM_X86_VMX_TDX_H +#define __KVM_X86_VMX_TDX_H + +#ifdef CONFIG_INTEL_TDX_HOST +int tdx_bringup (void ); +void tdx_cleanup (void ); +#else +static inline int tdx_bringup (void ) {return 0 ; } +static inline void tdx_cleanup (void ) {} +#endif + +#endif
include/linux/kvm_host.h +1 -0
@@ -2272,6 +2272,7 @@ static inline bool kvm_check_request(int req, struct kvm_vcpu *vcpu) }#ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING +extern bool enable_virt_at_load;extern bool kvm_rebooting;#endif
virt/kvm/kvm_main.c +2 -1
@@ -5440,8 +5440,9 @@ static struct miscdevice kvm_dev = { };#ifdef CONFIG_KVM_GENERIC_HARDWARE_ENABLING -static bool enable_virt_at_load = true; +bool enable_virt_at_load = true;module_param (enable_virt_at_load, bool,0444 ); +EXPORT_SYMBOL_GPL (enable_virt_at_load); __visible bool kvm_rebooting;EXPORT_SYMBOL_GPL (kvm_rebooting);
Signature · 1 line
2.43.5
Quoted 11 lines
arch/x86/kvm/vmx/tdx.c new file +11
-0+static void __do_tdx_cleanup (void ) +{ +/* +* Once TDX module is initialized, it cannot be disabled and +* re-initialized again w/o runtime update (which isn't +* supported by kernel). Only need to remove the cpuhp here. +* The TDX host core code tracks TDX status and can handle +* 'multiple enabling' scenario. +*/ +WARN_ON_ONCE (!tdx_cpuhp_state); +cpuhp_remove_state_nocalls (tdx_cpuhp_state);
...
Quoted 10 lines
arch/x86/kvm/vmx/tdx.c new file +10
-0+static int __init __do_tdx_bringup (void ) +{ +int r; + +/* +* TDX-specific cpuhp callback to call tdx_cpu_enable() on all +* online CPUs before calling tdx_enable(), and on any new +* going-online CPU to make sure it is ready for TDX guest. +*/ + r = cpuhp_setup_state_cpuslocked(CPUHP_AP_ONLINE_DYN,
arch/x86/kvm/vmx/tdx.c line 64
Quoted 10 lines
arch/x86/kvm/vmx/tdx.c new file +10
-0+"kvm/cpu/tdx:online" , + tdx_online_cpu, NULL); +if (r <0 ) +return r; + + tdx_cpuhp_state = r; + + r =tdx_enable (); +if (r) +__do_tdx_cleanup ();
The self deadlock issue isn't addressed.
Quoted 7 lines
arch/x86/kvm/vmx/tdx.c new file +7
-0+ +return r; +} + +static bool __init kvm_can_support_tdx (void ) +{ +return cpu_feature_enabled (X86_FEATURE_TDX_HOST_PLATFORM );
...
arch/x86/kvm/vmx/tdx.c line 119
Quoted 9 lines
arch/x86/kvm/vmx/tdx.c new file +9
-0+int __init tdx_bringup (void ) +{ +int r; + +if (!enable_tdx) +return 0 ; + +if (!kvm_can_support_tdx ()) { +pr_err ("tdx: no TDX private KeyIDs available\n" );
The lack of X86_FEATURE_TDX_HOST_PLATFORM doesn't necessarily mean no TDX private KeyIDs. In tdx_init(), X86_FEATURE_TDX_HOST_PLATFORM is not set if hibernation is enabled.
Quoted 21 lines
arch/x86/kvm/vmx/tdx.c new file +21
-0+ goto success_disable_tdx; + } + +if (!enable_virt_at_load) { +pr_err ("tdx: tdx requires kvm.enable_virt_at_load=1\n" ); + goto success_disable_tdx; + } + +/* +* Ideally KVM should probe whether TDX module has been loaded +* first and then try to bring it up. But TDX needs to use SEAMCALL +* to probe whether the module is loaded (there is no CPUID or MSR +* for that), and making SEAMCALL requires enabling virtualization +* first, just like the rest steps of bringing up TDX module. +* +* So, for simplicity do everything in __tdx_bringup(); the first +* SEAMCALL will return -ENODEV when the module is not loaded. The +* only complication is having to make sure that initialization +* SEAMCALLs don't return TDX_SEAMCALL_VMFAILINVALID in other +* cases. +*/
arch/x86/kvm/vmx/tdx.c line 150
Quoted 10 lines
arch/x86/kvm/vmx/tdx.c new file +10
-0+ r =__tdx_bringup (); +if (r) { +/* +* Disable TDX only but don't fail to load module if +* the TDX module could not be loaded. No need to print +* message saying "module is not loaded" because it was +* printed when the first SEAMCALL failed. +*/ +if (r == -ENODEV ) + goto success_disable_tdx;
Given that two error messages are added above, I think it is worth adding one more here for consistency. And, reloading KVM will not trigger the "module is not loaded" error which is printed once.
Quoted 10 lines
arch/x86/kvm/vmx/tdx.c new file +10
-0+ + enable_tdx =0 ; + } + +return r; + +success_disable_tdx: + enable_tdx =0 ; +return 0 ; +}
Quoted 6 lines
arch/x86/kvm/vmx/tdx.c line 64
Quoted 3 lines
arch/x86/kvm/vmx/tdx.c new file +3
-0+ r =tdx_enable (); +if (r) +__do_tdx_cleanup ();The self deadlock issue isn't addressed.
I planned to send out a new version after merge window, but Paolo beats me.
I have fixed and now testing. I'll send out the fixup soon.
Thanks Paolo!
Hi Paolo,
Thanks for doing this!
Quoted 4 lines
(quoted diff) +4
-0+ +static void __do_tdx_cleanup(void) +{ + /*
Review
Quoted 10 lines
(quoted diff) +10
-0+ * Once TDX module is initialized, it cannot be disabled and + * re-initialized again w/o runtime update (which isn't + * supported by kernel). Only need to remove the cpuhp here. + * The TDX host core code tracks TDX status and can handle + * 'multiple enabling' scenario. + */ + WARN_ON_ONCE(!tdx_cpuhp_state); + cpuhp_remove_state_nocalls(tdx_cpuhp_state); + tdx_cpuhp_state = 0; +}
As Gao, Chao pointed out, there's bug here since it is also called by __do_tdx_bringup() which is called with cpus_read_lock() hold. We need the _cpuslocked() version here.
I pasted the fixup at the bottom of this reply for your reference and please merge if it is fine to you. The diff is also attached if that's easier.
[...]
Quoted 6 lines
(quoted diff) +6
-0+int __init tdx_bringup(void) +{ + int r; + + if (!enable_tdx) + return 0;
Review
Quoted 10 lines
(quoted diff) +10
-0+ + if (!kvm_can_support_tdx()) { + pr_err("tdx: no TDX private KeyIDs available\n"); + goto success_disable_tdx; + } + + if (!enable_virt_at_load) { + pr_err("tdx: tdx requires kvm.enable_virt_at_load=1\n"); + goto success_disable_tdx; + }
The intention of kvm_can_support_tdx() is to put all dependency checks to it. I think we should just put the check of 'enable_virt_at_load' inside. And there will be more checks in the later patches such as checking 'tdp_mmu_enabled' and 'enable_mmio_caching' so it doesn't make sense to check 'enable_virt_at_load' outside.
arch/x86/kvm/vmx/tdx.c +21 -11
@@ -38,10 +38,17 @@ static void __do_tdx_cleanup(void)* 'multiple enabling' scenario. */ WARN_ON_ONCE (!tdx_cpuhp_state); -cpuhp_remove_state_nocalls (tdx_cpuhp_state); +cpuhp_remove_state_nocalls_cpuslocked (tdx_cpuhp_state); tdx_cpuhp_state =0 ; } +static void __tdx_cleanup (void ) +{ +cpus_read_lock (); +__do_tdx_cleanup (); +cpus_read_unlock (); +} +static int __init __do_tdx_bringup (void ) {int r;
@@ -68,7 +75,17 @@ static int __init __do_tdx_bringup(void)static bool __init kvm_can_support_tdx (void ) { -return cpu_feature_enabled (X86_FEATURE_TDX_HOST_PLATFORM ); +if (!cpu_feature_enabled (X86_FEATURE_TDX_HOST_PLATFORM )) { +pr_err ("tdx: no TDX private KeyIDs available\n" ); +return false; + } + +if (!enable_virt_at_load) { +pr_err ("tdx: tdx requires kvm.enable_virt_at_load=1\n" ); +return false; + } + +return true; }static int __init __tdx_bringup (void )
@@ -103,7 +120,7 @@ static int __init __tdx_bringup(void)void tdx_cleanup (void ) {if (enable_tdx) { -__do_tdx_cleanup (); +__tdx_cleanup ();kvm_disable_virtualization (); } }
@@ -115,15 +132,8 @@ int __init tdx_bringup(void)if (!enable_tdx)return 0 ; -if (!kvm_can_support_tdx ()) { -pr_err ("tdx: no TDX private KeyIDs available\n" ); - goto success_disable_tdx; - } - -if (!enable_virt_at_load) { -pr_err ("tdx: tdx requires kvm.enable_virt_at_load=1\n" ); +if (!kvm_can_support_tdx ()) goto success_disable_tdx; - }/* * Ideally KVM should probe whether TDX module has been loaded
arch/x86/kvm/vmx/tdx.c +21 -11
@@ -38,10 +38,17 @@ static void __do_tdx_cleanup(void)* 'multiple enabling' scenario. */ WARN_ON_ONCE (!tdx_cpuhp_state); -cpuhp_remove_state_nocalls (tdx_cpuhp_state); +cpuhp_remove_state_nocalls_cpuslocked (tdx_cpuhp_state); tdx_cpuhp_state =0 ; } +static void __tdx_cleanup (void ) +{ +cpus_read_lock (); +__do_tdx_cleanup (); +cpus_read_unlock (); +} +static int __init __do_tdx_bringup (void ) {int r;
@@ -68,7 +75,17 @@ static int __init __do_tdx_bringup(void)static bool __init kvm_can_support_tdx (void ) { -return cpu_feature_enabled (X86_FEATURE_TDX_HOST_PLATFORM ); +if (!cpu_feature_enabled (X86_FEATURE_TDX_HOST_PLATFORM )) { +pr_err ("tdx: no TDX private KeyIDs available\n" ); +return false; + } + +if (!enable_virt_at_load) { +pr_err ("tdx: tdx requires kvm.enable_virt_at_load=1\n" ); +return false; + } + +return true; }static int __init __tdx_bringup (void )
@@ -103,7 +120,7 @@ static int __init __tdx_bringup(void)void tdx_cleanup (void ) {if (enable_tdx) { -__do_tdx_cleanup (); +__tdx_cleanup ();kvm_disable_virtualization (); } }
@@ -115,15 +132,8 @@ int __init tdx_bringup(void)if (!enable_tdx)return 0 ; -if (!kvm_can_support_tdx ()) { -pr_err ("tdx: no TDX private KeyIDs available\n" ); - goto success_disable_tdx; - } - -if (!enable_virt_at_load) { -pr_err ("tdx: tdx requires kvm.enable_virt_at_load=1\n" ); +if (!kvm_can_support_tdx ()) goto success_disable_tdx; - }/* * Ideally KVM should probe whether TDX module has been loaded