From: Xu Yilun <yilun.xu@linux.intel.com>
To: linux-coco@lists.linux.dev, linux-pci@vger.kernel.org,
dan.j.williams@intel.com, x86@kernel.org
Cc: chao.gao@intel.com, dave.jiang@intel.com,
baolu.lu@linux.intel.com, yilun.xu@linux.intel.com,
yilun.xu@intel.com, zhenzhong.duan@intel.com,
kvm@vger.kernel.org, rick.p.edgecombe@intel.com,
dave.hansen@linux.intel.com, kas@kernel.org,
xiaoyao.li@intel.com, vishal.l.verma@intel.com,
linux-kernel@vger.kernel.org
Subject: [PATCH v2 05/31] x86/virt/tdx: Extend tdx_page_array to support IOMMU_MT
Date: Sat, 28 Mar 2026 00:01:06 +0800 [thread overview]
Message-ID: <20260327160132.2946114-6-yilun.xu@linux.intel.com> (raw)
In-Reply-To: <20260327160132.2946114-1-yilun.xu@linux.intel.com>
IOMMU_MT is another TDX Module defined structure similar to HPA_ARRAY_T
and HPA_LIST_INFO. The difference is it requires multi-order contiguous
pages for some entries. It adds an additional NUM_PAGES field for every
multi-order page entry.
Add a dedicated allocation helper for IOMMU_MT. Fortunately put_page()
works well for both single pages and multi-order folios, simplifying the
cleanup logic for all allocation methods.
Signed-off-by: Xu Yilun <yilun.xu@linux.intel.com>
---
arch/x86/include/asm/tdx.h | 2 +
arch/x86/virt/vmx/tdx/tdx.c | 90 +++++++++++++++++++++++++++++++++++--
2 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/arch/x86/include/asm/tdx.h b/arch/x86/include/asm/tdx.h
index 9173a432b312..d5f1d7b7d1e7 100644
--- a/arch/x86/include/asm/tdx.h
+++ b/arch/x86/include/asm/tdx.h
@@ -175,6 +175,8 @@ void tdx_page_array_ctrl_leak(struct tdx_page_array *array);
int tdx_page_array_ctrl_release(struct tdx_page_array *array,
unsigned int nr_released,
u64 released_hpa);
+struct tdx_page_array *
+tdx_page_array_create_iommu_mt(unsigned int iq_order, unsigned int nr_mt_pages);
struct tdx_td {
/* TD root structure: */
diff --git a/arch/x86/virt/vmx/tdx/tdx.c b/arch/x86/virt/vmx/tdx/tdx.c
index 6c4ed80e8e5a..2b17e0f73dac 100644
--- a/arch/x86/virt/vmx/tdx/tdx.c
+++ b/arch/x86/virt/vmx/tdx/tdx.c
@@ -275,8 +275,15 @@ static int tdx_page_array_populate(struct tdx_page_array *array,
TDX_PAGE_ARRAY_MAX_NENTS);
entries = array->root;
- for (i = 0; i < array->nents; i++)
- entries[i] = page_to_phys(array->pages[offset + i]);
+ for (i = 0; i < array->nents; i++) {
+ struct page *page = array->pages[offset + i];
+
+ entries[i] = page_to_phys(page);
+
+ /* Now only for iommu_mt */
+ if (compound_nr(page) > 1)
+ entries[i] |= compound_nr(page);
+ }
return array->nents;
}
@@ -286,7 +293,7 @@ static void tdx_free_pages_bulk(unsigned int nr_pages, struct page **pages)
int i;
for (i = 0; i < nr_pages; i++)
- __free_page(pages[i]);
+ put_page(pages[i]);
}
static int tdx_alloc_pages_bulk(unsigned int nr_pages, struct page **pages,
@@ -463,6 +470,10 @@ static bool tdx_page_array_validate_release(struct tdx_page_array *array,
struct page *page = array->pages[offset + i];
u64 val = page_to_phys(page);
+ /* Now only for iommu_mt */
+ if (compound_nr(page) > 1)
+ val |= compound_nr(page);
+
if (val != entries[i]) {
pr_err("%s entry[%d] [0x%llx] doesn't match page hpa [0x%llx]\n",
__func__, i, entries[i], val);
@@ -555,6 +566,79 @@ tdx_page_array_alloc_contig(unsigned int nr_pages)
return tdx_page_array_alloc(nr_pages, tdx_alloc_pages_contig, NULL);
}
+static int tdx_alloc_pages_iommu_mt(unsigned int nr_pages, struct page **pages,
+ void *data)
+{
+ unsigned int iq_order = (unsigned int)(long)data;
+ struct folio *t_iq, *t_ctxiq;
+ int ret;
+
+ /* TODO: folio_alloc_node() is preferred, but need numa info */
+ t_iq = folio_alloc(GFP_KERNEL | __GFP_ZERO, iq_order);
+ if (!t_iq)
+ return -ENOMEM;
+
+ t_ctxiq = folio_alloc(GFP_KERNEL | __GFP_ZERO, iq_order);
+ if (!t_ctxiq) {
+ ret = -ENOMEM;
+ goto out_t_iq;
+ }
+
+ ret = tdx_alloc_pages_bulk(nr_pages - 2, pages + 2, NULL);
+ if (ret)
+ goto out_t_ctxiq;
+
+ pages[0] = folio_page(t_iq, 0);
+ pages[1] = folio_page(t_ctxiq, 0);
+
+ return 0;
+
+out_t_ctxiq:
+ folio_put(t_ctxiq);
+out_t_iq:
+ folio_put(t_iq);
+
+ return ret;
+}
+
+/**
+ * tdx_page_array_create_iommu_mt() - Create a page array for IOMMU Memory Tables
+ * @iq_order: The allocation order for the IOMMU Invalidation Queue.
+ * @nr_mt_pages: Number of additional order-0 pages for the MT.
+ *
+ * Allocate and populate a specialized tdx_page_array for IOMMU_MT structures.
+ * The resulting array consists of two multi-order folios (at index 0 and 1)
+ * followed by the requested number of order-0 pages.
+ *
+ * Return: Fully populated tdx_page_array or NULL on failure.
+ */
+struct tdx_page_array *
+tdx_page_array_create_iommu_mt(unsigned int iq_order, unsigned int nr_mt_pages)
+{
+ unsigned int nr_pages = nr_mt_pages + 2;
+ struct tdx_page_array *array;
+ int populated;
+
+ if (nr_pages > TDX_PAGE_ARRAY_MAX_NENTS)
+ return NULL;
+
+ array = tdx_page_array_alloc(nr_pages, tdx_alloc_pages_iommu_mt,
+ (void *)(long)iq_order);
+ if (!array)
+ return NULL;
+
+ populated = tdx_page_array_populate(array, 0);
+ if (populated != nr_pages)
+ goto out_free;
+
+ return array;
+
+out_free:
+ tdx_page_array_free(array);
+ return NULL;
+}
+EXPORT_SYMBOL_GPL(tdx_page_array_create_iommu_mt);
+
#define HPA_LIST_INFO_FIRST_ENTRY GENMASK_U64(11, 3)
#define HPA_LIST_INFO_PFN GENMASK_U64(51, 12)
#define HPA_LIST_INFO_LAST_ENTRY GENMASK_U64(63, 55)
--
2.25.1
next prev parent reply other threads:[~2026-03-27 16:22 UTC|newest]
Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-27 16:01 [PATCH v2 00/31] PCI/TSM: PCIe Link Encryption Establishment via TDX platform services Xu Yilun
2026-03-27 16:01 ` [PATCH v2 01/31] x86/tdx: Move all TDX error defines into <asm/shared/tdx_errno.h> Xu Yilun
2026-03-27 23:37 ` Edgecombe, Rick P
2026-03-28 1:16 ` Dan Williams
2026-03-30 7:07 ` Xu Yilun
2026-03-30 7:10 ` Xu Yilun
2026-03-31 0:01 ` Dave Hansen
2026-03-27 16:01 ` [PATCH v2 02/31] x86/virt/tdx: Move bit definitions of TDX_FEATURES0 to public header Xu Yilun
2026-03-27 23:45 ` Edgecombe, Rick P
2026-03-30 8:07 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 03/31] x86/virt/tdx: Add tdx_page_array helpers for new TDX Module objects Xu Yilun
2026-03-28 1:35 ` Edgecombe, Rick P
2026-03-30 10:25 ` Xu Yilun
2026-03-30 23:25 ` Edgecombe, Rick P
2026-03-31 6:25 ` Tony Lindgren
2026-04-01 7:25 ` Tony Lindgren
2026-03-30 15:47 ` Xu Yilun
2026-03-30 23:57 ` Edgecombe, Rick P
2026-03-31 10:11 ` Xu Yilun
2026-03-30 13:31 ` Nikolay Borisov
2026-03-31 13:31 ` Xu Yilun
2026-04-12 2:53 ` Dan Williams
2026-04-16 9:05 ` Xu Yilun
2026-04-17 23:36 ` Dan Williams
2026-04-19 9:20 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 04/31] x86/virt/tdx: Support allocating contiguous pages for tdx_page_array Xu Yilun
2026-03-30 13:48 ` Nikolay Borisov
2026-03-31 13:37 ` Xu Yilun
2026-04-18 0:05 ` Dan Williams
2026-03-27 16:01 ` Xu Yilun [this message]
2026-03-30 23:54 ` [PATCH v2 05/31] x86/virt/tdx: Extend tdx_page_array to support IOMMU_MT Edgecombe, Rick P
2026-03-31 14:19 ` Xu Yilun
2026-04-01 0:17 ` Edgecombe, Rick P
2026-04-08 4:29 ` Xu Yilun
2026-04-14 9:57 ` Xu Yilun
2026-04-16 5:07 ` Xu Yilun
2026-04-17 23:58 ` Dan Williams
2026-04-19 8:33 ` Xu Yilun
2026-04-21 21:51 ` Dan Williams
2026-04-23 11:15 ` Xu Yilun
2026-04-02 0:05 ` Huang, Kai
2026-04-08 6:16 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 06/31] x86/virt/tdx: Read global metadata for TDX Module Extensions/Connect Xu Yilun
2026-03-30 14:23 ` Nikolay Borisov
2026-03-31 14:23 ` Xu Yilun
2026-04-01 21:36 ` Huang, Kai
2026-04-08 6:17 ` Xu Yilun
2026-04-21 22:19 ` Dan Williams
2026-04-23 11:58 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 07/31] x86/virt/tdx: Embed version info in SEAMCALL leaf function definitions Xu Yilun
2026-03-27 16:01 ` [PATCH v2 08/31] x86/virt/tdx: Configure TDX Module with optional TDX Connect feature Xu Yilun
2026-03-31 10:38 ` Nikolay Borisov
2026-04-08 7:21 ` Xu Yilun
2026-04-01 10:13 ` Huang, Kai
2026-04-08 7:12 ` Xu Yilun
2026-04-08 8:33 ` Huang, Kai
2026-04-01 23:42 ` Huang, Kai
2026-04-01 23:53 ` Edgecombe, Rick P
2026-04-02 0:40 ` Huang, Kai
2026-04-02 0:48 ` Dave Hansen
2026-04-02 1:06 ` Huang, Kai
2026-04-22 1:19 ` Dan Williams
2026-04-23 15:49 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 09/31] x86/virt/tdx: Move tdx_clflush_page() up in the file Xu Yilun
2026-03-27 16:01 ` [PATCH v2 10/31] x86/virt/tdx: Add extra memory to TDX Module for Extensions Xu Yilun
2026-03-30 23:36 ` Edgecombe, Rick P
2026-03-31 11:00 ` Nikolay Borisov
2026-04-08 7:28 ` Xu Yilun
2026-04-23 0:59 ` Huang, Kai
2026-04-23 16:41 ` Xu Yilun
2026-04-23 21:55 ` Huang, Kai
2026-04-23 17:05 ` Edgecombe, Rick P
2026-04-23 22:29 ` Huang, Kai
2026-04-24 3:07 ` Xu Yilun
2026-04-24 8:09 ` Huang, Kai
2026-04-24 9:10 ` Huang, Kai
2026-04-24 10:41 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 11/31] x86/virt/tdx: Make TDX Module initialize Extensions Xu Yilun
2026-03-30 23:25 ` Edgecombe, Rick P
2026-03-31 14:58 ` Xu Yilun
2026-04-01 11:42 ` Huang, Kai
2026-04-08 8:24 ` Xu Yilun
2026-04-08 21:24 ` Huang, Kai
2026-04-09 0:49 ` Edgecombe, Rick P
2026-04-09 1:29 ` Huang, Kai
2026-03-27 16:01 ` [PATCH v2 12/31] x86/virt/tdx: Enable the Extensions after basic TDX Module init Xu Yilun
2026-03-27 16:01 ` [PATCH v2 13/31] x86/virt/tdx: Extend tdx_clflush_page() to handle compound pages Xu Yilun
2026-03-27 16:01 ` [PATCH v2 14/31] PCI/TSM: Report active IDE streams per host bridge Xu Yilun
2026-04-02 22:48 ` Dan Williams
2026-04-07 16:08 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 15/31] coco/tdx-host: Introduce a "tdx_host" device Xu Yilun
2026-07-04 14:26 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 16/31] coco/tdx-host: Support Link TSM for TDX host Xu Yilun
2026-07-06 20:12 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 17/31] acpi: Add KEYP support to fw_table parsing Xu Yilun
2026-03-27 16:01 ` [PATCH v2 18/31] iommu/vt-d: Cache max domain ID to avoid redundant calculation Xu Yilun
2026-04-09 7:02 ` Tian, Kevin
2026-03-27 16:01 ` [PATCH v2 19/31] iommu/vt-d: Reserve the MSB domain ID bit for the TDX module Xu Yilun
2026-03-28 16:57 ` kernel test robot
2026-03-31 7:20 ` Baolu Lu
2026-04-08 12:07 ` Xu Yilun
2026-04-09 5:48 ` Baolu Lu
2026-03-28 19:58 ` kernel test robot
2026-04-09 7:16 ` Tian, Kevin
2026-04-22 6:00 ` Xu Yilun
2026-04-24 6:49 ` Tian, Kevin
2026-04-27 2:50 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 20/31] x86/virt/tdx: Add a helper to loop on TDX_INTERRUPTED_RESUMABLE Xu Yilun
2026-04-09 7:21 ` Tian, Kevin
2026-04-22 6:04 ` Xu Yilun
2026-04-24 6:57 ` Tian, Kevin
2026-07-04 14:45 ` Ackerley Tng
2026-04-23 0:29 ` Huang, Kai
2026-07-04 14:42 ` Ackerley Tng
2026-07-06 9:16 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 21/31] x86/virt/tdx: Add SEAMCALL wrappers for trusted IOMMU setup and clear Xu Yilun
2026-04-09 7:30 ` Tian, Kevin
2026-04-22 6:32 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 22/31] iommu/vt-d: Export a helper to do function for each dmar_drhd_unit Xu Yilun
2026-04-09 7:49 ` Tian, Kevin
2026-04-22 6:33 ` Xu Yilun
2026-04-24 6:50 ` Tian, Kevin
2026-07-06 18:35 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 23/31] coco/tdx-host: Setup all trusted IOMMUs on TDX Connect init Xu Yilun
2026-04-09 7:51 ` Tian, Kevin
2026-04-22 9:27 ` Xu Yilun
2026-04-24 6:54 ` Tian, Kevin
2026-04-27 3:10 ` Xu Yilun
2026-07-06 19:21 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 24/31] coco/tdx-host: Add a helper to exchange SPDM messages through DOE Xu Yilun
2026-04-09 7:56 ` Tian, Kevin
2026-04-22 9:41 ` Xu Yilun
2026-04-24 7:01 ` Tian, Kevin
2026-04-27 3:34 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 25/31] x86/virt/tdx: Add SEAMCALL wrappers for SPDM management Xu Yilun
2026-04-09 7:59 ` Tian, Kevin
2026-04-22 9:46 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 26/31] mm: Add __free() support for __free_page() Xu Yilun
2026-07-06 19:31 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 27/31] coco/tdx-host: Implement SPDM session setup Xu Yilun
2026-04-02 11:29 ` Nikolay Borisov
2026-04-22 9:53 ` Xu Yilun
2026-03-27 16:01 ` [PATCH v2 28/31] coco/tdx-host: Parse ACPI KEYP table to init IDE for PCI host bridges Xu Yilun
2026-07-06 19:46 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 29/31] x86/virt/tdx: Add SEAMCALL wrappers for IDE stream management Xu Yilun
2026-03-27 16:01 ` [PATCH v2 30/31] coco/tdx-host: Implement IDE stream setup/teardown Xu Yilun
2026-04-09 8:02 ` Tian, Kevin
2026-04-22 9:57 ` Xu Yilun
2026-04-24 7:05 ` Tian, Kevin
2026-04-27 3:54 ` Xu Yilun
2026-07-06 20:05 ` Ackerley Tng
2026-03-27 16:01 ` [PATCH v2 31/31] coco/tdx-host: Finally enable SPDM session and IDE Establishment Xu Yilun
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=20260327160132.2946114-6-yilun.xu@linux.intel.com \
--to=yilun.xu@linux.intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=chao.gao@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=dave.jiang@intel.com \
--cc=kas@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=rick.p.edgecombe@intel.com \
--cc=vishal.l.verma@intel.com \
--cc=x86@kernel.org \
--cc=xiaoyao.li@intel.com \
--cc=yilun.xu@intel.com \
--cc=zhenzhong.duan@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
Powered by JetHome