memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh
PATCH 1/1 memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh
From: Joerg Vehlow <[email protected]>
$PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file.
Fixes 04021637f4749a4797bf105862c45fe07374a161 ("tst_test.sh: Cleanup getopts usage")
Signed-off-by Joerg Vehlow <[email protected]>
--- .../controllers/memcg/functional/memcg_failcnt.sh | 7 ++++--- .../memcg/functional/memcg_max_usage_in_bytes_test.sh | 10 +++++----- .../memcg/functional/memcg_subgroup_charge.sh | 8 ++++---- .../memcg/functional/memcg_usage_in_bytes_test.sh | 10 +++++----- 4 files changed, 18 insertions(+), 17 deletions(-)
testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh +4 -3
@@ -12,9 +12,6 @@ MEMCG_TESTFUNC=test MEMCG_SHMMAX=1 TST_TEST_DATA="--mmap-anon --mmap-file --shm" -MEMORY_LIMIT=$PAGESIZE -MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2)) - test() { ROD echo $MEMORY_LIMIT \> memory.limit_in_bytes
@@ -36,4 +33,8 @@ test() } . memcg_lib.sh + +MEMORY_LIMIT=$PAGESIZE +MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2)) + tst_run
testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh +5 -5
@@ -9,11 +9,6 @@ MEMCG_TESTFUNC=test TST_CNT=4 - -MEM_TO_ALLOC=$((PAGESIZE * 1024)) -MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) -MEM_LIMIT=$((MEM_TO_ALLOC * 2)) - # Run test cases which checks memory.[memsw.]max_usage_in_bytes after make # some memory allocation test_max_usage_in_bytes()
@@ -88,4 +83,9 @@ test4() } . memcg_lib.sh + +MEM_TO_ALLOC=$((PAGESIZE * 1024)) +MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) +MEM_LIMIT=$((MEM_TO_ALLOC * 2)) + tst_run
testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh +4 -4
@@ -12,10 +12,6 @@ MEMCG_TESTFUNC=test TST_CNT=3 - -# Allocate memory bigger than per-cpu kernel memory -MEM_TO_ALLOC=$((PAGESIZES * 2)) - # Test the memory charge won't move to subgroup # $1 - memory.limit_in_bytes in sub group test_subgroup()
@@ -67,4 +63,8 @@ test3() } . memcg_lib.sh + +# Allocate memory bigger than per-cpu kernel memory +MEM_TO_ALLOC=$((PAGESIZES * 2)) + tst_run
testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh +5 -5
@@ -9,11 +9,6 @@ MEMCG_TESTFUNC=test TST_CNT=2 - -MEM_TO_ALLOC=$((PAGESIZE * 1024)) -MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) -MEM_LIMIT=$((MEM_TO_ALLOC * 2)) - test1() { tst_res TINFO "Test memory.usage_in_bytes"
@@ -35,4 +30,9 @@ test2() } . memcg_lib.sh + +MEM_TO_ALLOC=$((PAGESIZE * 1024)) +MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) +MEM_LIMIT=$((MEM_TO_ALLOC * 2)) + tst_run
Signature · 5 lines
2.25.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp