From: Eric Biggers <ebiggers@google.com>
Date: Thu, 4 May 2017 00:57:30 +0000 (-0700)
Subject: common/rc: catch updated suspicious RCU usage message in _check_dmesg()
X-Git-Tag: v2022.05.01~2065
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3c309f26fbd7e55cf101b5c034e9de32e1573a04;p=users%2Fhch%2Fxfstests-dev.git

common/rc: catch updated suspicious RCU usage message in _check_dmesg()

In the v4.11 kernel, the suspicious RCU usage message uses the word
"ERR" rather than "INFO".  Update _check_dmesg to accept both
versions.

[eguan: see kernel commit 4d4f88fa235f ("lockdep: Make RCU
suspicious-access splats use pr_err")]

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/common/rc b/common/rc
index 8dafd4bcf..257b19033 100644
--- a/common/rc
+++ b/common/rc
@@ -3285,13 +3285,13 @@ _check_dmesg()
 	# use sed \cregexpc address type, since $seqnum contains "/"
 	dmesg | tac | sed -ne "0,\#run fstests $seqnum at $date_time#p" | \
 		tac | $filter >$seqres.dmesg
-	grep -q -e "kernel BUG at" \
+	egrep -q -e "kernel BUG at" \
 	     -e "WARNING:" \
 	     -e "BUG:" \
 	     -e "Oops:" \
 	     -e "possible recursive locking detected" \
 	     -e "Internal error" \
-	     -e "INFO: suspicious RCU usage" \
+	     -e "(INFO|ERR): suspicious RCU usage" \
 	     -e "INFO: possible circular locking dependency detected" \
 	     -e "general protection fault:" \
 	     $seqres.dmesg