]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/tdx: Tidy reset_pamt functions
authorAdrian Hunter <adrian.hunter@intel.com>
Tue, 19 Aug 2025 15:58:10 +0000 (18:58 +0300)
committerDave Hansen <dave.hansen@linux.intel.com>
Fri, 22 Aug 2025 14:45:50 +0000 (07:45 -0700)
tdx_quirk_reset_paddr() was renamed to reflect that, in fact, the clearing
is necessary only for hardware with a certain quirk.  That is dealt with in
a subsequent patch.

Rename reset_pamt functions to contain "quirk" to reflect the new
functionality, and remove the now misleading comment.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com>
Acked-by: Kai Huang <kai.huang@intel.com>
Acked-by: Vishal Annapurve <vannapurve@google.com>
Link: https://lore.kernel.org/all/20250819155811.136099-3-adrian.hunter%40intel.com
arch/x86/virt/vmx/tdx/tdx.c

index fc8d8e444f157a148650b571c9d98270ca611fdd..9e4638f68ba0012f34cd68c9b83e46241c78bde4 100644 (file)
@@ -660,17 +660,17 @@ void tdx_quirk_reset_page(struct page *page)
 }
 EXPORT_SYMBOL_GPL(tdx_quirk_reset_page);
 
-static void tdmr_reset_pamt(struct tdmr_info *tdmr)
+static void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr)
 {
        tdmr_do_pamt_func(tdmr, tdx_quirk_reset_paddr);
 }
 
-static void tdmrs_reset_pamt_all(struct tdmr_info_list *tdmr_list)
+static void tdmrs_quirk_reset_pamt_all(struct tdmr_info_list *tdmr_list)
 {
        int i;
 
        for (i = 0; i < tdmr_list->nr_consumed_tdmrs; i++)
-               tdmr_reset_pamt(tdmr_entry(tdmr_list, i));
+               tdmr_quirk_reset_pamt(tdmr_entry(tdmr_list, i));
 }
 
 static unsigned long tdmrs_count_pamt_kb(struct tdmr_info_list *tdmr_list)
@@ -1142,15 +1142,7 @@ err_reset_pamts:
         * to the kernel.
         */
        wbinvd_on_all_cpus();
-       /*
-        * According to the TDX hardware spec, if the platform
-        * doesn't have the "partial write machine check"
-        * erratum, any kernel read/write will never cause #MC
-        * in kernel space, thus it's OK to not convert PAMTs
-        * back to normal.  But do the conversion anyway here
-        * as suggested by the TDX spec.
-        */
-       tdmrs_reset_pamt_all(&tdx_tdmr_list);
+       tdmrs_quirk_reset_pamt_all(&tdx_tdmr_list);
 err_free_pamts:
        tdmrs_free_pamt_all(&tdx_tdmr_list);
 err_free_tdmrs: