KVM: TDX: Move TDX hardware setup from main.c to tdx.c

Move TDX hardware setup to tdx.c, as the code is obviously TDX specific,
co-locating the setup with tdx_bringup() makes it easier to see and
document the success_disable_tdx "error" path, and configuring the TDX
specific hooks in tdx.c reduces the number of globally visible TDX symbols.

Reviewed-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com>
Link: https://lore.kernel.org/r/20250523001138.3182794-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
index d1e02e567b571f3885d46a8978f633ec235c050e..d7178d15ac8f644f4e7056c2651d30498dda1295 100644 (file)
--- a/arch/x86/kvm/vmx/main.c
+++ b/arch/x86/kvm/vmx/main.c
@@ -29,40 +29,8 @@ static __init int vt_hardware_setup(void)
        if (ret)
                return ret;
 
-       /*
-        * Update vt_x86_ops::vm_size here so it is ready before
-        * kvm_ops_update() is called in kvm_x86_vendor_init().
-        *
-        * Note, the actual bringing up of TDX must be done after
-        * kvm_ops_update() because enabling TDX requires enabling
-        * hardware virtualization first, i.e., all online CPUs must
-        * be in post-VMXON state.  This means the @vm_size here
-        * may be updated to TDX's size but TDX may fail to enable
-        * at later time.
-        *
-        * The VMX/VT code could update kvm_x86_ops::vm_size again
-        * after bringing up TDX, but this would require exporting
-        * either kvm_x86_ops or kvm_ops_update() from the base KVM
-        * module, which looks overkill.  Anyway, the worst case here
-        * is KVM may allocate couple of more bytes than needed for
-        * each VM.
-        */
-       if (enable_tdx) {
-               vt_x86_ops.vm_size = max_t(unsigned int, vt_x86_ops.vm_size,
-                               sizeof(struct kvm_tdx));
-               /*
-                * Note, TDX may fail to initialize in a later time in
-                * vt_init(), in which case it is not necessary to setup
-                * those callbacks.  But making them valid here even
-                * when TDX fails to init later is fine because those
-                * callbacks won't be called if the VM isn't TDX guest.
-                */
-               vt_x86_ops.link_external_spt = tdx_sept_link_private_spt;
-               vt_x86_ops.set_external_spte = tdx_sept_set_private_spte;
-               vt_x86_ops.free_external_spt = tdx_sept_free_private_spt;
-               vt_x86_ops.remove_external_spte = tdx_sept_remove_private_spte;
-               vt_x86_ops.protected_apic_has_interrupt = tdx_protected_apic_has_interrupt;
-       }
+       if (enable_tdx)
+               tdx_hardware_setup();
 
        return 0;
 }

diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
index f31ccdeb905b4e9ba7c646725f8a53c587461045..ddd7bbeabf259d10e15436ea89b9b1d2020924de 100644 (file)
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -745,7 +745,7 @@ bool tdx_interrupt_allowed(struct kvm_vcpu *vcpu)
               !to_tdx(vcpu)->vp_enter_args.r12;
 }
 
-bool tdx_protected_apic_has_interrupt(struct kvm_vcpu *vcpu)
+static bool tdx_protected_apic_has_interrupt(struct kvm_vcpu *vcpu)
 {
        u64 vcpu_state_details;
 
@@ -1642,8 +1642,8 @@ static int tdx_mem_page_record_premap_cnt(struct kvm *kvm, gfn_t gfn,
        return 0;
 }
 
-int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,
-                             enum pg_level level, kvm_pfn_t pfn)
+static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,
+                                    enum pg_level level, kvm_pfn_t pfn)
 {
        struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
        struct page *page = pfn_to_page(pfn);
@@ -1723,8 +1723,8 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,
        return 0;
 }
 
-int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn,
-                             enum pg_level level, void *private_spt)
+static int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn,
+                                    enum pg_level level, void *private_spt)
 {
        int tdx_level = pg_level_to_tdx_sept_level(level);
        gpa_t gpa = gfn_to_gpa(gfn);
@@ -1859,8 +1859,8 @@ static void tdx_track(struct kvm *kvm)
        kvm_make_all_cpus_request(kvm, KVM_REQ_OUTSIDE_GUEST_MODE);
 }
 
