Patrick Williams | db4c27e | 2022-08-05 08:10:29 -0500 | [diff] [blame^] | 1 | From bda92ad659a52d38ac810099f69adff626b064c6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Joerg Vehlow <joerg.vehlow@aox.de> |
| 3 | Date: Mon, 27 Jun 2022 10:44:49 +0200 |
| 4 | Subject: [PATCH] memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh |
| 5 | |
| 6 | $PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file. |
| 7 | |
| 8 | Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage") |
| 9 | |
| 10 | Reviewed-by: Petr Vorel <pvorel@suse.cz> |
| 11 | Signed-off-by: Joerg Vehlow <joerg.vehlow@aox.de> |
| 12 | Upstream-Status: Backport [bda92ad659a52d38ac810099f69adff626b064c6] |
| 13 | --- |
| 14 | .../controllers/memcg/functional/memcg_failcnt.sh | 7 ++++--- |
| 15 | .../memcg/functional/memcg_max_usage_in_bytes_test.sh | 10 +++++----- |
| 16 | .../memcg/functional/memcg_subgroup_charge.sh | 8 ++++---- |
| 17 | .../memcg/functional/memcg_usage_in_bytes_test.sh | 10 +++++----- |
| 18 | 4 files changed, 18 insertions(+), 17 deletions(-) |
| 19 | |
| 20 | diff --git a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh |
| 21 | index 1fed01569..1be98a056 100755 |
| 22 | --- a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh |
| 23 | +++ b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh |
| 24 | @@ -12,9 +12,6 @@ MEMCG_TESTFUNC=test |
| 25 | MEMCG_SHMMAX=1 |
| 26 | TST_TEST_DATA="--mmap-anon --mmap-file --shm" |
| 27 | |
| 28 | -MEMORY_LIMIT=$PAGESIZE |
| 29 | -MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2)) |
| 30 | - |
| 31 | test() |
| 32 | { |
| 33 | ROD echo $MEMORY_LIMIT \> memory.limit_in_bytes |
| 34 | @@ -36,4 +33,8 @@ test() |
| 35 | } |
| 36 | |
| 37 | . memcg_lib.sh |
| 38 | + |
| 39 | +MEMORY_LIMIT=$PAGESIZE |
| 40 | +MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2)) |
| 41 | + |
| 42 | tst_run |
| 43 | diff --git a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh |
| 44 | index d1ffbe053..302810513 100755 |
| 45 | --- a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh |
| 46 | +++ b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh |
| 47 | @@ -9,11 +9,6 @@ |
| 48 | MEMCG_TESTFUNC=test |
| 49 | TST_CNT=4 |
| 50 | |
| 51 | - |
| 52 | -MEM_TO_ALLOC=$((PAGESIZE * 1024)) |
| 53 | -MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) |
| 54 | -MEM_LIMIT=$((MEM_TO_ALLOC * 2)) |
| 55 | - |
| 56 | # Run test cases which checks memory.[memsw.]max_usage_in_bytes after make |
| 57 | # some memory allocation |
| 58 | test_max_usage_in_bytes() |
| 59 | @@ -88,4 +83,9 @@ test4() |
| 60 | } |
| 61 | |
| 62 | . memcg_lib.sh |
| 63 | + |
| 64 | +MEM_TO_ALLOC=$((PAGESIZE * 1024)) |
| 65 | +MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) |
| 66 | +MEM_LIMIT=$((MEM_TO_ALLOC * 2)) |
| 67 | + |
| 68 | tst_run |
| 69 | diff --git a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh |
| 70 | index 08b6697d4..9bcc01258 100755 |
| 71 | --- a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh |
| 72 | +++ b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh |
| 73 | @@ -12,10 +12,6 @@ |
| 74 | MEMCG_TESTFUNC=test |
| 75 | TST_CNT=3 |
| 76 | |
| 77 | - |
| 78 | -# Allocate memory bigger than per-cpu kernel memory |
| 79 | -MEM_TO_ALLOC=$((PAGESIZES * 2)) |
| 80 | - |
| 81 | # Test the memory charge won't move to subgroup |
| 82 | # $1 - memory.limit_in_bytes in sub group |
| 83 | test_subgroup() |
| 84 | @@ -67,4 +63,8 @@ test3() |
| 85 | } |
| 86 | |
| 87 | . memcg_lib.sh |
| 88 | + |
| 89 | +# Allocate memory bigger than per-cpu kernel memory |
| 90 | +MEM_TO_ALLOC=$((PAGESIZES * 2)) |
| 91 | + |
| 92 | tst_run |
| 93 | diff --git a/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh |
| 94 | index 6f932124e..125d88e55 100755 |
| 95 | --- a/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh |
| 96 | +++ b/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh |
| 97 | @@ -9,11 +9,6 @@ |
| 98 | MEMCG_TESTFUNC=test |
| 99 | TST_CNT=2 |
| 100 | |
| 101 | - |
| 102 | -MEM_TO_ALLOC=$((PAGESIZE * 1024)) |
| 103 | -MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) |
| 104 | -MEM_LIMIT=$((MEM_TO_ALLOC * 2)) |
| 105 | - |
| 106 | test1() |
| 107 | { |
| 108 | tst_res TINFO "Test memory.usage_in_bytes" |
| 109 | @@ -35,4 +30,9 @@ test2() |
| 110 | } |
| 111 | |
| 112 | . memcg_lib.sh |
| 113 | + |
| 114 | +MEM_TO_ALLOC=$((PAGESIZE * 1024)) |
| 115 | +MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE)) |
| 116 | +MEM_LIMIT=$((MEM_TO_ALLOC * 2)) |
| 117 | + |
| 118 | tst_run |
| 119 | -- |
| 120 | 2.37.1 |
| 121 | |