[LTP] [PATCH] memcg_lib.sh: Update 'PAGESIZES' for 6.1 kernel

[LTP] [PATCH] memcg_lib.sh: Update 'PAGESIZES' for 6.1 kernel

[Zhao Gongyi via ltp]

Post 6.1 kernel updates stat in batch (> 64 pages) every time
since commit 1813e51eece0ad6f4aacaeb738e7cced46feb470.

Update 'PAGESIZES' for 6.1 kernel, otherwise the testcase
memcg_max_usage_in_bytes_test.sh will fail and report:

memcg_max_usage_in_bytes_test 1 TINFO: timeout per run is 0h 5m 0s
memcg_max_usage_in_bytes_test 1 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed
memcg_max_usage_in_bytes_test 1 TINFO: Test memory.max_usage_in_bytes
memcg_max_usage_in_bytes_test 1 TINFO: Running memcg_process --mmap-anon -s 4194304
memcg_max_usage_in_bytes_test 1 TINFO: Warming up pid: 17808
memcg_max_usage_in_bytes_test 1 TINFO: Process is still here after warm up: 17808
memcg_max_usage_in_bytes_test 1 TFAIL: memory.max_usage_in_bytes is 4456448, 4206592-4341760 expected
memcg_max_usage_in_bytes_test 2 TINFO: Test memory.memsw.max_usage_in_bytes
memcg_max_usage_in_bytes_test 2 TPASS: echo 8388608 > memory.limit_in_bytes passed as expected
memcg_max_usage_in_bytes_test 2 TPASS: echo 8388608 > memory.memsw.limit_in_bytes passed as expected
memcg_max_usage_in_bytes_test 2 TINFO: Running memcg_process --mmap-anon -s 4194304
memcg_max_usage_in_bytes_test 2 TINFO: Warming up pid: 17828
memcg_max_usage_in_bytes_test 2 TINFO: Process is still here after warm up: 17828
memcg_max_usage_in_bytes_test 2 TFAIL: memory.memsw.max_usage_in_bytes is 4456448, 4206592-4341760 expected
memcg_max_usage_in_bytes_test 3 TINFO: Test reset memory.max_usage_in_bytes
memcg_max_usage_in_bytes_test 3 TINFO: Running memcg_process --mmap-anon -s 4194304
memcg_max_usage_in_bytes_test 3 TINFO: Warming up pid: 17844
memcg_max_usage_in_bytes_test 3 TINFO: Process is still here after warm up: 17844
memcg_max_usage_in_bytes_test 3 TFAIL: memory.max_usage_in_bytes is 4456448, 4206592-4341760 expected
memcg_max_usage_in_bytes_test 3 TFAIL: memory.max_usage_in_bytes is 262144, 0-135168 expected
memcg_max_usage_in_bytes_test 4 TINFO: Test reset memory.memsw.max_usage_in_bytes
memcg_max_usage_in_bytes_test 4 TPASS: echo 8388608 > memory.limit_in_bytes passed as expected
memcg_max_usage_in_bytes_test 4 TPASS: echo 8388608 > memory.memsw.limit_in_bytes passed as expected
memcg_max_usage_in_bytes_test 4 TINFO: Running memcg_process --mmap-anon -s 4194304
memcg_max_usage_in_bytes_test 4 TINFO: Warming up pid: 17863
memcg_max_usage_in_bytes_test 4 TINFO: Process is still here after warm up: 17863
memcg_max_usage_in_bytes_test 4 TFAIL: memory.memsw.max_usage_in_bytes is 4456448, 4206592-4341760 expected
memcg_max_usage_in_bytes_test 4 TFAIL: memory.memsw.max_usage_in_bytes is 262144, 0-135168 expected
memcg_max_usage_in_bytes_test 5 TINFO: SELinux enabled in enforcing mode, this may affect test results
memcg_max_usage_in_bytes_test 5 TINFO: it can be disabled with TST_DISABLE_SELINUX=1 (requires super/root)
memcg_max_usage_in_bytes_test 5 TWARN: test interrupted
memcg_max_usage_in_bytes_test 5 TINFO: loaded SELinux profiles: kill

Summary:
passed   4
failed   6
broken   0
skipped  0
warnings 1

Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
---
 testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
