From: Pranjal Shrivastava <praan@google.com>
To: iommu@lists.linux.dev, Will Deacon <will@kernel.org>,
Jason Gunthorpe <jgg@nvidia.com>
Cc: Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Nicolin Chen <nicolinc@nvidia.com>,
Kevin Tian <kevin.tian@intel.com>,
Samiullah Khawaja <skhawaja@google.com>,
David Matlack <dmatlack@google.com>,
Vipin Sharma <vipinsh@google.com>,
Mostafa Saleh <smostafa@google.com>,
Daniel Mentz <danielmentz@google.com>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
Pratyush Yadav <pratyush@kernel.org>,
linux-arm-kernel@lists.infradead.org, kexec@lists.infradead.org,
linux-kernel@vger.kernel.org,
Pranjal Shrivastava <praan@google.com>
Subject: [RFC PATCH v1 3/9] iommu/arm-smmu-v3: Implement CD Table preservation
Date: Tue, 29 Sep 2026 07:19:44 +0000 [thread overview]
Message-ID: <20260929071950.2710070-4-praan@google.com> (raw)
In-Reply-To: <20260929071950.2710070-1-praan@google.com>
The core IOMMU Live Update framework preserves page tables pointed by the
respective TTBs but the CD tables are expected to be preserved by the
SMMUv3 driver.
Extend the arm-smmu-v3 driver to preserve CD tables across a KHO with
Live Update enabled. Currently, only support for preserving S1 CD tables
exists since nested CD tables are auto-preserved as they reside in the
guest memory. The current implementation doesn't support preservation at
a PASID granularity due to the similar limitation in IOMMU LU core.
Unpreserve the CD tables in .unpreserve_device.
Signed-off-by: Pranjal Shrivastava <praan@google.com>
---
.../arm/arm-smmu-v3/arm-smmu-v3-liveupdate.c | 173 +++++++++++++++++-
1 file changed, 164 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-liveupdate.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-liveupdate.c
index 515a266ac22e..38b9d4e4ab4d 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-liveupdate.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-liveupdate.c
@@ -11,6 +11,114 @@
#include "arm-smmu-v3.h"
#ifdef CONFIG_IOMMU_LIVEUPDATE
+static int arm_smmu_preserve_cd_table_linear(struct arm_smmu_master *master,
+ struct iommu_device_ser *device_ser)
+{
+ struct device *dev = master->smmu->dev;
+ struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;
+ u32 size = cd_table->linear.num_ents * sizeof(struct arm_smmu_cd);
+ u64 state;
+ int ret;
+
+ ret = dma_preserve_coherent_allocation(dev, cd_table->linear.table,
+ size, cd_table->cdtab_dma, &state);
+ if (ret)
+ return ret;
+
+ device_ser->smmuv3.l1_cdtab_lu_state = state;
+ device_ser->smmuv3.num_l2_cdtables = 0;
+
+ return 0;
+}
+
+static int arm_smmu_preserve_cd_table_2lvl(struct arm_smmu_master *master,
+ struct iommu_device_ser *device_ser)
+{
+ struct device *dev = master->smmu->dev;
+ struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;
+ u32 l1size = cd_table->l2.num_l1_ents * sizeof(struct arm_smmu_cdtab_l1);
+ u32 num_l2 = 0;
+ u64 *l2_states;
+ u64 state;
+ int ret, i;
+
+ ret = dma_preserve_coherent_allocation(dev, cd_table->l2.l1tab,
+ l1size, cd_table->cdtab_dma, &state);
+ if (ret)
+ return ret;
+
+ device_ser->smmuv3.l1_cdtab_lu_state = state;
+
+ for (i = 0; i < cd_table->l2.num_l1_ents; i++) {
+ if (cd_table->l2.l2ptrs[i])
+ num_l2++;
+ }
+
+ device_ser->smmuv3.num_l2_cdtables = num_l2;
+ if (!num_l2)
+ return 0;
+
+ l2_states = kho_alloc_preserve(sizeof(*l2_states) * num_l2);
+ if (IS_ERR(l2_states)) {
+ ret = PTR_ERR(l2_states);
+ goto err_unpreserve_cd_l1;
+ }
+
+ device_ser->smmuv3.l2_cdtab_lu_states_phys = virt_to_phys(l2_states);
+ num_l2 = 0;
+
+ for (i = 0; i < cd_table->l2.num_l1_ents; i++) {
+ dma_addr_t l2_dma;
+
+ if (!cd_table->l2.l2ptrs[i])
+ continue;
+
+ l2_dma = le64_to_cpu(cd_table->l2.l1tab[i].l2ptr) & CTXDESC_L1_DESC_L2PTR_MASK;
+ ret = dma_preserve_coherent_allocation(dev, cd_table->l2.l2ptrs[i],
+ sizeof(struct arm_smmu_cdtab_l2),
+ l2_dma, &state);
+ if (ret)
+ goto err_free_cd_l2_states;
+
+ l2_states[num_l2++] = state;
+ }
+
+ return 0;
+
+err_free_cd_l2_states:
+ for (i = i - 1; i >= 0; i--) {
+ if (cd_table->l2.l2ptrs[i]) {
+ num_l2--;
+ dma_unpreserve_coherent_allocation(dev, l2_states[num_l2]);
+ }
+ }
+ kho_unpreserve_free(l2_states);
+err_unpreserve_cd_l1:
+ dma_unpreserve_coherent_allocation(dev, device_ser->smmuv3.l1_cdtab_lu_state);
+ return ret;
+}
+
+static void arm_smmu_unpreserve_cd_table(struct arm_smmu_master *master,
+ struct iommu_device_ser *device_ser)
+{
+ struct device *dev = master->smmu->dev;
+ u32 num_l2 = device_ser->smmuv3.num_l2_cdtables;
+ u64 *l2_states;
+ u32 i;
+
+ if (!device_ser->smmuv3.l1_cdtab_lu_state)
+ return;
+
+ if (num_l2) {
+ l2_states = phys_to_virt(device_ser->smmuv3.l2_cdtab_lu_states_phys);
+ for (i = 0; i < num_l2; i++)
+ dma_unpreserve_coherent_allocation(dev, l2_states[i]);
+ kho_unpreserve_free(l2_states);
+ }
+ dma_unpreserve_coherent_allocation(dev, device_ser->smmuv3.l1_cdtab_lu_state);
+ memset(&device_ser->smmuv3, 0, sizeof(device_ser->smmuv3));
+}
+
static u64 *arm_smmu_l2_strtab_states(struct arm_smmu_device *smmu)
{
struct iommu_hw_ser *iommu_ser = iommu_preserved_state(&smmu->iommu);
@@ -105,17 +213,53 @@ int arm_smmu_preserve_device(struct device *dev,
{
struct arm_smmu_master *master = dev_iommu_priv_get(dev);
struct iommu_domain *domain = iommu_get_domain_for_dev(dev);
+ struct arm_smmu_domain *smmu_domain;
+ struct arm_smmu_ctx_desc_cfg *cd_table = &master->cd_table;
struct iommu_domain_ser *domain_ser;
- int ret;
+ int ret = 0;
+
+ memset(&device_ser->smmuv3, 0, sizeof(device_ser->smmuv3));
/*
* We'd anyway configure abort STEs for non-preserved masters.
* TODO: Re-visit for identity once IOMMUFD noIOMMU is merged
+ * TODO: Re-visit for CXL + ATS + Identity CD Table thing
+ * Can use cd_table_allocated() helper here?
*/
if (domain->type == IOMMU_DOMAIN_IDENTITY ||
domain->type == IOMMU_DOMAIN_BLOCKED)
return 0;
+ /*
+ * For nested domains we only need to preserve STE.
+ * The S2 parent domain's page tables are preserved via its own
+ * iommu_preserve_domain() call during IOMMUFD's HWPT preservation.
+ * Since the CD Table in this case lives in the guest memory, it is
+ * naturally preserved by default across KHO when Live Update is enabled.
+ * Thus, since CD isn't allocated via DMA allocator by the host driver
+ * we must not attempt preserving CD here.
+ */
+ if (domain->type == IOMMU_DOMAIN_NESTED)
+ goto skip_cd_preservation;
+
+ smmu_domain = to_smmu_domain(domain);
+
+ /* SVA domains cannot be preserved across KHO */
+ if (smmu_domain->stage == ARM_SMMU_DOMAIN_SVA) {
+ dev_err(dev, "SVA domains are NOT preserved across KHO\n");
+ return -EOPNOTSUPP;
+ }
+
+ /*
+ * The IOMMU LU Core doesn't support preservation at a PASID
+ * granularity yet, reject preservation to prevent leaving active
+ * PASIDs pointing to unpreserved tables.
+ */
+ if (arm_smmu_ssids_in_use(&master->cd_table)) {
+ dev_err(dev, "Preserving devices with active PASIDS is NOT supported w/ Live Update\n");
+ return -EOPNOTSUPP;
+ }
+
if (domain->preserved_state) {
domain_ser = domain->preserved_state;
} else {
@@ -128,18 +272,28 @@ int arm_smmu_preserve_device(struct device *dev,
/* Link this master to the preserved IOMMU domain in the ABI */
device_ser->domain_iommu_ser.domain_phys = virt_to_phys(domain_ser);
- ret = arm_smmu_preserve_l2_strtabs(master);
+ /* If it's not Stage-1, or the CD table isn't allocated, we're done */
+ if (smmu_domain->stage != ARM_SMMU_DOMAIN_S1 ||
+ !arm_smmu_cdtab_allocated(&master->cd_table))
+ goto skip_cd_preservation;
+
+ if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_LINEAR)
+ ret = arm_smmu_preserve_cd_table_linear(master, device_ser);
+ else if (cd_table->s1fmt == STRTAB_STE_0_S1FMT_64K_L2)
+ ret = arm_smmu_preserve_cd_table_2lvl(master, device_ser);
+
+skip_cd_preservation:
if (ret)
return ret;
- /* Mark the master as preserved to track state across disable */
- master->preserved = true;
-
- /*
- * TODO: Preserve CD tables for Stage-1 domains here using
- * dmam_preserve_allocation_attrs() on master->cd_table.
- */
+ ret = arm_smmu_preserve_l2_strtabs(master);
+ if (ret) {
+ arm_smmu_unpreserve_cd_table(master, device_ser);
+ return ret;
+ }
+ /* Mark the master as preserved to track state during disable */
+ master->preserved = true;
return 0;
}
@@ -153,6 +307,7 @@ void arm_smmu_unpreserve_device(struct device *dev,
master->preserved = false;
arm_smmu_unpreserve_l2_strtabs(master, master->num_streams);
+ arm_smmu_unpreserve_cd_table(master, device_ser);
}
static int arm_smmu_preserve_strtab_2lvl(struct arm_smmu_device *smmu,
--
2.56.0.rc1.315.gc6ed9934b7-goog
next prev parent reply other threads:[~2026-09-29 7:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-29 7:19 [RFC PATCH v1 0/9] iommu/arm-smmu-v3: Implement Live Update support Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 1/9] iommu/kho: Extend IOMMU KHO ABI for ARM SMMUv3 Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 2/9] iommu/arm-smmu-v3: Implement KHO preservation for STEs Pranjal Shrivastava
2026-09-29 7:19 ` Pranjal Shrivastava [this message]
2026-09-29 7:19 ` [RFC PATCH v1 4/9] iommu/arm-smmu-v3: Implement Live Update Stream Table restoration Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 5/9] iommu/arm-smmu-v3: Implement Live Update CD " Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 6/9] iommu/arm-smmu-v3: Implement Live Update shutdown Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 7/9] iommu/arm-smmu-v3: Retain SMMUEN across a Live Update restore Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 8/9] iommu/arm-smmu-v3: Inherit the ASID/VMID of restored domains Pranjal Shrivastava
2026-09-29 7:19 ` [RFC PATCH v1 9/9] iommu/arm-smmu-v3: Adopt the Event queue across a Live Update Pranjal Shrivastava
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=20260929071950.2710070-4-praan@google.com \
--to=praan@google.com \
--cc=danielmentz@google.com \
--cc=dmatlack@google.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kexec@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolinc@nvidia.com \
--cc=pasha.tatashin@soleen.com \
--cc=pratyush@kernel.org \
--cc=robin.murphy@arm.com \
--cc=skhawaja@google.com \
--cc=smostafa@google.com \
--cc=vipinsh@google.com \
--cc=will@kernel.org \
/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®