From: Yuanhe Shu <xiangzao@linux.alibaba.com>
To: joro@8bytes.org, will@kernel.org, jgg@ziepe.ca
Cc: robin.murphy@arm.com, baolu.lu@linux.intel.com,
kevin.tian@intel.com, smostafa@google.com, praan@google.com,
skhawaja@google.com, iommu@lists.linux.dev,
linux-kernel@vger.kernel.org,
Yuanhe Shu <xiangzao@linux.alibaba.com>
Subject: [PATCH 2/2] iommupt: Drop pagealloc references during domain deinit
Date: Thu, 27 Aug 2026 22:58:55 +0800 [thread overview]
Message-ID: <20260827145855.1616223-3-xiangzao@linux.alibaba.com> (raw)
In-Reply-To: <20260827145855.1616223-1-xiangzao@linux.alibaba.com>
Since commit b948a8722848 ("iommu: Fix up map/unmap debugging for
iommupt domains") iommu_map() takes an IOMMU_DEBUG_PAGEALLOC reference
for every page it maps into a generic_pt domain, and those references
are only dropped by the IOVA based unmap path. When a domain is freed
while mappings are still installed, pt_iommu_deinit() releases the page
table memory without dropping them, so every mapped page stays counted
as IOMMU-mapped after it returns to the buddy allocator and each later
allocation or free of it reports:
WARNING: drivers/iommu/iommu-debug-pagealloc.c:91 at __iommu_debug_check_unmapped+0x4e/0x70, CPU#0: init/1
iommu: Detected page leak!
Freeing a domain with mappings still installed is not driver misuse:
the deinit contract in include/linux/generic_pt/iommu.h only requires
the table to be removed from HW access and caches, with no requirement
to unmap first, and the kunit suite itself frees domains with live
mappings in pt_kunit_iommu_exit().
Set a debug_unmap flag in the deinit collect args and have
__collect_tables() drop the reference of every OA leaf it destroys,
symmetric to how iommu_map() created them. Since the flag is only set
when the sanitizer is enabled, the !pt_can_have_table() fast path is
unaffected when it is off. This uses the __iommu_debug_unmap_phys()
helper added by the previous patch, which any backport of this fix
needs as well.
Verified with the generic_pt kunit suite as an in-tree reproducer:
running the x86_64 format's test_pgsize_boundary() with
iommu.debug_pagealloc=1 on a machine with enough RAM for its
hard-coded OA 0x208b95d000 to be online memory, then allocating and
freeing most of memory, produces 64 page leak WARNINGs unpatched - one
for each of the 32 mapped pages on both its allocation and free - and
none with this patch.
Fixes: b948a8722848 ("iommu: Fix up map/unmap debugging for iommupt domains")
Signed-off-by: Yuanhe Shu <xiangzao@linux.alibaba.com>
---
drivers/iommu/generic_pt/iommu_pt.h | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/iommu/generic_pt/iommu_pt.h b/drivers/iommu/generic_pt/iommu_pt.h
index 07ec2b3ab986..f4b02894f1c4 100644
--- a/drivers/iommu/generic_pt/iommu_pt.h
+++ b/drivers/iommu/generic_pt/iommu_pt.h
@@ -14,6 +14,7 @@
#include <linux/export.h>
#include <linux/iommu.h>
#include "../iommu-pages.h"
+#include "../iommu-priv.h"
#include <linux/cleanup.h>
#include <linux/dma-mapping.h>
@@ -379,6 +380,8 @@ struct pt_iommu_collect_args {
struct iommupt_pending_gather pending;
/* Fail if any OAs are within the range */
u8 check_mapped : 1;
+ /* Drop the IOMMU_DEBUG_PAGEALLOC references of any OAs in the range */
+ u8 debug_unmap : 1;
};
static int __collect_tables(struct pt_range *range, void *arg,
@@ -388,7 +391,8 @@ static int __collect_tables(struct pt_range *range, void *arg,
struct pt_iommu_collect_args *collect = arg;
int ret;
- if (!collect->check_mapped && !pt_can_have_table(&pts))
+ if (!collect->check_mapped && !collect->debug_unmap &&
+ !pt_can_have_table(&pts))
return 0;
for_each_pt_level_entry(&pts) {
@@ -400,8 +404,19 @@ static int __collect_tables(struct pt_range *range, void *arg,
return ret;
continue;
}
- if (pts.type == PT_ENTRY_OA && collect->check_mapped)
- return -EADDRINUSE;
+ if (pts.type == PT_ENTRY_OA) {
+ if (collect->check_mapped)
+ return -EADDRINUSE;
+ if (collect->debug_unmap) {
+ struct pt_iommu *iommu_table =
+ iommu_from_common(range->common);
+ size_t oasz = log2_to_int_t(size_t,
+ pt_entry_oa_lg2sz(&pts));
+
+ iommu_debug_unmap_phys(&iommu_table->domain,
+ pt_entry_oa(&pts), oasz);
+ }
+ }
}
return 0;
}
@@ -1162,6 +1177,7 @@ static void NS(deinit)(struct pt_iommu *iommu_table)
struct pt_common *common = common_from_iommu(iommu_table);
struct pt_range range = pt_all_range(common);
struct pt_iommu_collect_args collect = {
+ .debug_unmap = iommu_debug_pagealloc_enabled(),
.pending.free_list = IOMMU_PAGES_LIST_INIT(
collect.pending.free_list),
};
--
2.43.5
next prev parent reply other threads:[~2026-08-27 14:59 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-27 14:58 [PATCH 0/2] iommu: Drop IOMMU_DEBUG_PAGEALLOC refs on iommupt domain teardown Yuanhe Shu
2026-08-27 14:58 ` [PATCH 1/2] iommu: Add __iommu_debug_unmap_phys() to drop refs by physical address Yuanhe Shu
2026-08-27 16:13 ` Mostafa Saleh
2026-08-27 16:17 ` Mostafa Saleh
2026-08-27 16:21 ` Jason Gunthorpe
2026-08-31 6:21 ` Yuanhe Shu
2026-08-27 14:58 ` Yuanhe Shu [this message]
2026-08-27 16:18 ` [PATCH 2/2] iommupt: Drop pagealloc references during domain deinit Jason Gunthorpe
2026-08-31 6:16 ` Yuanhe Shu
2026-08-27 16:05 ` [PATCH 0/2] iommu: Drop IOMMU_DEBUG_PAGEALLOC refs on iommupt domain teardown Mostafa Saleh
2026-08-31 6:23 ` Yuanhe Shu
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=20260827145855.1616223-3-xiangzao@linux.alibaba.com \
--to=xiangzao@linux.alibaba.com \
--cc=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=praan@google.com \
--cc=robin.murphy@arm.com \
--cc=skhawaja@google.com \
--cc=smostafa@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®