Merge branch 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm
* 'kmemleak' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm: kmemleak: Add support for NO_BOOTMEM configurations kmemleak: Annotate false positive in init_section_page_cgroup()
This commit is contained in:
commit
46ac0cc92e
|
@ -7,6 +7,8 @@
|
|||
#include <linux/bootmem.h>
|
||||
#include <linux/mm.h>
|
||||
#include <linux/early_res.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/kmemleak.h>
|
||||
|
||||
/*
|
||||
* Early reserved memory areas.
|
||||
|
@ -319,6 +321,8 @@ void __init free_early(u64 start, u64 end)
|
|||
struct early_res *r;
|
||||
int i;
|
||||
|
||||
kmemleak_free_part(__va(start), end - start);
|
||||
|
||||
i = find_overlapped_early(start, end);
|
||||
r = &early_res[i];
|
||||
if (i >= max_early_res || r->end != end || r->start != start)
|
||||
|
@ -333,6 +337,8 @@ void __init free_early_partial(u64 start, u64 end)
|
|||
struct early_res *r;
|
||||
int i;
|
||||
|
||||
kmemleak_free_part(__va(start), end - start);
|
||||
|
||||
if (start == end)
|
||||
return;
|
||||
|
||||
|
|
|
@ -3659,6 +3659,11 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
|
|||
ptr = phys_to_virt(addr);
|
||||
memset(ptr, 0, size);
|
||||
reserve_early_without_check(addr, addr + size, "BOOTMEM");
|
||||
/*
|
||||
* The min_count is set to 0 so that bootmem allocated blocks
|
||||
* are never reported as leaks.
|
||||
*/
|
||||
kmemleak_alloc(ptr, size, 0, 0);
|
||||
return ptr;
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
#include <linux/vmalloc.h>
|
||||
#include <linux/cgroup.h>
|
||||
#include <linux/swapops.h>
|
||||
#include <linux/kmemleak.h>
|
||||
|
||||
static void __meminit
|
||||
__init_page_cgroup(struct page_cgroup *pc, unsigned long pfn)
|
||||
|
@ -126,6 +127,12 @@ static int __init_refok init_section_page_cgroup(unsigned long pfn)
|
|||
if (!base)
|
||||
base = vmalloc(table_size);
|
||||
}
|
||||
/*
|
||||
* The value stored in section->page_cgroup is (base - pfn)
|
||||
* and it does not point to the memory block allocated above,
|
||||
* causing kmemleak false positives.
|
||||
*/
|
||||
kmemleak_not_leak(base);
|
||||
} else {
|
||||
/*
|
||||
* We don't have to allocate page_cgroup again, but
|
||||
|
|
Loading…
Reference in New Issue
Block a user