The following commit has been merged into the core/rcu branch of tip: Commit-ID: b3578186b28da4ed5d0852ec69c13a7bce15b5fd Gitweb: https://git.kernel.org/tip/b3578186b28da4ed5d0852ec69c13a7bce15b5fd Author: Paul E. McKenney <[email protected]> AuthorDate: Fri, 14 Feb 2020 14:43:44 -08:00 Committer: Paul E. McKenney <[email protected]> CommitterDate: Mon, 27 Apr 2020 11:05:13 -07:00
rcutorture: Make kvm-recheck-rcu.sh handle truncated lines System hangs or killed rcutorture guest OSes can result in truncated "Reader Pipe:" lines, which can in turn result in false-positive reader-batch near-miss warnings. This commit therefore adjusts the reader-batch checks to account for possible line truncation. Signed-off-by: Paul E. McKenney <[email protected]> --- tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh | 16 ++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh index 9d9a416..1706cd4 100755 --- a/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh +++ b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh @@ -41,7 +41,21 @@ else title="$title ($ngpsps/s)" fi echo $title $stopstate $fwdprog - 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}'` + nclosecalls=`grep --binary-files=text 'torture: Reader Batch' $i/console.log | tail -1 | \ + awk -v sum=0 ' + { + for (i = 0; i <= NF; i++) { + sum += $i; + if ($i ~ /Batch:/) { + sum = 0; + i = i + 2; + } + } + } + + END { + print sum + }'` if test -z "$nclosecalls" then exit 0
