Skip to contentSkip to conversation

struct page to PFN conversion for TDX guest private memory

PATCH Applied Yan Zhao 7 participants 26 messages Apr 30 – May 27

Subsystems (4)
lore
Share & tools
lore

Yan Zhao

author
#0 lore raw

v2 cover struct page to PFN conversion for TDX guest private memory

Hi

This is v2 of the struct page to PFN conversion series, which converts TDX guest private memory mapping/unmapping APIs from taking struct page to taking PFN as input.

v2 is based on v7.1.0-rc1 + Sean's 4 cleanup patches (see details in section "Base" below). The purpose is to get Dave's Ack, so Sean can take it from the KVM x86 tree. The full stack of v2 is available at [14].

Compared to v1, v2:
- Rewrote commit messages of patches 1/2 (the conversion patches for mapping and unmapping) by specifically explaining the downside of assuming guest private memory must be backed by struct page, and incorporating Dave's rewording that also works for Sean.

- Updated patch 2 (which is for unmapping) to use tdx_quirk_reset_paddr() directly for unmapping guest private memory, and added patch 3 to drop the exported function tdx_quirk_reset_page() by having KVM invoke tdx_quirk_reset_paddr() in all scenarios, as suggested by Paolo and Xiaoyao.

- Split patch 4 (moving mk_keyed_paddr() to .c) out of patch 2, so patch 2 can focus on the struct page to PFN conversion for unmapping.

Note: as agreed in v1, Kirill's concern about AUG "level" will be addressed in a separate patch later.

Background
----------
TDX SEAMCALL wrappers take struct page as input, which provides:
1. Type safety
2. Make it harder to misuse and make it obvious that physical pages in RAM are expected from just looking at the API declaration [2][3][4][5].

This is appropriate for SEAMCALL wrappers for TDX control pages (e.g., TDR page, TDCS pages, TDX SEPT pages), since KVM manages and allocates those pages explicitly from core MM.

However, unlike TDX control pages, KVM guest memory is not necessarily backed by refcounted struct page or even struct page (e.g., VM_PFNMAP memory [6]). Taking struct page as input for SEAMCALL wrappers for mapping/unmapping guest private memory imposes unnecessary assumptions on how KVM and guest_memfd manage memory [7]. So, Sean suggested converting from using struct page to PFN for SEAMCALL wrappers operating on guest private memory [8].

This series therefore converts struct page to PFN for guest private memory while keeping struct page for TDX control pages, and uses kvm_pfn_t for type safety.

Sanity check
------------
Reasonable PFN sanity checks in the guest private memory mapping/unmapping APIs are still agreed upon [9][10], such as checking TDX convertibility to avoid SEAMCALL failure.

However, we decided not to provide any in-kernel sanity checks to avoid introducing unnecessary overhead, both because those failures are supposed to only occur when there are kernel bugs, and due to the lack of satisfactory tiny checks to ensure convertibility. When unexpected non-TDX-convertible PFNs are passed in, just let SEAMCALLs fail or have #MCs or #PFs generated, which are obvious enough in themselves.

Base:
----
This v2 is rebased on top of v7.1.0-rc1 (kvm/next, commit 39f1c201b93f) + the first 4 patches from Sean's v5 "TDX: Dynamic PAMT + S-EPT Hugepage" series [11].

Note: due to the instability of v7.1.0-rc1, I also applied series [12] and
[13] to pass CI.

Changelogs:
-----------
v1 [1] --> v2:
1. Updated patch logs of patches 1/2. (Dave).
2. Added patch 3 to drop tdx_quirk_reset_page() and export tdx_quirk_reset_paddr() only. (Paolo, Xiaoyao)
3. Split out patch 4 to move mk_keyed_paddr() from .h to .c.
4. Rebased to v7.1.0-rc1 + Sean's 4 cleanup patches.

Sean's original patch [0] --> v1:
1. Rebased to kvm-x86-next-2026.03.13.
2. Split to 2 patches for easy review. (Rick)
3. Replaced "u64 pfn" with "kvm_pfn_t pfn" (Rick)
4. Dropped using PFN as input to tdx_reclaim_page(). (Rick)
5. Move mk_keyed_paddr() from tdx.h to tdx.c.

Thanks
Yan

[0] https://lore.kernel.org/kvm/[email protected]
[1] https://lore.kernel.org/all/[email protected]
[2] https://lore.kernel.org/all/[email protected]
[3] https://lore.kernel.org/kvm/[email protected]
[4] https://lore.kernel.org/kvm/[email protected]
[5] https://lore.kernel.org/kvm/[email protected]
[6] https://lore.kernel.org/all/[email protected]
[7] https://lore.kernel.org/all/[email protected]
[8] https://lore.kernel.org/all/[email protected]
[9] https://lore.kernel.org/all/[email protected]
[10] https://lore.kernel.org/all/[email protected]
[11] https://lore.kernel.org/all/[email protected]
[12] https://lore.kernel.org/all/[email protected]
[13] https://lore.kernel.org/all/[email protected]
[14] https://github.com/intel-staging/tdx/tree/struct_page_to_pfn_v2

Sean Christopherson (2):
x86/tdx: Use PFN directly for mapping guest private memory x86/tdx: Use PFN directly for unmapping guest private memory

Yan Zhao (2):
x86/tdx: Drop exported function tdx_quirk_reset_page() x86/virt/tdx: Move mk_keyed_paddr() to tdx.c due to no external users

 arch/x86/include/asm/tdx.h  | 21 ++++++-------------
 arch/x86/kvm/vmx/tdx.c      | 17 ++++++++--------
 arch/x86/virt/vmx/tdx/tdx.c | 40 +++++++++++++++++++++----------------
 3 files changed, 37 insertions(+), 41 deletions(-)
Signature · 1 line
2.43.2
author
#1 lore raw

PATCH v2 1/4 x86/tdx: Use PFN directly for mapping guest private memory

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in the SEAMCALL wrapper APIs for mapping guest private memory and have them take PFN directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tied to the regular CPU MMUs and the kernel code around them. Using 'struct page' for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_mem_page_add() and tdh_mem_page_aug() are exported to KVM only.

[ Yan: Replace "u64 pfn" with "kvm_pfn_t pfn" ]

---
 arch/x86/include/asm/tdx.h  |  6 ++++--
 arch/x86/kvm/vmx/tdx.c      |  7 +++----
 arch/x86/virt/vmx/tdx/tdx.c | 19 ++++++++++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)
