mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
028725e733
commitdd0ff4d12d("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:f41f2ed43c("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>
68 lines
1.7 KiB
C
68 lines
1.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef __LINUX_BOOTMEM_INFO_H
|
|
#define __LINUX_BOOTMEM_INFO_H
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/kmemleak.h>
|
|
|
|
/*
|
|
* Types for free bootmem stored in page->lru.next. These have to be in
|
|
* some random range in unsigned long space for debugging purposes.
|
|
*/
|
|
enum {
|
|
MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE = 12,
|
|
SECTION_INFO = MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE,
|
|
MIX_SECTION_INFO,
|
|
NODE_INFO,
|
|
MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE = NODE_INFO,
|
|
};
|
|
|
|
#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE
|
|
void __init register_page_bootmem_info_node(struct pglist_data *pgdat);
|
|
|
|
void get_page_bootmem(unsigned long info, struct page *page,
|
|
unsigned long type);
|
|
void put_page_bootmem(struct page *page);
|
|
|
|
/*
|
|
* Any memory allocated via the memblock allocator and not via the
|
|
* buddy will be marked reserved already in the memmap. For those
|
|
* pages, we can call this function to free it to buddy allocator.
|
|
*/
|
|
static inline void free_bootmem_page(struct page *page)
|
|
{
|
|
unsigned long magic = page->index;
|
|
|
|
/*
|
|
* The reserve_bootmem_region sets the reserved flag on bootmem
|
|
* pages.
|
|
*/
|
|
VM_BUG_ON_PAGE(page_ref_count(page) != 2, page);
|
|
|
|
if (magic == SECTION_INFO || magic == MIX_SECTION_INFO)
|
|
put_page_bootmem(page);
|
|
else
|
|
VM_BUG_ON_PAGE(1, page);
|
|
}
|
|
#else
|
|
static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)
|
|
{
|
|
}
|
|
|
|
static inline void put_page_bootmem(struct page *page)
|
|
{
|
|
}
|
|
|
|
static inline void get_page_bootmem(unsigned long info, struct page *page,
|
|
unsigned long type)
|
|
{
|
|
}
|
|
|
|
static inline void free_bootmem_page(struct page *page)
|
|
{
|
|
kmemleak_free_part(page_to_virt(page), PAGE_SIZE);
|
|
free_reserved_page(page);
|
|
}
|
|
#endif
|
|
|
|
#endif /* __LINUX_BOOTMEM_INFO_H */
|