| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250928190624.3735830-11-skhawaja@google.com>
Date: Sun, 28 Sep 2025 19:06:18 +0000
From: Samiullah Khawaja <skhawaja@...gle.com>
To: David Woodhouse <dwmw2@...radead.org>, Lu Baolu <baolu.lu@...ux.intel.com>,
Joerg Roedel <joro@...tes.org>, Will Deacon <will@...nel.org>,
Pasha Tatashin <pasha.tatashin@...een.com>, Jason Gunthorpe <jgg@...pe.ca>, iommu@...ts.linux.dev
Cc: Samiullah Khawaja <skhawaja@...gle.com>, Robin Murphy <robin.murphy@....com>,
Pratyush Yadav <pratyush@...nel.org>, Kevin Tian <kevin.tian@...el.com>, linux-kernel@...r.kernel.org,
Saeed Mahameed <saeedm@...dia.com>, Adithya Jayachandran <ajayachandra@...dia.com>,
Parav Pandit <parav@...dia.com>, Leon Romanovsky <leonro@...dia.com>, William Tu <witu@...dia.com>,
Vipin Sharma <vipinsh@...gle.com>, dmatlack@...gle.com, zhuyifei@...gle.com,
Chris Li <chrisl@...nel.org>, praan@...gle.com
Subject: [RFC PATCH 10/15] iommu/vt-d: Restore iommu root_table and context on
live update
During boot if the live update state is updated then the iommu live
update state needs to be checked to see if the state of any iommu
hardware unit was persisted before live update. If there is preserved
state available for an iommu hardware unit then restore the root_table
and the iommu context from preserved state.
Signed-off-by: Samiullah Khawaja <skhawaja@...gle.com>
---
drivers/iommu/intel/iommu.c | 7 +++
drivers/iommu/intel/iommu.h | 1 +
drivers/iommu/intel/liveupdate.c | 92 +++++++++++++++++++++++++++++++-
3 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index caac4fd9a51e..245316db3650 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -984,6 +984,13 @@ static int iommu_alloc_root_entry(struct intel_iommu *iommu)
{
struct root_entry *root;
+#ifdef CONFIG_LIVEUPDATE
+ if (!intel_iommu_liveupdate_restore_root_table(iommu) &&
+ iommu->root_entry) {
+ __iommu_flush_cache(iommu, iommu->root_entry, ROOT_SIZE);
+ return 0;
+ }
+#endif
root = iommu_alloc_pages_node_sz(iommu->node, GFP_ATOMIC, SZ_4K);
if (!root) {
pr_err("Allocating root entry for %s failed\n",
diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
index 273d40812d09..6119a638c530 100644
--- a/drivers/iommu/intel/iommu.h
+++ b/drivers/iommu/intel/iommu.h
@@ -1351,6 +1351,7 @@ static inline int iopf_for_domain_replace(struct iommu_domain *new,
#ifdef CONFIG_LIVEUPDATE
int intel_iommu_domain_liveupdate_preserve(struct iommu_domain *domain);
+int intel_iommu_liveupdate_restore_root_table(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 a7d9b07aaada..755325a5225c 100644
--- a/drivers/iommu/intel/liveupdate.c
+++ b/drivers/iommu/intel/liveupdate.c
@@ -253,9 +253,11 @@ static void intel_liveupdate_cancel(struct liveupdate_subsystem *handle, u64 dat
pr_warn("Not implemented\n");
}
+static struct iommu_ser *serialized_state;
+
static void intel_liveupdate_finish(struct liveupdate_subsystem *handle, u64 data)
{
- pr_warn("Not implemented\n");
+ serialized_state = NULL;
}
static int intel_liveupdate_freeze(struct liveupdate_subsystem *handle, u64 *data)
@@ -280,6 +282,94 @@ static struct liveupdate_subsystem intel_liveupdate_subsystem = {
.ops = &intel_liveupdate_subsystem_ops,
};
+static struct iommu_ser *get_liveupdate_state(void)
+{
+ struct iommu_ser *ser;
+ u64 data;
+ int ret;
+
+ if (serialized_state)
+ return serialized_state;
+
+ ret = liveupdate_get_subsystem_data(&intel_liveupdate_subsystem, &data);
+ if (WARN_ON_ONCE(ret))
+ return NULL;
+
+ if (!kho_restore_folio(data))
+ return NULL;
+
+ ser = __va(data);
+ ser->iommu_units = __va(ser->iommu_units_phys);
+ ser->devices = __va(ser->devices_phys);
+ serialized_state = ser;
+
+ return ser;
+}
+
+static int restore_iommu_context(struct intel_iommu *iommu)
+{
+ struct context_entry *context;
+ int i, ret = 0;
+
+ for (i = 0; i < ROOT_ENTRY_NR; i++) {
+ context = iommu_context_addr(iommu, i, 0, 0);
+ if (context)
+ BUG_ON(!kho_restore_folio(virt_to_phys(context)));
+
+ if (!sm_supported(iommu))
+ continue;
+
+ context = iommu_context_addr(iommu, i, 0x80, 0);
+ if (context)
+ BUG_ON(!kho_restore_folio(virt_to_phys(context)));
+ }
+
+ return ret;
+}
+
+static struct iommu_unit_ser *get_iommu_unit_state(struct iommu_ser *ser, u64 reg_phys)
+{
+ int i;
+
+ for (i = 0; i < ser->nr_iommus; ++i) {
+ if (ser->iommu_units[i].phys_addr == reg_phys)
+ return &ser->iommu_units[i];
+ }
+
+ return NULL;
+}
+
+int intel_iommu_liveupdate_restore_root_table(struct intel_iommu *iommu)
+{
+ struct iommu_unit_ser *iser;
+ struct iommu_ser *ser;
+ int ret;
+
+ if (!liveupdate_state_updated())
+ return -EINVAL;
+
+ ser = get_liveupdate_state();
+ if (!ser)
+ return -EINVAL;
+
+ iser = get_iommu_unit_state(ser, iommu->reg_phys);
+ if (!iser)
+ return -EINVAL;
+
+ iommu->root_entry = __va(iser->root_table);
+
+ ret = restore_iommu_context(iommu);
+ if (ret) {
+ WARN_ONCE(ret, "Cannot restore iommu [%llx] root context\n", iommu->reg_phys);
+ folio_put(virt_to_folio(iommu->root_entry));
+ iommu->root_entry = NULL;
+ }
+ pr_info("Restored IOMMU[0x%llx] Root Table at: 0x%llx\n",
+ iommu->reg_phys, iser->root_table);
+
+ return ret;
+}
+
static int __init intel_liveupdate_init(void)
{
WARN_ON_ONCE(liveupdate_register_subsystem(&intel_liveupdate_subsystem));
--
2.51.0.536.g15c5d4f767-goog
Powered by blists - more mailing lists