[LTP] [PATCH v2 10/16] controllers: Update memcg_control_test to newer test lib and cgroup lib
Luke Nowakowski-Krijger
luke.nowakowskikrijger@canonical.com
Sat Mar 5 00:18:20 CET 2022
Update memcg_control_test to use the newer test lib and to use the newer
cgroup lib which enables the memory v1 and v2 controller to be tested.
Also updated to newer SPDX license identifier.
Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com>
---
v2: Change version numbers to 2 instead of v2
.../controllers/memcg/control/mem_process.c | 28 +---
.../memcg/control/memcg_control_test.sh | 150 +++++-------------
2 files changed, 40 insertions(+), 138 deletions(-)
diff --git a/testcases/kernel/controllers/memcg/control/mem_process.c b/testcases/kernel/controllers/memcg/control/mem_process.c
index 6c1b36ca6..8ecabb272 100644
--- a/testcases/kernel/controllers/memcg/control/mem_process.c
+++ b/testcases/kernel/controllers/memcg/control/mem_process.c
@@ -1,28 +1,6 @@
-/*****************************************************************************/
-/* */
-/* Copyright (c) 2010 Mohamed Naufal Basheer */
-/* */
-/* This program is free software; you can redistribute it and/or modify */
-/* it under the terms of the GNU General Public License as published by */
-/* the Free Software Foundation; either version 2 of the License, or */
-/* (at your option) any later version. */
-/* */
-/* This program is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */
-/* the GNU General Public License for more details. */
-/* */
-/* You should have received a copy of the GNU General Public License */
-/* along with this program; if not, write to the Free Software */
-/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
-/* */
-/* File: mem_process.c */
-/* */
-/* Purpose: act as a memory hog for the memcg_control tests */
-/* */
-/* Author: Mohamed Naufal Basheer <naufal11@gmail.com > */
-/* */
-/*****************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Copyright (c) 2010 Mohamed Naufal Basheer
+// Author: Mohamed Naufal Basheer
#include <sys/types.h>
#include <sys/mman.h>
diff --git a/testcases/kernel/controllers/memcg/control/memcg_control_test.sh b/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
index 4d9f1bb5d..b6a1ca2ae 100644
--- a/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
+++ b/testcases/kernel/controllers/memcg/control/memcg_control_test.sh
@@ -1,45 +1,16 @@
#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2010 Mohamed Naufal Basheer
+# Author: Mohamed Naufal Basheer
-################################################################################
-## ##
-## Copyright (c) 2010 Mohamed Naufal Basheer ##
-## ##
-## This program is free software; you can redistribute it and/or modify ##
-## it under the terms of the GNU General Public License as published by ##
-## the Free Software Foundation; either version 2 of the License, or ##
-## (at your option) any later version. ##
-## ##
-## This program is distributed in the hope that it will be useful, ##
-## but WITHOUT ANY WARRANTY; without even the implied warranty of ##
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See ##
-## the GNU General Public License for more details. ##
-## ##
-## You should have received a copy of the GNU General Public License ##
-## along with this program; if not, write to the Free Software ##
-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ##
-## ##
-## ##
-## File: memcg_control_test.sh ##
-## ##
-## Purpose: Implement various memory controller tests ##
-## ##
-## Author: Mohamed Naufal Basheer <naufal11@gmail.com> ##
-## ##
-################################################################################
-
-if [ "x$(grep -w memory /proc/cgroups | cut -f4)" != "x1" ]; then
- echo "WARNING:"
- echo "Either kernel does not support memory resource controller or feature not enabled"
- echo "Skipping all memcg_control testcases...."
- exit 0
-fi
-
-export TCID="memcg_control"
-export TST_TOTAL=1
-export TST_COUNT=0
-
-export TMP=${TMP:-/tmp}
-cd $TMP
+TST_TESTFUNC=test
+TST_SETUP=setup
+TST_CLEANUP=cleanup
+TST_CNT=1
+TST_NEEDS_ROOT=1
+TST_NEEDS_TMPDIR=1
+
+. cgroup_lib.sh
PAGE_SIZE=$(tst_getconf PAGESIZE)
@@ -47,20 +18,14 @@ TOT_MEM_LIMIT=$PAGE_SIZE
ACTIVE_MEM_LIMIT=$PAGE_SIZE
PROC_MEM=$((PAGE_SIZE * 2))
-TST_PATH=$PWD
-STATUS_PIPE="$TMP/status_pipe"
-
-PASS=0
-FAIL=1
+STATUS_PIPE="status_pipe"
# Check if the test process is killed on crossing boundary
test_proc_kill()
{
- cd $TMP
mem_process -m $PROC_MEM &
- cd $OLDPWD
sleep 1
- echo $! > tasks
+ ROD echo $! > "$test_dir/$task_list"
#Instruct the test process to start acquiring memory
echo m > $STATUS_PIPE
@@ -77,87 +42,46 @@ test_proc_kill()
}
# Validate the memory usage limit imposed by the hierarchically topmost group
-testcase_1()
+test1()
{
- TST_COUNT=1
- tst_resm TINFO "Test #1: Checking if the memory usage limit imposed by the topmost group is enforced"
+ cd $TST_TMPDIR
+
+ tst_res TINFO "Test #1: Checking if the memory usage limit imposed by the topmost group is enforced"
- echo "$ACTIVE_MEM_LIMIT" > $TST_PATH/mnt/$TST_NUM/memory.limit_in_bytes
- echo "$TOT_MEM_LIMIT" > $TST_PATH/mnt/$TST_NUM/memory.memsw.limit_in_bytes
+ ROD echo "$ACTIVE_MEM_LIMIT" > "$test_dir/$memory_limit"
+ ROD echo "$TOT_MEM_LIMIT" > "$test_dir/$memsw_memory_limit"
- mkdir sub
- (cd sub
KILLED_CNT=0
test_proc_kill
if [ $PROC_MEM -gt $TOT_MEM_LIMIT ] && [ $KILLED_CNT -eq 0 ]; then
- result $FAIL "Test #1: failed"
+ tst_res TFAIL "Test #1: failed"
else
- result $PASS "Test #1: passed"
- fi)
- rmdir sub
+ tst_res TPASS "Test #1: passed"
+ fi
}
-# Record the test results
-#
-# $1: Result of the test case, $PASS or $FAIL
-# $2: Output information
-result()
+setup()
{
- RES=$1
- INFO=$2
-
- if [ $RES -eq $PASS ]; then
- tst_resm TPASS "$INFO"
+ cgroup_require "memory"
+ cgroup_version=$(cgroup_get_version "memory")
+ test_dir=$(cgroup_get_test_path "memory")
+ task_list=$(cgroup_get_task_list "memory")
+
+ if [ "$cgroup_version" = "2" ]; then
+ memory_limit="memory.max"
+ memsw_memory_limit="memory.swap.max"
else
- : $((FAILED_CNT += 1))
- tst_resm TFAIL "$INFO"
+ memory_limit="memory.limit_in_bytes"
+ memsw_memory_limit="memory.memsw.limit_in_bytes"
fi
-}
-cleanup()
-{
- if [ -e $TST_PATH/mnt ]; then
- umount $TST_PATH/mnt 2> /dev/null
- rm -rf $TST_PATH/mnt
- fi
+ tst_res TINFO "Test starts with cgroup version $cgroup_version"
}
-do_mount()
+cleanup()
{
- cleanup
-
- mkdir $TST_PATH/mnt
- mount -t cgroup -o memory cgroup $TST_PATH/mnt 2> /dev/null
- if [ $? -ne 0 ]; then
- tst_brkm TBROK NULL "Mounting cgroup to temp dir failed"
- rmdir $TST_PATH/mnt
- exit 1
- fi
+ cgroup_cleanup
}
-do_mount
-
-echo 1 > mnt/memory.use_hierarchy 2> /dev/null
-
-FAILED_CNT=0
-
-TST_NUM=1
-while [ $TST_NUM -le $TST_TOTAL ]; do
- mkdir $TST_PATH/mnt/$TST_NUM
- (cd $TST_PATH/mnt/$TST_NUM && testcase_$TST_NUM)
- rmdir $TST_PATH/mnt/$TST_NUM
- : $((TST_NUM += 1))
-done
-
-echo 0 > mnt/memory.use_hierarchy 2> /dev/null
-
-cleanup
-
-if [ "$FAILED_CNT" -ne 0 ]; then
- tst_resm TFAIL "memcg_control: failed"
- exit 1
-else
- tst_resm TPASS "memcg_control: passed"
- exit 0
-fi
+tst_run
--
2.32.0
More information about the ltp
mailing list