Re: [PATCH v7 10/18] iommu/vt-d: Restore IOMMU state and reclaimed domain ids
From: Baolu Lu
Date: Sun Nov 15 2026 - 22:31:46 EST
On 11/10/2026 12:08 PM, Samiullah Khawaja wrote:
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@xxxxxxxxxx>
---
drivers/iommu/intel/iommu.c | 57 ++++++++++---
drivers/iommu/intel/iommu.h | 14 ++++
drivers/iommu/intel/liveupdate.c | 139 +++++++++++++++++++++++++++++++
3 files changed, 197 insertions(+), 13 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 6c86c155d12b..a83971368bef 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_restored_state(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);
What happens if the incoming kernel is booted with intel_iommu=off?
intel_iommu_init() calls intel_disable_iommus() before reaching this
restore path. A preserved device may still be issuing DMA, which would
then bypass translation.
Could we detect preserved IOMMUs and force VT-d on in that case? We
should also ensure that the ACS configuration for preserved devices and
their upstream bridges remains consistent with the previous kernel.
Thanks,
baolu