From 75e0c6f53ef0e208dc3aa8ab7417134fc31c827b Mon Sep 17 00:00:00 2001 From: zx01468051 Date: Wed, 7 Dec 2022 16:36:04 +0800 Subject: [PATCH 1/4] add ltp-stress.conf --- conf/functional/ltp-stress.conf | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 conf/functional/ltp-stress.conf diff --git a/conf/functional/ltp-stress.conf b/conf/functional/ltp-stress.conf new file mode 100644 index 0000000..a8be874 --- /dev/null +++ b/conf/functional/ltp-stress.conf @@ -0,0 +1,4 @@ +group runtime +ltp_stress 1m +ltp_stress 72h +ltp_stress 168h -- Gitee From 310370c99a6772f07408c784eb6cb9e97af83c7f Mon Sep 17 00:00:00 2001 From: zx01468051 Date: Wed, 7 Dec 2022 16:47:52 +0800 Subject: [PATCH 2/4] add ltp-stress --- tests/ltp-stress/README.md | 33 ++++++++ tests/ltp-stress/install.sh | 30 +++++++ tests/ltp-stress/ltp.an7.blacklist | 8 ++ tests/ltp-stress/ltp.blacklist | 115 +++++++++++++++++++++++++++ tests/ltp-stress/parse.awk | 27 +++++++ tests/ltp-stress/run.sh | 122 +++++++++++++++++++++++++++++ 6 files changed, 335 insertions(+) create mode 100644 tests/ltp-stress/README.md create mode 100644 tests/ltp-stress/install.sh create mode 100644 tests/ltp-stress/ltp.an7.blacklist create mode 100644 tests/ltp-stress/ltp.blacklist create mode 100644 tests/ltp-stress/parse.awk create mode 100644 tests/ltp-stress/run.sh diff --git a/tests/ltp-stress/README.md b/tests/ltp-stress/README.md new file mode 100644 index 0000000..b789ed5 --- /dev/null +++ b/tests/ltp-stress/README.md @@ -0,0 +1,33 @@ +# ltp + +## Description + +The LTP testsuite contains a collection of tools for testing the Linux kernel and related features. + +## Homepage +[https://gitee.com/anolis/ltp.git](https://gitee.com/anolis/ltp.git) + +Mirrored from upstream LTP project: +[https://github.com/linux-test-project/ltp](https://github.com/linux-test-project/ltp) + +## Version +master + +## Category +functional + +## Parameters + +## Results + +## Manual Run +``` +1, Run all tests +./runltp + +2, Run group tests +./runltp -f ipc + +3, Run single test +./runltp -f ipc -s pipeio_1 +``` diff --git a/tests/ltp-stress/install.sh b/tests/ltp-stress/install.sh new file mode 100644 index 0000000..8dd4c87 --- /dev/null +++ b/tests/ltp-stress/install.sh @@ -0,0 +1,30 @@ +GIT_URL="https://gitee.com/anolis/ltp.git" + +if echo "ubuntu debian uos kylin" | grep $TONE_OS_DISTRO; then + DEP_PKG_LIST="pkg-config libtirpc-dev autoconf m4 genisoimage sysstat automake gcc psmisc libaio-dev unzip dosfstools keyutils net-tools bc numactl libcap-dev quota libmnl libmnl-dev" +else + DEP_PKG_LIST="libtirpc-devel autoconf m4 genisoimage sysstat automake gcc psmisc libaio-devel unzip dosfstools keyutils net-tools bc numactl-devel libcap-devel quota dnsmasq libmnl-devel libmnl" + +fi + +if [ -z "$LTP_BRANCH" ]; then + BRANCH="master" + kver=$(uname -r | cut -d. -f1) + [[ $kver -le 4 ]] && BRANCH="anck-4.19" + [[ $kver -eq 5 ]] && BRANCH="anck-5.10" +else + BRANCH=$LTP_BRANCH +fi + +build() +{ + export CFLAGS+="-fcommon" + make autotools + ./configure --prefix="$TONE_BM_RUN_DIR" + make +} + +install() +{ + make install +} diff --git a/tests/ltp-stress/ltp.an7.blacklist b/tests/ltp-stress/ltp.an7.blacklist new file mode 100644 index 0000000..dfe8160 --- /dev/null +++ b/tests/ltp-stress/ltp.an7.blacklist @@ -0,0 +1,8 @@ +#Skip test cases with known failure +#https://bugzilla.openanolis.cn/show_bug.cgi?id=2200 +fallocate06 +#https://bugzilla.openanolis.cn/show_bug.cgi?id=2197 +sctp01 +sctp01_ipv6 +#https://bugzilla.openanolis.cn/show_bug.cgi?id=2261 +quotactl07 \ No newline at end of file diff --git a/tests/ltp-stress/ltp.blacklist b/tests/ltp-stress/ltp.blacklist new file mode 100644 index 0000000..1a33da1 --- /dev/null +++ b/tests/ltp-stress/ltp.blacklist @@ -0,0 +1,115 @@ +#Skip test cases with known failure + +#controllers +memcg_subgroup_charge +#https://bugs-old.openanolis.cn/view.php?id=19 +memcg_max_usage_in_bytes +#https://bugs-old.openanolis.cn/view.php?id=19 +memcg_usage_in_bytes +#passed in manual test +cpuset_memory_spread +#toneagent would be killed due to out of memory +memcg_stress +memcg_limit_in_bytes +cpuset_memory_pressure + +#cpuhotplug +cpuhotplug04 + +#cve +cve-2016-7042 +cve-2017-17053 +cve-2018-1000204 +cve-2018-13405 + +#syscalls +add_key05 +creat09 +finit_module02 +ioctl_sg01 +fanotify09 +madvise06 +leapsec01 +clock_settime03 +set_mempolicy03 +move_pages12 + +#net.features +bind_noport01 +bind_noport01_ipv6 +busy_poll03 +busy_poll03_ipv6 +vxlan_multi_03 +vxlan_uni_03 +vxlan_ipv6_multi_03 +vxlan_ipv6_uni_03 +vxlan_uni_04 +vxlan_ipv6_uni_04 +gre_ipv4_01 +gre_ipv6_01 +gre_ipv4_02 +gre_ipv6_02 +geneve01 +geneve01_ipv6 +geneve02 +geneve02_ipv6 +sit01 +mpls03 +mpls03_ipv6 + +#net.multicast +mc_commo + +#net.tcp_cmds +ipneigh01_arp +ftp +rsh +# trigger a crash on 4.19 +# https://bugzilla.openanolis.cn/show_bug.cgi?id=2109 +tc01 +#ECS doesn't have domain corresponding to it's ip, in brief, the machine doesn't meet the test conditions, skip it +host + +#net.rpc_tests +# T-one run failed on 4.19 +# https://bugzilla.openanolis.cn/show_bug.cgi?id=2322 +rpc_pmap_rmtcall +rpc_clnt_broadcast + +# case problem, should be skipped +# https://bugzilla.openanolis.cn/show_bug.cgi?id=1915 +rpc_svc_destroy +rpc_svcfd_create +rpc_xprt_register +rpc_xprt_unregister + +#net.tirpc_tests +# T-one run failed on 4.19 +# https://bugzilla.openanolis.cn/show_bug.cgi?id=2322 +tirpc_rpcb_rmtcall +tirpc_rpc_broadcast +tirpc_rpc_broadcast_exp + +#net_stress.interface +# old case, need source tst_net.sh or export NS_TIMES first +if4-addr-change_ifconfig +if4-updown_ip +if4-updown_ifconfig +if4-addr-adddel_ip +if4-addr-adddel_ifconfig +if4-addr-addlarge_ip +if4-addr-addlarge_ifconfig +if4-route-adddel_ip +if4-route-adddel_route +if4-route-addlarge_ip +if4-route-addlarge_route +if6-updown_ip +if6-updown_ifconfig +if6-addr-adddel_ip +if6-addr-adddel_ifconfig +if6-addr-addlarge_ip +if6-addr-addlarge_ifconfig +if6-route-adddel_ip +if6-route-adddel_route +if6-route-addlarge_ip +if6-route-addlarge_route diff --git a/tests/ltp-stress/parse.awk b/tests/ltp-stress/parse.awk new file mode 100644 index 0000000..7b69090 --- /dev/null +++ b/tests/ltp-stress/parse.awk @@ -0,0 +1,27 @@ +#!/usr/bin/awk -f + +BEGIN{ + fail_flag=s_flag=e_flag=0 +} + +/ltp_stress_check: FAIL/{ + fail_flag=1 +} +/Test start time:/{ + s_flag=1 +} + +/Test end time:/{ + e_flag=1 +} +END{ + if ( s_flag==1 && e_flag==1 && fail_flag==0 ) + { + printf("ltp_stress_result: Pass\n") + } + else + { + printf("s_flag=%de_flag=%dfail_flag=%d",s_flag,e_flag,fail_flag) + printf("ltp_stress_result: Fail\n") + } +} diff --git a/tests/ltp-stress/run.sh b/tests/ltp-stress/run.sh new file mode 100644 index 0000000..fb4104c --- /dev/null +++ b/tests/ltp-stress/run.sh @@ -0,0 +1,122 @@ +#!/bin/bash + +ltp_blacklist=$TONE_BM_SUITE_DIR/ltp.blacklist +sctp_flag=0 + +get_kernel_info() +{ + kernel_ver=$(uname -r | awk -F '.' '{print$1"."$2}') + os_ver=$(uname -r | awk -F '.' '{print$(NF-1)}') + arch=$(uname -m) +} + +get_kernel_info + +prepare_for_blacklist() +{ + # tpci testcase run on ecs will let the machine hanged, skip it + systemd-detect-virt --vm -q && grep -q "^tpci$" $ltp_blacklist || echo "tpci" >>$ltp_blacklist + + # https://bugzilla.openanolis.cn/show_bug.cgi?id=2213 + if [ x"$os_ver" == x"an7" ]; then + an7_skip_list=$(grep -v '^#' $TONE_BM_SUITE_DIR/ltp.an7.blacklist) + for an7_case in $an7_skip_list + do + grep -q "^$an7_case$" $ltp_blacklist || echo "$an7_case" >>$ltp_blacklist + done + fi + + if [ x"$kernel_ver" == x"4.19" -a x"$arch" == x"aarch64" ]; then + # https://bugzilla.openanolis.cn/show_bug.cgi?id=2202 + grep -q "^pty04$" $ltp_blacklist || echo "pty04" >>$ltp_blacklist + grep -q "^cve-2020-11494$" $ltp_blacklist || echo "cve-2020-11494" >>$ltp_blacklist + # https://bugzilla.openanolis.cn/show_bug.cgi?id=2262 + grep -q "^irqbalance01$" $ltp_blacklist || echo "irqbalance01" >>$ltp_blacklist + fi + + if [ x"$os_ver" == x"an8" -a x"$kernel_ver" == x"5.10" -a x"$arch" == x"x86_64" ]; then + # https://bugzilla.openanolis.cn/show_bug.cgi?id=2213 + grep -q "^macsec02$" $ltp_blacklist || echo "macsec02" >>$ltp_blacklist + grep -q "^macsec03$" $ltp_blacklist || echo "macsec03" >>$ltp_blacklist + fi + if [ x"$arch" == x"aarch64" ]; then + # https://bugzilla.openanolis.cn/show_bug.cgi?id=1762 + grep -q "^test_1_to_1_events" $ltp_blacklist || echo "test_1_to_1_events" >>$ltp_blacklist + fi + + if [ x"$os_ver" == x"an7" -a x"$kernel_ver" == x"4.19" -a x"$arch" == x"x86_64" ]; then + # Probabilistic failure testcases, temporary skip + grep -q "^busy_poll01$" $ltp_blacklist || echo "busy_poll01" >>$ltp_blacklist + grep -q "^busy_poll02$" $ltp_blacklist || echo "busy_poll02" >>$ltp_blacklist + fi + if [ x"$kernel_ver" == x"4.19" ]; then + # https://bugzilla.openanolis.cn/show_bug.cgi?id=3070 + grep -q "^route6-change-netlink-dst" $ltp_blacklist || echo "route6-change-netlink-dst" >>$ltp_blacklist + grep -q "^route6-change-netlink-gw" $ltp_blacklist || echo "route6-change-netlink-gw" >>$ltp_blacklist + grep -q "^route6-change-netlink-if" $ltp_blacklist || echo "route6-change-netlink-if" >>$ltp_blacklist + fi +} + +setup_for_net() +{ + if [ "$group" == "net.sctp" ]; then + lsmod | grep -q sctp || modprobe sctp && sctp_flag=1 + fi +} + +cleanup_for_net() +{ + if [ "$group" == "net.sctp" -a $sctp_flag == 1 ]; then + modprobe -r sctp + fi +} + +setup() +{ + echo 1 > /proc/sys/kernel/panic + echo 1 > /proc/sys/kernel/softlockup_panic + echo 50 > /proc/sys/kernel/watchdog_thresh + echo 1 > /proc/sys/kernel/hung_task_panic + echo 1200 > /proc/sys/kernel/hung_task_timeout_secs + systemctl start kdump.service + prepare_for_blacklist + setup_for_net +} + +run() +{ + nr_cpu=$(nproc) + [ $nr_cpu -lt 4 ] && nr_cpu=1 + echo "runtime=$runtime" + mem_kb=$(grep ^MemTotal /proc/meminfo | awk '{print $2}') + start_time=$(cat /proc/uptime |awk -F'.' '{print $1}') + logger ./runltp \ + -c $((nr_cpu / 2)) \ + -m $((nr_cpu / 4)),1,$(((mem_kb / 2) / (nr_cpu / 4) * 1024)) \ + -D 1,1,0,1 \ + -B ${LTP_DEV_FS:-ext4} \ + -R -p -q \ + -N \ + -t $runtime \ + -d ${LTP_TMPDIR:-/tmp/ltp_tmpdir} + end_time=$(cat /proc/uptime |awk -F'.' '{print $1}') + total_runtime=$(expr $end_time - $start_time ) + check_kmemleak=$(dmesg |grep -qi 'kmemleak') + check_process_z=$(ps -A -ostat,ppid,pid,cmd |egrep -q '^[Zz]') + check_process_d=$(ps -A -ostat,ppid,pid,cmd |egrep -q '^[Dd]') + echo "$total_runtime $runtime ${check_kmemleak}${check_process_z}${check_process_d}" + if [ "$total_runtime" -lt "$runtime" -o -n "${check_kmemleak}${check_process_z}${check_process_d}" ];then + echo "ltp_stress_check: FAIL" + fi +} + +parse() +{ + awk -f $TONE_BM_SUITE_DIR/parse.awk +} + +teardown() +{ + cleanup_for_net + exit 0 +} -- Gitee From aced6f301ecdf998f669d907a7ac6f52885dcb81 Mon Sep 17 00:00:00 2001 From: zx01468051 Date: Thu, 8 Dec 2022 13:29:19 +0800 Subject: [PATCH 3/4] modify --- tests/ltp-stress/ltp.blacklist | 120 ++------------------------------- tests/ltp-stress/parse.awk | 38 +++++++++-- tests/ltp-stress/run.sh | 77 ++++----------------- 3 files changed, 51 insertions(+), 184 deletions(-) diff --git a/tests/ltp-stress/ltp.blacklist b/tests/ltp-stress/ltp.blacklist index 1a33da1..073fd73 100644 --- a/tests/ltp-stress/ltp.blacklist +++ b/tests/ltp-stress/ltp.blacklist @@ -1,115 +1,7 @@ -#Skip test cases with known failure - -#controllers -memcg_subgroup_charge -#https://bugs-old.openanolis.cn/view.php?id=19 -memcg_max_usage_in_bytes -#https://bugs-old.openanolis.cn/view.php?id=19 -memcg_usage_in_bytes -#passed in manual test -cpuset_memory_spread -#toneagent would be killed due to out of memory +min_free_kbytes +oom01 +oom02 +oom03 +oom04 +oom05 memcg_stress -memcg_limit_in_bytes -cpuset_memory_pressure - -#cpuhotplug -cpuhotplug04 - -#cve -cve-2016-7042 -cve-2017-17053 -cve-2018-1000204 -cve-2018-13405 - -#syscalls -add_key05 -creat09 -finit_module02 -ioctl_sg01 -fanotify09 -madvise06 -leapsec01 -clock_settime03 -set_mempolicy03 -move_pages12 - -#net.features -bind_noport01 -bind_noport01_ipv6 -busy_poll03 -busy_poll03_ipv6 -vxlan_multi_03 -vxlan_uni_03 -vxlan_ipv6_multi_03 -vxlan_ipv6_uni_03 -vxlan_uni_04 -vxlan_ipv6_uni_04 -gre_ipv4_01 -gre_ipv6_01 -gre_ipv4_02 -gre_ipv6_02 -geneve01 -geneve01_ipv6 -geneve02 -geneve02_ipv6 -sit01 -mpls03 -mpls03_ipv6 - -#net.multicast -mc_commo - -#net.tcp_cmds -ipneigh01_arp -ftp -rsh -# trigger a crash on 4.19 -# https://bugzilla.openanolis.cn/show_bug.cgi?id=2109 -tc01 -#ECS doesn't have domain corresponding to it's ip, in brief, the machine doesn't meet the test conditions, skip it -host - -#net.rpc_tests -# T-one run failed on 4.19 -# https://bugzilla.openanolis.cn/show_bug.cgi?id=2322 -rpc_pmap_rmtcall -rpc_clnt_broadcast - -# case problem, should be skipped -# https://bugzilla.openanolis.cn/show_bug.cgi?id=1915 -rpc_svc_destroy -rpc_svcfd_create -rpc_xprt_register -rpc_xprt_unregister - -#net.tirpc_tests -# T-one run failed on 4.19 -# https://bugzilla.openanolis.cn/show_bug.cgi?id=2322 -tirpc_rpcb_rmtcall -tirpc_rpc_broadcast -tirpc_rpc_broadcast_exp - -#net_stress.interface -# old case, need source tst_net.sh or export NS_TIMES first -if4-addr-change_ifconfig -if4-updown_ip -if4-updown_ifconfig -if4-addr-adddel_ip -if4-addr-adddel_ifconfig -if4-addr-addlarge_ip -if4-addr-addlarge_ifconfig -if4-route-adddel_ip -if4-route-adddel_route -if4-route-addlarge_ip -if4-route-addlarge_route -if6-updown_ip -if6-updown_ifconfig -if6-addr-adddel_ip -if6-addr-adddel_ifconfig -if6-addr-addlarge_ip -if6-addr-addlarge_ifconfig -if6-route-adddel_ip -if6-route-adddel_route -if6-route-addlarge_ip -if6-route-addlarge_route diff --git a/tests/ltp-stress/parse.awk b/tests/ltp-stress/parse.awk index 7b69090..7d1b116 100644 --- a/tests/ltp-stress/parse.awk +++ b/tests/ltp-stress/parse.awk @@ -1,11 +1,21 @@ #!/usr/bin/awk -f BEGIN{ - fail_flag=s_flag=e_flag=0 + check_time_flag=check_kmem_flag=check_process_z=check_process_d=0 + s_flag=e_flag=0 } -/ltp_stress_check: FAIL/{ - fail_flag=1 +/stress_check_time: FAIL/{ + check_time_flag=1 +} +/stress_check_kmemleak: FAIL/{ + check_kmem_flag=1 +} +/stress_check_process_z: FAIL/{ + check_process_z=1 +} +/stress_check_process_d: FAIL/{ + check_process_d=1 } /Test start time:/{ s_flag=1 @@ -15,13 +25,27 @@ BEGIN{ e_flag=1 } END{ - if ( s_flag==1 && e_flag==1 && fail_flag==0 ) + if ( s_flag==1 && e_flag==1 ) { - printf("ltp_stress_result: Pass\n") + if (check_time_flag==1) + printf("ltp_stress_check_time: Fail\n") + else + printf("ltp_stress_check_time: Pass\n") + if (check_kmem_flag==1) + printf("ltp_stress_check_kmemleak: Fail\n") + else + printf("ltp_stress_check_kmemleak: Pass\n") + if (check_process_z==1) + printf("ltp_stress_check_process_z: Fail\n") + else + printf("ltp_stress_check_process_z: Pass\n") + if (check_process_d==1) + printf("ltp_stress_check_process_d: Fail\n") + else + printf("ltp_stress_check_process_d: Pass\n") } else { - printf("s_flag=%de_flag=%dfail_flag=%d",s_flag,e_flag,fail_flag) - printf("ltp_stress_result: Fail\n") + printf("ltp_stress_run: Fail\n") } } diff --git a/tests/ltp-stress/run.sh b/tests/ltp-stress/run.sh index fb4104c..af75f6b 100644 --- a/tests/ltp-stress/run.sh +++ b/tests/ltp-stress/run.sh @@ -3,70 +3,20 @@ ltp_blacklist=$TONE_BM_SUITE_DIR/ltp.blacklist sctp_flag=0 -get_kernel_info() -{ - kernel_ver=$(uname -r | awk -F '.' '{print$1"."$2}') - os_ver=$(uname -r | awk -F '.' '{print$(NF-1)}') - arch=$(uname -m) -} - -get_kernel_info - prepare_for_blacklist() { # tpci testcase run on ecs will let the machine hanged, skip it systemd-detect-virt --vm -q && grep -q "^tpci$" $ltp_blacklist || echo "tpci" >>$ltp_blacklist - - # https://bugzilla.openanolis.cn/show_bug.cgi?id=2213 - if [ x"$os_ver" == x"an7" ]; then - an7_skip_list=$(grep -v '^#' $TONE_BM_SUITE_DIR/ltp.an7.blacklist) - for an7_case in $an7_skip_list - do - grep -q "^$an7_case$" $ltp_blacklist || echo "$an7_case" >>$ltp_blacklist - done - fi - - if [ x"$kernel_ver" == x"4.19" -a x"$arch" == x"aarch64" ]; then - # https://bugzilla.openanolis.cn/show_bug.cgi?id=2202 - grep -q "^pty04$" $ltp_blacklist || echo "pty04" >>$ltp_blacklist - grep -q "^cve-2020-11494$" $ltp_blacklist || echo "cve-2020-11494" >>$ltp_blacklist - # https://bugzilla.openanolis.cn/show_bug.cgi?id=2262 - grep -q "^irqbalance01$" $ltp_blacklist || echo "irqbalance01" >>$ltp_blacklist - fi - - if [ x"$os_ver" == x"an8" -a x"$kernel_ver" == x"5.10" -a x"$arch" == x"x86_64" ]; then - # https://bugzilla.openanolis.cn/show_bug.cgi?id=2213 - grep -q "^macsec02$" $ltp_blacklist || echo "macsec02" >>$ltp_blacklist - grep -q "^macsec03$" $ltp_blacklist || echo "macsec03" >>$ltp_blacklist - fi - if [ x"$arch" == x"aarch64" ]; then - # https://bugzilla.openanolis.cn/show_bug.cgi?id=1762 - grep -q "^test_1_to_1_events" $ltp_blacklist || echo "test_1_to_1_events" >>$ltp_blacklist - fi - - if [ x"$os_ver" == x"an7" -a x"$kernel_ver" == x"4.19" -a x"$arch" == x"x86_64" ]; then - # Probabilistic failure testcases, temporary skip - grep -q "^busy_poll01$" $ltp_blacklist || echo "busy_poll01" >>$ltp_blacklist - grep -q "^busy_poll02$" $ltp_blacklist || echo "busy_poll02" >>$ltp_blacklist - fi - if [ x"$kernel_ver" == x"4.19" ]; then - # https://bugzilla.openanolis.cn/show_bug.cgi?id=3070 - grep -q "^route6-change-netlink-dst" $ltp_blacklist || echo "route6-change-netlink-dst" >>$ltp_blacklist - grep -q "^route6-change-netlink-gw" $ltp_blacklist || echo "route6-change-netlink-gw" >>$ltp_blacklist - grep -q "^route6-change-netlink-if" $ltp_blacklist || echo "route6-change-netlink-if" >>$ltp_blacklist - fi } setup_for_net() { - if [ "$group" == "net.sctp" ]; then - lsmod | grep -q sctp || modprobe sctp && sctp_flag=1 - fi + lsmod | grep -q sctp || modprobe sctp && sctp_flag=1 } cleanup_for_net() { - if [ "$group" == "net.sctp" -a $sctp_flag == 1 ]; then + if [ $sctp_flag == 1 ]; then modprobe -r sctp fi } @@ -74,9 +24,10 @@ cleanup_for_net() setup() { echo 1 > /proc/sys/kernel/panic + echo 1 > /proc/sys/kernel/hardlockup_panic echo 1 > /proc/sys/kernel/softlockup_panic - echo 50 > /proc/sys/kernel/watchdog_thresh - echo 1 > /proc/sys/kernel/hung_task_panic + echo 60 > /proc/sys/kernel/watchdog_thresh + echo 0 > /proc/sys/kernel/hung_task_panic echo 1200 > /proc/sys/kernel/hung_task_timeout_secs systemctl start kdump.service prepare_for_blacklist @@ -86,8 +37,7 @@ setup() run() { nr_cpu=$(nproc) - [ $nr_cpu -lt 4 ] && nr_cpu=1 - echo "runtime=$runtime" + [ $nr_cpu -lt 4 ] && nr_cpu=4 mem_kb=$(grep ^MemTotal /proc/meminfo | awk '{print $2}') start_time=$(cat /proc/uptime |awk -F'.' '{print $1}') logger ./runltp \ @@ -99,15 +49,16 @@ run() -N \ -t $runtime \ -d ${LTP_TMPDIR:-/tmp/ltp_tmpdir} + -S $ltp_blacklist end_time=$(cat /proc/uptime |awk -F'.' '{print $1}') total_runtime=$(expr $end_time - $start_time ) - check_kmemleak=$(dmesg |grep -qi 'kmemleak') - check_process_z=$(ps -A -ostat,ppid,pid,cmd |egrep -q '^[Zz]') - check_process_d=$(ps -A -ostat,ppid,pid,cmd |egrep -q '^[Dd]') - echo "$total_runtime $runtime ${check_kmemleak}${check_process_z}${check_process_d}" - if [ "$total_runtime" -lt "$runtime" -o -n "${check_kmemleak}${check_process_z}${check_process_d}" ];then - echo "ltp_stress_check: FAIL" - fi + check_kmemleak=$(dmesg |grep -i 'new suspected memory leaks') + check_process_z=$(ps -A -ostat,ppid,pid,cmd |grep -e '^[Zz]') + check_process_d=$(ps -A -ostat,ppid,pid,cmd |grep '^D') + [ "$total_runtime" -lt "$runtime" ] && echo "ltp_stress_check_time: FAIL" + [ xx"$check_process_z" == xx ] || echo "ltp_stress_check_process_z: FAIL" + [ xx"$check_process_d" == xx ] || echo "ltp_stress_check_process_d: FAIL" + [ xx"$check_kmemleak" == xx ] || echo "ltp_stress_check_kmemleak: FAIL" } parse() -- Gitee From 7916adbe96338d4872822ba4653221ea70f7da5a Mon Sep 17 00:00:00 2001 From: zx01468051 Date: Thu, 8 Dec 2022 13:35:49 +0800 Subject: [PATCH 4/4] delete ltp.an7.blacklist --- tests/ltp-stress/ltp.an7.blacklist | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 tests/ltp-stress/ltp.an7.blacklist diff --git a/tests/ltp-stress/ltp.an7.blacklist b/tests/ltp-stress/ltp.an7.blacklist deleted file mode 100644 index dfe8160..0000000 --- a/tests/ltp-stress/ltp.an7.blacklist +++ /dev/null @@ -1,8 +0,0 @@ -#Skip test cases with known failure -#https://bugzilla.openanolis.cn/show_bug.cgi?id=2200 -fallocate06 -#https://bugzilla.openanolis.cn/show_bug.cgi?id=2197 -sctp01 -sctp01_ipv6 -#https://bugzilla.openanolis.cn/show_bug.cgi?id=2261 -quotactl07 \ No newline at end of file -- Gitee