Re: [PATCH v7 02/18] iommu/pages: Add APIs to preserve/unpreserve/restore iommu pages
From: Ankit Soni
Date: Thu Nov 12 2026 - 11:53:14 EST
On Tue, Nov 10, 2026 at 04:08:08AM +0000, Samiullah Khawaja wrote:
> IOMMU pages are allocated/freed using APIs using struct ioptdesc. For
> the proper preservation and restoration of ioptdesc add helper
> functions.
>
> Signed-off-by: Samiullah Khawaja <skhawaja@xxxxxxxxxx>
Reviewed-by: Ankit Soni <Ankit.Soni@xxxxxxx>
> Reviewed-by: Pranjal Shrivastava <praan@xxxxxxxxxx>
> Reviewed-by: Lu Baolu <baolu.lu@xxxxxxxxxxxxxxx>
> ---
> drivers/iommu/iommu-pages.c | 109 ++++++++++++++++++++++++++++++++++--
> drivers/iommu/iommu-pages.h | 30 ++++++++++
> 2 files changed, 135 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iommu/iommu-pages.c b/drivers/iommu/iommu-pages.c
> index 3bab175d8557..0aa18c771baa 100644
> --- a/drivers/iommu/iommu-pages.c
> +++ b/drivers/iommu/iommu-pages.c
> @@ -6,6 +6,7 @@
> #include "iommu-pages.h"
> #include <linux/dma-mapping.h>
> #include <linux/gfp.h>
> +#include <linux/kexec_handover.h>
> #include <linux/mm.h>
>
> #define IOPTDESC_MATCH(pg_elm, elm) \
> @@ -28,6 +29,13 @@ static inline size_t ioptdesc_mem_size(struct ioptdesc *desc)
> return 1UL << (folio_order(ioptdesc_folio(desc)) + PAGE_SHIFT);
> }
>
> +static inline void iommu_folio_update_stats(struct folio *folio,
> + unsigned long nr_pages)
> +{
> + mod_node_page_state(folio_pgdat(folio), NR_IOMMU_PAGES, nr_pages);
> + lruvec_stat_mod_folio(folio, NR_SECONDARY_PAGETABLE, nr_pages);
> +}
> +
> /**
> * iommu_alloc_pages_node_sz - Allocate a zeroed page of a given size from
> * specific NUMA node
> @@ -80,8 +88,7 @@ void *iommu_alloc_pages_node_sz(int nid, gfp_t gfp, size_t size)
> * rather large, i.e. multiple gigabytes in size.
> */
> pgcnt = 1UL << order;
> - mod_node_page_state(folio_pgdat(folio), NR_IOMMU_PAGES, pgcnt);
> - lruvec_stat_mod_folio(folio, NR_SECONDARY_PAGETABLE, pgcnt);
> + iommu_folio_update_stats(folio, pgcnt);
>
> return folio_address(folio);
> }
> @@ -95,8 +102,7 @@ static void __iommu_free_desc(struct ioptdesc *iopt)
> if (IOMMU_PAGES_USE_DMA_API)
> WARN_ON_ONCE(iopt->incoherent);
>
> - mod_node_page_state(folio_pgdat(folio), NR_IOMMU_PAGES, -pgcnt);
> - lruvec_stat_mod_folio(folio, NR_SECONDARY_PAGETABLE, -pgcnt);
> + iommu_folio_update_stats(folio, -pgcnt);
> folio_put(folio);
> }
>
> @@ -131,6 +137,101 @@ void iommu_put_pages_list(struct iommu_pages_list *list)
> }
> EXPORT_SYMBOL_GPL(iommu_put_pages_list);
>
> +#if IS_ENABLED(CONFIG_IOMMU_LIVEUPDATE)
> +/**
> + * iommu_unpreserve_pages - Unpreserve pages that were preserved in KHO
> + * @virt: Virtual address of page to be unpreserved
> + */
> +void iommu_unpreserve_pages(void *virt)
> +{
> + kho_unpreserve_folio(ioptdesc_folio(virt_to_ioptdesc(virt)));
> +}
> +EXPORT_SYMBOL_GPL(iommu_unpreserve_pages);
> +
> +/**
> + * iommu_preserve_pages - Preserve pages using KHO
> + * @virt: Virtual address of page to preserve
> + *
> + * Returns 0 on success, negative error on failure
> + */
> +int iommu_preserve_pages(void *virt)
> +{
> + return kho_preserve_folio(ioptdesc_folio(virt_to_ioptdesc(virt)));
> +}
> +EXPORT_SYMBOL_GPL(iommu_preserve_pages);
> +
> +/**
> + * iommu_unpreserve_pages_list - Unpreserve a list of KHO preserved pages
> + * @list: List of pages to unpreserve
> + */
> +void iommu_unpreserve_pages_list(struct iommu_pages_list *list)
> +{
> + struct ioptdesc *iopt;
> +
> + list_for_each_entry(iopt, &list->pages, iopt_freelist_elm)
> + kho_unpreserve_folio(ioptdesc_folio(iopt));
> +}
> +EXPORT_SYMBOL_GPL(iommu_unpreserve_pages_list);
> +
> +/**
> + * iommu_restore_pages - Restore pages that were preserved in KHO
> + * @phys: Physical address of page to restore
> + */
> +void iommu_restore_pages(u64 phys)
> +{
> + struct ioptdesc *iopt;
> + struct folio *folio;
> + unsigned long pgcnt;
> + unsigned int order;
> +
> + folio = kho_restore_folio(phys);
> + if (!folio)
> + panic("Failed to restore preserved IOMMU page %llx\n", phys);
> +
> + iopt = folio_ioptdesc(folio);
> +
> + /*
> + * For the restored pages incoherent is set to false as these are not
> + * mapped using the DMA_API. The remapping of these pages using DMA_API
> + * is not needed as these are not going to be written to by the new
> + * kernel.
> + */
> + iopt->incoherent = false;
> +
> + order = folio_order(folio);
> + pgcnt = 1UL << order;
> + iommu_folio_update_stats(folio, pgcnt);
> +}
> +EXPORT_SYMBOL_GPL(iommu_restore_pages);
> +
> +/**
> + * iommu_preserve_pages_list - Preserve list of pages using KHO
> + * @list: List of pages to preserve
> + *
> + * Returns 0 on success, negative error on failure
> + */
> +int iommu_preserve_pages_list(struct iommu_pages_list *list)
> +{
> + struct ioptdesc *iopt;
> + int ret;
> +
> + list_for_each_entry(iopt, &list->pages, iopt_freelist_elm) {
> + ret = kho_preserve_folio(ioptdesc_folio(iopt));
> + if (ret)
> + goto err;
> + }
> +
> + return 0;
> +
> +err:
> + list_for_each_entry_continue_reverse(iopt, &list->pages, iopt_freelist_elm)
> + kho_unpreserve_folio(ioptdesc_folio(iopt));
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(iommu_preserve_pages_list);
> +#endif
> +
> /**
> * iommu_pages_start_incoherent - Setup the page for cache incoherent operation
> * @virt: The page to setup
> diff --git a/drivers/iommu/iommu-pages.h b/drivers/iommu/iommu-pages.h
> index e9e605b5fa3a..3c409ec3d170 100644
> --- a/drivers/iommu/iommu-pages.h
> +++ b/drivers/iommu/iommu-pages.h
> @@ -53,6 +53,36 @@ void *iommu_alloc_pages_node_sz(int nid, gfp_t gfp, size_t size);
> void iommu_free_pages(void *virt);
> void iommu_put_pages_list(struct iommu_pages_list *list);
>
> +#if IS_ENABLED(CONFIG_IOMMU_LIVEUPDATE)
> +int iommu_preserve_pages(void *virt);
> +void iommu_unpreserve_pages(void *virt);
> +int iommu_preserve_pages_list(struct iommu_pages_list *list);
> +void iommu_unpreserve_pages_list(struct iommu_pages_list *list);
> +void iommu_restore_pages(u64 phys);
> +#else
> +static inline int iommu_preserve_pages(void *virt)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> +static inline void iommu_unpreserve_pages(void *virt)
> +{
> +}
> +
> +static inline int iommu_preserve_pages_list(struct iommu_pages_list *list)
> +{
> + return -EOPNOTSUPP;
> +}
> +
> +static inline void iommu_unpreserve_pages_list(struct iommu_pages_list *list)
> +{
> +}
> +
> +static inline void iommu_restore_pages(u64 phys)
> +{
> +}
> +#endif
> +
> /**
> * iommu_pages_list_add - add the page to a iommu_pages_list
> * @list: List to add the page to
> --
> 2.56.0.506.g506a7eabc5-goog
>