From: Stanislav K. <sta...@or...> - 2013-10-04 10:09:26
|
Hi! This a series promised in 'Re: [LTP] [PATCH V2 8/8] controllers/cpuset: reorganization'. Thanks. |
From: Stanislav K. <sta...@or...> - 2013-10-04 10:09:28
|
In the testcases removed './' next to binaries. Signed-off-by: Stanislav Kholmanskikh <sta...@or...> --- .../cpuset_hotplug_test/cpuset_hotplug_test.sh | 6 ++-- .../cpuset_load_balance_test.sh | 4 +- .../cpuset_sched_domains_test.sh | 6 ++-- .../cpuset_memory_pressure_testset.sh | 10 +++--- .../cpuset_memory_spread_testset.sh | 4 +- .../cpuset_memory_test/cpuset_memory_testset.sh | 36 ++++++++++---------- .../cpuset_syscall_test/cpuset_syscall_testset.sh | 6 ++-- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh b/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh index 1a8eb98..611ea62 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh @@ -36,7 +36,7 @@ nr_cpus=$NR_CPUS nr_mems=$N_NODES cpus_all="$(seq -s, 0 $((nr_cpus-1)))" -cpus_all="`./cpuset_list_compute $cpus_all`" +cpus_all="`cpuset_list_compute $cpus_all`" mems_all="$(seq -s, 0 $((nr_mems-1)))" # check_result <result> <expect> @@ -224,7 +224,7 @@ base_test() # Test Case 1-2 test_root_cpu_hotplug() { - local tmp_cpus="`./cpuset_list_compute -s $cpus_all $HOTPLUG_CPU`" + local tmp_cpus="`cpuset_list_compute -s $cpus_all $HOTPLUG_CPU`" test_function="root_cpu_hotplug_test" while read hotplug cpus_expect task_expect @@ -240,7 +240,7 @@ test_root_cpu_hotplug() # Test Case 3-6 test_general_cpu_hotplug() { - local tmp_cpus="`./cpuset_list_compute -s $cpus_all $HOTPLUG_CPU`" + local tmp_cpus="`cpuset_list_compute -s $cpus_all $HOTPLUG_CPU`" test_function="general_cpu_hotplug_test" while read hotplug cpus cpus_expect task_expect diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh index 0c9e5c6..8ba7222 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh @@ -84,7 +84,7 @@ general_load_balance_test1() return 1 fi - ./cpuset_cpu_hog 2> $CPUSET_TMP/cpu-hog_stderr & + cpuset_cpu_hog 2> $CPUSET_TMP/cpu-hog_stderr & pid=$! read fifo < ./myfifo @@ -209,7 +209,7 @@ general_load_balance_test2() return 1 fi - ./cpuset_cpu_hog 2> $CPUSET_TMP/cpu-hog_stderr & + cpuset_cpu_hog 2> $CPUSET_TMP/cpu-hog_stderr & pid=$! # wait for the parent to do prepare diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh index 27d8266..53675ec 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh @@ -76,7 +76,7 @@ root_load_balance_test() # check sched domains of every CPU sleep 1 - ./cpuset_sched_domains_check 2> $CPUSET_TMP/stderr + cpuset_sched_domains_check 2> $CPUSET_TMP/stderr ret=$? if [ $ret -ne 0 ]; then cpuset_log_error $CPUSET_TMP/stderr @@ -119,7 +119,7 @@ general_load_balance_test1() # check sched domains of every CPU sleep 1 - ./cpuset_sched_domains_check 2> $CPUSET_TMP/stderr + cpuset_sched_domains_check 2> $CPUSET_TMP/stderr if [ $? -ne 0 ]; then cpuset_log_error $CPUSET_TMP/stderr tst_resm TFAIL "partition sched domains failed." @@ -195,7 +195,7 @@ general_load_balance_test2() # check sched domains of every CPU sleep 1 - ./cpuset_sched_domains_check > $CPUSET_TMP/stdout + cpuset_sched_domains_check > $CPUSET_TMP/stdout if [ $? -ne 0 ]; then cpuset_log_error $CPUSET_TMP/stdout tst_resm TFAIL "partition sched domains failed." diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh index 889398f..fcf00d4 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh @@ -69,7 +69,7 @@ test2() return 1 fi - ./cpuset_memory_pressure $usemem + cpuset_memory_pressure $usemem local i for i in $(seq 0 9) @@ -135,7 +135,7 @@ test4() return 1 fi - ./cpuset_memory_pressure $usemem + cpuset_memory_pressure $usemem echo $$ > "$CPUSET/tasks" 2> $CPUSET_TMP/stderr if [ $? -ne 0 ]; then @@ -174,7 +174,7 @@ test5() return 1 fi - ./cpuset_memory_pressure $usemem + cpuset_memory_pressure $usemem local i for i in $(seq 0 9) do @@ -211,7 +211,7 @@ test6() tst_resm TFAIL "attaching self to sub group failed" return 1 fi - ./cpuset_memory_pressure $usemem + cpuset_memory_pressure $usemem echo $$ > "$CPUSET/tasks" 2> $CPUSET_TMP/stderr if [ $? -ne 0 ]; then @@ -220,7 +220,7 @@ test6() return 1 fi - ./cpuset_memory_pressure $usemem + cpuset_memory_pressure $usemem local i for i in $(seq 0 9) do diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh index f3f3b09..b8a434f 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh @@ -256,7 +256,7 @@ base_test() if [ $? -ne 0 ]; then exit_status=1 else - ./cpuset_mem_hog & + cpuset_mem_hog & pid=$! general_memory_spread_test "$@" "$pid" result_num=$? @@ -303,7 +303,7 @@ test_spread_page2() if [ $? -ne 0 ]; then exit_status=1 else - ./cpuset_mem_hog & + cpuset_mem_hog & pid=$! general_memory_spread_test "1" "$cpus_all" "0" "0" "$pid" result_num=$? diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh index bc4ff1c..315f759 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh @@ -71,7 +71,7 @@ test1() return 1 fi - ./cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "0" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#0)." @@ -88,7 +88,7 @@ test2() return 1 fi - ./cpuset_memory_test --mmap-file >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-file >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "0" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#0)." @@ -105,7 +105,7 @@ test3() return 1 fi - ./cpuset_memory_test --shm >"$MEMORY_RESULT" & + cpuset_memory_test --shm >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "0" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#0)." @@ -122,7 +122,7 @@ test4() return 1 fi - ./cpuset_memory_test --mmap-lock1 >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-lock1 >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "0" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#0)." @@ -139,7 +139,7 @@ test5() return 1 fi - ./cpuset_memory_test --mmap-lock2 >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-lock2 >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "0" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#0)." @@ -182,7 +182,7 @@ test6() save_nr_hugepages=$(cat /proc/sys/vm/nr_hugepages) echo $((2*$nr_mems)) > /proc/sys/vm/nr_hugepages - ./cpuset_memory_test --mmap-file --hugepage -s $HUGEPAGESIZE >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-file --hugepage -s $HUGEPAGESIZE >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" umount /hugetlb @@ -221,7 +221,7 @@ test7() save_nr_hugepages=$(cat /proc/sys/vm/nr_hugepages) echo $((2*$nr_mems)) > /proc/sys/vm/nr_hugepages - ./cpuset_memory_test --shm --hugepage -s $HUGEPAGESIZE --key=7 >"$MEMORY_RESULT" & + cpuset_memory_test --shm --hugepage -s $HUGEPAGESIZE --key=7 >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" umount /hugetlb @@ -248,7 +248,7 @@ test8() return 1 fi - ./cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "0" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#0)." @@ -265,7 +265,7 @@ test9() return 1 fi - ./cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & simple_getresult $! "$CPUSET/0" if [ "$node" != "1" ]; then tst_resm TFAIL "allocate memory on the Node#$node(Expect: Node#1)." @@ -308,7 +308,7 @@ test10() return 1 fi - ./cpuset_memory_test --mmap-anon --check >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon --check >"$MEMORY_RESULT" & talk2memory_test_for_case_10_11 $! "$CPUSET/1" "$CPUSET/2" { read node0 @@ -353,7 +353,7 @@ test11() return 1 fi - ./cpuset_memory_test --mmap-anon --check >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon --check >"$MEMORY_RESULT" & talk2memory_test_for_case_10_11 $! "$CPUSET/1" "$CPUSET/2" { read node0 @@ -405,7 +405,7 @@ test12() return 1 fi - ./cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon >"$MEMORY_RESULT" & talk2memory_test_for_case_12_13 $! "$CPUSET/0" { @@ -441,7 +441,7 @@ test13() fi - ./cpuset_memory_test --mmap-anon --check >"$MEMORY_RESULT" & + cpuset_memory_test --mmap-anon --check >"$MEMORY_RESULT" & talk2memory_test_for_case_12_13 $! "$CPUSET/0" { @@ -496,7 +496,7 @@ test14() return 1 fi - ./cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & { local testpid=$! sleep 1 @@ -552,7 +552,7 @@ test15() fi - ./cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & { local testpid=$! sleep 1 @@ -608,7 +608,7 @@ test16() fi - ./cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & { local testpid=$! sleep 1 @@ -674,7 +674,7 @@ test17() return 1 fi - ./cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & { local testpid=$! sleep 1 @@ -756,7 +756,7 @@ test18() return 1 fi - ./cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & + cpuset_memory_test --thread --mmap-anon >"$MEMORY_RESULT" & { local testpid=$! sleep 1 diff --git a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh index b6ac7a7..95196b7 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh @@ -37,10 +37,10 @@ TEST_OUTPUT="$CPUSET_TMP/result" TEST_PROCSTATUS="$CPUSET_TMP/status" TEST_PROCNUMA="$CPUSET_TMP/numa_maps" -# do_syscall_test - call ./syscall_test +# do_syscall_test - call syscall_test # $1 - cpus # $2 - mems -# $3 - ./syscall_test's args +# $3 - syscall_test's args # $4 - expect return value of test task do_syscall_test() @@ -63,7 +63,7 @@ do_syscall_test() tst_resm TFAIL "set $TEST_CPUSET/mems as $2 fail." return 1 fi - ./cpuset_syscall_test $3 >"$TEST_OUTPUT" & + cpuset_syscall_test $3 >"$TEST_OUTPUT" & testpid=$! echo $testpid > "$TEST_CPUSET/tasks" if [ $? -ne 0 ]; then -- 1.7.1 |
From: Stanislav K. <sta...@or...> - 2013-10-04 10:09:29
|
A separate name is assigned to each cpuset shell testcase (which was invoked earlier by run_cpuset_test.sh). This will simplify results analysis. Signed-off-by: Stanislav Kholmanskikh <sta...@or...> --- runtest/controllers | 13 ++ .../cpuset_base_ops_testset.sh | 8 +- .../cpuset_exclusive_test/cpuset_exclusive_test.sh | 8 +- .../kernel/controllers/cpuset/cpuset_funcs.sh | 25 ++- .../cpuset_hierarchy_test/cpuset_hierarchy_test.sh | 8 +- .../cpuset_hotplug_test/cpuset_hotplug_test.sh | 8 +- .../cpuset_inherit_test/cpuset_inherit_testset.sh | 8 +- .../cpuset_load_balance_test.sh | 8 +- .../cpuset_sched_domains_test.sh | 8 +- .../cpuset_memory_pressure_testset.sh | 8 +- .../cpuset_memory_spread_testset.sh | 8 +- .../cpuset_memory_test/cpuset_memory_testset.sh | 8 +- .../cpuset_syscall_test/cpuset_syscall_testset.sh | 8 +- .../kernel/controllers/cpuset/run_cpuset_test.sh | 183 -------------------- testcases/kernel/controllers/test_controllers.sh | 20 -- 15 files changed, 73 insertions(+), 256 deletions(-) delete mode 100755 testcases/kernel/controllers/cpuset/run_cpuset_test.sh diff --git a/runtest/controllers b/runtest/controllers index 94fc185..81a9a10 100644 --- a/runtest/controllers +++ b/runtest/controllers @@ -12,4 +12,17 @@ memcg_stress memcg_stress_test.sh memcg_control PAGESIZE=$(mem_process -p);memcg_control_test.sh $PAGESIZE $PAGESIZE $((PAGESIZE * 2)) cgroup_fj run_cgroup_test_fj.sh controllers test_controllers.sh + +cpuset_base_ops cpuset_base_ops_testset.sh +cpuset_inherit cpuset_inherit_testset.sh +cpuset_exclusive cpuset_exclusive_test.sh +cpuset_hierarchy cpuset_hierarchy_test.sh +cpuset_syscall cpuset_syscall_testset.sh +cpuset_sched_domains cpuset_sched_domains_test.sh +cpuset_load_balance cpuset_load_balance_test.sh +cpuset_hotplug cpuset_hotplug_test.sh +cpuset_memory cpuset_memory_testset.sh +cpuset_memory_pressure cpuset_memory_pressure_testset.sh +cpuset_memory_spread cpuset_memory_spread_testset.sh + cgroup_xattr cgroup_xattr diff --git a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh index 126eec5..be28c4b 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset01" +export TCID="cpuset_base_ops" export TST_TOTAL=97 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_exclusive_test/cpuset_exclusive_test.sh b/testcases/kernel/controllers/cpuset/cpuset_exclusive_test/cpuset_exclusive_test.sh index 0ad31e7..2188ab6 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_exclusive_test/cpuset_exclusive_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_exclusive_test/cpuset_exclusive_test.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset03" +export TCID="cpuset_exclusive" export TST_TOTAL=18 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh index a83845c..edca7b4 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh @@ -89,38 +89,45 @@ user_check() cpuset_check() { - grep cpuset /proc/cgroups > /dev/null 2>&1 - if [ $? -ne 0 ]; then - tst_brkm TCONF ignored "Cpuset is not supported" - return 1 + if [ -f /proc/cgroups ]; then + CPUSET_CONTROLLER=`grep -w cpuset /proc/cgroups | cut -f1` + CPUSET_CONTROLLER_VALUE=`grep -w cpuset /proc/cgroups | cut -f4` + + if [ "$CPUSET_CONTROLLER" = "cpuset" ] && [ "$CPUSET_CONTROLLER_VALUE" = "1" ] + then + return 0 + fi fi + + tst_brkm TCONF ignored "Cpuset is not supported" + return 1 } check() { user_check if [ $? -ne 0 ]; then - return 1 + exit 0 fi cpuset_check if [ $? -ne 0 ]; then - return 1 + exit 0 fi version_check if [ $? -ne 0 ]; then - return 1 + exit 0 fi ncpus_check if [ $? -ne 0 ]; then - return 1 + exit 0 fi nnodes_check if [ $? -ne 0 ]; then - return 1 + exit 0 fi } diff --git a/testcases/kernel/controllers/cpuset/cpuset_hierarchy_test/cpuset_hierarchy_test.sh b/testcases/kernel/controllers/cpuset/cpuset_hierarchy_test/cpuset_hierarchy_test.sh index 5804aa4..61f58fc 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_hierarchy_test/cpuset_hierarchy_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_hierarchy_test/cpuset_hierarchy_test.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset04" +export TCID="cpuset_hierarchy" export TST_TOTAL=32 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh b/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh index 2bfe0f5..1a8eb98 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_hotplug_test/cpuset_hotplug_test.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset08" +export TCID="cpuset_hotplug" export TST_TOTAL=13 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/cpuset_inherit_test/cpuset_inherit_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_inherit_test/cpuset_inherit_testset.sh index 780b7eb..f9d524e 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_inherit_test/cpuset_inherit_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_inherit_test/cpuset_inherit_testset.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset02" +export TCID="cpuset_inherit" export TST_TOTAL=27 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh index 55f533a..0c9e5c6 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset07" +export TCID="cpuset_load_balance" export TST_TOTAL=13 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh index 3ca70df..27d8266 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset06" +export TCID="cpuset_sched_domains" export TST_TOTAL=19 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh index f342e6c..889398f 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_pressure_test/cpuset_memory_pressure_testset.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset10" +export TCID="cpuset_memory_pressure" export TST_TOTAL=6 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh index ffce419..f3f3b09 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset11" +export TCID="cpuset_memory_spread" export TST_TOTAL=6 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 # must >= 3 for: 1-$((nr_mems-2)) diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh index 2a9f7e3..bc4ff1c 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset09" +export TCID="cpuset_memory" export TST_TOTAL=18 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh index af92373..b6ac7a7 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh @@ -22,13 +22,13 @@ # # ################################################################################ -cd $LTPROOT/testcases/bin - -export TCID="cpuset05" +export TCID="cpuset_syscall" export TST_TOTAL=16 export TST_COUNT=1 -. ./cpuset_funcs.sh +. cpuset_funcs.sh + +check exit_status=0 diff --git a/testcases/kernel/controllers/cpuset/run_cpuset_test.sh b/testcases/kernel/controllers/cpuset/run_cpuset_test.sh deleted file mode 100755 index abdc885..0000000 --- a/testcases/kernel/controllers/cpuset/run_cpuset_test.sh +++ /dev/null @@ -1,183 +0,0 @@ -#!/bin/sh -# usage ./run_cpuset_test.sh test_num - -################################################################################ -# # -# 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 # -# # -################################################################################ -# Name Of File: run_cpuset_test.sh # -# # -# Description: This file runs the setup for testing different cpuset resource # -# controller features. After setup it runs diff test cases in # -# diff setup. # -# # -# Test 01: Tests basal operation of control file # -# # -# Precaution: Avoid system use by other applications/users to get fair and # -# appropriate results (avoid unnecessary killing of applicatio) # -# # -# Author: Miao Xie <mi...@cn...> # -# # -# History: # -# # -# DATE NAME EMAIL DESC # -# # -# 02/03/09 Miao Xie <mi...@cn...> Created this test # -# # -################################################################################ - -export TCID="cpuset_test"; -export TST_TOTAL=1; -export TST_COUNT=1; - -. cpuset_funcs.sh; - -TEST_NUM=$1; -SCRIPT_PID=$$; -RC=0; -PWD=`pwd`; - -check -if [ $? -ne 0 ]; then - exit 0 -fi - -# The usage of the script file -usage() -{ - echo "Could not start cpuset controller test"; - echo "usage: run_cpuset_test.sh test_num"; - echo "Skipping the cpuset controller test..."; -} - -cd $LTPROOT/testcases/bin/ - -echo "TEST $TEST_NUM: CPUSET CONTROLLER TESTING"; - -echo "TEST STARTED: Please avoid using system while this test executes"; -#Check if C source file has been compiled and then run it in different groups - -case $TEST_NUM in -"1" ) - if [ -f cpuset_base_ops_testset.sh ]; then - ./cpuset_base_ops_testset.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"2" ) - if [ -f cpuset_inherit_testset.sh ]; then - ./cpuset_inherit_testset.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"3" ) - if [ -f cpuset_exclusive_test.sh ]; then - ./cpuset_exclusive_test.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"4" ) - if [ -f cpuset_hierarchy_test.sh ]; then - ./cpuset_hierarchy_test.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"5" ) - if [ -f cpuset_syscall_testset.sh ]; then - ./cpuset_syscall_testset.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"6" ) - if [ -f cpuset_sched_domains_test.sh ]; then - ./cpuset_sched_domains_test.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"7" ) - if [ -f cpuset_load_balance_test.sh ]; then - ./cpuset_load_balance_test.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"8" ) - if [ -f cpuset_hotplug_test.sh ]; then - ./cpuset_hotplug_test.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"9" ) - if [ -f cpuset_memory_testset.sh ]; then - ./cpuset_memory_testset.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"10" ) - if [ -f cpuset_memory_pressure_testset.sh ]; then - ./cpuset_memory_pressure_testset.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"11" ) - if [ -f cpuset_memory_spread_testset.sh ]; then - ./cpuset_memory_spread_testset.sh - exit $?; - else - echo "Shell file not installed..Please check Makefile...Exiting" - exit -1; - fi; - ;; -"*" ) - usage; - exit -1; - ;; -esac - -echo "Cpuset Resource Controller test executed successfully."; -cd $PWD -exit 0; #to let PAN reprt success of test diff --git a/testcases/kernel/controllers/test_controllers.sh b/testcases/kernel/controllers/test_controllers.sh index d3c3362..7aa974f 100755 --- a/testcases/kernel/controllers/test_controllers.sh +++ b/testcases/kernel/controllers/test_controllers.sh @@ -47,8 +47,6 @@ then IOTHROTTLE_CONTROLLER_VALUE=`grep -w blockio /proc/cgroups | cut -f4`; FREEZER=`grep -w freezer /proc/cgroups | cut -f1`; FREEZER_VALUE=`grep -w freezer /proc/cgroups | cut -f4`; - CPUSET_CONTROLLER=`grep -w cpuset /proc/cgroups | cut -f1` - CPUSET_CONTROLLER_VALUE=`grep -w cpuset /proc/cgroups | cut -f4` CPUACCOUNT_CONTROLLER=`grep -w cpuacct /proc/cgroups | cut -f1` CPUACCOUNT_CONTROLLER_VALUE=`grep -w cpuacct /proc/cgroups | cut -f4` @@ -102,24 +100,6 @@ then echo "Kernel does not support freezer controller"; echo "Skipping all freezer testcases...."; fi - if [ "$CPUSET_CONTROLLER" = "cpuset" ] && [ "$CPUSET_CONTROLLER_VALUE" = "1" ] - then - $LTPROOT/testcases/bin/run_cpuset_test.sh 1; - $LTPROOT/testcases/bin/run_cpuset_test.sh 2; - $LTPROOT/testcases/bin/run_cpuset_test.sh 3; - $LTPROOT/testcases/bin/run_cpuset_test.sh 4; - $LTPROOT/testcases/bin/run_cpuset_test.sh 5; - $LTPROOT/testcases/bin/run_cpuset_test.sh 6; - $LTPROOT/testcases/bin/run_cpuset_test.sh 7; - $LTPROOT/testcases/bin/run_cpuset_test.sh 8; - $LTPROOT/testcases/bin/run_cpuset_test.sh 9; - $LTPROOT/testcases/bin/run_cpuset_test.sh 10; - $LTPROOT/testcases/bin/run_cpuset_test.sh 11; - else - echo "CONTROLLERS TESTCASES: WARNING"; - echo "Either Kernel does not support for cpuset controller or functionality is not enabled"; - echo "Skipping all cpuset controller testcases...."; - fi if [ "$CPUACCOUNT_CONTROLLER" = "cpuacct" ] && [ "$CPUACCOUNT_CONTROLLER_VALUE" = "1" ] then $LTPROOT/testcases/bin/run_cpuacct_test.sh 1; -- 1.7.1 |
From: Stanislav K. <sta...@or...> - 2013-10-04 10:09:33
|
RHEL6 kernel backported a fix to not produce an error in case of writing '0-' to cpuset/N/{cpus,mems} file. Signed-off-by: Stanislav Kholmanskikh <sta...@or...> --- .../cpuset_base_ops_testset.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh index 3fa905c..63a9dc5 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh @@ -128,7 +128,7 @@ test_cpus() base_op_test "$CPUSET/1/cpus" "0,1-$((nr_cpus-2))," "0-$((nr_cpus-2))" fi - tst_kvercmp 3 0 0 + tst_kvercmp2 3 0 0 "RHEL6:2.6.32" if [ $? -eq 0 ]; then base_op_test "$CPUSET/1/cpus" "0-" "WRITE_ERROR" else @@ -164,7 +164,7 @@ test_mems() base_op_test "$CPUSET/1/mems" "0,1-$((nr_mems-2))," "0-$((nr_mems-2))" fi - tst_kvercmp 3 0 0 + tst_kvercmp2 3 0 0 "RHEL6:2.6.32" if [ $? -eq 0 ]; then base_op_test "$CPUSET/1/mems" "0-" "WRITE_ERROR" else -- 1.7.1 |
From: Stanislav K. <sta...@or...> - 2013-10-04 10:09:37
|
Initially these testcases required a host with 4 CPUs and 3 memory nodes minumum. This prevented to run the testcases on widely used 2-memory-nodes configuration. And in fact the testcases only need 2 memory nodes, and a few needs 4 CPUs. Modified the checks accordingly. Now "ideal" minumum configuration of a host is 4 CPUs and 2 memory nodes. Signed-off-by: Stanislav Kholmanskikh <sta...@or...> --- .../cpuset_base_ops_testset.sh | 14 ++++++++++---- .../kernel/controllers/cpuset/cpuset_funcs.sh | 15 +++++++++------ .../cpuset_load_balance_test.sh | 3 +-- .../cpuset_sched_domains_test.sh | 3 +-- .../cpuset_memory_spread_testset.sh | 1 - .../cpuset_memory_test/cpuset_memory_testset.sh | 1 - .../cpuset_syscall_test/cpuset_syscall_testset.sh | 14 ++++++++++++-- 7 files changed, 33 insertions(+), 18 deletions(-) diff --git a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh index be28c4b..3fa905c 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_base_ops_test/cpuset_base_ops_testset.sh @@ -118,13 +118,16 @@ test_cpus() -1 WRITE_ERROR 0-$nr_cpus WRITE_ERROR 0--$((nr_cpus-1)) WRITE_ERROR - 0,1-$((nr_cpus-2)),$((nr_cpus-1)) 0-$((nr_cpus-1)) - 0,1-$((nr_cpus-2)), 0-$((nr_cpus-2)) 0AAA WRITE_ERROR AAA WRITE_ERROR EOF # while read cpus result + if [ $nr_cpus -ge 3 ]; then + base_op_test "$CPUSET/1/cpus" "0,1-$((nr_cpus-2)),$((nr_cpus-1))" "0-$((nr_cpus-1))" + base_op_test "$CPUSET/1/cpus" "0,1-$((nr_cpus-2))," "0-$((nr_cpus-2))" + fi + tst_kvercmp 3 0 0 if [ $? -eq 0 ]; then base_op_test "$CPUSET/1/cpus" "0-" "WRITE_ERROR" @@ -151,13 +154,16 @@ test_mems() -1 WRITE_ERROR 0-$nr_mems WRITE_ERROR 0--$((nr_mems-1)) WRITE_ERROR - 0,1-$((nr_mems-2)),$((nr_mems-1)) 0-$((nr_mems-1)) - 0,1-$((nr_mems-2)), 0-$((nr_mems-2)) 0AAA WRITE_ERROR AAA WRITE_ERROR EOF # while read mems result + if [ $nr_mems -ge 3 ]; then + base_op_test "$CPUSET/1/mems" "0,1-$((nr_mems-2)),$((nr_mems-1))" "0-$((nr_mems-1))" + base_op_test "$CPUSET/1/mems" "0,1-$((nr_mems-2))," "0-$((nr_mems-2))" + fi + tst_kvercmp 3 0 0 if [ $? -eq 0 ]; then base_op_test "$CPUSET/1/mems" "0-" "WRITE_ERROR" diff --git a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh index edca7b4..3419a11 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh @@ -65,16 +65,16 @@ version_check() ncpus_check() { - if [ $NR_CPUS -lt 4 ]; then - tst_brkm TCONF ignored "The total of CPUs is less than 4" + if [ $NR_CPUS -lt $1 ]; then + tst_brkm TCONF ignored "The total of CPUs is less than $1" return 1 fi } nnodes_check() { - if [ $N_NODES -lt 3 ]; then - tst_brkm TCONF ignored "The total of nodes is less than 3" + if [ $N_NODES -lt $1 ]; then + tst_brkm TCONF ignored "The total of nodes is less than $1" return 1 fi } @@ -103,6 +103,9 @@ cpuset_check() return 1 } +# optional parameters (pass both or none of them): +# $1 - required number of cpus (default 2) +# $2 - required number of memory nodes (default 2) check() { user_check @@ -120,12 +123,12 @@ check() exit 0 fi - ncpus_check + ncpus_check ${1:-2} if [ $? -ne 0 ]; then exit 0 fi - nnodes_check + nnodes_check ${2:-2} if [ $? -ne 0 ]; then exit 0 fi diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh index 8ba7222..7123019 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh @@ -28,11 +28,10 @@ export TST_COUNT=1 . cpuset_funcs.sh -check +check 4 2 exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh index 53675ec..014bc74 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_sched_domains_test.sh @@ -28,11 +28,10 @@ export TST_COUNT=1 . cpuset_funcs.sh -check +check 4 2 exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh index ae1bc09..ad989f3 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh @@ -31,7 +31,6 @@ export TST_COUNT=1 check exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh index 315f759..e8ef6bf 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_testset.sh @@ -32,7 +32,6 @@ check exit_status=0 -# must >= 3 for: 1-$((nr_mems-2)) nr_cpus=$NR_CPUS nr_mems=$N_NODES diff --git a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh index 587e912..561c3b9 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh @@ -32,6 +32,8 @@ check exit_status=0 +nr_mems=$N_NODES + TEST_CPUSET="$CPUSET/0" TEST_OUTPUT="$CPUSET_TMP/result" TEST_PROCSTATUS="$CPUSET_TMP/status" @@ -276,14 +278,22 @@ test12() test13() { - do_syscall_test 0 0-1 --set_mempolicy=6 0 || return 1 + if [ $nr_mems -ge 3 ]; then + do_syscall_test 0 0-1 --set_mempolicy=6 0 || return 1 + else + do_syscall_test 0 0-1 --set_mempolicy=2 0 || return 1 + fi check_result "1" return $? } test14() { - do_syscall_test 0 0 --set_mempolicy=6 1 || return 1 + if [ $nr_mems -ge 3 ]; then + do_syscall_test 0 0 --set_mempolicy=6 1 || return 1 + else + do_syscall_test 0 0 --set_mempolicy=2 1 || return 1 + fi return 0 } -- 1.7.1 |
From: Stanislav K. <sta...@or...> - 2013-10-04 10:09:44
|
It seems that '\s' does not work with old version of grep (2.6.3). Therefore several testcases fail on some distributions using this version. For example - RHEL5-based. Signed-off-by: Stanislav Kholmanskikh <sta...@or...> --- .../cpuset_memory_spread_testset.sh | 6 +++--- .../cpuset_syscall_test/cpuset_syscall_testset.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh index b8a434f..ae1bc09 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_spread_test/cpuset_memory_spread_testset.sh @@ -61,7 +61,7 @@ set_memsinfo_val() local nl=' ' # clearing existent value (if present) - memsinfo=`echo "$memsinfo" | sed -r "/^\_$1\:\s/d"` + memsinfo=`echo "$memsinfo" | sed -r "/^\_$1\: /d"` if [ -z "$memsinfo" ]; then memsinfo="_$1: $2" @@ -74,8 +74,8 @@ set_memsinfo_val() get_memsinfo_val() { local value= - value=`echo "$memsinfo" | grep -e "^\_$1\:\s"` - value=`echo "$value" | sed -r "s/^.*\:\s(.*)$/\1/"` + value=`echo "$memsinfo" | grep -e "^\_$1\: "` + value=`echo "$value" | sed -r "s/^.*\: (.*)$/\1/"` echo "$value" } diff --git a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh index 95196b7..587e912 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_syscall_test/cpuset_syscall_testset.sh @@ -231,7 +231,7 @@ test10() awk '{print $2}') allowed_list="$(echo $allowed_list | sed -e s/bind://)" - task_policy=$(cat $TEST_PROCNUMA | grep -e "\s\+stack\s\+anon" | \ + task_policy=$(cat $TEST_PROCNUMA | grep -e " *stack *anon" | \ awk '{print $2}') test "$allowed_list" = "$task_policy" -- 1.7.1 |
From: <ch...@su...> - 2013-10-15 13:30:53
Attachments:
cpuset_logs.txt
|
Hi! > This a series promised in 'Re: [LTP] [PATCH V2 8/8] controllers/cpuset: reorganization'. The patches looks good, but when I try to run it on SLES11 SP3 I got failures in setup() in cpuset_funcs.sh: TFAIL : Could not mount cgroup filesystem with TWARN : /dev/cpuset already exists.. overwriting mkdir: cannot create directory `/dev/cpuset': File exists ... If I comment the code in the setup() the tests at least run, but I got a lot of invalid arguments and errors (see bellow). This is machine with two nodes and 24 Xeon CPUs. And also if I su to root (not su -) the $USER stays set to whatever it was before and the user_check() from cpuset_funcs.sh fails, but that is easy to fix, it should use $EUID instead of $USER (as the tst_require_root() in tst_res.c does). -- Cyril Hrubis ch...@su... |
From: Stanislav K. <sta...@or...> - 2013-10-16 09:52:33
|
On 10/15/2013 05:30 PM, ch...@su... wrote: > Hi! Hi! >> This a series promised in 'Re: [LTP] [PATCH V2 8/8] controllers/cpuset: reorganization'. > The patches looks good, but when I try to run it on SLES11 SP3 I got > failures in setup() in cpuset_funcs.sh: > > TFAIL : Could not mount cgroup filesystem with > TWARN : /dev/cpuset already exists.. overwriting > mkdir: cannot create directory `/dev/cpuset': File exists > ... > > > If I comment the code in the setup() the tests at least run, but I got a > lot of invalid arguments and errors (see bellow). This is machine with > two nodes and 24 Xeon CPUs. Thanks. I will check it. Could you paste the code you comment? I suppose cleanup() function doesn't perform normally. Since it has many '> /dev/null 2>&1' you didn't see any errors on the screen. > > And also if I su to root (not su -) the $USER stays set to whatever it > was before and the user_check() from cpuset_funcs.sh fails, but that is > easy to fix, it should use $EUID instead of $USER (as the > tst_require_root() in tst_res.c does). > |
From: <ch...@su...> - 2013-10-16 10:47:28
|
Hi! > >> This a series promised in 'Re: [LTP] [PATCH V2 8/8] controllers/cpuset: reorganization'. > > The patches looks good, but when I try to run it on SLES11 SP3 I got > > failures in setup() in cpuset_funcs.sh: > > > > TFAIL : Could not mount cgroup filesystem with > > TWARN : /dev/cpuset already exists.. overwriting > > mkdir: cannot create directory `/dev/cpuset': File exists > > ... > > > > > > If I comment the code in the setup() the tests at least run, but I got a > > lot of invalid arguments and errors (see bellow). This is machine with > > two nodes and 24 Xeon CPUs. > > Thanks. I will check it. Could you paste the code you comment? Just disable the setup, for example like this: diff --git a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh index a83845c..b178d53 100755 --- a/testcases/kernel/controllers/cpuset/cpuset_funcs.sh +++ b/testcases/kernel/controllers/cpuset/cpuset_funcs.sh @@ -129,6 +129,7 @@ check() # clean any group created eralier (if any) setup() { + return 0; if [ -e "$CPUSET" ] then tst_resm TWARN "$CPUSET already exist.. overwriting" And as I've looked for the the cpuset_funcs.sh I've found that there are two copies of the file that differ only in one line. $ find -name cpuset_funcs.sh ./testcases/kernel/controllers/cpuset/cpuset_lib/cpuset_funcs.sh ./testcases/kernel/controllers/cpuset/cpuset_funcs.sh $ diff -u cpuset_funcs.sh cpuset_lib/cpuset_funcs.sh --- cpuset_funcs.sh 2013-10-16 12:06:12.978604247 +0200 +++ cpuset_lib/cpuset_funcs.sh 2013-05-27 11:16:48.186777123 +0200 @@ -31,7 +31,7 @@ N_NODES="`cat /sys/devices/system/node/has_normal_memory`" fi N_NODES=${N_NODES#*-*} -N_NODES=$(($N_NODES + 1)) +: $((N_NODES++)) CPUSET="/dev/cpuset" CPUSET_TMP="/tmp/cpuset_tmp" We should remove one of them... > I suppose cleanup() function doesn't perform normally. Since it has many > '> /dev/null 2>&1' you didn't see any errors on the screen. That is likely. And after I've rebooted the machine, the tests seems to run fine (the setup is no longer commented). I think that the problem is that the cleanup() is not able to cope with the /dev/cpuset directory left out after killed cpuset01 test. I will look into this. -- Cyril Hrubis ch...@su... |
From: <ch...@su...> - 2013-10-16 18:07:35
|
Hi! > > I suppose cleanup() function doesn't perform normally. Since it has many > > '> /dev/null 2>&1' you didn't see any errors on the screen. > > That is likely. > > And after I've rebooted the machine, the tests seems to run fine (the setup is > no longer commented). > > I think that the problem is that the cleanup() is not able to cope with the > /dev/cpuset directory left out after killed cpuset01 test. I will look into > this. The problem was caused by a cpuset01 child that was still there in cpuset named '1', which couldn't be deleted because the proces was still running... And that interfered with the testing. The reason why the cleanup fails is that cpuset is not included in the output from mount (not present in /etc/mtab at all). This is easy to fix, we just need to use /proc/mounts instead. But even after that the loop that kills the processes does not work right, there is a race between the processes to be killed and the umount after the loop, but kill -9 fixes that... Otherwise than that I've managed to run the tests several times and apart from a few failures in memory, memory_presure and hotplug that needs to be taken care of, it seems to run fine. I will push your patches tomorrow and add my fixes as well. -- Cyril Hrubis ch...@su... |
From: Stanislav K. <sta...@or...> - 2013-10-17 05:26:14
|
On 10/16/2013 10:07 PM, ch...@su... wrote: > Hi! >>> I suppose cleanup() function doesn't perform normally. Since it has many >>> '> /dev/null 2>&1' you didn't see any errors on the screen. >> That is likely. >> >> And after I've rebooted the machine, the tests seems to run fine (the setup is >> no longer commented). >> >> I think that the problem is that the cleanup() is not able to cope with the >> /dev/cpuset directory left out after killed cpuset01 test. I will look into >> this. > The problem was caused by a cpuset01 child that was still there in > cpuset named '1', which couldn't be deleted because the proces was still > running... And that interfered with the testing. > > The reason why the cleanup fails is that cpuset is not included in the > output from mount (not present in /etc/mtab at all). This is easy to > fix, we just need to use /proc/mounts instead. But even after that the > loop that kills the processes does not work right, there is a race > between the processes to be killed and the umount after the loop, but > kill -9 fixes that... > > Otherwise than that I've managed to run the tests several times and > apart from a few failures in memory, memory_presure and hotplug that > needs to be taken care of, it seems to run fine. > > I will push your patches tomorrow and add my fixes as well. > Thank you, Cyril. |