History

Merge branches 'doc.2015.01.07a', 'fixes.2015.01.15a', 'preempt.2015.01.06a', 'srcu.2015.01.06a', 'stall.2015.01.16a' and 'torture.2015.01.11a' into HEAD

doc.2015.01.07a: Documentation updates. fixes.2015.01.15a: Miscellaneous fixes. preempt.2015.01.06a: Changes to handling of lists of preempted tasks. srcu.2015.01.06a: SRCU updates. stall.2015.01.16a: RCU CPU stall-warning updates and fixes. torture.2015.01.11a: RCU torture-test updates and fixes.

Paul E. McKenney committed 11 years ago

Commit 78e691f6 parents d87510c 6047967 ab954c1 83fe27e 630181c 7602de447 files · +562 −567Browse files

Showing the changes to tools/testing (5 of 47 files). Show all

Unified · Split

5 files
  1. tools/testing/selftests/rcutorture/bin/cpus2use.sh +1 −1
  2. tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh +18 −0
  3. tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +5 −4
  4. tools/testing/selftests/rcutorture/bin/parse-build.sh +13 −7
  5. tools/testing/selftests/rcutorture/bin/parse-console.sh +1 −1
tools/testing/selftests/rcutorture/bin/cpus2use.sh+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424
2525 ncpus=`grep '^processor' /proc/cpuinfo | wc -l`
2626 idlecpus=`mpstat | tail -1 | \
27− awk -v ncpus=$ncpus '{ print ncpus * ($7 + $12) / 100 }'`
27+ awk -v ncpus=$ncpus '{ print ncpus * ($7 + $NF) / 100 }'`
2828 awk -v ncpus=$ncpus -v idlecpus=$idlecpus < /dev/null '
2929 BEGIN {
3030 cpus2use = idlecpus;
tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh+18−0
@@ -30,6 +30,7 @@ else · 29 unmodified lines
3030 echo Unreadable results directory: $i
3131 exit 1
3232 fi
33+. tools/testing/selftests/rcutorture/bin/functions.sh
3334
3435 configfile=`echo $i | sed -e 's/^.*\///'`
3536 ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
@@ -48,4 +49,21 @@ else · 12 unmodified lines
4849 title="$title ($ngpsps per second)"
4950 fi
5051 echo $title
52+ nclosecalls=`grep --binary-files=text 'torture: Reader Batch' $i/console.log | tail -1 | awk '{for (i=NF-8;i<=NF;i++) sum+=$i; } END {print sum}'`
53+ if test -z "$nclosecalls"
54+ then
55+ exit 0
56+ fi
57+ if test "$nclosecalls" -eq 0
58+ then
59+ exit 0
60+ fi
61+ # Compute number of close calls per tenth of an hour
62+ nclosecalls10=`awk -v nclosecalls=$nclosecalls -v dur=$dur 'BEGIN { print int(nclosecalls * 36000 / dur) }' < /dev/null`
63+ if test $nclosecalls10 -gt 5 -a $nclosecalls -gt 1
64+ then
65+ print_bug $nclosecalls "Reader Batch close calls in" $(($dur/60)) minute run: $i
66+ else
67+ print_warning $nclosecalls "Reader Batch close calls in" $(($dur/60)) minute run: $i
68+ fi
5169 fi
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh+5−4
@@ -8,9 +8,9 @@ · 7 unmodified lines
88 #
99 # Usage: kvm-test-1-run.sh config builddir resdir minutes qemu-args boot_args
1010 #
11−# qemu-args defaults to "-nographic", along with arguments specifying the
12−# number of CPUs and other options generated from
13−# the underlying CPU architecture.
11+# qemu-args defaults to "-enable-kvm -soundhw pcspk -nographic", along with
12+# arguments specifying the number of CPUs and other
13+# options generated from the underlying CPU architecture.
1414 # boot_args defaults to value returned by the per_version_boot_params
1515 # shell function.
1616 #
@@ -138,7 +138,7 @@ then · 121 unmodified lines
138138 fi
139139
140140 # Generate -smp qemu argument.
141−qemu_args="-nographic $qemu_args"
141+qemu_args="-enable-kvm -soundhw pcspk -nographic $qemu_args"
142142 cpu_count=`configNR_CPUS.sh $config_template`
143143 cpu_count=`configfrag_boot_cpus "$boot_args" "$config_template" "$cpu_count"`
144144 vcpus=`identify_qemu_vcpus`
@@ -168,6 +168,7 @@ then · 23 unmodified lines
168168 touch $resdir/buildonly
169169 exit 0
170170 fi
171+echo "NOTE: $QEMU either did not run or was interactive" > $builddir/console.log
171172 echo $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
172173 ( $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &
173174 qemu_pid=$!
tools/testing/selftests/rcutorture/bin/parse-build.sh+13−7
@@ -26,12 +26,15 @@ · 25 unmodified lines
2626 #
2727 # Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
2828
29−T=$1
29+F=$1
3030 title=$2
31+T=/tmp/parse-build.sh.$$
32+trap 'rm -rf $T' 0
33+mkdir $T
3134
3235 . functions.sh
3336
34−if grep -q CC < $T
37+if grep -q CC < $F
3538 then
3639 :
3740 else
@@ -39,18 +42,21 @@ else · 1 unmodified line
3942 exit 1
4043 fi
4144
42−if grep -q "error:" < $T
45+if grep -q "error:" < $F
4346 then
4447 print_bug $title build errors:
45− grep "error:" < $T
48+ grep "error:" < $F
4649 exit 2
4750 fi
48−exit 0
4951
50−if egrep -q "rcu[^/]*\.c.*warning:|rcu.*\.h.*warning:" < $T
52+grep warning: < $F > $T/warnings
53+grep "include/linux/*rcu*\.h:" $T/warnings > $T/hwarnings
54+grep "kernel/rcu/[^/]*:" $T/warnings > $T/cwarnings
55+cat $T/hwarnings $T/cwarnings > $T/rcuwarnings
56+if test -s $T/rcuwarnings
5157 then
5258 print_warning $title build errors:
53− egrep "rcu[^/]*\.c.*warning:|rcu.*\.h.*warning:" < $T
59+ cat $T/rcuwarnings
5460 exit 2
5561 fi
5662 exit 0
tools/testing/selftests/rcutorture/bin/parse-console.sh+1−1
@@ -36,7 +36,7 @@ if grep -Pq '\x00' < $file · 35 unmodified lines
3636 then
3737 print_warning Console output contains nul bytes, old qemu still running?
3838 fi
39−egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $T
39+egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|Stall ended before state dump start' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $T
4040 if test -s $T
4141 then
4242 print_warning Assertion failure in $file $title

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t