The following commit has been merged into the core/rcu branch of tip:
Commit-ID: bc77a72cd188d44881ee1b9d0a9d65ca8108b508
Gitweb:
https://git.kernel.org/tip/bc77a72cd188d44881ee1b9d0a9d65ca8108b508
Author: Paul E. McKenney <paul...@kernel.org>
AuthorDate: Wed, 10 Jun 2020 14:08:19 -07:00
Committer: Paul E. McKenney <paul...@kernel.org>
CommitterDate: Mon, 29 Jun 2020 12:01:44 -07:00
torture: Abstract out console-log error detection
This commit pulls the simple pattern-based error detection from the
console log into a new console-badness.sh file. This will enable future
commits to end a run on the first error.
Signed-off-by: Paul E. McKenney <paul...@kernel.org>
---
tools/testing/selftests/rcutorture/bin/console-badness.sh | 16 +++++++-
tools/testing/selftests/rcutorture/bin/parse-console.sh | 5 +--
2 files changed, 17 insertions(+), 4 deletions(-)
create mode 100755 tools/testing/selftests/rcutorture/bin/console-badness.sh
diff --git a/tools/testing/selftests/rcutorture/bin/console-badness.sh
b/tools/testing/selftests/rcutorture/bin/console-badness.sh
new file mode 100755
index 0000000..0e4c0b2
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/bin/console-badness.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0+
+#
+# Scan standard input for error messages, dumping any found to standard
+# output.
+#
+# Usage: console-badness.sh
+#
+# Copyright (C) 2020 Facebook, Inc.
+#
+# Authors: Paul E. McKenney <paul...@kernel.org>
+
+egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|detected stalls
on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump
start|\?\?\? Writer stall state|rcu_.*kthread starved for|!!!' |
+grep -v 'ODEBUG: ' |
+grep -v 'This means that this is a DEBUG kernel and it is' |
+grep -v 'Warning: unable to open an initial console'
diff --git a/tools/testing/selftests/rcutorture/bin/parse-console.sh
b/tools/testing/selftests/rcutorture/bin/parse-console.sh
index 1c64ca8..98478e1 100755
--- a/tools/testing/selftests/rcutorture/bin/parse-console.sh
+++ b/tools/testing/selftests/rcutorture/bin/parse-console.sh
@@ -116,10 +116,7 @@ then
fi
fi | tee -a $file.diags
-egrep 'Badness|WARNING:|Warn|BUG|===========|Call Trace:|Oops:|detected stalls
on CPUs/tasks:|self-detected stall on CPU|Stall ended before state dump
start|\?\?\? Writer stall state|rcu_.*kthread starved for' < $file |
-grep -v 'ODEBUG: ' |
-grep -v 'This means that this is a DEBUG kernel and it is' |
-grep -v 'Warning: unable to open an initial console' > $T.diags
+console-badness.sh < $file > $T.diags
if test -s $T.diags
then
print_warning "Assertion failure in $file $title"
