From: Samiullah Khawaja <skhawaja@google.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Lu Baolu <baolu.lu@linux.intel.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
David Woodhouse <dwmw2@infradead.org>
Cc: Samiullah Khawaja <skhawaja@google.com>,
Robin Murphy <robin.murphy@arm.com>,
Kevin Tian <kevin.tian@intel.com>,
Alex Williamson <alex@shazbot.org>, Shuah Khan <shuah@kernel.org>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
kvm@vger.kernel.org, Pratyush Yadav <pratyush@kernel.org>,
Pasha Tatashin <pasha.tatashin@soleen.com>,
David Matlack <dmatlack@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Pranjal Shrivastava <praan@google.com>,
Vipin Sharma <vipinsh@google.com>,
Ankit Soni <Ankit.Soni@amd.com>,
Nicolin Chen <nicolinc@nvidia.com>,
John Starks <dev@jstarks.net>
Subject: [PATCH v6 10/18] iommu/vt-d: Restore IOMMU state and reclaimed domain ids
Date: Sun, 25 Oct 2026 02:19:21 +0000 [thread overview]
Message-ID: <20261025021930.674647-11-skhawaja@google.com> (raw)
In-Reply-To: <20261025021930.674647-1-skhawaja@google.com>
During boot fetch the preserved state of IOMMU unit and if found then
restore the state.
- Reuse the root_table that was preserved in the previous kernel.
- Reclaim the domain ids of the preserved domains for each preserved
devices so these are not acquired by another domain.
Signed-off-by: Samiullah Khawaja <skhawaja@google.com>
---
drivers/iommu/intel/iommu.c | 71 ++++++++++++------
drivers/iommu/intel/iommu.h | 14 ++++
drivers/iommu/intel/liveupdate.c | 121 +++++++++++++++++++++++++++++++
3 files changed, 185 insertions(+), 21 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 35ec2ae0c8d5..991ad9b2456e 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -987,6 +987,8 @@ static void iommu_disable_translation(struct intel_iommu *iommu)
static void release_dmar_iommu(struct intel_iommu *iommu)
{
+ intel_iommu_handle_drhd_restore_failure(iommu);
+
/*
* All iommu domains must have been detached from the devices,
* hence there should be no domain IDs in use.
@@ -1452,7 +1454,7 @@ static void intel_iommu_init_qi(struct intel_iommu *iommu)
* Returns 0 when the ID is reserved, was already reserved, or cannot be
* re-assigned, and a negative errno for a genuine allocation failure.
*/
-static int reserve_domain_id(struct intel_iommu *iommu, int did)
+int reserve_domain_id(struct intel_iommu *iommu, int did)
{
int ret;
@@ -1743,12 +1745,16 @@ static int copy_translation_tables(struct intel_iommu *iommu)
static int __init init_dmars(void)
{
+ struct iommu_hw_ser *iommu_ser;
struct dmar_drhd_unit *drhd;
struct intel_iommu *iommu;
int ret;
for_each_iommu(iommu, drhd) {
+ iommu_ser = iommu_get_preserved_data(iommu->reg_phys,
+ IOMMU_SER_TYPE_INTEL);
if (drhd->ignored) {
+ intel_iommu_handle_drhd_restore_failure(iommu);
iommu_disable_translation(iommu);
continue;
}
@@ -1766,7 +1772,9 @@ static int __init init_dmars(void)
}
intel_iommu_init_qi(iommu);
- init_translation_status(iommu);
+
+ if (!iommu_ser)
+ init_translation_status(iommu);
if (translation_pre_enabled(iommu) && !is_kdump_kernel()) {
iommu_disable_translation(iommu);
@@ -1775,14 +1783,18 @@ static int __init init_dmars(void)
iommu->name);
}
- /*
- * TBD:
- * we could share the same root & context tables
- * among all IOMMU's. Need to Split it later.
- */
- ret = iommu_alloc_root_entry(iommu);
- if (ret)
- goto free_iommu;
+ if (iommu_ser) {
+ intel_iommu_liveupdate_restore_root_table(iommu, iommu_ser);
+ } else {
+ /*
+ * TBD:
+ * we could share the same root & context tables
+ * among all IOMMU's. Need to Split it later.
+ */
+ ret = iommu_alloc_root_entry(iommu);
+ if (ret)
+ goto free_iommu;
+ }
if (translation_pre_enabled(iommu)) {
pr_info("Translation already enabled - trying to copy translation structures\n");
@@ -1818,7 +1830,11 @@ static int __init init_dmars(void)
*/
for_each_active_iommu(iommu, drhd) {
iommu_flush_write_buffer(iommu);
- iommu_set_root_entry(iommu);
+
+ iommu_ser = iommu_get_preserved_data(iommu->reg_phys,
+ IOMMU_SER_TYPE_INTEL);
+ if (!iommu_ser)
+ iommu_set_root_entry(iommu);
}
check_tylersburg_isoch();
@@ -2245,17 +2261,28 @@ int dmar_parse_one_satc(struct acpi_dmar_header *hdr, void *arg)
static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
{
struct intel_iommu *iommu = dmaru->iommu;
+ struct iommu_hw_ser *iommu_ser;
int ret;
- /*
- * Disable translation if already enabled prior to OS handover.
- */
- if (iommu->gcmd & DMA_GCMD_TE)
- iommu_disable_translation(iommu);
+ /* Use IOMMU HW unit MMIO base to identify the preserved state. */
+ iommu_ser = iommu_get_preserved_data(iommu->reg_phys,
+ IOMMU_SER_TYPE_INTEL);
+ if (iommu_ser) {
+ if (dmaru->ignored)
+ intel_iommu_handle_drhd_restore_failure(iommu);
- ret = iommu_alloc_root_entry(iommu);
- if (ret)
- goto out;
+ intel_iommu_liveupdate_restore_root_table(iommu, iommu_ser);
+ } else {
+ /*
+ * Disable translation if already enabled prior to OS handover.
+ */
+ if (iommu->gcmd & DMA_GCMD_TE)
+ iommu_disable_translation(iommu);
+
+ ret = iommu_alloc_root_entry(iommu);
+ if (ret)
+ goto out;
+ }
intel_svm_check(iommu);
@@ -2281,7 +2308,8 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
if (ret)
goto out;
- iommu_set_root_entry(iommu);
+ if (!iommu_ser)
+ iommu_set_root_entry(iommu);
iommu_enable_translation(iommu);
iommu_disable_protect_mem_regions(iommu);
@@ -2797,7 +2825,8 @@ int __init intel_iommu_init(void)
* to avoid unnecessary lock order splat.
*/
up_read(&dmar_global_lock);
- iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL);
+ if (iommu_device_register(&iommu->iommu, &intel_iommu_ops, NULL))
+ intel_iommu_handle_drhd_restore_failure(iommu);
down_read(&dmar_global_lock);
iommu_pmu_register(iommu);
diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 16ab103d308a..260c7a5b1240 100644
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -1307,6 +1307,8 @@ static inline int iopf_for_domain_replace(struct iommu_domain *new,
return 0;
}
+int reserve_domain_id(struct intel_iommu *iommu, int did);
+
#ifdef CONFIG_IOMMU_LIVEUPDATE
int intel_iommu_preserve_device(struct device *dev,
struct iommu_device_ser *device_ser);
@@ -1317,10 +1319,22 @@ int intel_iommu_preserve(struct iommu_device *iommu,
void intel_iommu_unpreserve(struct iommu_device *iommu,
struct iommu_hw_ser *iommu_ser);
void clear_unpreserved_context_entries(struct intel_iommu *iommu);
+void intel_iommu_liveupdate_restore_root_table(struct intel_iommu *iommu,
+ struct iommu_hw_ser *iommu_ser);
+void intel_iommu_handle_drhd_restore_failure(struct intel_iommu *iommu);
#else
static inline void clear_unpreserved_context_entries(struct intel_iommu *iommu)
{
}
+
+static inline void intel_iommu_liveupdate_restore_root_table(struct intel_iommu *iommu,
+ struct iommu_hw_ser *iommu_ser)
+{
+}
+
+static inline void intel_iommu_handle_drhd_restore_failure(struct intel_iommu *iommu)
+{
+}
#endif
#ifdef CONFIG_INTEL_IOMMU_SVM
diff --git a/drivers/iommu/intel/liveupdate.c b/drivers/iommu/intel/liveupdate.c
index f92cb774cc99..cf98b95bf8d2 100644
--- a/drivers/iommu/intel/liveupdate.c
+++ b/drivers/iommu/intel/liveupdate.c
@@ -272,6 +272,127 @@ static int preserve_iommu_context_tables(struct device_domain_info *info)
return 0;
}
+static int restore_context_table(struct intel_iommu *iommu,
+ struct iommu_hw_ser *ser,
+ u8 bus, u8 devfn, u64 root_val)
+{
+ bool present = root_val & 1;
+
+ /*
+ * The root entries of unpreserved context tables are cleared during
+ * shutdown, so the preserved bitmap must match the present bits.
+ */
+ if (is_context_table_preserved(iommu, ser, bus, devfn) != present)
+ return -EINVAL;
+
+ if (present)
+ iommu_restore_pages(root_val & VTD_PAGE_MASK);
+
+ return 0;
+}
+
+static int restore_iommu_context(struct intel_iommu *iommu,
+ struct iommu_hw_ser *ser)
+{
+ struct root_entry *root;
+ int ret;
+ int i;
+
+ for (i = 0; i < ROOT_ENTRY_NR; i++) {
+ root = &iommu->root_entry[i];
+
+ ret = restore_context_table(iommu, ser, i, 0, root->lo);
+ if (ret)
+ return ret;
+
+ if (!sm_supported(iommu))
+ continue;
+
+ ret = restore_context_table(iommu, ser, i, 0x80, root->hi);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+static int _restore_used_domain_ids(struct iommu_device_ser *ser, void *arg)
+{
+ int id = ser->attachment.attachment_id;
+ struct iommu_hw_ser *iommu_hw_ser;
+ struct intel_iommu *iommu = arg;
+
+ if (WARN_ON(!ser->iommu_phys))
+ return 0;
+
+ iommu_hw_ser = phys_to_virt(ser->iommu_phys);
+ if (iommu_hw_ser->type != IOMMU_SER_TYPE_INTEL)
+ return 0;
+
+ /* Only allocate domain ID from associated IOMMU HW unit */
+ if (iommu_hw_ser->intel.phys_addr != iommu->reg_phys)
+ return 0;
+
+ return reserve_domain_id(iommu, id);
+}
+
+/**
+ * intel_iommu_liveupdate_restore_root_table() - Restore root table and reclaim domain IDs
+ * @iommu: Target IOMMU
+ * @iommu_ser: Serialized IOMMU hardware state from previous kernel
+ *
+ * Restores the preserved root table and context tables for the IOMMU hardware
+ * instance across Live Update, and reclaims all domain IDs previously allocated
+ * to preserved devices so they are not reused.
+ *
+ * The preserved devices keep doing DMA through the preserved translation
+ * tables, so a failure to restore them is fatal.
+ */
+void intel_iommu_liveupdate_restore_root_table(struct intel_iommu *iommu,
+ struct iommu_hw_ser *iommu_ser)
+{
+ int ret;
+
+ /*
+ * The kernel command line might have changed across kexec, e.g.
+ * intel_iommu=sm_off, so make sure the preserved tables are in the
+ * format this kernel is going to use.
+ */
+ if (iommu_ser->intel.sm_enabled != sm_supported(iommu))
+ panic("%s: preserved scalable mode %u does not match current %u\n",
+ iommu->name, iommu_ser->intel.sm_enabled,
+ sm_supported(iommu));
+
+ iommu_restore_pages(iommu_ser->intel.root_table);
+ iommu->root_entry = __va(iommu_ser->intel.root_table);
+
+ ret = restore_iommu_context(iommu, iommu_ser);
+ if (ret)
+ panic("%s: failed to restore preserved context tables\n",
+ iommu->name);
+
+ ret = iommu_for_each_preserved_device(_restore_used_domain_ids, iommu);
+ if (ret)
+ panic("%s: failed to reclaim preserved domain IDs: %d\n",
+ iommu->name, ret);
+}
+
+/**
+ * intel_iommu_handle_drhd_restore_failure() - Handle DRHD restore failure
+ * @iommu: Target IOMMU
+ */
+void intel_iommu_handle_drhd_restore_failure(struct intel_iommu *iommu)
+{
+ /*
+ * The preserved devices keep doing DMA through the preserved
+ * translation tables, so a failure to restore and register the IOMMU
+ * is fatal.
+ */
+ if (iommu_get_preserved_data(iommu->reg_phys, IOMMU_SER_TYPE_INTEL))
+ panic("%s: failed to restore IOMMU with preserved state\n",
+ iommu->name);
+}
+
/**
* intel_iommu_preserve_device() - Intel IOMMU callback to preserve device state
* @dev: Target device
--
2.56.0.257.gf7497c7d27-goog
next prev parent reply other threads:[~2026-10-25 2:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-25 2:19 [PATCH v6 00/18] iommu: Add live update state preservation Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 01/18] iommu: Implement IOMMU Live update FLB callbacks Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 02/18] iommu/pages: Add APIs to preserve/unpreserve/restore iommu pages Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 03/18] iommupt: Implement preserve/unpreserve/restore callbacks Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 04/18] iommu: Implement IOMMU domain preservation Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 05/18] iommu: Implement device and IOMMU HW preservation Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 06/18] iommu/vt-d: Implement device and iommu preserve/unpreserve ops Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 07/18] iommu/vt-d: Clear unpreserved context entries during shutdown Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 08/18] iommu: Add APIs to get iommu and device preserved state Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 09/18] iommu/vt-d: Combine disable_dmar_iommu() and free_dmar_iommu() Samiullah Khawaja
2026-10-25 2:19 ` Samiullah Khawaja [this message]
2026-10-25 2:19 ` [PATCH v6 11/18] iommu/vt-d: Preserve PASID table of preserved device Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 12/18] iommu: Restore and reattach preserved domains to devices Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 13/18] iommu/vt-d: Handle reattach of the restored domain Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 14/18] iommufd: Implement ioctl to mark HWPT for preservation Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 15/18] iommufd: Persist iommu hardware pagetables for live update Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 16/18] iommufd: Add APIs to preserve/unpreserve a vfio cdev Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 17/18] vfio/pci: Preserve the iommufd state of the " Samiullah Khawaja
2026-10-25 2:19 ` [PATCH v6 18/18] iommufd/selftest: Add test to verify iommufd preservation Samiullah Khawaja
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=20261025021930.674647-11-skhawaja@google.com \
--to=skhawaja@google.com \
--cc=Ankit.Soni@amd.com \
--cc=akpm@linux-foundation.org \
--cc=alex@shazbot.org \
--cc=baolu.lu@linux.intel.com \
--cc=dev@jstarks.net \
--cc=dmatlack@google.com \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolinc@nvidia.com \
--cc=pasha.tatashin@soleen.com \
--cc=praan@google.com \
--cc=pratyush@kernel.org \
--cc=robin.murphy@arm.com \
--cc=shuah@kernel.org \
--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®