Re: [PATCH rcu 7/7] rcutorture: Add srcu_lockdep.sh

From: Boqun Feng
Date: Mon Mar 20 2023 - 15:34:10 EST


On Mon, Mar 20, 2023 at 12:09:00PM -0700, Paul E. McKenney wrote:
> On Mon, Mar 20, 2023 at 11:19:05AM -0700, Boqun Feng wrote:
> > Hi Paul,
> >
> > On Thu, Mar 16, 2023 at 08:13:39PM -0700, Boqun Feng wrote:
> > > From: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
> > >
> > > This commit adds an srcu_lockdep.sh script that checks whether lockdep
> > > correctly classifies SRCU-based, SRCU/mutex-based, and SRCU/rwsem-based
> > > deadlocks.
> > >
> > > Signed-off-by: Paul E. McKenney <paulmck@xxxxxxxxxx>
> > > [ boqun: Fix "RCUTORTURE" with "$RCUTORTURE" ]
> > > Signed-off-by: Boqun Feng <boqun.feng@xxxxxxxxx>
> > > ---
> > > .../selftests/rcutorture/bin/srcu_lockdep.sh | 73 +++++++++++++++++++
> > > 1 file changed, 73 insertions(+)
> > > create mode 100755 tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh
> > >
> > > diff --git a/tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh b/tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh
> > > new file mode 100755
> > > index 000000000000..961932754684
> > > --- /dev/null
> > > +++ b/tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh
> >
> > Could you provide the SPDX header and copyright bits for this newly
> > added file? For small changes I can do it myself, however this is about
> > licenses and copyright, so I need it from you, thanks!
>
> Good catch, thank you!
>
> Would you like a delta patch to merge into your existing one, or would
> you prefer a replacement patch? Either way works for me.
>

A delta patch if that's not much trouble. I will fold it into this one.

Regards,
Boqun

> Thanx, Paul
>
> > Regards,
> > Boqun
> >
> > > @@ -0,0 +1,73 @@
> > > +#!/bin/bash
> > > +#
> > > +# Run SRCU-lockdep tests and report any that fail to meet expectations.
> > > +
> > > +usage () {
> > > + echo "Usage: $scriptname optional arguments:"
> > > + echo " --datestamp string"
> > > + exit 1
> > > +}
> > > +
> > > +ds=`date +%Y.%m.%d-%H.%M.%S`-srcu_lockdep
> > > +scriptname="$0"
> > > +
> > > +T="`mktemp -d ${TMPDIR-/tmp}/srcu_lockdep.sh.XXXXXX`"
> > > +trap 'rm -rf $T' 0
> > > +
> > > +RCUTORTURE="`pwd`/tools/testing/selftests/rcutorture"; export RCUTORTURE
> > > +PATH=${RCUTORTURE}/bin:$PATH; export PATH
> > > +. functions.sh
> > > +
> > > +while test $# -gt 0
> > > +do
> > > + case "$1" in
> > > + --datestamp)
> > > + checkarg --datestamp "(relative pathname)" "$#" "$2" '^[a-zA-Z0-9._/-]*$' '^--'
> > > + ds=$2
> > > + shift
> > > + ;;
> > > + *)
> > > + echo Unknown argument $1
> > > + usage
> > > + ;;
> > > + esac
> > > + shift
> > > +done
> > > +
> > > +err=
> > > +nerrs=0
> > > +for d in 0 1
> > > +do
> > > + for t in 0 1 2
> > > + do
> > > + for c in 1 2 3
> > > + do
> > > + err=
> > > + val=$((d*1000+t*10+c))
> > > + tools/testing/selftests/rcutorture/bin/kvm.sh --allcpus --duration 5s --configs "SRCU-P" --bootargs "rcutorture.test_srcu_lockdep=$val" --trust-make --datestamp "$ds/$val" > "$T/kvm.sh.out" 2>&1
> > > + ret=$?
> > > + mv "$T/kvm.sh.out" "$RCUTORTURE/res/$ds/$val"
> > > + if test "$d" -ne 0 && test "$ret" -eq 0
> > > + then
> > > + err=1
> > > + echo -n Unexpected success for > "$RCUTORTURE/res/$ds/$val/kvm.sh.err"
> > > + fi
> > > + if test "$d" -eq 0 && test "$ret" -ne 0
> > > + then
> > > + err=1
> > > + echo -n Unexpected failure for > "$RCUTORTURE/res/$ds/$val/kvm.sh.err"
> > > + fi
> > > + if test -n "$err"
> > > + then
> > > + grep "rcu_torture_init_srcu_lockdep: test_srcu_lockdep = " "$RCUTORTURE/res/$ds/$val/SRCU-P/console.log" | sed -e 's/^.*rcu_torture_init_srcu_lockdep://' >> "$RCUTORTURE/res/$ds/$val/kvm.sh.err"
> > > + cat "$RCUTORTURE/res/$ds/$val/kvm.sh.err"
> > > + nerrs=$((nerrs+1))
> > > + fi
> > > + done
> > > + done
> > > +done
> > > +if test "$nerrs" -ne 0
> > > +then
> > > + exit 1
> > > +fi
> > > +exit 0
> > > --
> > > 2.39.2
> > >