Skip to contentSkip to conversation

stackdepot-use-gfp_nested_mask-instead-of-open-coded-masking.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message May 19, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: stackdepot: use gfp_nested_mask() instead of open coded masking
has been removed from the -mm tree. Its filename was
stackdepot-use-gfp_nested_mask-instead-of-open-coded-masking.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: Dave Chinner <[email protected]>
Subject: stackdepot: use gfp_nested_mask() instead of open coded masking
Date: Tue, 30 Apr 2024 15:28:24 +1000

The stackdepot code is used by KASAN and lockdep for recoding stack traces. Both of these track allocation context information, and so their internal allocations must obey the caller allocation contexts to avoid generating their own false positive warnings that have nothing to do with the code they are instrumenting/tracking.

We also don't want recording stack traces to deplete emergency memory reserves - debug code is useless if it creates new issues that can't be replicated when the debug code is disabled.

Switch the stackdepot allocation masking to use gfp_nested_mask() to address these issues. gfp_nested_mask() also strips GFP_ZONEMASK naturally, so that greatly simplifies this code.

---

 lib/stackdepot.c |   11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)
lib/stackdepot.c renamed from lib/stackdepot.c~stackdepot-use-gfp_nested_mask-instead-of-open-coded-masking +2 -9
@@ -624,15 +624,8 @@ depot_stack_handle_t stack_depot_save_fl
 	 * we won't be able to do that under the lock.
 	 */
 	if (unlikely(can_alloc && !READ_ONCE(new_pool))) {
-		/*
-		 * Zero out zone modifiers, as we don't have specific zone
-		 * requirements. Keep the flags related to allocation in atomic
-		 * contexts, I/O, nolockdep.
-		 */
-		alloc_flags &= ~GFP_ZONEMASK;
-		alloc_flags &= (GFP_ATOMIC | GFP_KERNEL | __GFP_NOLOCKDEP);
-		alloc_flags |= __GFP_NOWARN;
-		page = alloc_pages(alloc_flags, DEPOT_POOL_ORDER);
+		page = alloc_pages(gfp_nested_mask(alloc_flags),
+				   DEPOT_POOL_ORDER);
 		if (page)
 			prealloc = page_address(page);
 	}

_

Patches currently in -mm which might be from [email protected] are