arch/x86/include/asm/tdx.h +4 -2
index 0cb77ed4adc5..619aed134c83 100644
@@ -6,6 +6,7 @@
 #include <linux/init.h>
 #include <linux/bits.h>
 #include <linux/mmzone.h>
+#include <linux/kvm_types.h>
 
 #include <asm/errno.h>
 #include <asm/ptrace.h>
@@ -189,11 +190,12 @@ static inline u64 mk_keyed_paddr(u16 hkid, struct page *page)
 
 u64 tdh_vp_enter(struct tdx_vp *vp, struct tdx_module_args *args);
 u64 tdh_mng_addcx(struct tdx_td *td, struct page *tdcs_page);
-u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, struct page *page, struct page *source, u64 *ext_err1, u64 *ext_err2);
+u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, kvm_pfn_t pfn, struct page *source,
+		     u64 *ext_err1, u64 *ext_err2);
 u64 tdh_mem_sept_add(struct tdx_td *td, u64 gpa, enum pg_level level, struct page *page,
 		     u64 *ext_err1, u64 *ext_err2);
 u64 tdh_vp_addcx(struct tdx_vp *vp, struct page *tdcx_page);
-u64 tdh_mem_page_aug(struct tdx_td *td, u64 gpa, enum pg_level level, struct page *page,
+u64 tdh_mem_page_aug(struct tdx_td *td, u64 gpa, enum pg_level level, kvm_pfn_t pfn,
 		     u64 *ext_err1, u64 *ext_err2);
 u64 tdh_mem_range_block(struct tdx_td *td, u64 gpa, enum pg_level level, u64 *ext_err1,
 			u64 *ext_err2);
arch/x86/kvm/vmx/tdx.c +3 -4
index 77aea8920a4a..9b47dd257ff4 100644
@@ -1624,8 +1624,8 @@ static int tdx_mem_page_add(struct kvm *kvm, gfn_t gfn, enum pg_level level,
 	    KVM_BUG_ON(!kvm_tdx->page_add_src, kvm))
 		return -EIO;
 
-	err = tdh_mem_page_add(&kvm_tdx->td, gpa, pfn_to_page(pfn),
-			       kvm_tdx->page_add_src, &entry, &level_state);
+	err = tdh_mem_page_add(&kvm_tdx->td, gpa, pfn, kvm_tdx->page_add_src,
+			       &entry, &level_state);
 	if (unlikely(tdx_operand_busy(err)))
 		return -EBUSY;
 
@@ -1639,12 +1639,11 @@ static int tdx_mem_page_aug(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);
 	gpa_t gpa = gfn_to_gpa(gfn);
 	u64 entry, level_state;
 	u64 err;
 
-	err = tdh_mem_page_aug(&kvm_tdx->td, gpa, level, page, &entry, &level_state);
+	err = tdh_mem_page_aug(&kvm_tdx->td, gpa, level, pfn, &entry, &level_state);
 	if (unlikely(tdx_operand_busy(err)))
 		return -EBUSY;
 
arch/x86/virt/vmx/tdx/tdx.c +12 -7
index a6e77afafa79..b24b81cea5ea 100644
@@ -30,7 +30,6 @@
 #include <linux/suspend.h>
 #include <linux/syscore_ops.h>
 #include <linux/idr.h>
-#include <linux/kvm_types.h>
 #include <asm/page.h>
 #include <asm/special_insns.h>
 #include <asm/msr-index.h>
@@ -1568,6 +1567,11 @@ static void tdx_clflush_page(struct page *page)
 	clflush_cache_range(page_to_virt(page), PAGE_SIZE);
 }
 
+static void tdx_clflush_pfn(kvm_pfn_t pfn)
+{
+	clflush_cache_range(__va(PFN_PHYS(pfn)), PAGE_SIZE);
+}
+
 static int pg_level_to_tdx_sept_level(enum pg_level level)
 {
 	WARN_ON_ONCE(level == PG_LEVEL_NONE);
@@ -1594,17 +1598,18 @@ u64 tdh_mng_addcx(struct tdx_td *td, struct page *tdcs_page)
 }
 EXPORT_SYMBOL_FOR_KVM(tdh_mng_addcx);
 
-u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, struct page *page, struct page *source, u64 *ext_err1, u64 *ext_err2)
+u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, kvm_pfn_t pfn, struct page *source,
+		     u64 *ext_err1, u64 *ext_err2)
 {
 	struct tdx_module_args args = {
 		.rcx = gpa,
 		.rdx = tdx_tdr_pa(td),
-		.r8 = page_to_phys(page),
+		.r8 = PFN_PHYS(pfn),
 		.r9 = page_to_phys(source),
 	};
 	u64 ret;
 
-	tdx_clflush_page(page);
+	tdx_clflush_pfn(pfn);
 	ret = seamcall_ret(TDH_MEM_PAGE_ADD, &args);
 
 	*ext_err1 = args.rcx;
@@ -1647,16 +1652,16 @@ u64 tdh_vp_addcx(struct tdx_vp *vp, struct page *tdcx_page)
 EXPORT_SYMBOL_FOR_KVM(tdh_vp_addcx);
 
 u64 tdh_mem_page_aug(struct tdx_td *td, u64 gpa, enum pg_level level,
-		     struct page *page, u64 *ext_err1, u64 *ext_err2)
+		     kvm_pfn_t pfn, u64 *ext_err1, u64 *ext_err2)
 {
 	struct tdx_module_args args = {
 		.rcx = gpa | pg_level_to_tdx_sept_level(level),
 		.rdx = tdx_tdr_pa(td),
-		.r8 = page_to_phys(page),
+		.r8 = PFN_PHYS(pfn),
 	};
 	u64 ret;
 
-	tdx_clflush_page(page);
+	tdx_clflush_pfn(pfn);
 	ret = seamcall_ret(TDH_MEM_PAGE_AUG, &args);
 
 	*ext_err1 = args.rcx;
Signature · 1 line
2.43.2
Reviewed-by on v2 1/4
#2 lore raw

Re: [PATCH v2 1/4] x86/tdx: Use PFN directly for mapping guest private memory

Quoted 5 lines · Yan Zhao

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in the SEAMCALL wrapper APIs for mapping guest private memory and have them take PFN directly.

Thanks for this :)

Quoted 11 lines

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tied to the regular CPU MMUs and the kernel code around them. Using 'struct page' for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Quoted 6 lines

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_mem_page_add() and tdh_mem_page_aug() are exported to KVM only.

[ Yan: Replace "u64 pfn" with "kvm_pfn_t pfn" ]

Thanks for your help, Yan!

Quoted 7 lines

[...snip...]