index a89e24485..004946456 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
@@ -402,7 +402,12 @@ if [ $? -ne 0 ]; then
 fi

 # Post 4.16 kernel updates stat in batch (> 32 pages) every time
-PAGESIZES=$(($PAGESIZE * 33))
+# Post 6.1 kernel updates stat in batch (> 64 pages) every time
+if tst_kvcmp -lt "6.1"; then
+	PAGESIZES=$(($PAGESIZE * 33))
+else
+	PAGESIZES=$(($PAGESIZE * 65))
+fi

 # On recent Linux kernels (at least v5.4) updating stats happens in batches
 # (PAGESIZES) and also might depend on workload and number of CPUs.  The kernel
--
2.17.1


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] memcg_lib.sh: Update 'PAGESIZES' for 6.1 kernel

[xuyang2018.jy]

Hi Zhao

Obviously correct, So
Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>

Best Regards
Yang Xu

> Post 6.1 kernel updates stat in batch (> 64 pages) every time
> since commit 1813e51eece0ad6f4aacaeb738e7cced46feb470.
> 
> Update 'PAGESIZES' for 6.1 kernel, otherwise the testcase
> memcg_max_usage_in_bytes_test.sh will fail and report:
> 
> memcg_max_usage_in_bytes_test 1 TINFO: timeout per run is 0h 5m 0s
> memcg_max_usage_in_bytes_test 1 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed
> memcg_max_usage_in_bytes_test 1 TINFO: Test memory.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 1 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 1 TINFO: Warming up pid: 17808
> memcg_max_usage_in_bytes_test 1 TINFO: Process is still here after warm up: 17808
> memcg_max_usage_in_bytes_test 1 TFAIL: memory.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 2 TINFO: Test memory.memsw.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 2 TPASS: echo 8388608 > memory.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 2 TPASS: echo 8388608 > memory.memsw.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 2 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 2 TINFO: Warming up pid: 17828
> memcg_max_usage_in_bytes_test 2 TINFO: Process is still here after warm up: 17828
> memcg_max_usage_in_bytes_test 2 TFAIL: memory.memsw.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 3 TINFO: Test reset memory.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 3 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 3 TINFO: Warming up pid: 17844
> memcg_max_usage_in_bytes_test 3 TINFO: Process is still here after warm up: 17844
> memcg_max_usage_in_bytes_test 3 TFAIL: memory.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 3 TFAIL: memory.max_usage_in_bytes is 262144, 0-135168 expected
> memcg_max_usage_in_bytes_test 4 TINFO: Test reset memory.memsw.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 4 TPASS: echo 8388608 > memory.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 4 TPASS: echo 8388608 > memory.memsw.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 4 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 4 TINFO: Warming up pid: 17863
> memcg_max_usage_in_bytes_test 4 TINFO: Process is still here after warm up: 17863
> memcg_max_usage_in_bytes_test 4 TFAIL: memory.memsw.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 4 TFAIL: memory.memsw.max_usage_in_bytes is 262144, 0-135168 expected
> memcg_max_usage_in_bytes_test 5 TINFO: SELinux enabled in enforcing mode, this may affect test results
> memcg_max_usage_in_bytes_test 5 TINFO: it can be disabled with TST_DISABLE_SELINUX=1 (requires super/root)
> memcg_max_usage_in_bytes_test 5 TWARN: test interrupted
> memcg_max_usage_in_bytes_test 5 TINFO: loaded SELinux profiles: kill
> 
> Summary:
> passed   4
> failed   6
> broken   0
> skipped  0
> warnings 1
> 
> Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
> ---
>   testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> index a89e24485..004946456 100755
> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> @@ -402,7 +402,12 @@ if [ $? -ne 0 ]; then
>   fi
> 
>   # Post 4.16 kernel updates stat in batch (> 32 pages) every time
> -PAGESIZES=$(($PAGESIZE * 33))
> +# Post 6.1 kernel updates stat in batch (> 64 pages) every time
> +if tst_kvcmp -lt "6.1"; then
> +	PAGESIZES=$(($PAGESIZE * 33))
> +else
> +	PAGESIZES=$(($PAGESIZE * 65))
> +fi
> 
>   # On recent Linux kernels (at least v5.4) updating stats happens in batches
>   # (PAGESIZES) and also might depend on workload and number of CPUs.  The kernel
> --
> 2.17.1
> 
> 

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

Re: [LTP] [PATCH] memcg_lib.sh: Update 'PAGESIZES' for 6.1 kernel

[xuyang2018.jy]

Hi Zhao

Thanks, merged!

Best Regards
Yang Xu

> Post 6.1 kernel updates stat in batch (> 64 pages) every time
> since commit 1813e51eece0ad6f4aacaeb738e7cced46feb470.
> 
> Update 'PAGESIZES' for 6.1 kernel, otherwise the testcase
> memcg_max_usage_in_bytes_test.sh will fail and report:
> 
> memcg_max_usage_in_bytes_test 1 TINFO: timeout per run is 0h 5m 0s
> memcg_max_usage_in_bytes_test 1 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed
> memcg_max_usage_in_bytes_test 1 TINFO: Test memory.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 1 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 1 TINFO: Warming up pid: 17808
> memcg_max_usage_in_bytes_test 1 TINFO: Process is still here after warm up: 17808
> memcg_max_usage_in_bytes_test 1 TFAIL: memory.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 2 TINFO: Test memory.memsw.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 2 TPASS: echo 8388608 > memory.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 2 TPASS: echo 8388608 > memory.memsw.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 2 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 2 TINFO: Warming up pid: 17828
> memcg_max_usage_in_bytes_test 2 TINFO: Process is still here after warm up: 17828
> memcg_max_usage_in_bytes_test 2 TFAIL: memory.memsw.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 3 TINFO: Test reset memory.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 3 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 3 TINFO: Warming up pid: 17844
> memcg_max_usage_in_bytes_test 3 TINFO: Process is still here after warm up: 17844
> memcg_max_usage_in_bytes_test 3 TFAIL: memory.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 3 TFAIL: memory.max_usage_in_bytes is 262144, 0-135168 expected
> memcg_max_usage_in_bytes_test 4 TINFO: Test reset memory.memsw.max_usage_in_bytes
> memcg_max_usage_in_bytes_test 4 TPASS: echo 8388608 > memory.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 4 TPASS: echo 8388608 > memory.memsw.limit_in_bytes passed as expected
> memcg_max_usage_in_bytes_test 4 TINFO: Running memcg_process --mmap-anon -s 4194304
> memcg_max_usage_in_bytes_test 4 TINFO: Warming up pid: 17863
> memcg_max_usage_in_bytes_test 4 TINFO: Process is still here after warm up: 17863
> memcg_max_usage_in_bytes_test 4 TFAIL: memory.memsw.max_usage_in_bytes is 4456448, 4206592-4341760 expected
> memcg_max_usage_in_bytes_test 4 TFAIL: memory.memsw.max_usage_in_bytes is 262144, 0-135168 expected
> memcg_max_usage_in_bytes_test 5 TINFO: SELinux enabled in enforcing mode, this may affect test results
> memcg_max_usage_in_bytes_test 5 TINFO: it can be disabled with TST_DISABLE_SELINUX=1 (requires super/root)
> memcg_max_usage_in_bytes_test 5 TWARN: test interrupted
> memcg_max_usage_in_bytes_test 5 TINFO: loaded SELinux profiles: kill
> 
> Summary:
> passed   4
> failed   6
> broken   0
> skipped  0
> warnings 1
> 
> Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
> ---
>   testcases/kernel/controllers/memcg/functional/memcg_lib.sh | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> index a89e24485..004946456 100755
> --- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
> @@ -402,7 +402,12 @@ if [ $? -ne 0 ]; then
>   fi
> 
>   # Post 4.16 kernel updates stat in batch (> 32 pages) every time
> -PAGESIZES=$(($PAGESIZE * 33))
> +# Post 6.1 kernel updates stat in batch (> 64 pages) every time
> +if tst_kvcmp -lt "6.1"; then
> +	PAGESIZES=$(($PAGESIZE * 33))
> +else
> +	PAGESIZES=$(($PAGESIZE * 65))
> +fi
> 
>   # On recent Linux kernels (at least v5.4) updating stats happens in batches
>   # (PAGESIZES) and also might depend on workload and number of CPUs.  The kernel
> --
> 2.17.1
> 
> 

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp