[LTP] [PATCH] controllers/memcg_lib.sh: reset root cgroup's memory.use_hierarchy to 0

[Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>]

For some linux distribution, such as RHEL7U0Beta,
memory.use_hierarchy is 1 by default, which will caused some tests
failed, such as memcg_stat_test.sh. According to kernel
Documentation/cgroups/memory.txt's description, the default value
should be 0, and some ltp tests are written based on this assumption,
so here we reset the root cgroup's memory.use_hierarchy to 0
before the test.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 .../controllers/memcg/functional/memcg_lib.sh      | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
index 16e30ec..f93b291 100755
--- a/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
+++ b/testcases/kernel/controllers/memcg/functional/memcg_lib.sh
@@ -38,6 +38,7 @@ HUGEPAGESIZE=`grep Hugepagesize /proc/meminfo | awk '{ print $2 }'`
 HUGEPAGESIZE=$(( $HUGEPAGESIZE * 1024 ))
 PASS=0
 FAIL=1
+orig_memory_use_hierarchy="none"
 
 cur_id=0
 failed=0
@@ -396,6 +397,15 @@ test_move_charge()
 
 cleanup()
 {
+	if [ "$orig_memory_use_hierarchy" != "none" ];then
+		echo $orig_memory_use_hierarchy > \
+		     /dev/memcg/memory.use_hierarchy
+		if [ $? -ne 0 ];then
+			tst_resm TINFO "restore "\
+				 "/dev/memcg/memory.use_hierarchy failed"
+		fi
+	fi
+	orig_memory_use_hierarchy="none"
 	killall -9 memcg_process 2>/dev/null
 	if [ -e /dev/memcg ]; then
 		umount /dev/memcg 2>/dev/null
@@ -409,4 +419,17 @@ do_mount()
 
 	mkdir /dev/memcg 2> /dev/null
 	mount -t cgroup -omemory memcg /dev/memcg
+
+	# For some linux distribution, such as RHEL7U0Beta,
+	# memory.use_hierarchy is 1 by default, which will caused some tests
+	# failed, such as memcg_stat_test.sh. According to kernel
+	# Documentation/cgroups/memory.txt's description, the default value
+	# should be 0, and some ltp tests are written based on this assumption,
+	# so here we reset the root cgroup's memory.use_hierarchy to 0
+	# before the test.
+	orig_memory_use_hierarchy=$(cat /dev/memcg/memory.use_hierarchy)
+	echo 0 > /dev/memcg/memory.use_hierarchy
+	if [ $? -ne 0 ];then
+		tst_resm TINFO "set /dev/memcg/memory.use_hierarchy to 0 failed"
+	fi
 }
-- 
1.8.2.1


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list