Reviewed-by on v2 1/4
#3 lore raw

Re: [PATCH v2 1/4] x86/tdx: Use PFN directly for mapping guest private memory

In reply to Yan Zhao
Quoted 20 lines · Yan Zhao

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in the SEAMCALL wrapper APIs for mapping guest private memory and have them take PFN directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tied to the regular CPU MMUs and the kernel code around them. Using 'struct page' for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_mem_page_add() and tdh_mem_page_aug() are exported to KVM only.

Quoted 6 lines

[ Yan: Replace "u64 pfn" with "kvm_pfn_t pfn" ]

...

arch/x86/virt/vmx/tdx/tdx.c static void tdx_clflush_page(struct page *page) · line 1572

Quoted 3 lines
arch/x86/virt/vmx/tdx/tdx.c +3 -0
+static void tdx_clflush_pfn(kvm_pfn_t pfn)
+{
+	clflush_cache_range(__va(PFN_PHYS(pfn)), PAGE_SIZE);

If the pfn is not in the kernel direct map, we will get #PF, right?

There is on-going attempt to remove the direct map for guest_memfd. The good news is TDX is excluded. [1]

[1] https://lore.kernel.org/all/[email protected]/

author
#4 lore raw

Re: [PATCH v2 1/4] x86/tdx: Use PFN directly for mapping guest private memory

Quoted 21 lines · Xiaoyao Li
Quoted 20 lines · Yan Zhao

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in the SEAMCALL wrapper APIs for mapping guest private memory and have them take PFN directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tied to the regular CPU MMUs and the kernel code around them. Using 'struct page' for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_mem_page_add() and tdh_mem_page_aug() are exported to KVM only.

Quoted 8 lines
Quoted 6 lines

[ Yan: Replace "u64 pfn" with "kvm_pfn_t pfn" ]

Thanks!

Quoted 5 lines

arch/x86/virt/vmx/tdx/tdx.c static void tdx_clflush_page(struct page *page) · line 1572

Quoted 3 lines
arch/x86/virt/vmx/tdx/tdx.c +3 -0
+static void tdx_clflush_pfn(kvm_pfn_t pfn)
+{
+	clflush_cache_range(__va(PFN_PHYS(pfn)), PAGE_SIZE);

If the pfn is not in the kernel direct map, we will get #PF, right?

Right.

There's no simple interface like pfn_range_is_mapped() that tells whether a PFN has direct map or not if removing direct map is supported.

So, as PFNs not in the kernel direct map are unexpected for TDX, this series leaves #PF, which is obvious enough for debugging.

Quoted 2 lines

There is on-going attempt to remove the direct map for guest_memfd. The good news is TDX is excluded. [1]

We can see if any code refinement is necessary if TDX is included in the future.

Quoted 1 line

[1] https://lore.kernel.org/all/[email protected]/

#5 lore raw

Re: [PATCH v2 1/4] x86/tdx: Use PFN directly for mapping guest private memory

Quoted 5 lines · Yan Zhao
Quoted 3 lines · Xiaoyao Li

On 4/30/2026 9:49 AM, Yan Zhao wrote:
There is on-going attempt to remove the direct map for guest_memfd. The good news is TDX is excluded. [1]

We can see if any code refinement is necessary if TDX is included in the future.

Yeah, I wouldn't worry too much about that effort. The onus will firmly be on that series to do the right thing for TDX (and any other unique code).

maintainer Acked-by on v2 1/4
#6 lore raw

Re: [PATCH v2 1/4] x86/tdx: Use PFN directly for mapping guest private memory

In reply to Yan Zhao
Quoted 20 lines · Yan Zhao

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in the SEAMCALL wrapper APIs for mapping guest private memory and have them take PFN directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tied to the regular CPU MMUs and the kernel code around them. Using 'struct page' for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_mem_page_add() and tdh_mem_page_aug() are exported to KVM only.

Quoted 6 lines

[ Yan: Replace "u64 pfn" with "kvm_pfn_t pfn" ]

Signature · 1 line
  Kiryl Shutsemau / Kirill A. Shutemov
author
#7 lore raw

PATCH v2 2/4 x86/tdx: Use PFN directly for unmapping guest private memory

In reply to Yan Zhao

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in APIs for unmapping guest private memory and have them take physical address directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tightly tied to the regular CPU MMUs and the kernel code around them. Using "struct page" for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Therefore, for unmapping guest private memory: export tdx_quirk_reset_paddr() for direct KVM invocation, and convert the SEAMCALL wrapper API tdh_phymem_page_wbinvd_hkid() to take PFN as input (thus updating mk_keyed_paddr() and tdh_phymem_page_wbinvd_tdr()).

Intentionally have KVM pass PAGE_SIZE (rather than KVM_HPAGE_SIZE(level)) to tdx_quirk_reset_paddr() in tdx_sept_remove_private_spte() to avoid mixing in huge page changes. The KVM_BUG_ON() check for !PG_LEVEL_4K in tdx_sept_remove_private_spte() justifies using PAGE_SIZE.

Do not convert tdx_reclaim_page() to use PFN as input since it currently does not remove guest private memory.

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_phymem_page_wbinvd_hkid() and tdx_quirk_reset_paddr() are exported to KVM only.

[Yan: Use kvm_pfn_t,exclude tdx_reclaim_page(),use tdx_quirk_reset_paddr()]

---
 arch/x86/include/asm/tdx.h  | 14 +++++---------
 arch/x86/kvm/vmx/tdx.c      |  6 +++---
 arch/x86/virt/vmx/tdx/tdx.c |  9 +++++----
 3 files changed, 13 insertions(+), 16 deletions(-)
arch/x86/include/asm/tdx.h +5 -9
index 619aed134c83..65f7d874fb5a 100644
@@ -154,6 +154,7 @@ u32 tdx_get_nr_guest_keyids(void);
 void tdx_guest_keyid_free(unsigned int keyid);
 
 void tdx_quirk_reset_page(struct page *page);
+void tdx_quirk_reset_paddr(unsigned long base, unsigned long size);
 
 struct tdx_td {
 	/* TD root structure: */
@@ -177,15 +178,10 @@ struct tdx_vp {
 	struct page **tdcx_pages;
 };
 
-static inline u64 mk_keyed_paddr(u16 hkid, struct page *page)
+static inline u64 mk_keyed_paddr(u16 hkid, kvm_pfn_t pfn)
 {
-	u64 ret;
-
-	ret = page_to_phys(page);
-	/* KeyID bits are just above the physical address bits: */
-	ret |= (u64)hkid << boot_cpu_data.x86_phys_bits;
-
-	return ret;
+	/* KeyID bits are just above the physical address bits. */
+	return PFN_PHYS(pfn) | ((u64)hkid << boot_cpu_data.x86_phys_bits);
 }
 
 u64 tdh_vp_enter(struct tdx_vp *vp, struct tdx_module_args *args);
@@ -218,7 +214,7 @@ u64 tdh_mem_page_remove(struct tdx_td *td, u64 gpa, enum pg_level level,
 			u64 *ext_err1, u64 *ext_err2);
 u64 tdh_phymem_cache_wb(bool resume);
 u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td);
-u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, struct page *page);
+u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, kvm_pfn_t pfn);
 #else
 static inline void tdx_init(void) { }
 static inline u32 tdx_get_nr_guest_keyids(void) { return 0; }
arch/x86/kvm/vmx/tdx.c +3 -3
index 9b47dd257ff4..a2aadc6d0174 100644
@@ -1774,8 +1774,8 @@ static int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn,
 static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
 					 enum pg_level level, u64 mirror_spte)
 {
-	struct page *page = pfn_to_page(spte_to_pfn(mirror_spte));
 	struct kvm_tdx *kvm_tdx = to_kvm_tdx(kvm);
+	kvm_pfn_t pfn = spte_to_pfn(mirror_spte);
 	gpa_t gpa = gfn_to_gpa(gfn);
 	u64 err, entry, level_state;
 
@@ -1814,11 +1814,11 @@ static void tdx_sept_remove_private_spte(struct kvm *kvm, gfn_t gfn,
 	if (TDX_BUG_ON_2(err, TDH_MEM_PAGE_REMOVE, entry, level_state, kvm))
 		return;
 
-	err = tdh_phymem_page_wbinvd_hkid((u16)kvm_tdx->hkid, page);
+	err = tdh_phymem_page_wbinvd_hkid((u16)kvm_tdx->hkid, pfn);
 	if (TDX_BUG_ON(err, TDH_PHYMEM_PAGE_WBINVD, kvm))
 		return;
 
-	tdx_quirk_reset_page(page);
+	tdx_quirk_reset_paddr(PFN_PHYS(pfn), PAGE_SIZE);
 }
 
 void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,
arch/x86/virt/vmx/tdx/tdx.c +5 -4
index b24b81cea5ea..e5a37ea2d4a0 100644
@@ -710,7 +710,7 @@ static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,
  * to normal kernel memory. Systems with the X86_BUG_TDX_PW_MCE erratum need to
  * do the conversion explicitly via MOVDIR64B.
  */
-static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
+void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
 {
 	const void *zero_page = (const void *)page_address(ZERO_PAGE(0));
 	unsigned long phys, end;
@@ -729,6 +729,7 @@ static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
 	 */
 	mb();
 }
+EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
 void tdx_quirk_reset_page(struct page *page)
 {
@@ -1920,17 +1921,17 @@ u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
 {
 	struct tdx_module_args args = {};
 
-	args.rcx = mk_keyed_paddr(tdx_global_keyid, td->tdr_page);
+	args.rcx = mk_keyed_paddr(tdx_global_keyid, page_to_pfn(td->tdr_page));
 
 	return seamcall(TDH_PHYMEM_PAGE_WBINVD, &args);
 }
 EXPORT_SYMBOL_FOR_KVM(tdh_phymem_page_wbinvd_tdr);
 
-u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, struct page *page)
+u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, kvm_pfn_t pfn)
 {
 	struct tdx_module_args args = {};
 
-	args.rcx = mk_keyed_paddr(hkid, page);
+	args.rcx = mk_keyed_paddr(hkid, pfn);
 
 	return seamcall(TDH_PHYMEM_PAGE_WBINVD, &args);
 }
Signature · 1 line
2.43.2
Reviewed-by on v2 2/4
#8 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

arch/x86/virt/vmx/tdx/tdx.c static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list, · line 713

Quoted 13 lines · Yan Zhao

[...snip...]

arch/x86/virt/vmx/tdx/tdx.c +1 -1
index b24b81cea5ea..e5a37ea2d4a0 100644
@@ -710,7 +710,7 @@ static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,
  * to normal kernel memory. Systems with the X86_BUG_TDX_PW_MCE erratum need to
  * do the conversion explicitly via MOVDIR64B.
  */
-static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
+void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)

Could this be updated to use phys_addr_t base and size_t size instead of generic unsigned long?

Quoted 12 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -0
 {
 	const void *zero_page = (const void *)page_address(ZERO_PAGE(0));
 	unsigned long phys, end;
@@ -729,6 +729,7 @@ static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
 	 */
 	mb();
 }
+EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
 void tdx_quirk_reset_page(struct page *page)
 {

arch/x86/virt/vmx/tdx/tdx.c u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td) · line 1924

Quoted 5 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -1
@@ -1920,17 +1921,17 @@ u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
 {
 	struct tdx_module_args args = {};
 
-	args.rcx = mk_keyed_paddr(tdx_global_keyid, td->tdr_page);
+	args.rcx = mk_keyed_paddr(tdx_global_keyid, page_to_pfn(td->tdr_page));

Should mk_keyed_paddr() be updated to have a return type of phys_addr_t? I guess in this case since mk_keyed_paddr() is pretty much an internal function, returning u64 also makes sense to indicate that it should only be used to set 64 bit registers.

Quoted 16 lines
arch/x86/virt/vmx/tdx/tdx.c +2 -3
 	return seamcall(TDH_PHYMEM_PAGE_WBINVD, &args);
 }
 EXPORT_SYMBOL_FOR_KVM(tdh_phymem_page_wbinvd_tdr);
 
-u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, struct page *page)
+u64 tdh_phymem_page_wbinvd_hkid(u64 hkid, kvm_pfn_t pfn)
 {
 	struct tdx_module_args args = {};
 
-	args.rcx = mk_keyed_paddr(hkid, page);
+	args.rcx = mk_keyed_paddr(hkid, pfn);
 
 	return seamcall(TDH_PHYMEM_PAGE_WBINVD, &args);
 }
--
Quoted 1 line

2.43.2

#9 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

Quoted 5 lines · Ackerley Tng
Quoted 3 lines · Yan Zhao

[...snip...]

Quoted 13 lines

arch/x86/virt/vmx/tdx/tdx.c static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list, · line 713

Quoted 10 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -1
index b24b81cea5ea..e5a37ea2d4a0 100644
@@ -710,7 +710,7 @@ static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,
    * to normal kernel memory. Systems with the X86_BUG_TDX_PW_MCE erratum need to
    * do the conversion explicitly via MOVDIR64B.
    */
