Skip to content

Commit ff7ee93

Browse files
rostedttorvalds
authored andcommitted
cgroup/kmemleak: Annotate alloc_page() for cgroup allocations
When the cgroup base was allocated with kmalloc, it was necessary to annotate the variable with kmemleak_not_leak(). But because it has recently been changed to be allocated with alloc_page() (which skips kmemleak checks) causes a warning on boot up. I was triggering this output: allocated 8388608 bytes of page_cgroup please try 'cgroup_disable=memory' option if you don't want memory cgroups kmemleak: Trying to color unknown object at 0xf5840000 as Grey Pid: 0, comm: swapper Not tainted 3.0.0-test #12 Call Trace: [<c17e34e6>] ? printk+0x1d/0x1f^M [<c10e2941>] paint_ptr+0x4f/0x78 [<c178ab57>] kmemleak_not_leak+0x58/0x7d [<c108ae9f>] ? __rcu_read_unlock+0x9/0x7d [<c1cdb462>] kmemleak_init+0x19d/0x1e9 [<c1cbf771>] start_kernel+0x346/0x3ec [<c1cbf1b4>] ? loglevel+0x18/0x18 [<c1cbf0aa>] i386_start_kernel+0xaa/0xb0 After a bit of debugging I tracked the object 0xf840000 (and others) down to the cgroup code. The change from allocating base with kmalloc to alloc_page() has the base not calling kmemleak_alloc() which adds the pointer to the object_tree_root, but kmemleak_not_leak() adds it to the crt_early_log[] table. On kmemleak_init(), the entry is found in the early_log[] but not the object_tree_root, and this error message is displayed. If alloc_page() fails then it defaults back to vmalloc() which still uses the kmemleak_alloc() which makes us still need the kmemleak_not_leak() call. The solution is to call the kmemleak_alloc() directly if the alloc_page() succeeds. Reviewed-by: Michal Hocko <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> Acked-by: Catalin Marinas <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 77ceab8 commit ff7ee93

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

mm/page_cgroup.c

+5-2
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,13 @@ struct page *lookup_cgroup_page(struct page_cgroup *pc)
133133
static void *__meminit alloc_page_cgroup(size_t size, int nid)
134134
{
135135
void *addr = NULL;
136+
gfp_t flags = GFP_KERNEL | __GFP_NOWARN;
136137

137-
addr = alloc_pages_exact_nid(nid, size, GFP_KERNEL | __GFP_NOWARN);
138-
if (addr)
138+
addr = alloc_pages_exact_nid(nid, size, flags);
139+
if (addr) {
140+
kmemleak_alloc(addr, size, 1, flags);
139141
return addr;
142+
}
140143

141144
if (node_state(nid, N_HIGH_MEMORY))
142145
addr = vmalloc_node(size, nid);

0 commit comments

Comments
 (0)