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
24 24
25ncpus=`grep '^processor' /proc/cpuinfo | wc -l`25ncpus=`grep '^processor' /proc/cpuinfo | wc -l`
26idlecpus=`mpstat | tail -1 | \26idlecpus=`mpstat | tail -1 | \
27 awk -v ncpus=$ncpus '{ print ncpus * ($7 + $12) / 100 }'`27 awk -v ncpus=$ncpus '{ print ncpus * ($7 + $NF) / 100 }'`
28awk -v ncpus=$ncpus -v idlecpus=$idlecpus < /dev/null '28awk -v ncpus=$ncpus -v idlecpus=$idlecpus < /dev/null '
29BEGIN {29BEGIN {
30 cpus2use = idlecpus;30 cpus2use = idlecpus;
tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh+18−0
@@ -30,6 +30,7 @@ else · 29 unmodified lines
30 echo Unreadable results directory: $i30 echo Unreadable results directory: $i
31 exit 131 exit 1
32fi32fi
33. tools/testing/selftests/rcutorture/bin/functions.sh
33 34
34configfile=`echo $i | sed -e 's/^.*\///'`35configfile=`echo $i | sed -e 's/^.*\///'`
35ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`36ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
@@ -48,4 +49,21 @@ else · 12 unmodified lines
48 title="$title ($ngpsps per second)"49 title="$title ($ngpsps per second)"
49 fi50 fi
50 echo $title51 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
51fi69fi
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh+5−4
@@ -8,9 +8,9 @@ · 7 unmodified lines
8#8#
9# Usage: kvm-test-1-run.sh config builddir resdir minutes qemu-args boot_args9# Usage: kvm-test-1-run.sh config builddir resdir minutes qemu-args boot_args
10#10#
11# qemu-args defaults to "-nographic", along with arguments specifying the11# qemu-args defaults to "-enable-kvm -soundhw pcspk -nographic", along with
12# number of CPUs and other options generated from12# arguments specifying the number of CPUs and other
13# the underlying CPU architecture.13# options generated from the underlying CPU architecture.
14# boot_args defaults to value returned by the per_version_boot_params14# boot_args defaults to value returned by the per_version_boot_params
15# shell function.15# shell function.
16#16#
@@ -138,7 +138,7 @@ then · 121 unmodified lines
138fi138fi
139 139
140# Generate -smp qemu argument.140# Generate -smp qemu argument.
141qemu_args="-nographic $qemu_args"141qemu_args="-enable-kvm -soundhw pcspk -nographic $qemu_args"
142cpu_count=`configNR_CPUS.sh $config_template`142cpu_count=`configNR_CPUS.sh $config_template`
143cpu_count=`configfrag_boot_cpus "$boot_args" "$config_template" "$cpu_count"`143cpu_count=`configfrag_boot_cpus "$boot_args" "$config_template" "$cpu_count"`
144vcpus=`identify_qemu_vcpus`144vcpus=`identify_qemu_vcpus`
@@ -168,6 +168,7 @@ then · 23 unmodified lines
168 touch $resdir/buildonly168 touch $resdir/buildonly
169 exit 0169 exit 0
170fi170fi
171echo "NOTE: $QEMU either did not run or was interactive" > $builddir/console.log
171echo $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd172echo $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
172( $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &173( $QEMU $qemu_args -m 512 -kernel $resdir/bzImage -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval ) &
173qemu_pid=$!174qemu_pid=$!
tools/testing/selftests/rcutorture/bin/parse-build.sh+13−7
@@ -26,12 +26,15 @@ · 25 unmodified lines
26#26#
27# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>27# Authors: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
28 28
29T=$129F=$1
30title=$230title=$2
31T=/tmp/parse-build.sh.$$
32trap 'rm -rf $T' 0
33mkdir $T
31 34
32. functions.sh35. functions.sh
33 36
34if grep -q CC < $T37if grep -q CC < $F
35then38then
36 :39 :
37else40else
@@ -39,18 +42,21 @@ else · 1 unmodified line
39 exit 142 exit 1
40fi43fi
41 44
42if grep -q "error:" < $T45if grep -q "error:" < $F
43then46then
44 print_bug $title build errors:47 print_bug $title build errors:
45 grep "error:" < $T48 grep "error:" < $F
46 exit 249 exit 2
47fi50fi
48exit 0
49 51
50if egrep -q "rcu[^/]*\.c.*warning:|rcu.*\.h.*warning:" < $T52grep warning: < $F > $T/warnings
53grep "include/linux/*rcu*\.h:" $T/warnings > $T/hwarnings
54grep "kernel/rcu/[^/]*:" $T/warnings > $T/cwarnings
55cat $T/hwarnings $T/cwarnings > $T/rcuwarnings
56if test -s $T/rcuwarnings
51then57then
52 print_warning $title build errors:58 print_warning $title build errors:
53 egrep "rcu[^/]*\.c.*warning:|rcu.*\.h.*warning:" < $T59 cat $T/rcuwarnings
54 exit 260 exit 2
55fi61fi
56exit 062exit 0
tools/testing/selftests/rcutorture/bin/parse-console.sh+1−1
@@ -36,7 +36,7 @@ if grep -Pq '\x00' < $file · 35 unmodified lines
36then36then
37 print_warning Console output contains nul bytes, old qemu still running?37 print_warning Console output contains nul bytes, old qemu still running?
38fi38fi
39egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:' < $file | grep -v 'ODEBUG: ' | grep -v 'Warning: unable to open an initial console' > $T39egrep '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
40if test -s $T40if test -s $T
41then41then
42 print_warning Assertion failure in $file $title42 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