-static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
+void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)

Could this be updated to use phys_addr_t base and size_t size instead of generic unsigned long?

A type is a really good idea. It could look like a virtual address, despite the paddr in the name.

I added it to the cleanup list. But I would prefer to keep this series focused on resolving the critical controversy around the struct page/pfn type, rather than adding in more things to debate. If you don't mind.

Quoted 16 lines
Quoted 16 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -0
   {
   	const void *zero_page = (const void *)page_address(ZERO_PAGE(0));
   	unsigned long phys, end;
@@ -729,6 +729,7 @@ static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
   	 */
   	mb();
   }
+EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
   void tdx_quirk_reset_page(struct page *page)
   {
@@ -1920,17 +1921,17 @@ u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
   {
   	struct tdx_module_args args = {};
 
Quoted 7 lines

arch/x86/virt/vmx/tdx/tdx.c u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td) · line 1924

Quoted 2 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -1
-	args.rcx = mk_keyed_paddr(tdx_global_keyid, td->tdr_page);
+	args.rcx = mk_keyed_paddr(tdx_global_keyid, page_to_pfn(td->tdr_page));

Should mk_keyed_paddr() be updated to have a return type of phys_addr_t? I guess in this case since mk_keyed_paddr() is pretty much an internal function, returning u64 also makes sense to indicate that it should only be used to set 64 bit registers.

Yea, this is used to construct u64 inputs for seamcall args. So I think it should keep returning u64s. Maybe instead it would be better to have a function name pattern that denotes that purpose. We have some more helpers like this coming.

But similarly, I'd like to not grow a snowballing cleanup series for this one.

#10 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

Quoted 24 lines · Rick P Edgecombe
Quoted 15 lines · Ackerley Tng
Quoted 15 lines

  {
   const void *zero_page = (const void *)page_address(ZERO_PAGE(0)); unsigned long phys, end;

arch/x86/virt/vmx/tdx/tdx.c +1 -0
@@ -729,6 +729,7 @@ static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
   	 */
   	mb();
   }
+EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
   void tdx_quirk_reset_page(struct page *page)
   {
@@ -1920,17 +1921,17 @@ u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
   {
   	struct tdx_module_args args = {};
 
Quoted 7 lines

arch/x86/virt/vmx/tdx/tdx.c u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td) · line 1924

Quoted 2 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -1
-	args.rcx = mk_keyed_paddr(tdx_global_keyid, td->tdr_page);
+	args.rcx = mk_keyed_paddr(tdx_global_keyid, page_to_pfn(td->tdr_page));

Should mk_keyed_paddr() be updated to have a return type of phys_addr_t? I guess in this case since mk_keyed_paddr() is pretty much an internal function, returning u64 also makes sense to indicate that it should only be used to set 64 bit registers.

Quoted 2 lines

Yea, this is used to construct u64 inputs for seamcall args. So I think it should keep returning u64s.

+1. IMO, we should treat the TDX-Module as an extension of hardware and pass in u64s where the spec says it takes a 64-bit value.

#11 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

Quoted 4 lines · Sean Christopherson
Quoted 2 lines

Yea, this is used to construct u64 inputs for seamcall args. So I think it should keep returning u64s.

+1. IMO, we should treat the TDX-Module as an extension of hardware and pass in u64s where the spec says it takes a 64-bit value.

+2

In this very specific case 'phys_addr_t' is 100% the *WRONG* type for mk_keyed_paddr(). Why? Because the thing being returned is *NOT* *A* *PHYSICAL* *ADDRESS*. It's a composite type that contains a special physical address plus some metadata in a special "hardware" format. It's as much of a 'phys_addr_t' as a PTE is a 'phys_addr_t'. Yeah, they contain and are constructed partly from physical addresses, but they are not physical addresses themselves.

At the same time, if the kernel has a type-safe way of representing something that's also a 64-bit value, we should use it. Just because the TDX spec takes a 64-bit virtual address doesn't mean we should use a u64 and not a "struct foo *".

Let's please just not go back to a sea of u64's everywhere. Use common sense. Use the kernel's type system where appropriate, but don't over-apply it.

IOW, I agree with Sean. But please don't take Sean's advise too far here.

#12 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

Quoted 8 lines · Dave Hansen
Quoted 4 lines · Sean Christopherson
Quoted 2 lines

Yea, this is used to construct u64 inputs for seamcall args. So I think it should keep returning u64s.

+1. IMO, we should treat the TDX-Module as an extension of hardware and pass in u64s where the spec says it takes a 64-bit value.

+2

Quoted 8 lines

In this very specific case 'phys_addr_t' is 100% the *WRONG* type for mk_keyed_paddr(). Why? Because the thing being returned is *NOT* *A* *PHYSICAL* *ADDRESS*. It's a composite type that contains a special physical address plus some metadata in a special "hardware" format. It's as much of a 'phys_addr_t' as a PTE is a 'phys_addr_t'. Yeah, they contain and are constructed partly from physical addresses, but they are not physical addresses themselves.

Got it, thanks!

Quoted 10 lines

At the same time, if the kernel has a type-safe way of representing something that's also a 64-bit value, we should use it. Just because the TDX spec takes a 64-bit virtual address doesn't mean we should use a u64 and not a "struct foo *".

Let's please just not go back to a sea of u64's everywhere. Use common sense. Use the kernel's type system where appropriate, but don't over-apply it.

IOW, I agree with Sean. But please don't take Sean's advise too far here.

#13 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

In reply to Edgecombe, Rick P
Quoted 20 lines · Rick P
Quoted 5 lines · Ackerley Tng
Quoted 3 lines · Yan Zhao

[...snip...]

Quoted 13 lines

arch/x86/virt/vmx/tdx/tdx.c static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list, · line 713

Quoted 10 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -1
index b24b81cea5ea..e5a37ea2d4a0 100644
@@ -710,7 +710,7 @@ static __init int tdmrs_set_up_pamt_all(struct tdmr_info_list *tdmr_list,
    * to normal kernel memory. Systems with the X86_BUG_TDX_PW_MCE erratum need to
    * do the conversion explicitly via MOVDIR64B.
    */
-static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
+void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)

Could this be updated to use phys_addr_t base and size_t size instead of generic unsigned long?

Quoted 7 lines

A type is a really good idea. It could look like a virtual address, despite the paddr in the name.

I added it to the cleanup list. But I would prefer to keep this series focused on resolving the critical controversy around the struct page/pfn type, rather than adding in more things to debate. If you don't mind.

No worries, please go ahead :)

Quoted 24 lines
Quoted 16 lines
Quoted 16 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -0
   {
   	const void *zero_page = (const void *)page_address(ZERO_PAGE(0));
   	unsigned long phys, end;
@@ -729,6 +729,7 @@ static void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
   	 */
   	mb();
   }
+EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
   void tdx_quirk_reset_page(struct page *page)
   {
@@ -1920,17 +1921,17 @@ u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
   {
   	struct tdx_module_args args = {};
 
Quoted 7 lines

arch/x86/virt/vmx/tdx/tdx.c u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td) · line 1924

Quoted 2 lines
arch/x86/virt/vmx/tdx/tdx.c +1 -1
-	args.rcx = mk_keyed_paddr(tdx_global_keyid, td->tdr_page);
+	args.rcx = mk_keyed_paddr(tdx_global_keyid, page_to_pfn(td->tdr_page));

Should mk_keyed_paddr() be updated to have a return type of phys_addr_t? I guess in this case since mk_keyed_paddr() is pretty much an internal function, returning u64 also makes sense to indicate that it should only be used to set 64 bit registers.

Quoted 6 lines

Yea, this is used to construct u64 inputs for seamcall args. So I think it should keep returning u64s. Maybe instead it would be better to have a function name pattern that denotes that purpose. We have some more helpers like this coming.

But similarly, I'd like to not grow a snowballing cleanup series for this one.

Makes sense, let's go :)

Reviewed-by on v2 2/4
#14 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

In reply to Yan Zhao
Quoted 34 lines · Yan Zhao

From: Sean Christopherson<[email protected]>

Remove struct page assumptions/constraints in APIs for unmapping guest private memory and have them take physical address directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tightly tied to the regular CPU MMUs and the kernel code around them. Using "struct page" for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Therefore, for unmapping guest private memory: export tdx_quirk_reset_paddr() for direct KVM invocation, and convert the SEAMCALL wrapper API tdh_phymem_page_wbinvd_hkid() to take PFN as input (thus updating mk_keyed_paddr() and tdh_phymem_page_wbinvd_tdr()).

Intentionally have KVM pass PAGE_SIZE (rather than KVM_HPAGE_SIZE(level)) to tdx_quirk_reset_paddr() in tdx_sept_remove_private_spte() to avoid mixing in huge page changes. The KVM_BUG_ON() check for !PG_LEVEL_4K in tdx_sept_remove_private_spte() justifies using PAGE_SIZE.

Do not convert tdx_reclaim_page() to use PFN as input since it currently does not remove guest private memory.

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_phymem_page_wbinvd_hkid() and tdx_quirk_reset_paddr() are exported to KVM only.

Quoted 6 lines

[Yan: Use kvm_pfn_t,exclude tdx_reclaim_page(),use tdx_quirk_reset_paddr()]

maintainer Acked-by on v2 2/4
#15 lore raw

Re: [PATCH v2 2/4] x86/tdx: Use PFN directly for unmapping guest private memory

In reply to Yan Zhao
Quoted 34 lines · Yan Zhao

From: Sean Christopherson <[email protected]>

Remove struct page assumptions/constraints in APIs for unmapping guest private memory and have them take physical address directly.

Having core TDX make assumptions that guest private memory must be backed by struct page (and/or folio) will create subtle dependencies on how KVM/guest_memfd allocates/manages memory (e.g., whether it uses memory allocated from core MM, if the memory is refcounted, or if the folio is split) that are easily avoided. [1].

KVM's MMUs work with PFNs. This is very much an intentional design choice. It ensures that the KVM MMUs remain flexible and are not too tightly tied to the regular CPU MMUs and the kernel code around them. Using "struct page" for TDX guest memory is not a good fit anywhere near the KVM MMU code [2].

Therefore, for unmapping guest private memory: export tdx_quirk_reset_paddr() for direct KVM invocation, and convert the SEAMCALL wrapper API tdh_phymem_page_wbinvd_hkid() to take PFN as input (thus updating mk_keyed_paddr() and tdh_phymem_page_wbinvd_tdr()).

Intentionally have KVM pass PAGE_SIZE (rather than KVM_HPAGE_SIZE(level)) to tdx_quirk_reset_paddr() in tdx_sept_remove_private_spte() to avoid mixing in huge page changes. The KVM_BUG_ON() check for !PG_LEVEL_4K in tdx_sept_remove_private_spte() justifies using PAGE_SIZE.

Do not convert tdx_reclaim_page() to use PFN as input since it currently does not remove guest private memory.

Use "kvm_pfn_t pfn" for type safety. Using this KVM type is appropriate since APIs tdh_phymem_page_wbinvd_hkid() and tdx_quirk_reset_paddr() are exported to KVM only.

Quoted 6 lines

[Yan: Use kvm_pfn_t,exclude tdx_reclaim_page(),use tdx_quirk_reset_paddr()]

Signature · 1 line
  Kiryl Shutsemau / Kirill A. Shutemov
author
#16 lore raw

PATCH v2 3/4 x86/tdx: Drop exported function tdx_quirk_reset_page()

In reply to Yan Zhao

KVM invokes tdx_quirk_reset_page() to reset TDX control pages (including S-EPT pages, TDR page, etc.), as all those pages are allocated by KVM TDX and thus always have struct page.

However, it's also reasonable for KVM to reset those TDX control pages via tdx_quirk_reset_paddr() directly, eliminating the need to export two parallel APIs. Keeping tdx_quirk_reset_page() as a one-line helper in the header file is also unnecessary.

No functional change intended.

---
 arch/x86/include/asm/tdx.h  | 1 -
 arch/x86/kvm/vmx/tdx.c      | 4 ++--
 arch/x86/virt/vmx/tdx/tdx.c | 6 ------
 3 files changed, 2 insertions(+), 9 deletions(-)
arch/x86/include/asm/tdx.h +0 -1
index 65f7d874fb5a..9c63deaa0e8f 100644
@@ -153,7 +153,6 @@ int tdx_guest_keyid_alloc(void);
 u32 tdx_get_nr_guest_keyids(void);
 void tdx_guest_keyid_free(unsigned int keyid);
 
-void tdx_quirk_reset_page(struct page *page);
 void tdx_quirk_reset_paddr(unsigned long base, unsigned long size);
 
 struct tdx_td {
arch/x86/kvm/vmx/tdx.c +2 -2
index a2aadc6d0174..9bd4fd748e2a 100644
@@ -343,7 +343,7 @@ static int tdx_reclaim_page(struct page *page)
 
 	r = __tdx_reclaim_page(page);
 	if (!r)
-		tdx_quirk_reset_page(page);
+		tdx_quirk_reset_paddr(page_to_phys(page), PAGE_SIZE);
 	return r;
 }
 
@@ -597,7 +597,7 @@ static void tdx_reclaim_td_control_pages(struct kvm *kvm)
 	if (TDX_BUG_ON(err, TDH_PHYMEM_PAGE_WBINVD, kvm))
 		return;
 
-	tdx_quirk_reset_page(kvm_tdx->td.tdr_page);
+	tdx_quirk_reset_paddr(page_to_phys(kvm_tdx->td.tdr_page), PAGE_SIZE);
 
 	__free_page(kvm_tdx->td.tdr_page);
 	kvm_tdx->td.tdr_page = NULL;
arch/x86/virt/vmx/tdx/tdx.c +0 -6
index e5a37ea2d4a0..deb67e68f85f 100644
@@ -731,12 +731,6 @@ void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
 }
 EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
-void tdx_quirk_reset_page(struct page *page)
-{
-	tdx_quirk_reset_paddr(page_to_phys(page), PAGE_SIZE);
-}
-EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_page);
-
 static __init void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr)
 
 {
Signature · 1 line
2.43.2
Reviewed-by on v2 3/4
#17 lore raw

Re: [PATCH v2 3/4] x86/tdx: Drop exported function tdx_quirk_reset_page()

Quoted 9 lines · Yan Zhao

KVM invokes tdx_quirk_reset_page() to reset TDX control pages (including S-EPT pages, TDR page, etc.), as all those pages are allocated by KVM TDX and thus always have struct page.

However, it's also reasonable for KVM to reset those TDX control pages via tdx_quirk_reset_paddr() directly, eliminating the need to export two parallel APIs. Keeping tdx_quirk_reset_page() as a one-line helper in the header file is also unnecessary.

Quoted 5 lines

No functional change intended.

Thanks for the cleanup!

Quoted 3 lines

[...snip...]

Reviewed-by on v2 3/4
#18 lore raw

Re: [PATCH v2 3/4] x86/tdx: Drop exported function tdx_quirk_reset_page()

In reply to Yan Zhao
Quoted 9 lines · Yan Zhao

KVM invokes tdx_quirk_reset_page() to reset TDX control pages (including S-EPT pages, TDR page, etc.), as all those pages are allocated by KVM TDX and thus always have struct page.

However, it's also reasonable for KVM to reset those TDX control pages via tdx_quirk_reset_paddr() directly, eliminating the need to export two parallel APIs. Keeping tdx_quirk_reset_page() as a one-line helper in the header file is also unnecessary.

Quoted 5 lines

No functional change intended.

Quoted 57 lines
---
  arch/x86/include/asm/tdx.h  | 1 -
  arch/x86/kvm/vmx/tdx.c      | 4 ++--
  arch/x86/virt/vmx/tdx/tdx.c | 6 ------
  3 files changed, 2 insertions(+), 9 deletions(-)
arch/x86/include/asm/tdx.h +0 -1
index 65f7d874fb5a..9c63deaa0e8f 100644
@@ -153,7 +153,6 @@ int tdx_guest_keyid_alloc(void);
  u32 tdx_get_nr_guest_keyids(void);
  void tdx_guest_keyid_free(unsigned int keyid);
 
-void tdx_quirk_reset_page(struct page *page);
  void tdx_quirk_reset_paddr(unsigned long base, unsigned long size);
 
  struct tdx_td {
arch/x86/kvm/vmx/tdx.c +2 -2
index a2aadc6d0174..9bd4fd748e2a 100644
@@ -343,7 +343,7 @@ static int tdx_reclaim_page(struct page *page)
 
  	r = __tdx_reclaim_page(page);
  	if (!r)
-		tdx_quirk_reset_page(page);
+		tdx_quirk_reset_paddr(page_to_phys(page), PAGE_SIZE);
  	return r;
  }
 
@@ -597,7 +597,7 @@ static void tdx_reclaim_td_control_pages(struct kvm *kvm)
  	if (TDX_BUG_ON(err, TDH_PHYMEM_PAGE_WBINVD, kvm))
  		return;
 
-	tdx_quirk_reset_page(kvm_tdx->td.tdr_page);
+	tdx_quirk_reset_paddr(page_to_phys(kvm_tdx->td.tdr_page), PAGE_SIZE);
 
  	__free_page(kvm_tdx->td.tdr_page);
  	kvm_tdx->td.tdr_page = NULL;
arch/x86/virt/vmx/tdx/tdx.c +0 -6
index e5a37ea2d4a0..deb67e68f85f 100644
@@ -731,12 +731,6 @@ void tdx_quirk_reset_paddr(unsigned long base, unsigned long size)
  }
  EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_paddr);
 
