From: Rick Edgecombe <rick.p.edgecombe@intel.com>
To: bp@alien8.de, dave.hansen@intel.com, hpa@zytor.com,
kas@kernel.org, kvm@vger.kernel.org, linux-coco@lists.linux.dev,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
mingo@redhat.com, nik.borisov@suse.com, pbonzini@redhat.com,
seanjc@google.com, tglx@kernel.org, vannapurve@google.com,
x86@kernel.org, chao.gao@intel.com, yan.y.zhao@intel.com,
kai.huang@intel.com
Cc: rick.p.edgecombe@intel.com,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH v6 05/11] x86/virt/tdx: Handle concurrent callers in tdx_pamt_get/put()
Date: Mon, 25 May 2026 19:35:09 -0700 [thread overview]
Message-ID: <20260526023515.288829-6-rick.p.edgecombe@intel.com> (raw)
In-Reply-To: <20260526023515.288829-1-rick.p.edgecombe@intel.com>
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
tdx_pamt_get()/tdx_pamt_put() unconditionally add or remove Dynamic PAMT
backing for the 2MB region covering the passed pfn. However, multiple
callers can concurrently operate on 4KB pages that fall within the same
2MB region. When this happens only one Dynamic PAMT page pair needs to be
installed to cover the 2MB range. And when one page is freed, the Dynamic
PAMT backing cannot be freed until all pages in the range are no longer in
use. Make the helpers handle these races internally.
Use the per-2MB refcounts from previous changes to track how many 4KB
pages are in use within each region. Gate the actual Dynamic PAMT add and
remove on refcount transitions (0->1 and 1->0). Serialize the refcount
check and SEAMCALL with a global spinlock so the read-decide-act sequence
is atomic. This also avoids TDX module BUSY errors, as Dynamic PAMT add
and remove SEAMCALLs take an internal TDX module locks at 2MB granularity,
so simultaneous attempts on the same region would conflict.
The lock is global and heavyweight. Use simple conditional logic to keep
correctness obvious. This will be optimized in a later change.
Assisted-by: GitHub Copilot:claude-opus-4-6 Claude:claude-opus-4-7
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Co-developed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
---
v6:
- Split from "x86/virt/tdx: Add tdx_alloc/free_control_page() helpers"
- Return 0 instead of ret to be clearer (Binbin)
- Clarify log (Nikolay)
- Justify why the patch is not optimized in response to comments by
(Nikolay)
- Move tdx_find_pamt_refcount() to faciliate patch re-order
- Adjustments from dropping error helper patches
- Log tweaks
---
arch/x86/virt/vmx/tdx/tdx.c | 72 ++++++++++++++++++++++++++++---------
1 file changed, 56 insertions(+), 16 deletions(-)
diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
index 6658a6be6697c..50333eb96efa6 100644
--- a/arch/x86/virt/vmx/tdx/tdx.c
+++ b/arch/x86/virt/vmx/tdx/tdx.c
@@ -2043,10 +2043,14 @@ static u64 tdh_phymem_pamt_remove(kvm_pfn_t pfn, struct page **pamt_pages)
return 0;
}
-/* Allocate PAMT memory for the given page */
+/* Serializes adding/removing PAMT memory */
+static DEFINE_SPINLOCK(pamt_lock);
+
+/* Bump PAMT refcount for the given page and allocate PAMT memory if needed */
static int tdx_pamt_get(kvm_pfn_t pfn)
{
struct page *pamt_pages[TDX_DPAMT_ENTRY_PAGE_CNT];
+ atomic_t *pamt_refcount;
u64 tdx_status;
int ret;
@@ -2057,10 +2061,26 @@ static int tdx_pamt_get(kvm_pfn_t pfn)
if (ret)
return ret;
- tdx_status = tdh_phymem_pamt_add(pfn, pamt_pages);
- if (tdx_status != TDX_SUCCESS) {
- ret = -EIO;
- goto out_free;
+ pamt_refcount = tdx_find_pamt_refcount(pfn);
+
+ scoped_guard(spinlock, &pamt_lock) {
+ /*
+ * If the pamt page is already added (i.e. refcount >= 1),
+ * then just increment the refcount.
+ */
+ if (atomic_read(pamt_refcount)) {
+ atomic_inc(pamt_refcount);
+ goto out_free;
+ }
+
+ /* Try to add the pamt page and take the refcount 0->1. */
+ tdx_status = tdh_phymem_pamt_add(pfn, pamt_pages);
+ if (WARN_ON_ONCE(tdx_status != TDX_SUCCESS)) {
+ ret = -EIO;
+ goto out_free;
+ }
+
+ atomic_set(pamt_refcount, 1);
}
return 0;
@@ -2069,26 +2089,46 @@ static int tdx_pamt_get(kvm_pfn_t pfn)
return ret;
}
-/* Free PAMT memory for the given page */
+/*
+ * Drop PAMT refcount for the given page and free PAMT memory if it is no
+ * longer needed.
+ */
static void tdx_pamt_put(kvm_pfn_t pfn)
{
struct page *pamt_pages[TDX_DPAMT_ENTRY_PAGE_CNT] = {};
+ atomic_t *pamt_refcount;
u64 tdx_status;
if (!tdx_supports_dynamic_pamt(&tdx_sysinfo))
return;
- tdx_status = tdh_phymem_pamt_remove(pfn, pamt_pages);
+ pamt_refcount = tdx_find_pamt_refcount(pfn);
- /*
- * Don't free pamt_pages as it could hold garbage when
- * tdh_phymem_pamt_remove() fails. Don't panic/BUG_ON(), as
- * there is no risk of data corruption, but do yell loudly as
- * failure indicates a kernel bug, memory is being leaked, and
- * the dangling PAMT entry may cause future operations to fail.
- */
- if (WARN_ON_ONCE(tdx_status != TDX_SUCCESS))
- return;
+ scoped_guard(spinlock, &pamt_lock) {
+ /*
+ * If the there are more than 1 references on the pamt page,
+ * don't remove it yet. Just decrement the refcount.
+ */
+ if (atomic_read(pamt_refcount) > 1) {
+ atomic_dec(pamt_refcount);
+ return;
+ }
+
+ /* Try to remove the pamt page and take the refcount 1->0. */
+ tdx_status = tdh_phymem_pamt_remove(pfn, pamt_pages);
+
+ /*
+ * Don't free pamt_pages as it could hold garbage when
+ * tdh_phymem_pamt_remove() fails. Don't panic/BUG_ON(), as
+ * there is no risk of data corruption, but do yell loudly as
+ * failure indicates a kernel bug, memory is being leaked, and
+ * the dangling PAMT entry may cause future operations to fail.
+ */
+ if (WARN_ON_ONCE(tdx_status != TDX_SUCCESS))
+ return;
+
+ atomic_set(pamt_refcount, 0);
+ }
free_pamt_array(pamt_pages);
}
--
2.54.0
next prev parent reply other threads:[~2026-05-26 2:35 UTC|newest]
Thread overview: 107+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-26 2:35 [PATCH v6 00/11] Dynamic PAMT Rick Edgecombe
2026-05-26 2:35 ` [PATCH v6 01/11] x86/virt/tdx: Simplify tdmr_get_pamt_sz() Rick Edgecombe
2026-06-04 16:05 ` Kiryl Shutsemau
2026-07-01 0:08 ` Edgecombe, Rick P
2026-06-11 18:25 ` Vishal Annapurve
2026-07-03 5:48 ` Chao Gao
2026-07-06 20:18 ` Edgecombe, Rick P
2026-07-07 3:24 ` Yan Zhao
2026-07-07 19:08 ` Edgecombe, Rick P
2026-07-07 23:22 ` Sohil Mehta
2026-07-08 1:23 ` Edgecombe, Rick P
2026-05-26 2:35 ` [PATCH v6 02/11] x86/virt/tdx: Allocate page bitmap for Dynamic PAMT Rick Edgecombe
2026-06-04 16:14 ` Kiryl Shutsemau
2026-07-01 0:14 ` Edgecombe, Rick P
2026-06-11 18:47 ` Vishal Annapurve
2026-07-03 8:26 ` Chao Gao
2026-07-07 3:59 ` Yan Zhao
2026-07-07 21:25 ` Edgecombe, Rick P
2026-07-08 0:49 ` Sohil Mehta
2026-07-08 2:07 ` Edgecombe, Rick P
2026-07-08 2:10 ` Edgecombe, Rick P
2026-07-08 3:35 ` Sohil Mehta
2026-07-08 20:50 ` Edgecombe, Rick P
2026-07-08 21:20 ` Sohil Mehta
2026-05-26 2:35 ` [PATCH v6 03/11] x86/virt/tdx: Add tdx_alloc/free_control_page() helpers Rick Edgecombe
2026-06-08 2:11 ` Binbin Wu
2026-06-08 2:18 ` Yan Zhao
2026-07-01 0:15 ` Edgecombe, Rick P
2026-07-06 12:31 ` Chao Gao
2026-07-06 20:23 ` Edgecombe, Rick P
2026-07-08 3:50 ` Sohil Mehta
2026-07-08 22:54 ` Edgecombe, Rick P
2026-05-26 2:35 ` [PATCH v6 04/11] x86/virt/tdx: Allocate ref counts for Dynamic PAMT memory Rick Edgecombe
2026-07-02 7:20 ` Binbin Wu
2026-07-06 20:26 ` Edgecombe, Rick P
2026-07-06 13:22 ` Chao Gao
2026-07-06 20:26 ` Edgecombe, Rick P
2026-07-07 4:53 ` Yan Zhao
2026-07-07 22:32 ` Edgecombe, Rick P
2026-07-08 20:49 ` Sohil Mehta
2026-07-08 23:21 ` Edgecombe, Rick P
2026-05-26 2:35 ` Rick Edgecombe [this message]
2026-07-02 7:39 ` [PATCH v6 05/11] x86/virt/tdx: Handle concurrent callers in tdx_pamt_get/put() Binbin Wu
2026-07-06 20:27 ` Edgecombe, Rick P
2026-07-07 5:54 ` Chao Gao
2026-07-08 6:46 ` Yan Zhao
2026-07-09 0:33 ` Edgecombe, Rick P
2026-07-09 2:50 ` Yan Zhao
2026-07-09 23:09 ` Edgecombe, Rick P
2026-07-10 2:24 ` Yan Zhao
2026-07-08 19:01 ` Dave Hansen
2026-07-08 21:03 ` Edgecombe, Rick P
2026-07-08 21:11 ` Sohil Mehta
2026-07-08 21:13 ` Dave Hansen
2026-05-26 2:35 ` [PATCH v6 06/11] x86/virt/tdx: Optimize tdx_pamt_get/put() Rick Edgecombe
2026-05-26 8:57 ` Chao Gao
2026-05-26 16:42 ` Edgecombe, Rick P
2026-06-04 16:59 ` Kiryl Shutsemau
2026-06-05 5:40 ` Chao Gao
2026-06-05 11:42 ` Kiryl Shutsemau
2026-06-05 16:23 ` Dave Hansen
2026-06-08 9:14 ` Kiryl Shutsemau
2026-06-08 9:50 ` Yan Zhao
2026-07-01 1:45 ` Edgecombe, Rick P
2026-07-01 5:37 ` Yan Zhao
2026-07-01 1:05 ` Edgecombe, Rick P
2026-07-07 6:45 ` Chao Gao
2026-07-08 8:46 ` Yan Zhao
2026-07-09 0:44 ` Edgecombe, Rick P
2026-05-26 2:35 ` [PATCH v6 07/11] KVM: TDX: Allocate PAMT memory for TD and vCPU control structures Rick Edgecombe
2026-07-02 8:55 ` Binbin Wu
2026-07-06 23:47 ` Sean Christopherson
2026-07-06 23:54 ` Edgecombe, Rick P
2026-07-07 0:25 ` Sean Christopherson
2026-07-08 18:30 ` Dave Hansen
2026-07-07 6:54 ` Chao Gao
2026-07-08 9:13 ` Yan Zhao
2026-07-09 1:12 ` Edgecombe, Rick P
2026-07-09 3:18 ` Yan Zhao
2026-07-10 1:04 ` Edgecombe, Rick P
2026-07-10 2:43 ` Yan Zhao
2026-05-26 2:35 ` [PATCH v6 08/11] x86/tdx: Add APIs to support Dynamic PAMT ops from KVM's fault path Rick Edgecombe
2026-06-04 17:11 ` Kiryl Shutsemau
2026-07-02 9:32 ` Binbin Wu
2026-07-07 7:25 ` Chao Gao
2026-07-09 7:17 ` Yan Zhao
2026-07-10 1:34 ` Edgecombe, Rick P
2026-07-10 2:47 ` Yan Zhao
2026-05-26 2:35 ` [PATCH v6 09/11] KVM: TDX: Get/put PAMT pages when (un)mapping private memory Rick Edgecombe
2026-07-03 3:15 ` Binbin Wu
2026-07-06 20:47 ` Edgecombe, Rick P
2026-07-06 21:02 ` Sean Christopherson
2026-07-06 21:52 ` Edgecombe, Rick P
2026-07-08 8:35 ` Chao Gao
2026-07-09 1:22 ` Edgecombe, Rick P
2026-05-26 2:35 ` [PATCH v6 10/11] x86/virt/tdx: Enable Dynamic PAMT Rick Edgecombe
2026-06-04 17:14 ` Kiryl Shutsemau
2026-06-05 5:25 ` Chao Gao
2026-07-01 1:20 ` Edgecombe, Rick P
2026-07-06 20:48 ` Edgecombe, Rick P
2026-07-03 4:35 ` Binbin Wu
2026-05-26 2:35 ` [PATCH v6 11/11] Documentation/x86: Add documentation for TDX's " Rick Edgecombe
2026-07-03 4:54 ` Binbin Wu
2026-06-08 5:45 ` [PATCH v6 00/11] " Tony Lindgren
2026-07-06 21:01 ` Edgecombe, Rick P
2026-07-07 16:17 ` Sean Christopherson
2026-07-07 17:25 ` Edgecombe, Rick P
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260526023515.288829-6-rick.p.edgecombe@intel.com \
--to=rick.p.edgecombe@intel.com \
--cc=bp@alien8.de \
--cc=chao.gao@intel.com \
--cc=dave.hansen@intel.com \
--cc=hpa@zytor.com \
--cc=kai.huang@intel.com \
--cc=kas@kernel.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nik.borisov@suse.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tglx@kernel.org \
--cc=vannapurve@google.com \
--cc=x86@kernel.org \
--cc=yan.y.zhao@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®