FAILED: patch "[PATCH] KVM: TDX: Account all non-transient page allocations for" failed to apply to 6.18-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x a8b2924676ec42d76597f849baba31acc3ba1bfc
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071641-falsify-antiquely-4d9a@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a8b2924676ec42d76597f849baba31acc3ba1bfc Mon Sep 17 00:00:00 2001
From: Sean Christopherson <[email protected]>
Date: Wed, 28 Jan 2026 17:14:35 -0800
Subject: [PATCH] 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").
arch/x86/kvm/vmx/tdx.c +7 -7
@@ -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;
PATCH 1/1 KVM: TDX: Account all non-transient page allocations for per-TD structures
From: Sean Christopherson <[email protected]>
[ Upstream commit a8b2924676ec42d76597f849baba31acc3ba1bfc ]
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").
[ Binbin: Resolved conflicts in __tdx_td_init() due to lacking commits
eac90a5ba0aa and 69050f8d6d07, retain nr_configured_hkid increment and kcalloc() call. ]
--- arch/x86/kvm/vmx/tdx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/x86/kvm/vmx/tdx.c +6 -6
@@ -2474,7 +2474,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 =alloc_page (GFP_KERNEL_ACCOUNT );if (!tdr_page) goto free_hkid;
@@ -2482,12 +2482,12 @@ static int __tdx_td_init(struct kvm *kvm, struct td_params *td_params,/* 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 =kcalloc (kvm_tdx->td.tdcs_nr_pages,sizeof (*kvm_tdx->td.tdcs_pages), -GFP_KERNEL ); +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; }
@@ -2937,7 +2937,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;
@@ -2950,14 +2950,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;
Signature · 1 line
2.46.0
Re: [PATCH 6.18.y] KVM: TDX: Account all non-transient page allocations for per-TD structures
Quoted 18 lines · Binbin Wu
From: Sean Christopherson <[email protected]>
[ Upstream commit
a8b2924676ec42d76597f849baba31acc3ba1bfc]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 unnecessaryGFP_KERNEL_ACCOUNTfor temporary variables").Fixes 8d032b683c29 ("KVM: TDX: create/destroy VM structure")Fixes a50f673f25e0 ("KVM: TDX: Do TDX specific vcpu initialization")Reviewed-by Kai Huang <[email protected]>Reviewed-by Rick Edgecombe <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Quoted 5 lines
[ Binbin: Resolved conflicts in
__tdx_td_init()due to lacking commits
eac90a5ba0aaand69050f8d6d07, retainnr_configured_hkidincrement andkcalloc()call. ]Signed-off-by Binbin Wu <[email protected]>---
Re: [PATCH 6.18.y] KVM: TDX: Account all non-transient page allocations for per-TD structures
In reply to Binbin WuQuoted 3 lines
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.
Queued for 6.18, thanks.
Signature · 2 lines
Thanks, Sasha