-void tdx_quirk_reset_page(struct page *page)
-{
-	tdx_quirk_reset_paddr(page_to_phys(page), PAGE_SIZE);
-}
-EXPORT_SYMBOL_FOR_KVM(tdx_quirk_reset_page);
-
  static __init void tdmr_quirk_reset_pamt(struct tdmr_info *tdmr)
 
  {
maintainer Acked-by on v2 3/4
#19 lore raw

Re: [PATCH v2 3/4] x86/tdx: Drop exported function tdx_quirk_reset_page()

In reply to Yan Zhao
Quoted 9 lines · Yan Zhao

KVM invokes tdx_quirk_reset_page() to reset TDX control pages (including S-EPT pages, TDR page, etc.), as all those pages are allocated by KVM TDX and thus always have struct page.

However, it's also reasonable for KVM to reset those TDX control pages via tdx_quirk_reset_paddr() directly, eliminating the need to export two parallel APIs. Keeping tdx_quirk_reset_page() as a one-line helper in the header file is also unnecessary.

Quoted 5 lines

No functional change intended.

Signature · 1 line
  Kiryl Shutsemau / Kirill A. Shutemov
author
#20 lore raw

PATCH v2 4/4 x86/virt/tdx: Move mk_keyed_paddr() to tdx.c due to no external users

In reply to Yan Zhao

Move mk_keyed_paddr() from tdx.h to tdx.c to avoid unnecessary header inclusion and improve encapsulation since there are no users outside of tdx.c.

No functional change intended.

---
 arch/x86/include/asm/tdx.h  | 6 ------
 arch/x86/virt/vmx/tdx/tdx.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/tdx.h +0 -6
index 9c63deaa0e8f..503f9a3f46d6 100644
@@ -177,12 +177,6 @@ struct tdx_vp {
 	struct page **tdcx_pages;
 };
 
-static inline u64 mk_keyed_paddr(u16 hkid, kvm_pfn_t pfn)
-{
-	/* KeyID bits are just above the physical address bits. */
-	return PFN_PHYS(pfn) | ((u64)hkid << boot_cpu_data.x86_phys_bits);
-}
-
 u64 tdh_vp_enter(struct tdx_vp *vp, struct tdx_module_args *args);
 u64 tdh_mng_addcx(struct tdx_td *td, struct page *tdcs_page);
 u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, kvm_pfn_t pfn, struct page *source,
arch/x86/virt/vmx/tdx/tdx.c +6 -0
index deb67e68f85f..967482ae3c80 100644
@@ -1911,6 +1911,12 @@ u64 tdh_phymem_cache_wb(bool resume)
 }
 EXPORT_SYMBOL_FOR_KVM(tdh_phymem_cache_wb);
 
