Re: [LTP] [PATCH] memcg_move_charge_at_immigrate_test: fix a bug of usage_in_bytes is not 'exact'

Wanlong Gao
2012-04-25T03:08:12Z

On 04/24/2012 03:43 PM, Peng Haitao wrote:

> In memory.txt says:
> usage_in_bytes is affected by the method and doesn't show 'exact' value of memory(and swap) usage, it's an fuzz value for efficient access. (Of course, when necessary, it's synchronized.) If you want to know more exact memory usage, you should use RSS+CACHE(+SWAP) value in memory.stat(see 5.2).
>
> So memory.usage_in_bytes should be replaced with memory.stat in the case of
> memcg_move_charge_at_immigrate_test.
>
> Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>

pushed, thanks Peng,

Wanlong Gao

> ---
> testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 6 ++++--
> .../memcg/functional/memcg_move_charge_at_immigrate_test.sh | 8 ++++----
> 2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> index 470932d..fd2c7fd 100755
> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> @@ -380,9 +380,11 @@ test_move_charge()
> echo $! > subgroup_b/tasks
>
> cd subgroup_b
> - check_mem_stat memory.usage_in_bytes $4
> + check_mem_stat "rss" $4
> + check_mem_stat "cache" $5
> cd ../subgroup_a
> - check_mem_stat memory.usage_in_bytes $5
> + check_mem_stat "rss" $6
> + check_mem_stat "cache" $7
>
> cd ..
> echo $! > tasks
> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
> index fb639c7..cf2c603 100755
> --- a/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_move_charge_at_immigrate_test.sh
> @@ -35,27 +35,27 @@ export TST_COUNT=0
> # Test disable moving charges
> testcase_1()
> {
> - test_move_charge "--mmap-anon" $PAGESIZE 0 0 $PAGESIZE
> + test_move_charge "--mmap-anon" $PAGESIZE 0 0 0 $PAGESIZE 0
> }
>
> # Test move anon
> testcase_2()
> {
> test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 1 \
> - $PAGESIZE $((PAGESIZE*2))
> + $PAGESIZE 0 0 $((PAGESIZE*2))
> }
>
> # Test move file
> testcase_3()
> {
> test_move_charge "--mmap-anon --shm --mmap-file" $PAGESIZE 2 \
> - $((PAGESIZE*2)) $PAGESIZE
> + 0 $((PAGESIZE*2)) $PAGESIZE 0
> }
>
> # Test move anon and file
> testcase_4()
> {
> - test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $((PAGESIZE*2)) 0
> + test_move_charge "--mmap-anon --shm" $PAGESIZE 3 $PAGESIZE $PAGESIZE 0 0
> }
>
> # Run all the test cases