-int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn,
-                             enum pg_level level, void *private_spt)
+static int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn,
+                                    enum pg_level level, void *private_spt)
 {
        struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
 
@@ -1882,8 +1882,8 @@ int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn,
        return tdx_reclaim_page(virt_to_page(private_spt));
 }
 
-int tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
-                                enum pg_level level, kvm_pfn_t pfn)
+static int tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
+                                       enum pg_level level, kvm_pfn_t pfn)
 {
        struct page *page = pfn_to_page(pfn);
        int ret;
@@ -3606,10 +3606,14 @@ int __init tdx_bringup(void)
        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.
+                * 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.  Don't bother unwinding the S-EPT hooks or
+                * vm_size, as kvm_x86_ops have already been finalized (and are
+                * intentionally not exported).  The S-EPT code is unreachable,
+                * and allocating a few more bytes per VM in a should-be-rare
+                * failure scenario is a non-issue.
                 */
                if (r == -ENODEV)
                        goto success_disable_tdx;
@@ -3623,3 +3627,18 @@ success_disable_tdx:
        enable_tdx = 0;
        return 0;
 }
+
+void __init tdx_hardware_setup(void)
+{
+       /*
+        * Note, if the TDX module can't be loaded, KVM TDX support will be
+        * disabled but KVM will continue loading (see tdx_bringup()).
+        */
+       vt_x86_ops.vm_size = max_t(unsigned int, vt_x86_ops.vm_size, sizeof(struct kvm_tdx));
+
+       vt_x86_ops.link_external_spt = tdx_sept_link_private_spt;
+       vt_x86_ops.set_external_spte = tdx_sept_set_private_spte;
+       vt_x86_ops.free_external_spt = tdx_sept_free_private_spt;
+       vt_x86_ops.remove_external_spte = tdx_sept_remove_private_spte;
+       vt_x86_ops.protected_apic_has_interrupt = tdx_protected_apic_has_interrupt;
+}

diff --git a/arch/x86/kvm/vmx/tdx.h b/arch/x86/kvm/vmx/tdx.h
index 51f98443e8a255ef51a20d79e37fa28c899aac55..ca39a9391db1e33312cc9ac77b71648488cd7ba2 100644 (file)
--- a/arch/x86/kvm/vmx/tdx.h
+++ b/arch/x86/kvm/vmx/tdx.h
@@ -8,6 +8,7 @@
 #ifdef CONFIG_KVM_INTEL_TDX
 #include "common.h"
 
+void tdx_hardware_setup(void);
 int tdx_bringup(void);
 void tdx_cleanup(void);
 

diff --git a/arch/x86/kvm/vmx/x86_ops.h b/arch/x86/kvm/vmx/x86_ops.h
index b4596f65123282cd5a42892f59d3c6cb4c00b479..87e855276a88485104edf5a8d76ea50ad60ac00c 100644 (file)
--- a/arch/x86/kvm/vmx/x86_ops.h
+++ b/arch/x86/kvm/vmx/x86_ops.h
@@ -136,7 +136,6 @@ int tdx_vcpu_pre_run(struct kvm_vcpu *vcpu);
 fastpath_t tdx_vcpu_run(struct kvm_vcpu *vcpu, bool force_immediate_exit);
 void tdx_prepare_switch_to_guest(struct kvm_vcpu *vcpu);
 void tdx_vcpu_put(struct kvm_vcpu *vcpu);
-bool tdx_protected_apic_has_interrupt(struct kvm_vcpu *vcpu);
 int tdx_handle_exit(struct kvm_vcpu *vcpu,
                enum exit_fastpath_completion fastpath);
 
@@ -151,15 +150,6 @@ int tdx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr);
 
 int tdx_vcpu_ioctl(struct kvm_vcpu *vcpu, void __user *argp);
 
-int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn,
-                             enum pg_level level, void *private_spt);
-int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn,
-                             enum pg_level level, void *private_spt);
-int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,
-                             enum pg_level level, kvm_pfn_t pfn);
-int tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
-                                enum pg_level level, kvm_pfn_t pfn);
-
 void tdx_flush_tlb_current(struct kvm_vcpu *vcpu);
 void tdx_flush_tlb_all(struct kvm_vcpu *vcpu);
 void tdx_load_mmu_pgd(struct kvm_vcpu *vcpu, hpa_t root_hpa, int root_level);