+static inline u64 mk_keyed_paddr(u16 hkid, kvm_pfn_t pfn)
+{
+	/* KeyID bits are just above the physical address bits. */
+	return PFN_PHYS(pfn) | ((u64)hkid << boot_cpu_data.x86_phys_bits);
+}
+
 u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
 {
 	struct tdx_module_args args = {};
Signature · 1 line
2.43.2
Reviewed-by on v2 4/4
#21 lore raw

Re: [PATCH v2 4/4] x86/virt/tdx: Move mk_keyed_paddr() to tdx.c due to no external users

Quoted 5 lines · Yan Zhao

Move mk_keyed_paddr() from tdx.h to tdx.c to avoid unnecessary header inclusion and improve encapsulation since there are no users outside of tdx.c.

No functional change intended.

Missing a new blank line.

Quoted 1 line
Quoted 39 lines
---
  arch/x86/include/asm/tdx.h  | 6 ------
  arch/x86/virt/vmx/tdx/tdx.c | 6 ++++++
  2 files changed, 6 insertions(+), 6 deletions(-)
arch/x86/include/asm/tdx.h +0 -6
index 9c63deaa0e8f..503f9a3f46d6 100644
@@ -177,12 +177,6 @@ struct tdx_vp {
  	struct page **tdcx_pages;
  };
 
-static inline u64 mk_keyed_paddr(u16 hkid, kvm_pfn_t pfn)
-{
-	/* KeyID bits are just above the physical address bits. */
-	return PFN_PHYS(pfn) | ((u64)hkid << boot_cpu_data.x86_phys_bits);
-}
-
  u64 tdh_vp_enter(struct tdx_vp *vp, struct tdx_module_args *args);
  u64 tdh_mng_addcx(struct tdx_td *td, struct page *tdcs_page);
  u64 tdh_mem_page_add(struct tdx_td *td, u64 gpa, kvm_pfn_t pfn, struct page *source,
arch/x86/virt/vmx/tdx/tdx.c +6 -0
index deb67e68f85f..967482ae3c80 100644
@@ -1911,6 +1911,12 @@ u64 tdh_phymem_cache_wb(bool resume)
  }
  EXPORT_SYMBOL_FOR_KVM(tdh_phymem_cache_wb);
 
+static inline u64 mk_keyed_paddr(u16 hkid, kvm_pfn_t pfn)
+{
+	/* KeyID bits are just above the physical address bits. */
+	return PFN_PHYS(pfn) | ((u64)hkid << boot_cpu_data.x86_phys_bits);
+}
+
  u64 tdh_phymem_page_wbinvd_tdr(struct tdx_td *td)
  {
  	struct tdx_module_args args = {};
maintainer Acked-by on v2 4/4
#22 lore raw

Re: [PATCH v2 4/4] x86/virt/tdx: Move mk_keyed_paddr() to tdx.c due to no external users

In reply to Yan Zhao
Quoted 5 lines · Yan Zhao

Move mk_keyed_paddr() from tdx.h to tdx.c to avoid unnecessary header inclusion and improve encapsulation since there are no users outside of tdx.c.

No functional change intended.

Add a new line before SoB.

Quoted 1 line

Otherwise:

Signature · 1 line
  Kiryl Shutsemau / Kirill A. Shutemov
#23 lore raw
In reply to Yan Zhao
Quoted 9 lines · Yan Zhao

Hi

This is v2 of the struct page to PFN conversion series, which converts TDX guest private memory mapping/unmapping APIs from taking struct page to taking PFN as input.

v2 is based on v7.1.0-rc1 + Sean's 4 cleanup patches (see details in section "Base" below). The purpose is to get Dave's Ack, so Sean can take it from the KVM x86 tree. The full stack of v2 is available at [14].

Dave, any concerns?

I'd like to get these into the KVM x86 tree sooner than later, so that we at least have a fighting chance of landing the S-EPT cleanup (prep work for D-PAMT) in 7.2.

Acked-by
#24 lore raw
Quoted 4 lines · Sean Christopherson
Quoted 3 lines

v2 is based on v7.1.0-rc1 + Sean's 4 cleanup patches (see details in section "Base" below). The purpose is to get Dave's Ack, so Sean can take it from the KVM x86 tree. The full stack of v2 is available at [14].

Dave, any concerns?

These look fine to me. They make the code marginally cleaner and the changelogs are much better at describing the problem now.

Going to Linus via the KVM route is fine with me:

maintainer Applied
#25 lore raw
In reply to Yan Zhao
Quoted 9 lines · Yan Zhao

This is v2 of the struct page to PFN conversion series, which converts TDX guest private memory mapping/unmapping APIs from taking struct page to taking PFN as input.

v2 is based on v7.1.0-rc1 + Sean's 4 cleanup patches (see details in section "Base" below). The purpose is to get Dave's Ack, so Sean can take it from the KVM x86 tree. The full stack of v2 is available at [14].

[...]

Applied to kvm-x86 mmu, thanks!

[1/4] x86/tdx: Use PFN directly for mapping guest private memory

      https://github.com/kvm-x86/linux/commit/6ad0badd765c
[2/4] x86/tdx: Use PFN directly for unmapping guest private memory
      https://github.com/kvm-x86/linux/commit/4c7a1247646c
[3/4] x86/tdx: Drop exported function tdx_quirk_reset_page()
      https://github.com/kvm-x86/linux/commit/4a72a6dc447d
[4/4] x86/virt/tdx: Move mk_keyed_paddr() to tdx.c due to no external users
      https://github.com/kvm-x86/linux/commit/3f330fbb918f

--
https://github.com/kvm-x86/linux/tree/next