@@ -31,3 +31,30 @@ get_cgroup_mountpoint()
return $ret
}
+#
+# Helper to check /proc/cgroups to verify if the cgroup subsytem
+# provided as param is supported and enabled in Kernel.
+#
+# It expects as single argument the cgroup subsytem for
+# which to check in /proc/cgroups
+#
+# - returns true if subsystem is supported and enabled
+#
+is_cgroup_subsystem_available_and_enabled()
+{
+ local line
+ local val
+ local ret=1
+ local subsystem=$1
+
+ # fail straight away with no args
+ [ $# -eq 0 ] && return $ret
+
+ line=$(grep -w $subsystem /proc/cgroups)
+ if [ $? = 0 ];then
+ val=$(echo $line | awk '{print $4 }')
+ [ $val = 1 ] && ret=0
+ fi
+
+ return $ret
+}
@@ -1,24 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009, Cisco Systems Inc.
+# Author: Ngie Cooper, September 2009
#
# kernel/controllers/memcg/stress testcase suite Makefile.
#
-# Copyright (C) 2009, Cisco Systems Inc.
-#
-# 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.
-#
-# Ngie Cooper, September 2009
-#
top_srcdir ?= ../../../../..
@@ -1,24 +1,9 @@
-/******************************************************************************/
-/* */
-/* Copyright (c) 2009 FUJITSU LIMITED */
-/* */
-/* 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 */
-/* */
-/* Author: Li Zefan <lizf@cn.fujitsu.com> */
-/* */
-/******************************************************************************/
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2009 FUJITSU LIMITED
+ *
+ * Author: Li Zefan <lizf@cn.fujitsu.com>
+ */
#include <sys/mman.h>
#include <err.h>
@@ -1,56 +1,56 @@
-#! /bin/sh
-
-################################################################################
-## ##
-## Copyright (c) 2009 FUJITSU LIMITED ##
-## ##
-## 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 ##
-## ##
-## Author: Li Zefan <lizf@cn.fujitsu.com> ##
-## Restructure for LTP: Shi Weihua <shiwh@cn.fujitsu.com> ##
-## Added memcg enable/disable functinality: Rishikesh K Rajak ##
-## <risrajak@linux.vnet.ibm.com ##
-## ##
-################################################################################
-
-cd $LTPROOT/testcases/bin
-export TCID="memcg_stress_test"
-export TST_TOTAL=2
-export TST_COUNT=0
-
-if [ "x$(grep -w memory /proc/cgroups | cut -f4)" != "x1" ]; then
- echo "WARNING:";
- echo "Either Kernel does not support for memory resource controller or feature not enabled";
- echo "Skipping all memcgroup testcases....";
- exit 0
-fi
-
-RUN_TIME=$(( 15 * 60 ))
-
-cleanup()
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (c) 2009 FUJITSU LIMITED
+# Copyright (c) 2018-2019 ARM Ltd. All Rights Reserved.
+#
+# Author: Li Zefan <lizf@cn.fujitsu.com>
+# Restructure for LTP: Shi Weihua <shiwh@cn.fujitsu.com>
+# Added memcg enable/disable functionality: Rishikesh K Rajak <risrajak@linux.vnet.ibm.com
+
+TST_TESTFUNC=testcase
+TST_SETUP=do_setup
+TST_CLEANUP=do_cleanup
+TST_CNT=2
+TST_NEEDS_ROOT=1
+TST_NEEDS_CMDS="mount umount cat kill mkdir rmdir grep awk cut"
+
+# Each test case runs for 900 secs when everything fine...
+# ...so the default 5mins timeout is not enough.
+LTP_TIMEOUT_MUL=10
+
+. tst_test.sh
+. cgroup_lib.sh
+
+do_setup()
{
- if [ -e /dev/memcg ]; then
- umount /dev/memcg 2>/dev/null
- rmdir /dev/memcg 2>/dev/null
+ if ! is_cgroup_subsystem_available_and_enabled "memory";then
+ tst_res TWARN "Either Kernel does not support MEMORY resource controller or feature not enabled"
+ tst_brk TCONF ignored "Skipping all memory cgroup testcases...."
fi
+
+ echo 3 > /proc/sys/vm/drop_caches
+ sleep 2
+ local mem_free=`cat /proc/meminfo | grep MemFree | awk '{ print $2 }'`
+ local swap_free=`cat /proc/meminfo | grep SwapFree | awk '{ print $2 }'`
+
+ MEM=$(( $mem_free + $swap_free / 2 ))
+ MEM=$(( MEM / 1024 ))
+ RUN_TIME=$(( 15 * 60 ))
+
+ tst_res TINFO "Using up to $MEM MBytes or memory."
}
+do_cleanup()
+{
+ if [ -e /dev/memcg ]; then
+ umount /dev/memcg 2> /dev/null
+ rmdir /dev/memcg 2> /dev/null
+ fi
+}
do_mount()
{
- cleanup;
+ do_cleanup
mkdir /dev/memcg 2> /dev/null
mount -t cgroup -omemory memcg /dev/memcg
@@ -65,12 +65,14 @@ do_mount()
# $4 - How long does this test run ? in second
run_stress()
{
- do_mount;
+ local i
+
+ do_mount
for i in $(seq 0 $(($1-1)))
do
mkdir /dev/memcg/$i 2> /dev/null
- ./memcg_process_stress $2 $3 &
+ memcg_process_stress $2 $3 &
eval pid$i=$!
eval echo \$pid$i > /dev/memcg/$i/tasks
@@ -78,49 +80,38 @@ run_stress()
for i in $(seq 0 $(($1-1)))
do
- eval /bin/kill -s SIGUSR1 \$pid$i 2> /dev/null
+ eval kill -USR1 \$pid$i 2> /dev/null
done
sleep $4
for i in $(seq 0 $(($1-1)))
do
- eval /bin/kill -s SIGKILL \$pid$i 2> /dev/null
+ eval kill -KILL \$pid$i 2> /dev/null
eval wait \$pid$i
rmdir /dev/memcg/$i 2> /dev/null
done
- cleanup;
+ do_cleanup
}
-testcase_1()
+testcase1()
{
- run_stress 150 $(( ($mem-150) / 150 )) 5 $RUN_TIME
+ tst_res TINFO "testcase 1 started...it will run for $RUN_TIME secs"
- tst_resm TPASS "stress test 1 passed"
-}
+ run_stress 150 $(( $MEM / 150 )) 5 $RUN_TIME
-testcase_2()
-{
- run_stress 1 $mem 5 $RUN_TIME
-
- tst_resm TPASS "stress test 2 passed"
+ tst_res TPASS "stress test 1 passed"
}
-echo 3 > /proc/sys/vm/drop_caches
-sleep 2
-mem_free=`cat /proc/meminfo | grep MemFree | awk '{ print $2 }'`
-swap_free=`cat /proc/meminfo | grep SwapFree | awk '{ print $2 }'`
+testcase2()
+{
+ tst_res TINFO "testcase 2 started...it will run for $RUN_TIME secs"
-mem=$(( $mem_free + $swap_free / 2 ))
-mem=$(( mem / 1024 ))
+ run_stress 1 $MEM 5 $RUN_TIME
-date
-export TST_COUNT=$(( $TST_COUNT + 1 ))
-testcase_1
-export TST_COUNT=$(( $TST_COUNT + 1 ))
-testcase_2
-date
+ tst_res TPASS "stress test 2 passed"
+}
-exit 0
+tst_run
Ported to newlib framework and general cleanup. Moved an helper function out into cgroup_lib.sh. Signed-off-by: Cristian Marussi <cristian.marussi@arm.com> --- testcases/kernel/controllers/cgroup_lib.sh | 27 ++++ .../kernel/controllers/memcg/stress/Makefile | 21 +-- .../memcg/stress/memcg_process_stress.c | 27 +--- .../memcg/stress/memcg_stress_test.sh | 137 ++++++++---------- 4 files changed, 100 insertions(+), 112 deletions(-)