From: Samiullah Khawaja <skhawaja@google.com>
To: Baolu Lu <baolu.lu@linux.intel.com>
Cc: David Woodhouse <dwmw2@infradead.org>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>,
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>
Subject: Re: [PATCH v5 08/18] iommu/vt-d: Clear unpreserved context entries during shutdown
Date: Sat, 10 Oct 2026 00:32:09 +0000 [thread overview]
Message-ID: <asmC5Ow_VYtvgGOQ@google.com> (raw)
In-Reply-To: <c724012c-13e1-41de-b7e3-1fb08d9b9d8c@linux.intel.com>
On Fri, Oct 09, 2026 at 08:43:26AM +0800, Baolu Lu wrote:
>On 9/21/26 08:48, Samiullah Khawaja wrote:
>>During normal shutdown the iommu translation is disabled. Since the root
>>table is preserved during live update, it needs to be cleaned up and the
>>context entries of the unpreserved devices and root entries for the
>>unpreserved context tables need to be cleared.
>>
>>This is required because during kexec reboot and shutdown the devices do
>>not go through the release flow, so there might be stale entries in the
>>root table and context tables. Also note that new unpreserved context
>>tables for unpreserved devices might have been added after preservation,
>>so the root table entries for unpreserved context tables also need to
>>removed.
>>
>>Signed-off-by: Samiullah Khawaja<skhawaja@google.com>
>>---
>> drivers/iommu/intel/iommu.c | 15 +++-
>> drivers/iommu/intel/iommu.h | 5 ++
>> drivers/iommu/intel/liveupdate.c | 139 +++++++++++++++++++++++++++++++
>> 3 files changed, 157 insertions(+), 2 deletions(-)
>>
>>diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
>>index 4bfc2f173010..474c926172c5 100644
>>--- a/drivers/iommu/intel/iommu.c
>>+++ b/drivers/iommu/intel/iommu.c
>>@@ -1852,6 +1852,14 @@ static int iommu_suspend(void *data)
>> iommu_flush_all();
>>+ /*
>>+ * Note that IOMMU suspend doesn't affect live update. The state
>>+ * preserved during live update is not released and remains valid during
>>+ * suspend and reused during IOMMU resume.
>>+ *
>>+ * Also note deployment of suspend/resume and live updated use case
>>+ * should be mostly mutually exclusive.
>>+ */
>> for_each_active_iommu(iommu, drhd) {
>> iommu_disable_translation(iommu);
>>@@ -2397,8 +2405,11 @@ void intel_iommu_shutdown(void)
>> /* Disable PMRs explicitly here. */
>> iommu_disable_protect_mem_regions(iommu);
>>- /* Make sure the IOMMUs are switched off */
>>- iommu_disable_translation(iommu);
>>+ /* Make sure the IOMMUs are switched off if not preserved. */
>>+ if (iommu_preserved_state(&iommu->iommu))
>>+ clear_unpreserved_context_entries(iommu);
>>+ else
>>+ iommu_disable_translation(iommu);
>> }
>> }
>>diff --git a/drivers/iommu/intel/iommu.h b/drivers/iommu/intel/iommu.h
>>index 785057236e7c..4feb5bd76b18 100644
>>--- a/drivers/iommu/intel/iommu.h
>>+++ b/drivers/iommu/intel/iommu.h
>>@@ -1307,6 +1307,11 @@ int intel_iommu_preserve(struct iommu_device *iommu,
>> struct iommu_hw_ser *iommu_ser);
>> void intel_iommu_unpreserve(struct iommu_device *iommu,
>> struct iommu_hw_ser *iommu_ser);
>>+void clear_unpreserved_context_entries(struct intel_iommu *iommu);
>>+#else
>>+static inline void clear_unpreserved_context_entries(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 0837bb889fed..501dc0e9cc0a 100644
>>--- a/drivers/iommu/intel/liveupdate.c
>>+++ b/drivers/iommu/intel/liveupdate.c
>>@@ -77,6 +77,145 @@ static int preserve_context_table(struct intel_iommu *iommu,
>> return 0;
>> }
>>+static void clear_unpreserved_context_root_entries(struct intel_iommu *iommu,
>>+ struct iommu_hw_ser *ser)
>>+{
>>+ struct root_entry *root;
>>+ int i;
>>+
>>+ /*
>>+ * Individual invalidations for each context table removal are not
>>+ * needed as we issue global invalidations later.
>>+ */
>>+ for (i = 0; i < ROOT_ENTRY_NR; i++) {
>>+ root = &iommu->root_entry[i];
>>+
>>+ if (!is_context_table_preserved(iommu, ser, i, 0) && (root->lo & 1)) {
>>+ root->lo = 0;
>>+ __iommu_flush_cache(iommu,
>>+ &root->lo,
>>+ sizeof(root->lo));
>>+ }
>>+
>>+ if (!sm_supported(iommu))
>>+ continue;
>>+
>>+ if (!is_context_table_preserved(iommu, ser, i, 0x80) && (root->hi & 1)) {
>>+ root->hi = 0;
>>+ __iommu_flush_cache(iommu,
>>+ &root->hi,
>>+ sizeof(root->hi));
>>+ }
>>+ }
>>+}
>>+
>>+static void clear_unpreserved_context(struct device_domain_info *info, u8 bus, u8 devfn)
>>+{
>>+ struct context_entry *context;
>>+
>>+ /*
>>+ * This cleanup is done during shutdown, so it should be fine to only
>>+ * clear the entries here and issue one global invalidation later to
>>+ * invalidate all cleared entries.
>>+ *
>>+ * Note that the device IOTLB invalidation for unpreserved devices is
>>+ * skipped this way, but that should not be needed as the devices are
>>+ * quiesced at this point. This should improve the performance of the
>>+ * cleanup process and avoids any invalidation timeouts because drivers
>>+ * might have moved devices to D3 state.
>
>I don't quite follow why device-TLB flushes could be skipped when the
>device is quiesced. Nothing guarantees that an unpreserved device that
>has ATS enabled doesn't carry stale cache entries. It may keep
>translations to memory that the next kernel reuses.
I agree with your assessment, the device-TLB might still have stale
entries. But this assumption is based on the existing kexec reboot
behaviour. That is, during normal shutdown the iommu translation is
disabled but the device-TLB invalidations are not issued either. The
unpreserved devices go through the same flow in the next kernel as they
do after a normal kexec reboot. I will update the comment to add this
detail.
>
>I would suggest at least a global device-TLB flush for ATS-enabled
>unpreserved devices, or is there anything I've overlooked?
This might be tricky as this late during shutdown some devices might
already be in a low power state, and sending them device-TLB
invalidations would cause invalidation timeouts. Even if that doesn't
happen, it will still add to the shutdown time.
>
>>+ *
>>+ * The iommu lock is not needed as the context tables are never removed
>>+ * and the new ones are not added during shutdown.
>>+ */
>>+ context = iommu_context_addr(info->iommu, bus, devfn, 0);
>>+ if (context) {
>>+ /*
>>+ * Individual invalidations are not needed as we issue global
>>+ * invalidations later once all the cleanups are done.
>>+ */
>>+ context_clear_present(context);
>>+ __iommu_flush_cache(info->iommu, context, sizeof(*context));
>>+ context_clear_entry(context);
>>+ __iommu_flush_cache(info->iommu, context, sizeof(*context));
>>+ }
>>+}
>
>[-snipped-]
>
>Thanks,
>baolu
>
Thanks,
Sami
next prev parent reply other threads:[~2026-10-10 0:32 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 0:48 [PATCH v5 00/18] iommu: Add live update state preservation Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 01/18] memfd: export memfd_get_seals() Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 02/18] iommu: Implement IOMMU Live update FLB callbacks Samiullah Khawaja
2026-10-06 23:31 ` Nicolin Chen
2026-09-21 0:48 ` [PATCH v5 03/18] iommu/pages: Add APIs to preserve/unpreserve/restore iommu pages Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 04/18] iommupt: Implement preserve/unpreserve/restore callbacks Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 05/18] iommu: Implement IOMMU domain preservation Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 06/18] iommu: Implement device and IOMMU HW preservation Samiullah Khawaja
2026-10-07 3:21 ` Nicolin Chen
2026-09-21 0:48 ` [PATCH v5 07/18] iommu/vt-d: Implement device and iommu preserve/unpreserve ops Samiullah Khawaja
2026-10-08 7:54 ` Baolu Lu
2026-10-10 0:10 ` Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 08/18] iommu/vt-d: Clear unpreserved context entries during shutdown Samiullah Khawaja
2026-10-09 0:43 ` Baolu Lu
2026-10-10 0:32 ` Samiullah Khawaja [this message]
2026-09-21 0:48 ` [PATCH v5 09/18] iommu: Add APIs to get iommu and device preserved state Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 10/18] iommu/vt-d: Restore IOMMU state and reclaimed domain ids Samiullah Khawaja
2026-10-09 1:44 ` Baolu Lu
2026-10-10 1:58 ` Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 11/18] iommu: Restore and reattach preserved domains to devices Samiullah Khawaja
2026-10-07 19:44 ` Nicolin Chen
2026-09-21 0:48 ` [PATCH v5 12/18] iommu/vt-d: Handle reattach of the restored domain Samiullah Khawaja
2026-10-09 2:24 ` Baolu Lu
2026-10-10 2:09 ` Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 13/18] iommu/vt-d: Preserve PASID table of preserved device Samiullah Khawaja
2026-10-09 3:38 ` Baolu Lu
2026-10-10 2:31 ` Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 14/18] iommufd: Implement ioctl to mark HWPT for preservation Samiullah Khawaja
2026-10-07 20:17 ` Nicolin Chen
2026-09-21 0:48 ` [PATCH v5 15/18] iommufd: Persist iommu hardware pagetables for live update Samiullah Khawaja
2026-09-23 23:59 ` John Starks
2026-09-24 17:49 ` Samiullah Khawaja
2026-10-07 21:31 ` Nicolin Chen
2026-09-21 0:48 ` [PATCH v5 16/18] iommufd: Add APIs to preserve/unpreserve a vfio cdev Samiullah Khawaja
2026-10-07 22:00 ` Nicolin Chen
2026-09-21 0:48 ` [PATCH v5 17/18] vfio/pci: Preserve the iommufd state of the " Samiullah Khawaja
2026-09-21 0:48 ` [PATCH v5 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=asmC5Ow_VYtvgGOQ@google.com \
--to=skhawaja@google.com \
--cc=akpm@linux-foundation.org \
--cc=alex@shazbot.org \
--cc=baolu.lu@linux.intel.com \
--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=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®