bootmem: remove the vmemmap pages from kmemleak in put_page_bootmem

Liu Shixin · akpm00 · commit dd0ff4d12dd2 · 2022-08-28T14:02:45.000-07:00
The vmemmap pages is marked by kmemleak when allocated from memblock. Remove it from kmemleak when freeing the page. Otherwise, when we reuse the page, kmemleak may report such an error and then stop working. kmemleak: Cannot insert 0xffff98fb6eab3d40 into the object search tree (overlaps existing) kmemleak: Kernel memory leak detector disabled kmemleak: Object 0xffff98fb6be00000 (size 335544320): kmemleak: comm "swapper", pid 0, jiffies 4294892296 kmemleak: min_count = 0 kmemleak: count = 0 kmemleak: flags = 0x1 kmemleak: checksum = 0 kmemleak: backtrace: Link: https://lkml.kernel.org/r/20220819094005.2928241-1-liushixin2@huawei.com Fixes: f41f2ed (mm: hugetlb: free the vmemmap pages associated with each HugeTLB page) Signed-off-by: Liu Shixin <liushixin2@huawei.com> Reviewed-by: Muchun Song <songmuchun@bytedance.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Mike Kravetz <mike.kravetz@oracle.com> Cc: Oscar Salvador <osalvador@suse.de> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c
@@ -12,6 +12,7 @@
 #include <linux/memblock.h>
 #include <linux/bootmem_info.h>
 #include <linux/memory_hotplug.h>
+#include <linux/kmemleak.h>
 
 void get_page_bootmem(unsigned long info, struct page *page, unsigned long type)
 {
@@ -33,6 +34,7 @@ void put_page_bootmem(struct page *page)
 		ClearPagePrivate(page);
 		set_page_private(page, 0);
 		INIT_LIST_HEAD(&page->lru);
+		kmemleak_free_part(page_to_virt(page), PAGE_SIZE);
 		free_reserved_page(page);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`#include <linux/memblock.h>`
`13`	`13`	`#include <linux/bootmem_info.h>`
`14`	`14`	`#include <linux/memory_hotplug.h>`
	`15`	`+#include <linux/kmemleak.h>`
`15`	`16`
`16`	`17`	`void get_page_bootmem(unsigned long info, struct page *page, unsigned long type)`
`17`	`18`	`{`
`@@ -33,6 +34,7 @@ void put_page_bootmem(struct page *page)`
`33`	`34`	`ClearPagePrivate(page);`
`34`	`35`	`set_page_private(page, 0);`
`35`	`36`	`INIT_LIST_HEAD(&page->lru);`
	`37`	`+ kmemleak_free_part(page_to_virt(page), PAGE_SIZE);`
`36`	`38`	`free_reserved_page(page);`
`37`	`39`	`}`
`38`	`40`	`}`