On 11/21/2025 8:51 AM, Rick Edgecombe wrote:
> From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
>
> TDX TD control structures are provided to the TDX module at 4KB page size
> and require PAMT backing. This means for Dynamic PAMT they need to also
> have 4KB backings installed.
>
> Previous changes introduced tdx_alloc_page()/tdx_free_page() that can
> allocate a page and automatically handle the DPAMT maintenance. Use them
> for vCPU control structures instead of alloc_page()/__free_page().
vCPU -> TD
>
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> [update log]
> Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
One typo above.
Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com>
> ---
> v3:
> - Write log. Rename from “KVM: TDX: Allocate PAMT memory in __tdx_td_init()”
> ---
> arch/x86/kvm/vmx/tdx.c | 16 ++++++----------
> 1 file changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/tdx.c b/arch/x86/kvm/vmx/tdx.c
> index 0eed334176b3..8c4c1221e311 100644
> --- a/arch/x86/kvm/vmx/tdx.c
> +++ b/arch/x86/kvm/vmx/tdx.c
> @@ -2398,7 +2398,7 @@ static int __tdx_td_init(struct kvm *kvm, struct td_params *td_params,
>
> atomic_inc(&nr_configured_hkid);
>
> - tdr_page = alloc_page(GFP_KERNEL);
> + tdr_page = tdx_alloc_page();
> if (!tdr_page)
> goto free_hkid;
>
> @@ -2411,7 +2411,7 @@ static int __tdx_td_init(struct kvm *kvm, struct td_params *td_params,
> goto free_tdr;
>
> for (i = 0; i < kvm_tdx->td.tdcs_nr_pages; i++) {
> - tdcs_pages[i] = alloc_page(GFP_KERNEL);
> + tdcs_pages[i] = tdx_alloc_page();
> if (!tdcs_pages[i])
> goto free_tdcs;
> }
> @@ -2529,10 +2529,8 @@ static int __tdx_td_init(struct kvm *kvm, struct td_params *td_params,
> teardown:
> /* Only free pages not yet added, so start at 'i' */
> for (; i < kvm_tdx->td.tdcs_nr_pages; i++) {
> - if (tdcs_pages[i]) {
> - __free_page(tdcs_pages[i]);
> - tdcs_pages[i] = NULL;
> - }
> + tdx_free_page(tdcs_pages[i]);
> + tdcs_pages[i] = NULL;
> }
> if (!kvm_tdx->td.tdcs_pages)
> kfree(tdcs_pages);
> @@ -2548,15 +2546,13 @@ static int __tdx_td_init(struct kvm *kvm, struct td_params *td_params,
>
> free_tdcs:
> for (i = 0; i < kvm_tdx->td.tdcs_nr_pages; i++) {
> - if (tdcs_pages[i])
> - __free_page(tdcs_pages[i]);
> + tdx_free_page(tdcs_pages[i]);
> }
> kfree(tdcs_pages);
> kvm_tdx->td.tdcs_pages = NULL;
>
> free_tdr:
> - if (tdr_page)
> - __free_page(tdr_page);
> + tdx_free_page(tdr_page);
> kvm_tdx->td.tdr_page = NULL;
>
> free_hkid: