From: fangyu.yu@linux.alibaba.com
To: jgg@nvidia.com, joro@8bytes.org, will@kernel.org,
robin.murphy@arm.com, joerg.roedel@amd.com, jgg@ziepe.ca,
vasant.hegde@amd.com, kevin.tian@intel.com, Ankit.Soni@amd.com
Cc: guoren@kernel.org, iommu@lists.linux.dev,
linux-kernel@vger.kernel.org,
Fangyu Yu <fangyu.yu@linux.alibaba.com>
Subject: [PATCH] iommupt/kunit: Read an exact NR_SECONDARY_PAGETABLE snapshot for the leak check
Date: Thu, 15 Oct 2026 21:20:24 +0800 [thread overview]
Message-ID: <20261015132024.43998-1-fangyu.yu@linux.alibaba.com> (raw)
From: Fangyu Yu <fangyu.yu@linux.alibaba.com>
NR_SECONDARY_PAGETABLE is per-CPU batched and only folded into the global
counter about once per second. The tests complete within a few seconds, so
the init/exit checks can read stale values and randomly fail when a fold
lands mid-test, even though no page table is leaked:
# test_map_simple: ASSERTION FAILED at .../kunit_iommu_pt.h:473
Expected priv->orig_nr_secondary_pagetable ==
global_node_page_state(NR_SECONDARY_PAGETABLE), but
priv->orig_nr_secondary_pagetable == 68 (0x44)
global_node_page_state(NR_SECONDARY_PAGETABLE) == 70 (0x46)
Sum the per-CPU batches together with the global counter to get an exact
snapshot before and after each test case, which makes the check
deterministic without any settling delay.
Fixes: bc5233c0904e ("iommupt: Add a kunit test for the IOMMU implementation")
Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com>
---
drivers/iommu/generic_pt/kunit_iommu_pt.h | 40 ++++++++++++++++++++---
1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/generic_pt/kunit_iommu_pt.h b/drivers/iommu/generic_pt/kunit_iommu_pt.h
index ece1c9b8c55d..d20728b196be 100644
--- a/drivers/iommu/generic_pt/kunit_iommu_pt.h
+++ b/drivers/iommu/generic_pt/kunit_iommu_pt.h
@@ -4,6 +4,7 @@
*/
#include "kunit_iommu.h"
#include "pt_iter.h"
+#include <linux/cpu.h>
#include <linux/generic_pt/iommu.h>
#include <linux/iommu.h>
@@ -438,6 +439,36 @@ static struct kunit_case iommu_test_cases[] = {
{},
};
+/*
+ * The global NR_SECONDARY_PAGETABLE counter is batched per-CPU and folded
+ * into the global value asynchronously, sum the global value and the per-CPU
+ * deltas to get an exact snapshot.
+ *
+ * The global value must be read without the clamp of global_node_page_state():
+ * the raw counter is transiently negative whenever a folded free batch
+ * outweighs allocation deltas still pending on other CPUs, and clamping
+ * before adding the deltas back would overestimate and report phantom leaks.
+ * global_node_page_state_monotonic() is normally reserved for monotonic
+ * counters because a raw negative read is garbage as a page count, but the
+ * sum with the pending deltas always restores the exact non-negative value.
+ */
+static unsigned long pt_kunit_nr_secondary_pagetable(void)
+{
+ unsigned long nr = global_node_page_state_monotonic(NR_SECONDARY_PAGETABLE);
+
+#ifdef CONFIG_SMP
+ int nid, cpu;
+
+ cpus_read_lock();
+ for_each_online_cpu(cpu)
+ for_each_online_node(nid)
+ nr += per_cpu_ptr(NODE_DATA(nid)->per_cpu_nodestats,
+ cpu)->vm_node_stat_diff[NR_SECONDARY_PAGETABLE];
+ cpus_read_unlock();
+#endif
+ return nr;
+}
+
static int pt_kunit_iommu_init(struct kunit *test)
{
struct kunit_iommu_priv *priv;
@@ -447,8 +478,7 @@ static int pt_kunit_iommu_init(struct kunit *test)
if (!priv)
return -ENOMEM;
- priv->orig_nr_secondary_pagetable =
- global_node_page_state(NR_SECONDARY_PAGETABLE);
+ priv->orig_nr_secondary_pagetable = pt_kunit_nr_secondary_pagetable();
ret = pt_kunit_priv_init(test, priv);
if (ret) {
kunit_kfree(test, priv);
@@ -461,17 +491,19 @@ static int pt_kunit_iommu_init(struct kunit *test)
static void pt_kunit_iommu_exit(struct kunit *test)
{
struct kunit_iommu_priv *priv = test->priv;
+ unsigned long nr;
if (!test->priv)
return;
pt_iommu_deinit(priv->iommu);
+ nr = pt_kunit_nr_secondary_pagetable();
+
/*
* Look for memory leaks, assumes kunit is running isolated and nothing
* else is using secondary page tables.
*/
- KUNIT_ASSERT_EQ(test, priv->orig_nr_secondary_pagetable,
- global_node_page_state(NR_SECONDARY_PAGETABLE));
+ KUNIT_ASSERT_EQ(test, priv->orig_nr_secondary_pagetable, nr);
kunit_kfree(test, test->priv);
}
--
2.50.1
next reply other threads:[~2026-10-15 13:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-15 13:20 fangyu.yu [this message]
2026-10-15 13:40 ` Jason Gunthorpe
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=20261015132024.43998-1-fangyu.yu@linux.alibaba.com \
--to=fangyu.yu@linux.alibaba.com \
--cc=Ankit.Soni@amd.com \
--cc=guoren@kernel.org \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=joerg.roedel@amd.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=vasant.hegde@amd.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®