Skip to contentSkip to conversation

mmpage_owner-defer-enablement-of-static-branch.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Apr 16, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm,page_owner: defer enablement of static branch
has been removed from the -mm tree. Its filename was
mmpage_owner-defer-enablement-of-static-branch.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Oscar Salvador <[email protected]>
Subject: mm,page_owner: defer enablement of static branch
Date: Tue, 9 Apr 2024 15:17:15 +0200

Kefeng Wang reported that he was seeing some memory leaks with kmemleak with page_owner enabled.

The reason is that we enable the page_owner_inited static branch and then proceed with the linking of stack_list struct to dummy_stack, which means that exists a race window between these two steps where we can have pages already being allocated calling add_stack_record_to_list(), allocating objects and linking them to stack_list, but then we set stack_list pointing to dummy_stack in init_page_owner. Which means that the objects that have been allocated during that time window are unreferenced and lost.

Fix this by deferring the enablement of the branch until we have properly set up the list.

---

 mm/page_owner.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
mm/page_owner.c renamed from mm/page_owner.c~mmpage_owner-defer-enablement-of-static-branch +1 -1
@@ -118,7 +118,6 @@ static __init void init_page_owner(void)
 	register_dummy_stack();
 	register_failure_stack();
 	register_early_stack();
-	static_branch_enable(&page_owner_inited);
 	init_early_allocated_pages();
 	/* Initialize dummy and failure stacks and link them to stack_list */
 	dummy_stack.stack_record = __stack_depot_get_stack_record(dummy_handle);
@@ -129,6 +128,7 @@ static __init void init_page_owner(void)
 		refcount_set(&failure_stack.stack_record->count, 1);
 	dummy_stack.next = &failure_stack;
 	stack_list = &dummy_stack;
+	static_branch_enable(&page_owner_inited);
 }
 
 struct page_ext_operations page_owner_ops = {

_

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