From: Baolu Lu <baolu.lu@linux.intel.com>
To: Samiullah Khawaja <skhawaja@google.com>,
David Woodhouse <dwmw2@infradead.org>,
Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
Jason Gunthorpe <jgg@ziepe.ca>
Cc: 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 v4 08/18] iommu/vt-d: Clear unpreserved context entries during shutdown
Date: Wed, 26 Aug 2026 16:05:51 +0800 [thread overview]
Message-ID: <446684d8-44d0-47c5-9301-172c55efd950@linux.intel.com> (raw)
In-Reply-To: <20260808022723.3893618-9-skhawaja@google.com>
On 8/8/26 10:27, 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.
The key assumption here seems to be that, during a live-update kexec,
most devices do not go through the normal iommu release path. Otherwise,
their context entries should already be torn down in the
iommu_release_device path.
Could you please confirm this assumption and add some short note in the
comments or commit message?
>
> 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 | 140 +++++++++++++++++++++++++++++++
> 3 files changed, 158 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
> index aeae0563dfd0..eca3944d9cf5 100644
> --- a/drivers/iommu/intel/iommu.c
> +++ b/drivers/iommu/intel/iommu.c
> @@ -1832,6 +1832,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);
>
> @@ -2377,8 +2385,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 4906cce1e66e..6c971f04ead3 100644
> --- a/drivers/iommu/intel/iommu.h
> +++ b/drivers/iommu/intel/iommu.h
> @@ -1306,6 +1306,7 @@ 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 int intel_iommu_preserve_device(struct device *dev,
> struct iommu_device_ser *device_ser)
> @@ -1328,6 +1329,10 @@ static inline void intel_iommu_unpreserve(struct iommu_device *iommu,
> struct iommu_hw_ser *iommu_ser)
> {
> }
> +
> +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 ffdcebf2b773..b5aaebeeb5c1 100644
> --- a/drivers/iommu/intel/liveupdate.c
> +++ b/drivers/iommu/intel/liveupdate.c
> @@ -77,6 +77,146 @@ 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;
> +
> + 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.
> + */
> + context = iommu_context_addr(info->iommu, bus, devfn, 0);
> + if (context) {
> + context_clear_entry(context);
> + __iommu_flush_cache(info->iommu, context, sizeof(*context));
For tearing down a present context entry, please follow the VT-d
recommended sequence:
- clear only the Present bit,
- flush the updated entry to memory if necessary,
- issue the required cache invalidations,
- then clear the remaining fields of the entry.
> + }
> +}
> +
> +static int clear_unpreserved_alias_cb(struct pci_dev *pdev, u16 alias, void *data)
> +{
> + struct device_domain_info *info = data;
> +
> + clear_unpreserved_context(info, PCI_BUS_NUM(alias), alias & 0xff);
> + return 0;
> +}
> +
> +static int clear_unpreserve_context_entry_fn(struct device *dev,
> + struct iommu_device *iommu_dev,
> + void *arg)
> +{
> + struct device_domain_info *info;
> + struct context_entry *context;
> +
> + info = dev_iommu_priv_get(dev);
> + if (!info)
> + return 0;
> +
> + if (!dev_is_pci(dev) || !dev_iommu_preserved_state(dev))
> + goto out_unpreserved;
> +
> + /*
> + * PRE use cases are not supported with Live Update and a preservation
> + * attempt on such domains returns an error. But Intel IOMMU driver
> + * enables PRE by default on all devices that support it. For preserved
> + * entries, the PRE needs to be disabled so preserved PCI devices do not
> + * generate PRQs, during kexec, as translations are kept enabled during
> + * live update. There is no need to disable these for DMA aliases.
> + */
> + if (sm_supported(info->iommu)) {
> + context = iommu_context_addr(info->iommu, info->bus, info->devfn, 0);
Nit: please add a brief comment explaining why locking is not needed at
this call site.
> + if (context) {
> + context_clear_sm_pre(context);
For cache invalidation considerations when changing the PRE bit in a
present context entry, please follow the VT-d spec guidance (Table 28,
“Guidance to Software for Invalidations”).
> + __iommu_flush_cache(info->iommu, context, sizeof(*context));
> + }> + }
> +
> + return 0;
> +
> +out_unpreserved:
> + if (dev_is_pci(dev))
> + pci_for_each_dma_alias(to_pci_dev(dev),
> + clear_unpreserved_alias_cb, info);
> + else
> + clear_unpreserved_context(info, info->bus, info->devfn);
> +
> + return 0;
> +}
> +
> +/**
> + * clear_unpreserved_context_entries() - Clear context entries for unpreserved devices
> + * @iommu: Target IOMMU
> + *
> + * Clear the context entries of unpreserved devices during shutdown before kexec.
> + */
> +void clear_unpreserved_context_entries(struct intel_iommu *iommu)
> +{
> + struct iommu_dev_iter iter = {
> + .fn = clear_unpreserve_context_entry_fn,
> + .iommu = &iommu->iommu,
> + .arg = NULL,
> +
> + };
> +
> + /*
> + * Clear context entries for unpreserved devices.
> + *
> + * Note that the error can be ignored as the iterator function does not
> + * fail.
> + */
> + iommu_for_each_dev(&iter);
> +
> + /* Clear reference to unpreserved context tables */
> + clear_unpreserved_context_root_entries(iommu,
> + iommu_preserved_state(&iommu->iommu));
> +
> + /*
> + * Some devices might not have teardown/detached properly depending on
> + * whether a proper device remove is done before kexec is triggered.
> + * Also unpreserved context tables and entries are removed during
> + * shutdown. So issue global invalidations to remove references to
> + * unpreserved tables and entries.
> + */
> + iommu->flush.flush_context(iommu, 0, 0, 0, DMA_CCMD_GLOBAL_INVL);
> + if (sm_supported(iommu))
> + qi_flush_pasid_cache(iommu, 0, QI_PC_GLOBAL, 0);
> + iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
> +}
> +
> static void unpreserve_iommu_context_tables(struct intel_iommu *iommu,
> struct iommu_hw_ser *ser)
> {
Thanks,
baolu
next prev parent reply other threads:[~2026-08-26 8:05 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-08 2:27 [PATCH v4 00/18] iommu: Add live update state preservation Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 01/18] memfd: export memfd_get_seals() Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 02/18] iommu: Implement IOMMU Live update FLB callbacks Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 03/18] iommu/pages: Add APIs to preserve/unpreserve/restore iommu pages Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 04/18] iommupt: Implement preserve/unpreserve/restore callbacks Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 05/18] iommu: Implement IOMMU domain preservation Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 06/18] iommu: Implement device and IOMMU HW preservation Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 07/18] iommu/vt-d: Implement device and iommu preserve/unpreserve ops Samiullah Khawaja
2026-08-26 7:10 ` Baolu Lu
2026-08-26 20:46 ` Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 08/18] iommu/vt-d: Clear unpreserved context entries during shutdown Samiullah Khawaja
2026-08-26 8:05 ` Baolu Lu [this message]
2026-08-26 12:30 ` Pranjal Shrivastava
2026-08-26 20:37 ` Samiullah Khawaja
2026-08-26 20:30 ` Samiullah Khawaja
2026-08-27 6:09 ` Baolu Lu
2026-08-27 18:57 ` Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 09/18] iommu: Add APIs to get iommu and device preserved state Samiullah Khawaja
2026-08-12 6:29 ` Ankit Soni
2026-08-12 23:23 ` Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 10/18] iommu/vt-d: Restore IOMMU state and reclaimed domain ids Samiullah Khawaja
2026-08-27 7:22 ` Baolu Lu
2026-08-27 18:47 ` Samiullah Khawaja
2026-08-28 1:36 ` Baolu Lu
2026-08-08 2:27 ` [PATCH v4 11/18] iommu: Restore and reattach preserved domains to devices Samiullah Khawaja
2026-08-14 16:59 ` Ankit Soni
2026-08-14 19:46 ` Samiullah Khawaja
2026-08-17 15:32 ` Ankit Soni
2026-08-08 2:27 ` [PATCH v4 12/18] iommu/vt-d: Handle reattach of the restored domain Samiullah Khawaja
2026-08-27 8:12 ` Baolu Lu
2026-08-27 17:52 ` Samiullah Khawaja
2026-08-28 1:42 ` Baolu Lu
2026-08-28 1:55 ` Baolu Lu
2026-08-08 2:27 ` [PATCH v4 13/18] iommu/vt-d: Preserve PASID table of preserved device Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 14/18] iommufd: Implement ioctl to mark HWPT for preservation Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 15/18] iommufd: Persist iommu hardware pagetables for live update Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 16/18] iommufd: Add APIs to preserve/unpreserve a vfio cdev Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 17/18] vfio/pci: Preserve the iommufd state of the " Samiullah Khawaja
2026-08-08 2:27 ` [PATCH v4 18/18] iommufd/selftest: Add test to verify iommufd preservation Samiullah Khawaja
2026-08-26 8:12 ` [PATCH v4 00/18] iommu: Add live update state preservation David Woodhouse
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=446684d8-44d0-47c5-9301-172c55efd950@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=alex@shazbot.org \
--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=skhawaja@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