iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page

Browse Source 
commit dd0ff4d12dd2 ("bootmem: remove the vmemmap pages from kmemleak in
put_page_bootmem") fix an overlaps existing problem of kmemleak.  But the
problem still existed when HAVE_BOOTMEM_INFO_NODE is disabled, because in
this case, free_bootmem_page() will call free_reserved_page() directly.

Fix the problem by adding kmemleak_free_part() in free_bootmem_page() when
HAVE_BOOTMEM_INFO_NODE is disabled.

Link: https://lkml.kernel.org/r/20230704101942.2819426-1-liushixin2@huawei.com
Fixes: f41f2ed43ca5 ("mm: hugetlb: free the vmemmap pages associated with each HugeTLB page")
Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Acked-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>
This commit is contained in:
Liu Shixin 2023-07-04 18:19:42 +08:00 committed by Andrew Morton
parent 0d707cdefb
commit 028725e733
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/bootmem_info.h
View File

@ -3,6 +3,7 @@
#define __LINUX_BOOTMEM_INFO_H #define __LINUX_BOOTMEM_INFO_H
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/kmemleak.h>
/* /*
* Types for free bootmem stored in page->lru.next. These have to be in * Types for free bootmem stored in page->lru.next. These have to be in
@ -59,6 +60,7 @@ static inline void get_page_bootmem(unsigned long info, struct page *page,
static inline void free_bootmem_page(struct page *page) static inline void free_bootmem_page(struct page *page)
{ {
kmemleak_free_part(page_to_virt(page), PAGE_SIZE);
free_reserved_page(page); free_reserved_page(page);
} }
#endif #endif