Commit 46ac0cc9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 2decd5a7 9078370c
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/early_res.h> #include <linux/early_res.h>
#include <linux/slab.h>
#include <linux/kmemleak.h>
/* /*
* Early reserved memory areas. * Early reserved memory areas.
...@@ -319,6 +321,8 @@ void __init free_early(u64 start, u64 end) ...@@ -319,6 +321,8 @@ void __init free_early(u64 start, u64 end)
struct early_res *r; struct early_res *r;
int i; int i;
kmemleak_free_part(__va(start), end - start);
i = find_overlapped_early(start, end); i = find_overlapped_early(start, end);
r = &early_res[i]; r = &early_res[i];
if (i >= max_early_res || r->end != end || r->start != start) if (i >= max_early_res || r->end != end || r->start != start)
...@@ -333,6 +337,8 @@ void __init free_early_partial(u64 start, u64 end) ...@@ -333,6 +337,8 @@ void __init free_early_partial(u64 start, u64 end)
struct early_res *r; struct early_res *r;
int i; int i;
kmemleak_free_part(__va(start), end - start);
if (start == end) if (start == end)
return; return;
......
...@@ -3659,6 +3659,11 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align, ...@@ -3659,6 +3659,11 @@ void * __init __alloc_memory_core_early(int nid, u64 size, u64 align,
ptr = phys_to_virt(addr); ptr = phys_to_virt(addr);
memset(ptr, 0, size); memset(ptr, 0, size);
reserve_early_without_check(addr, addr + size, "BOOTMEM"); 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; return ptr;
} }
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/cgroup.h> #include <linux/cgroup.h>
#include <linux/swapops.h> #include <linux/swapops.h>
#include <linux/kmemleak.h>
static void __meminit static void __meminit
__init_page_cgroup(struct page_cgroup *pc, unsigned long pfn) __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) ...@@ -126,6 +127,12 @@ static int __init_refok init_section_page_cgroup(unsigned long pfn)
if (!base) if (!base)
base = vmalloc(table_size); 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 { } else {
/* /*
* We don't have to allocate page_cgroup again, but * We don't have to allocate page_cgroup again, but
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment