Revision 94b3dd0f7bb393d93e84a173b1df9b8b64c83ac4 authored by Greg Thelen on 04 June 2010, 21:15:03 UTC, committed by Linus Torvalds on 04 June 2010, 22:21:45 UTC
Child groups should have a greater depth than their parents. Prior to this change, the parent would incorrectly report zero memory usage for child cgroups when use_hierarchy is enabled. test script: mount -t cgroup none /cgroups -o memory cd /cgroups mkdir cg1 echo 1 > cg1/memory.use_hierarchy mkdir cg1/cg11 echo $$ > cg1/cg11/tasks dd if=/dev/zero of=/tmp/foo bs=1M count=1 echo echo CHILD grep cache cg1/cg11/memory.stat echo echo PARENT grep cache cg1/memory.stat echo $$ > tasks rmdir cg1/cg11 cg1 cd / umount /cgroups Using fae9c79, a recent patch that changed alloc_css_id() depth computation, the parent incorrectly reports zero usage: root@ubuntu:~# ./test 1+0 records in 1+0 records out 1048576 bytes (1.0 MB) copied, 0.0151844 s, 69.1 MB/s CHILD cache 1048576 total_cache 1048576 PARENT cache 0 total_cache 0 With this patch, the parent correctly includes child usage: root@ubuntu:~# ./test 1+0 records in 1+0 records out 1048576 bytes (1.0 MB) copied, 0.0136827 s, 76.6 MB/s CHILD cache 1052672 total_cache 1052672 PARENT cache 0 total_cache 1052672 Signed-off-by: Greg Thelen <gthelen@google.com> Acked-by: Paul Menage <menage@google.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Li Zefan <lizf@cn.fujitsu.com> Cc: <stable@kernel.org> [2.6.34.x] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 007d086
File | Mode | Size |
---|---|---|
Kconfig | -rw-r--r-- | 9.8 KB |
Kconfig.debug | -rw-r--r-- | 1014 bytes |
Makefile | -rw-r--r-- | 1.6 KB |
backing-dev.c | -rw-r--r-- | 18.7 KB |
bootmem.c | -rw-r--r-- | 23.8 KB |
bounce.c | -rw-r--r-- | 6.5 KB |
compaction.c | -rw-r--r-- | 16.1 KB |
debug-pagealloc.c | -rw-r--r-- | 2.5 KB |
dmapool.c | -rw-r--r-- | 12.9 KB |
fadvise.c | -rw-r--r-- | 3.5 KB |
failslab.c | -rw-r--r-- | 1.6 KB |
filemap.c | -rw-r--r-- | 66.2 KB |
filemap_xip.c | -rw-r--r-- | 11.0 KB |
fremap.c | -rw-r--r-- | 6.7 KB |
highmem.c | -rw-r--r-- | 11.3 KB |
hugetlb.c | -rw-r--r-- | 72.1 KB |
hwpoison-inject.c | -rw-r--r-- | 3.2 KB |
init-mm.c | -rw-r--r-- | 538 bytes |
internal.h | -rw-r--r-- | 7.1 KB |
kmemcheck.c | -rw-r--r-- | 2.8 KB |
kmemleak-test.c | -rw-r--r-- | 3.3 KB |
kmemleak.c | -rw-r--r-- | 47.5 KB |
ksm.c | -rw-r--r-- | 53.0 KB |
maccess.c | -rw-r--r-- | 1.6 KB |
madvise.c | -rw-r--r-- | 11.3 KB |
memcontrol.c | -rw-r--r-- | 118.3 KB |
memory-failure.c | -rw-r--r-- | 33.7 KB |
memory.c | -rw-r--r-- | 94.8 KB |
memory_hotplug.c | -rw-r--r-- | 22.1 KB |
mempolicy.c | -rw-r--r-- | 65.9 KB |
mempool.c | -rw-r--r-- | 8.9 KB |
migrate.c | -rw-r--r-- | 26.8 KB |
mincore.c | -rw-r--r-- | 7.6 KB |
mlock.c | -rw-r--r-- | 15.2 KB |
mm_init.c | -rw-r--r-- | 3.7 KB |
mmap.c | -rw-r--r-- | 68.6 KB |
mmu_context.c | -rw-r--r-- | 1.4 KB |
mmu_notifier.c | -rw-r--r-- | 8.8 KB |
mmzone.c | -rw-r--r-- | 1.8 KB |
mprotect.c | -rw-r--r-- | 7.6 KB |
mremap.c | -rw-r--r-- | 13.0 KB |
msync.c | -rw-r--r-- | 2.4 KB |
nommu.c | -rw-r--r-- | 48.4 KB |
oom_kill.c | -rw-r--r-- | 17.7 KB |
page-writeback.c | -rw-r--r-- | 36.3 KB |
page_alloc.c | -rw-r--r-- | 150.1 KB |
page_cgroup.c | -rw-r--r-- | 11.2 KB |
page_io.c | -rw-r--r-- | 3.3 KB |
page_isolation.c | -rw-r--r-- | 3.6 KB |
pagewalk.c | -rw-r--r-- | 4.7 KB |
percpu-km.c | -rw-r--r-- | 2.7 KB |
percpu-vm.c | -rw-r--r-- | 13.0 KB |
percpu.c | -rw-r--r-- | 52.7 KB |
percpu_up.c | -rw-r--r-- | 672 bytes |
prio_tree.c | -rw-r--r-- | 6.3 KB |
quicklist.c | -rw-r--r-- | 2.4 KB |
readahead.c | -rw-r--r-- | 15.4 KB |
rmap.c | -rw-r--r-- | 40.7 KB |
shmem.c | -rw-r--r-- | 70.8 KB |
slab.c | -rw-r--r-- | 118.3 KB |
slob.c | -rw-r--r-- | 17.0 KB |
slub.c | -rw-r--r-- | 109.5 KB |
sparse-vmemmap.c | -rw-r--r-- | 6.2 KB |
sparse.c | -rw-r--r-- | 20.5 KB |
swap.c | -rw-r--r-- | 12.9 KB |
swap_state.c | -rw-r--r-- | 10.4 KB |
swapfile.c | -rw-r--r-- | 63.6 KB |
thrash.c | -rw-r--r-- | 1.9 KB |
truncate.c | -rw-r--r-- | 15.8 KB |
util.c | -rw-r--r-- | 7.0 KB |
vmalloc.c | -rw-r--r-- | 60.8 KB |
vmscan.c | -rw-r--r-- | 80.4 KB |
vmstat.c | -rw-r--r-- | 28.5 KB |
Computing file changes ...