KVM: TDX: Account all non-transient page allocations for per-TD structures

Account all non-transient allocations associated with a single TD (or its
vCPUs), as KVM's ABI is that allocations that are active for the lifetime
of a VM are accounted.  Leave temporary allocations, i.e. allocations that
are freed within a single function/ioctl, unaccounted, to again align with
KVM's existing behavior, e.g. see commit dd103407ca31 ("KVM: X86: Remove
unnecessary GFP_KERNEL_ACCOUNT for temporary variables").

Fixes: 8d032b683c29 ("KVM: TDX: create/destroy VM structure")
Fixes: a50f673f25e0 ("KVM: TDX: Do TDX specific vcpu initialization")
Cc: stable@vger.kernel.org
Reviewed-by: Kai Huang <kai.huang@intel.com>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Link: https://patch.msgid.link/20260129011517.3545883-4-seanjc@google.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 04aecdd3a6c0b335f6d442650cca55d9d07ff971..72d916c957bc321e76feb183101bf76633ec8ea3 100644 (file)
--- a/arch/x86/kvm/vmx/tdx.c
+++ b/arch/x86/kvm/vmx/tdx.c
@@ -2384,20 +2384,20 @@ static int __tdx_td_init(struct kvm *kvm, struct td_params *td_params,
 
        ret = -ENOMEM;
 
-       tdr_page = alloc_page(GFP_KERNEL);
+       tdr_page = alloc_page(GFP_KERNEL_ACCOUNT);
        if (!tdr_page)
                goto free_hkid;
 
        kvm_tdx->td.tdcs_nr_pages = tdx_sysinfo->td_ctrl.tdcs_base_size / PAGE_SIZE;
        /* TDVPS = TDVPR(4K page) + TDCX(multiple 4K pages), -1 for TDVPR. */
        kvm_tdx->td.tdcx_nr_pages = tdx_sysinfo->td_ctrl.tdvps_base_size / PAGE_SIZE - 1;
-       tdcs_pages = kzalloc_objs(*kvm_tdx->td.tdcs_pages,
-                                 kvm_tdx->td.tdcs_nr_pages);
+       tdcs_pages = kzalloc_objs(*kvm_tdx->td.tdcs_pages, kvm_tdx->td.tdcs_nr_pages,
+                                 GFP_KERNEL_ACCOUNT);
        if (!tdcs_pages)
                goto free_tdr;
 
        for (i = 0; i < kvm_tdx->td.tdcs_nr_pages; i++) {
-               tdcs_pages[i] = alloc_page(GFP_KERNEL);
+               tdcs_pages[i] = alloc_page(GFP_KERNEL_ACCOUNT);
                if (!tdcs_pages[i])
                        goto free_tdcs;
        }
@@ -2872,7 +2872,7 @@ static int tdx_td_vcpu_init(struct kvm_vcpu *vcpu, u64 vcpu_rcx)
        int ret, i;
        u64 err;
 
-       page = alloc_page(GFP_KERNEL);
+       page = alloc_page(GFP_KERNEL_ACCOUNT);
        if (!page)
                return -ENOMEM;
        tdx->vp.tdvpr_page = page;
@@ -2885,14 +2885,14 @@ static int tdx_td_vcpu_init(struct kvm_vcpu *vcpu, u64 vcpu_rcx)
        tdx->vp.tdvpr_pa = page_to_phys(tdx->vp.tdvpr_page);
 
        tdx->vp.tdcx_pages = kcalloc(kvm_tdx->td.tdcx_nr_pages, sizeof(*tdx->vp.tdcx_pages),
-                                    GFP_KERNEL);
+                                    GFP_KERNEL_ACCOUNT);
        if (!tdx->vp.tdcx_pages) {
                ret = -ENOMEM;
                goto free_tdvpr;
        }
 
        for (i = 0; i < kvm_tdx->td.tdcx_nr_pages; i++) {
-               page = alloc_page(GFP_KERNEL);
+               page = alloc_page(GFP_KERNEL_ACCOUNT);
                if (!page) {
                        ret = -ENOMEM;
                        goto free_tdcx;