Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/memory-model: Make judgelitmus.sh identify bad macros

Browse Source 
Currently, judgelitmus.sh treats use of unknown primitives (such as
srcu_read_lock() prior to SRCU support) as "!!! Verification error".
This can be misleading because it fails to call out typos and running
a version LKMM on a litmus test requiring a feature not provided by
that version.  This commit therefore changes judgelitmus.sh to check
for unknown primitives and to report them, for example, with:

	'!!! Current LKMM version does not know "rcu_write_lock"'.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
This commit is contained in:
Paul E. McKenney 2019-03-18 13:40:57 -07:00
parent b1da11c936
commit 02484d826f
2 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/memory-model/scripts/cmplitmushist.sh
View File

@ -12,6 +12,7 @@ trap 'rm -rf $T' 0
mkdir $T mkdir $T
# comparetest oldpath newpath # comparetest oldpath newpath
badmacnam=0
timedout=0 timedout=0
perfect=0 perfect=0
obsline=0 obsline=0
@ -19,8 +20,26 @@ noobsline=0
obsresult=0 obsresult=0
badcompare=0 badcompare=0
comparetest () { comparetest () {
if grep -q '^Command exited with non-zero status 124' $1 || if grep -q ': Unknown macro ' $1 || grep -q ': Unknown macro ' $2
grep -q '^Command exited with non-zero status 124' $2 then
if grep -q ': Unknown macro ' $1
then
badname=`grep ': Unknown macro ' $1 |
sed -e 's/^.*: Unknown macro //' |
sed -e 's/ (User error).*$//'`
echo 'Current LKMM version does not know "'$badname'"' $1
fi
if grep -q ': Unknown macro ' $2
then
badname=`grep ': Unknown macro ' $2 |
sed -e 's/^.*: Unknown macro //' |
sed -e 's/ (User error).*$//'`
echo 'Current LKMM version does not know "'$badname'"' $2
fi
badmacnam=`expr "$badmacnam" + 1`
return 0
elif grep -q '^Command exited with non-zero status 124' $1 ||
grep -q '^Command exited with non-zero status 124' $2
then then
if grep -q '^Command exited with non-zero status 124' $1 && if grep -q '^Command exited with non-zero status 124' $1 &&
grep -q '^Command exited with non-zero status 124' $2 grep -q '^Command exited with non-zero status 124' $2
@ -56,7 +75,7 @@ comparetest () {
return 0 return 0
fi fi
else else
echo Missing Observation line "(e.g., herd7 timeout)": $2 echo Missing Observation line "(e.g., syntax error)": $2
noobsline=`expr "$noobsline" + 1` noobsline=`expr "$noobsline" + 1`
return 0 return 0
fi fi
@ -90,7 +109,7 @@ then
fi fi
if test "$noobsline" -ne 0 if test "$noobsline" -ne 0
then then
echo Missing Observation line "(e.g., herd7 timeout)": $noobsline 1>&2 echo Missing Observation line "(e.g., syntax error)": $noobsline 1>&2
fi fi
if test "$obsresult" -ne 0 if test "$obsresult" -ne 0
then then
@ -100,6 +119,10 @@ if test "$timedout" -ne 0
then then
echo "!!!" Timed out: $timedout 1>&2 echo "!!!" Timed out: $timedout 1>&2
fi fi
if test "$badmacnam" -ne 0
then
echo "!!!" Unknown primitive: $badmacnam 1>&2
fi
if test "$badcompare" -ne 0 if test "$badcompare" -ne 0
then then
echo "!!!" Result changed: $badcompare 1>&2 echo "!!!" Result changed: $badcompare 1>&2

12
tools/memory-model/scripts/judgelitmus.sh
View File

@ -42,6 +42,18 @@ grep '^Observation' $LKMM_DESTDIR/$litmus.out
if grep -q '^Observation' $LKMM_DESTDIR/$litmus.out if grep -q '^Observation' $LKMM_DESTDIR/$litmus.out
then then
: :
elif grep ': Unknown macro ' $LKMM_DESTDIR/$litmus.out
then
badname=`grep ': Unknown macro ' $LKMM_DESTDIR/$litmus.out |
sed -e 's/^.*: Unknown macro //' |
sed -e 's/ (User error).*$//'`
badmsg=' !!! Current LKMM version does not know "'$badname'"'" $litmus"
echo $badmsg
if ! grep -q '!!!' $LKMM_DESTDIR/$litmus.out
then
echo ' !!! '$badmsg >> $LKMM_DESTDIR/$litmus.out 2>&1
fi
exit 254
elif grep '^Command exited with non-zero status 124' $LKMM_DESTDIR/$litmus.out elif grep '^Command exited with non-zero status 124' $LKMM_DESTDIR/$litmus.out
then then
echo ' !!! Timeout' $litmus echo ' !!! Timeout' $litmus