KVM: TDX: Hoist tdx_sept_remove_private_spte() above set_private_spte()

Arrange tdx_sept_remove_private_spte() (and its tdx_track() helper) to be
above tdx_sept_set_private_spte() in anticipation of routing all S-EPT
writes (with the exception of reclaiming non-leaf pages) through the "set"
API.

No functional change intended.

Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
Link: https://patch.msgid.link/20260509075658.4306-1-yan.y.zhao@intel.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
index 2e41bddfb80e143972934ed6b35c1606c5bfdb72..8991f08ef81cde74194dea05d7953ba8bdb01517 100644 (file)
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -1718,23 +1718,6 @@ static int tdx_sept_map_leaf_spte(struct kvm *kvm, gfn_t gfn, enum pg_level leve
        return tdx_mem_page_aug(kvm, gfn, level, pfn);
 }
 
-static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn, u64 old_spte,
-                                    u64 new_spte, enum pg_level level)
-{
-       lockdep_assert_held(&kvm->mmu_lock);
-
-       if (KVM_BUG_ON(is_shadow_present_pte(old_spte), kvm))
-               return -EIO;
-
-       if (KVM_BUG_ON(!is_shadow_present_pte(new_spte), kvm))
-               return -EIO;
-
-       if (!is_last_spte(new_spte, level))
-               return tdx_sept_map_nonleaf_spte(kvm, gfn, level, new_spte);
-
-       return tdx_sept_map_leaf_spte(kvm, gfn, level, new_spte);
-}
-
 /*
  * Ensure shared and private EPTs to be flushed on all vCPUs.
  * tdh_mem_track() is the only caller that increases TD epoch. An increase in
@@ -1781,29 +1764,6 @@ static void tdx_track(struct kvm *kvm)
        kvm_make_all_cpus_request(kvm, KVM_REQ_OUTSIDE_GUEST_MODE);
 }
 
-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);
-
-       /*
-        * free_external_spt() is only called after hkid is freed when TD is
-        * tearing down.
-        * KVM doesn't (yet) zap page table pages in mirror page table while
-        * TD is active, though guest pages mapped in mirror page table could be
-        * zapped during TD is active, e.g. for shared <-> private conversion
-        * and slot move/deletion.
-        */
-       if (KVM_BUG_ON(is_hkid_assigned(kvm_tdx), kvm))
-               return -EIO;
-
-       /*
-        * The HKID assigned to this TD was already freed and cache was
-        * already flushed. We don't have to flush again.
-        */
-       return tdx_reclaim_page(virt_to_page(private_spt));
-}
-
 static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
                                         enum pg_level level, u64 mirror_spte)
 {
@@ -1854,6 +1814,46 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
        tdx_quirk_reset_paddr(PFN_PHYS(pfn), PAGE_SIZE);
 }
 
+static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn, u64 old_spte,
+                                    u64 new_spte, enum pg_level level)
+{
+       lockdep_assert_held(&kvm->mmu_lock);
+
+       if (KVM_BUG_ON(is_shadow_present_pte(old_spte), kvm))
+               return -EIO;
+
+       if (KVM_BUG_ON(!is_shadow_present_pte(new_spte), kvm))
+               return -EIO;
+
+       if (!is_last_spte(new_spte, level))
+               return tdx_sept_map_nonleaf_spte(kvm, gfn, level, new_spte);
+
+       return tdx_sept_map_leaf_spte(kvm, gfn, level, new_spte);
+}
+
+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);
+
+       /*
+        * free_external_spt() is only called after hkid is freed when TD is
+        * tearing down.
+        * KVM doesn't (yet) zap page table pages in mirror page table while
+        * TD is active, though guest pages mapped in mirror page table could be
+        * zapped during TD is active, e.g. for shared <-> private conversion
+        * and slot move/deletion.
+        */
+       if (KVM_BUG_ON(is_hkid_assigned(kvm_tdx), kvm))
+               return -EIO;
+
+       /*
+        * The HKID assigned to this TD was already freed and cache was
+        * already flushed. We don't have to flush again.
+        */
+       return tdx_reclaim_page(virt_to_page(private_spt));
+}
+
 void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,
                           int trig_mode, int vector)
 {