* [merged mm-stable] mm-kmemleak-factor-leak-confirmation-into-a-helper.patch removed from -mm tree
@ 2026-08-25 1:55 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2026-08-25 1:55 UTC (permalink / raw)
To: mm-commits, vbabka, surenb, shuah, rppt, mhocko, ljs, liam, geert,
david, corbet, catalin.marinas, leitao, akpm
The quilt patch titled
Subject: mm: kmemleak: factor leak confirmation into a helper
has been removed from the -mm tree. Its filename was
mm-kmemleak-factor-leak-confirmation-into-a-helper.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Breno Leitao <leitao@debian.org>
Subject: mm: kmemleak: factor leak confirmation into a helper
Date: Mon, 13 Jul 2026 04:48:06 -0700
The reporting loop in kmemleak_scan() decided whether to tag an object as
a reported leak with a four-term compound condition whose last operand
also had a side effect (++object->unref_scans). Mixing the candidate
tests with the counter update made the check hard to read.
Move the state transition into confirm_leak(): it returns true when a
still-unreferenced suspect crosses min_unref_scans consecutive scans and
is newly flagged OBJECT_REPORTED, leaving only the reporting bookkeeping
in the caller. No functional change.
Link: https://lore.kernel.org/20260713-catalin_pto-v1-3-5b93b1131089@debian.org
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Hildenbrand <david@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Liam R. Howlett <liam@infradead.org>
Cc: Lorenzo Stoakes <ljs@kernel.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/kmemleak.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
--- a/mm/kmemleak.c~mm-kmemleak-factor-leak-confirmation-into-a-helper
+++ a/mm/kmemleak.c
@@ -2015,6 +2015,26 @@ scan_gray:
}
/*
+ * Promote a suspected object to a reported leak once it has stayed
+ * unreferenced for min_unref_scans consecutive scans. Called with
+ * object->lock held; returns true when the object is newly reported.
+ */
+static bool confirm_leak(struct kmemleak_object *object)
+{
+ if (!unreferenced_object(object) ||
+ !(object->flags & OBJECT_SUSPECT) ||
+ (object->flags & OBJECT_REPORTED))
+ return false;
+
+ object->unref_scans += 1;
+ if (object->unref_scans < min_unref_scans)
+ return false;
+
+ object->flags |= OBJECT_REPORTED;
+ return true;
+}
+
+/*
* Scan the memory and report the unreferenced objects as leaks. Must be
* called with the scan_mutex held.
*/
@@ -2074,11 +2094,7 @@ static void kmemleak_scan(void)
trace_handle = 0;
dedup_print = false;
- if (unreferenced_object(object) &&
- (object->flags & OBJECT_SUSPECT) &&
- !(object->flags & OBJECT_REPORTED) &&
- ++object->unref_scans >= min_unref_scans) {
- object->flags |= OBJECT_REPORTED;
+ if (confirm_leak(object)) {
if (kmemleak_verbose) {
trace_handle = object->trace_handle;
dedup_print = true;
_
Patches currently in -mm which might be from leitao@debian.org are
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-25 1:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-08-25 1:55 [merged mm-stable] mm-kmemleak-factor-leak-confirmation-into-a-helper.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.