Torture-test changes for 3.16

From: "Paul E. McKenney" <[email protected]>

The current lock_torture_writer() spends too much time sleeping and not enough time hammering locks, as in an eight-CPU test will often only be utilizing a CPU or two. This commit therefore makes lock_torture_writer() sleep less and hammer more.

Signed-off-by Paul E. McKenney <[email protected]>

---
 kernel/locking/locktorture.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

kernel/locking/locktorture.c +0 -0

index f26b1a18e34e..b0d3e3c50672 100644

kernel/locking/locktorture.c +0 -0

 		cur_ops->writelock();
 		if (WARN_ON_ONCE(lock_is_write_held))
 			lwsp->n_write_lock_fail++;

Signature · 1 line

1.8.1.5

Quoted 19 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

The current lock_torture_writer() spends too much time sleeping and not enough time hammering locks, as in an eight-CPU test will often only be utilizing a CPU or two. This commit therefore makes lock_torture_writer() sleep less and hammer more.

Signed-off-by Paul E. McKenney <[email protected]>

---
 kernel/locking/locktorture.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

kernel/locking/locktorture.c +0 -0

index f26b1a18e34e..b0d3e3c50672 100644
@@ -219,7 +219,8 @@ static int lock_torture_writer(void *arg)
 	set_user_nice(current, 19);
 

kernel/locking/locktorture.c static int lock_torture_writer(void *arg) · line 223

Quoted 4 lines

kernel/locking/locktorture.c +2 -1

 	do {
-		schedule_timeout_uninterruptible(1);
+		if ((torture_random(&rand) & 0xfffff) == 0)
+			schedule_timeout_uninterruptible(1);

That's a one-in-1048576 chance of sleeping for a jiffy; is that frequent enough to even bother sleeping at all?

Quoted 6 lines

kernel/locking/locktorture.c +0 -0

 		cur_ops->writelock();
 		if (WARN_ON_ONCE(lock_is_write_held))
 			lwsp->n_write_lock_fail++;

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

Some environments require some variation on "make defconfig" to initialize the .config file. This commit therefore adds a --defconfig argument to allow this to be specified. The default value is of course "defconfig".

Signed-off-by Paul E. McKenney <[email protected]>

 tools/testing/selftests/rcutorture/bin/configinit.sh | 2 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

tools/testing/selftests/rcutorture/bin/configinit.sh +1 -1

index a1be6e62add1..9c3f3d39b934 100755
@@ -62,7 +62,7 @@ grep '^grep' < $T/u.sh > $T/upd.sh
 echo "cat - $c" >> $T/upd.sh
 make mrproper
 make $buildloc distclean > $builddir/Make.distclean 2>&1
-make $buildloc defconfig > $builddir/Make.defconfig.out 2>&1
+make $buildloc $TORTURE_DEFCONFIG > $builddir/Make.defconfig.out 2>&1
 mv $builddir/.config $builddir/.config.sav
 sh $T/upd.sh < $builddir/.config.sav > $builddir/.config
 cp $builddir/.config $builddir/.config.new

tools/testing/selftests/rcutorture/bin/kvm.sh +8 -0

index a52a077ee258..59945b7793d9 100644
@@ -38,6 +38,7 @@ dur=30
 dryrun=""
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
+TORTURE_DEFCONFIG=defconfig
 TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
 RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
 TORTURE_SUITE=rcu

@@ -56,6 +57,7 @@ usage () {
 	echo "       --configs \"config-file list\""
 	echo "       --cpus N"
 	echo "       --datestamp string"
+	echo "       --defconfig string"
 	echo "       --dryrun sched|script"
 	echo "       --duration minutes"
 	echo "       --interactive"

@@ -96,6 +98,11 @@ do
 		ds=$2
 		shift
 		;;
+	--defconfig)
+		checkarg --defconfig "defconfigtype" "$#" "$2" '^[^/][^/]*$' '^--'
+		TORTURE_DEFCONFIG=$2
+		shift
+		;;
 	--dryrun)
 		checkarg --dryrun "sched|script" $# "$2" 'sched\|script' '^--'
 		dryrun=$2

@@ -259,6 +266,7 @@ END {
 # Generate a script to execute the tests in appropriate batches.
 cat << ___EOF___ > $T/script
 TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
 ___EOF___
 awk < $T/cfgcpu.pack \
 	-v CONFIGDIR="$CONFIGFRAG/$kversion/" \

Signature · 1 line

1.8.1.5

Quoted 6 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Some environments require some variation on "make defconfig" to initialize the .config file. This commit therefore adds a --defconfig argument to allow this to be specified. The default value is of course "defconfig".

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

<bikeshed color="blue">
"--defconfig randconfig" or "--defconfig allyesconfig" or similar seems rather odd; how about calling it --kconfig or similar? </bikeshed>

Quoted 60 lines

 tools/testing/selftests/rcutorture/bin/configinit.sh | 2 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh        | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

tools/testing/selftests/rcutorture/bin/configinit.sh +1 -1

index a1be6e62add1..9c3f3d39b934 100755
@@ -62,7 +62,7 @@ grep '^grep' < $T/u.sh > $T/upd.sh
 echo "cat - $c" >> $T/upd.sh
 make mrproper
 make $buildloc distclean > $builddir/Make.distclean 2>&1
-make $buildloc defconfig > $builddir/Make.defconfig.out 2>&1
+make $buildloc $TORTURE_DEFCONFIG > $builddir/Make.defconfig.out 2>&1
 mv $builddir/.config $builddir/.config.sav
 sh $T/upd.sh < $builddir/.config.sav > $builddir/.config
 cp $builddir/.config $builddir/.config.new

tools/testing/selftests/rcutorture/bin/kvm.sh +8 -0

index a52a077ee258..59945b7793d9 100644
@@ -38,6 +38,7 @@ dur=30
 dryrun=""
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
+TORTURE_DEFCONFIG=defconfig
 TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
 RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
 TORTURE_SUITE=rcu

@@ -56,6 +57,7 @@ usage () {
 	echo "       --configs \"config-file list\""
 	echo "       --cpus N"
 	echo "       --datestamp string"
+	echo "       --defconfig string"
 	echo "       --dryrun sched|script"
 	echo "       --duration minutes"
 	echo "       --interactive"

@@ -96,6 +98,11 @@ do
 		ds=$2
 		shift
 		;;
+	--defconfig)
+		checkarg --defconfig "defconfigtype" "$#" "$2" '^[^/][^/]*$' '^--'
+		TORTURE_DEFCONFIG=$2
+		shift
+		;;
 	--dryrun)
 		checkarg --dryrun "sched|script" $# "$2" 'sched\|script' '^--'
 		dryrun=$2

@@ -259,6 +266,7 @@ END {
 # Generate a script to execute the tests in appropriate batches.
 cat << ___EOF___ > $T/script
 TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
 ___EOF___
 awk < $T/cfgcpu.pack \
 	-v CONFIGDIR="$CONFIGFRAG/$kversion/" \

Signature · 1 line

1.8.1.5

Quoted 7 lines · On Wed, May 07, 2014 at 02:22:19PM -0700, [email protected] wrote:

Quoted 6 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Some environments require some variation on "make defconfig" to initialize the .config file. This commit therefore adds a --defconfig argument to allow this to be specified. The default value is of course "defconfig".

Quoted 6 lines

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

<bikeshed color="blue">
"--defconfig randconfig" or "--defconfig allyesconfig" or similar seems rather odd; how about calling it --kconfig or similar? </bikeshed>

Some day I am going to have to feed that to a browser and see what happens. ;-)

I must confess that I hadn't considered feeding randconfig or allyesconfig to that argument, partly because I figured that I would have to also supply Kconfig constraints in those cases in order to ensure that the resulting kernel would actually run under qemu. I was instead thinking in terms of a --configs option beginning with "RAND", which would pick up the Kconfig constraints from the appropriate configs directory, for example:

tools/testing/selftests/rcutorture/configs/rcu/RAND1

That said, I haven't thought that far down that path.

So for the --defconfig argument, I was thinking more in terms of things like pseries_defconfig or versatile_defconfig.

Quoted 30 lines · Paul E. McKenney

Quoted 7 lines · On Wed, May 07, 2014 at 02:22:19PM -0700, [email protected] wrote:

Quoted 6 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Some environments require some variation on "make defconfig" to initialize the .config file. This commit therefore adds a --defconfig argument to allow this to be specified. The default value is of course "defconfig".

Quoted 6 lines

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

<bikeshed color="blue">
"--defconfig randconfig" or "--defconfig allyesconfig" or similar seems rather odd; how about calling it --kconfig or similar? </bikeshed>

Some day I am going to have to feed that to a browser and see what happens. ;-)

I must confess that I hadn't considered feeding randconfig or allyesconfig to that argument, partly because I figured that I would have to also supply Kconfig constraints in those cases in order to ensure that the resulting kernel would actually run under qemu. I was instead thinking in terms of a --configs option beginning with "RAND", which would pick up the Kconfig constraints from the appropriate configs directory, for example:

tools/testing/selftests/rcutorture/configs/rcu/RAND1

That said, I haven't thought that far down that path.

Quoted 2 lines

So for the --defconfig argument, I was thinking more in terms of things like pseries_defconfig or versatile_defconfig.

Ah, I see. --defconfig specifies the base configuration, while --configs specifies the constraints. In that case, how about --baseconfig? It might still make sense to pass --baseconfig allnoconfig or --baseconfig allyesconfig or --baseconfig randconfig, given a sufficiently complete constraints file.

Quoted 31 lines · Josh Triplett

Quoted 30 lines · Paul E. McKenney

Quoted 7 lines · On Wed, May 07, 2014 at 02:22:19PM -0700, [email protected] wrote:

Quoted 6 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Some environments require some variation on "make defconfig" to initialize the .config file. This commit therefore adds a --defconfig argument to allow this to be specified. The default value is of course "defconfig".

Quoted 6 lines

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

<bikeshed color="blue">
"--defconfig randconfig" or "--defconfig allyesconfig" or similar seems rather odd; how about calling it --kconfig or similar? </bikeshed>

Some day I am going to have to feed that to a browser and see what happens. ;-)

I must confess that I hadn't considered feeding randconfig or allyesconfig to that argument, partly because I figured that I would have to also supply Kconfig constraints in those cases in order to ensure that the resulting kernel would actually run under qemu. I was instead thinking in terms of a --configs option beginning with "RAND", which would pick up the Kconfig constraints from the appropriate configs directory, for example:

tools/testing/selftests/rcutorture/configs/rcu/RAND1

That said, I haven't thought that far down that path.

Quoted 8 lines

Quoted 2 lines

So for the --defconfig argument, I was thinking more in terms of things like pseries_defconfig or versatile_defconfig.

Ah, I see. --defconfig specifies the base configuration, while --configs specifies the constraints. In that case, how about --baseconfig? It might still make sense to pass --baseconfig allnoconfig or --baseconfig allyesconfig or --baseconfig randconfig, given a sufficiently complete constraints file.

My choice of name was guided by the following:

	$ find arch -name '*defconfig*' -print | wc -l
	469

When I try baseconfig:

	$ find arch -name '*baseconfig*' -print | wc -l
	0

Don't get me wrong, you might be correct here. But the thing is that I like being able to specify all tests in one go. That means that I want to still be able to run my current defconfig-based config files (e.g., TREE01) when I get a randconfig-based setup going. So I would like to be able to specify something like:

	sh kvm.sh --defconfig pseries_defconfig --configs "TREE01 RAND01"

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

Signed-off-by Paul E. McKenney <[email protected]>

---
 tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm-build.sh +1 -1

index d8e68a5e4411..e838c775f709 100755
@@ -60,7 +60,7 @@ then
 	exit 2
 fi
 ncpus=`cpus2use.sh`
-make O=$builddir -j$ncpus $RCU_KMAKE_ARG > $builddir/Make.out 2>&1
+make O=$builddir -j$ncpus $TORTURE_KMAKE_ARG > $builddir/Make.out 2>&1
 retval=$?
 if test $retval -ne 0 || grep "rcu[^/]*": < $builddir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $builddir/Make.out
 then

tools/testing/selftests/rcutorture/bin/kvm.sh +3 -3

index 59945b7793d9..04ad1f980dfe 100644
@@ -40,7 +40,7 @@ KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
 TORTURE_DEFCONFIG=defconfig
 TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
-RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
+TORTURE_KMAKE_ARG=""
 TORTURE_SUITE=rcu
 resdir=""
 configs=""

@@ -118,7 +118,7 @@ do
 		;;
 	--kmake-arg)
 		checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$'
-		RCU_KMAKE_ARG="$2"; export RCU_KMAKE_ARG
+		TORTURE_KMAKE_ARG="$2"
 		shift
 		;;
 	--kversion)

@@ -376,7 +376,7 @@ then
 	echo PATH="$PATH; export PATH"
 	echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
 	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
-	echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"
+	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
 	echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"
 	echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"

Signature · 1 line

1.8.1.5

Quoted 3 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

You've also dropped unnecessary "export" calls; please document that in the commit message. With that change:

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

Reviewed-by Josh Triplett <[email protected]>

Quoted 52 lines

---
 tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm-build.sh +1 -1

index d8e68a5e4411..e838c775f709 100755
@@ -60,7 +60,7 @@ then
 	exit 2
 fi
 ncpus=`cpus2use.sh`
-make O=$builddir -j$ncpus $RCU_KMAKE_ARG > $builddir/Make.out 2>&1
+make O=$builddir -j$ncpus $TORTURE_KMAKE_ARG > $builddir/Make.out 2>&1
 retval=$?
 if test $retval -ne 0 || grep "rcu[^/]*": < $builddir/Make.out | egrep -q "Stop|Error|error:|warning:" || egrep -q "Stop|Error|error:" < $builddir/Make.out
 then

tools/testing/selftests/rcutorture/bin/kvm.sh +3 -3

index 59945b7793d9..04ad1f980dfe 100644
@@ -40,7 +40,7 @@ KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
 TORTURE_DEFCONFIG=defconfig
 TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
-RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG
+TORTURE_KMAKE_ARG=""
 TORTURE_SUITE=rcu
 resdir=""
 configs=""

@@ -118,7 +118,7 @@ do
 		;;
 	--kmake-arg)
 		checkarg --kmake-arg "(kernel make arguments)" $# "$2" '.*' '^error$'
-		RCU_KMAKE_ARG="$2"; export RCU_KMAKE_ARG
+		TORTURE_KMAKE_ARG="$2"
 		shift
 		;;
 	--kversion)

@@ -376,7 +376,7 @@ then
 	echo PATH="$PATH; export PATH"
 	echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
 	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
-	echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG"
+	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
 	echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"
 	echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

Signed-off-by Paul E. McKenney <[email protected]>

---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh            | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +1 -1

index e82f4f201c8c..86e6ffe6df45 100755
@@ -152,7 +152,7 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
 boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
 
 echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
-if test -n "$RCU_BUILDONLY"
+if test -n "$TORTURE_BUILDONLY"
 then
 	echo Build-only run specified, boot/test omitted.
 	exit 0

tools/testing/selftests/rcutorture/bin/kvm.sh +6 -3

index 08c90cba79d2..73c586f6bdf6 100644
@@ -81,7 +81,7 @@ do
 		shift
 		;;
 	--buildonly)
-		RCU_BUILDONLY=1; export RCU_BUILDONLY
+		TORTURE_BUILDONLY=1
 		;;
 	--configs)
 		checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--'

@@ -374,7 +374,7 @@ then
 	echo KVM="$KVM; export KVM"
 	echo KVPATH="$KVPATH; export KVPATH"
 	echo PATH="$PATH; export PATH"
-	echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
+	echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY"
 	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
 	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"

@@ -402,4 +402,7 @@ echo
 echo
 echo " --- `date` Test summary:"
 echo Results directory: $resdir/$ds
-kvm-recheck.sh $resdir/$ds
+if test -n "$TORTURE_BUILDONLY"
+then
+	kvm-recheck.sh $resdir/$ds
+fi

Signature · 1 line

1.8.1.5

Quoted 3 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

And removes unnecessary exports; please document that. With that change:

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

Reviewed-by Josh Triplett <[email protected]>

Quoted 52 lines

---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh            | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +1 -1

index e82f4f201c8c..86e6ffe6df45 100755
@@ -152,7 +152,7 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
 boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
 
 echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
-if test -n "$RCU_BUILDONLY"
+if test -n "$TORTURE_BUILDONLY"
 then
 	echo Build-only run specified, boot/test omitted.
 	exit 0

tools/testing/selftests/rcutorture/bin/kvm.sh +6 -3

index 08c90cba79d2..73c586f6bdf6 100644
@@ -81,7 +81,7 @@ do
 		shift
 		;;
 	--buildonly)
-		RCU_BUILDONLY=1; export RCU_BUILDONLY
+		TORTURE_BUILDONLY=1
 		;;
 	--configs)
 		checkarg --configs "(list of config files)" "$#" "$2" '^[^/]*$' '^--'

@@ -374,7 +374,7 @@ then
 	echo KVM="$KVM; export KVM"
 	echo KVPATH="$KVPATH; export KVPATH"
 	echo PATH="$PATH; export PATH"
-	echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY"
+	echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY"
 	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
 	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"

@@ -402,4 +402,7 @@ echo
 echo
 echo " --- `date` Test summary:"
 echo Results directory: $resdir/$ds
-kvm-recheck.sh $resdir/$ds
+if test -n "$TORTURE_BUILDONLY"
+then
+	kvm-recheck.sh $resdir/$ds
+fi

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

Signed-off-by Paul E. McKenney <[email protected]>

tools/testing/selftests/rcutorture/bin/kvm.sh +0 -0

Quoted 5 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

Signed-off-by Paul E. McKenney <[email protected]>

Bug below; with that fixed,

Reviewed-by Josh Triplett <[email protected]>

Quoted 2 lines

tools/testing/selftests/rcutorture/bin/kvm.sh +0 -0

[...]

tools/testing/selftests/rcutorture/bin/kvm.sh then · line 382

Quoted 7 lines

tools/testing/selftests/rcutorture/bin/kvm.sh +2 -1

@@ -378,7 +378,8 @@ then
 	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
 	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
-	echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE"
+	echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE;
+		export TORTURE_QEMU_INTERACTIVE"

Don't break this line in the middle of your quoted string.

tools/testing/selftests/rcutorture/bin/functions.sh identify_qemu_args () { · line 142

Quoted 9 lines · Paul E. McKenney

tools/testing/selftests/rcutorture/bin/functions.sh +2 -2

-		if test -n "$RCU_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
+		if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
 		then
 			echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC
 			echo -netdev bridge,br=br0,id=net0
-		elif test -n "$RCU_QEMU_INTERACTIVE"
+		elif test -n "$TORTURE_QEMU_INTERACTIVE"
 		then
 			echo -net nic -net user

Not related to this patch, but: qemu defaults to -net nic -net user, so you don't need to specify it.

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

Signed-off-by Paul E. McKenney <[email protected]>

---
 tools/testing/selftests/rcutorture/bin/functions.sh | 6 +++---
 tools/testing/selftests/rcutorture/bin/kvm.sh       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

tools/testing/selftests/rcutorture/bin/functions.sh +3 -3

index 623939cf814e..41fb52b805e4 100644
@@ -124,7 +124,7 @@ identify_qemu_append () {
 
 # identify_qemu_args qemu-cmd serial-file
 #
-# Output arguments for qemu arguments based on the RCU_QEMU_MAC
+# Output arguments for qemu arguments based on the TORTURE_QEMU_MAC
 # and TORTURE_QEMU_INTERACTIVE environment variables.
 identify_qemu_args () {
 	case "$1" in

@@ -133,9 +133,9 @@ identify_qemu_args () {
 	qemu-system-ppc64)
 		echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
 		echo -device spapr-vscsi
-		if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
+		if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$TORTURE_QEMU_MAC"
 		then
-			echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC
+			echo -device spapr-vlan,netdev=net0,mac=$TORTURE_QEMU_MAC
 			echo -netdev bridge,br=br0,id=net0
 		elif test -n "$TORTURE_QEMU_INTERACTIVE"
 		then

tools/testing/selftests/rcutorture/bin/kvm.sh +0 -0

index 2f9605ed5b58..1a4a68c76914 100644

tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1

 		shift
 		;;
 	--no-initrd)

@@ -380,7 +380,7 @@ then
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
 	echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE;
 		export TORTURE_QEMU_INTERACTIVE"
-	echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
+	echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
 	echo "mkdir -p "$resdir" || :"
 	echo "mkdir $resdir/$ds"
 	cat $T/script

Signature · 1 line

1.8.1.5

Quoted 5 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

This commit makes the torture scripts a bit more RCU-independent.

Signed-off-by Paul E. McKenney <[email protected]>

One comment below; with or without that change:

Reviewed-by Josh Triplett <[email protected]>

Quoted 34 lines

---
 tools/testing/selftests/rcutorture/bin/functions.sh | 6 +++---
 tools/testing/selftests/rcutorture/bin/kvm.sh       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

tools/testing/selftests/rcutorture/bin/functions.sh +3 -3

index 623939cf814e..41fb52b805e4 100644
@@ -124,7 +124,7 @@ identify_qemu_append () {
 
 # identify_qemu_args qemu-cmd serial-file
 #
-# Output arguments for qemu arguments based on the RCU_QEMU_MAC
+# Output arguments for qemu arguments based on the TORTURE_QEMU_MAC
 # and TORTURE_QEMU_INTERACTIVE environment variables.
 identify_qemu_args () {
 	case "$1" in

@@ -133,9 +133,9 @@ identify_qemu_args () {
 	qemu-system-ppc64)
 		echo -enable-kvm -M pseries -cpu POWER7 -nodefaults
 		echo -device spapr-vscsi
-		if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$RCU_QEMU_MAC"
+		if test -n "$TORTURE_QEMU_INTERACTIVE" -a -n "$TORTURE_QEMU_MAC"
 		then
-			echo -device spapr-vlan,netdev=net0,mac=$RCU_QEMU_MAC
+			echo -device spapr-vlan,netdev=net0,mac=$TORTURE_QEMU_MAC
 			echo -netdev bridge,br=br0,id=net0
 		elif test -n "$TORTURE_QEMU_INTERACTIVE"
 		then

tools/testing/selftests/rcutorture/bin/kvm.sh +0 -0

index 2f9605ed5b58..1a4a68c76914 100644

tools/testing/selftests/rcutorture/bin/kvm.sh do · line 131

Quoted 6 lines

tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1

@@ -128,7 +128,7 @@ do
 		;;
 	--mac)
 		checkarg --mac "(MAC address)" $# "$2" '^\([0-9a-fA-F]\{2\}:\)\{5\}[0-9a-fA-F]\{2\}$' error
-		RCU_QEMU_MAC=$2; export RCU_QEMU_MAC
+		TORTURE_QEMU_MAC=$2; export TORTURE_QEMU_MAC

Can't you drop this export the same way you did previous exports?

Quoted 15 lines

tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1

 		shift
 		;;
 	--no-initrd)

@@ -380,7 +380,7 @@ then
 	echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD"
 	echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE;
 		export TORTURE_QEMU_INTERACTIVE"
-	echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC"
+	echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
 	echo "mkdir -p "$resdir" || :"
 	echo "mkdir $resdir/$ds"
 	cat $T/script

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

The torture tests need to set specific values for their respective Kconfig options (e.g., CONFIG_LOCK_TORTURE_TEST), and must therefore filter any conflicting definitions from the Kconfig fragment file. Unfortunately, the code in kvm-build.sh was looking only for CONFIG_RCU_TORTURE_TEST. This commit therefore handles the general case of CONFIG_[A-Z]*TORTURE_TEST.

Signed-off-by Paul E. McKenney <[email protected]>

---
 tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

tools/testing/selftests/rcutorture/bin/kvm-build.sh +0 -0

index e838c775f709..6d0b76d918f4 100755

tools/testing/selftests/rcutorture/bin/kvm-build.sh +0 -0

 cat << ___EOF___ >> $T/config
 CONFIG_INITRAMFS_SOURCE="$TORTURE_INITRD"
 CONFIG_VIRTIO_PCI=y

Signature · 1 line

1.8.1.5

Quoted 8 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

The torture tests need to set specific values for their respective Kconfig options (e.g., CONFIG_LOCK_TORTURE_TEST), and must therefore filter any conflicting definitions from the Kconfig fragment file. Unfortunately, the code in kvm-build.sh was looking only for CONFIG_RCU_TORTURE_TEST. This commit therefore handles the general case of CONFIG_[A-Z]*TORTURE_TEST.

This doesn't match your code below, which includes an _ after the * .

Also, one nit below.

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

With the commit message fixed:

Reviewed-by Josh Triplett <[email protected]>

Quoted 12 lines

---
 tools/testing/selftests/rcutorture/bin/kvm-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

tools/testing/selftests/rcutorture/bin/kvm-build.sh +0 -0

index e838c775f709..6d0b76d918f4 100755
@@ -45,7 +45,7 @@ T=/tmp/test-linux.sh.$$
 trap 'rm -rf $T' 0
 mkdir $T
 

tools/testing/selftests/rcutorture/bin/kvm-build.sh T=/tmp/test-linux.sh.$$ · line 48

Quoted 2 lines

tools/testing/selftests/rcutorture/bin/kvm-build.sh +1 -1

-cat ${config_template} | grep -v CONFIG_RCU_TORTURE_TEST > $T/config
+cat ${config_template} | grep -v 'CONFIG_[A-Z]*_TORTURE_TEST' > $T/config

UUOC (useless use of cat): you can redirect from ${config_template} rather than catting it.

Quoted 6 lines

tools/testing/selftests/rcutorture/bin/kvm-build.sh +0 -0

 cat << ___EOF___ >> $T/config
 CONFIG_INITRAMFS_SOURCE="$TORTURE_INITRD"
 CONFIG_VIRTIO_PCI=y

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

In a normal torture-test run, the script inherits its environment variables, but this does not work when producing a script that is to run later. Therefore, definitions and exports are prepended to a dryrun script but not to a script that is run immediately. This commit reconciles this by placing definitions and exports at the beginning of the script in both cases.

Signed-off-by Paul E. McKenney <[email protected]>

---
 tools/testing/selftests/rcutorture/bin/kvm.sh | 28 ++++++++++++---------------
 1 file changed, 12 insertions(+), 16 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm.sh +12 -16

index 8aa62a2dccb5..93a6c5a8517d 100644
@@ -241,8 +241,19 @@ END {
 
 # Generate a script to execute the tests in appropriate batches.
 cat << ___EOF___ > $T/script
-TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+CONFIGFRAG="$CONFIGFRAG"; export CONFIGFRAG
+KVM="$KVM"; export KVM
+KVPATH="$KVPATH"; export KVPATH
+PATH="$PATH"; export PATH
+TORTURE_BUILDONLY="$TORTURE_BUILDONLY"; export TORTURE_BUILDONLY
 TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
+TORTURE_INITRD="$TORTURE_INITRD"; export TORTURE_INITRD
+TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG"; export TORTURE_KMAKE_ARG
+TORTURE_QEMU_CMD="$TORTURE_QEMU_CMD"; export TORTURE_QEMU_CMD
+TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE";
+	export TORTURE_QEMU_INTERACTIVE
+TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC"; export TORTURE_QEMU_MAC
+TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
 if ! test -e $resdir
 then
 	mkdir -p "$resdir" || :

@@ -371,21 +382,6 @@ ___EOF___
 
 if test "$dryrun" = script
 then
-	# Dump out the script, but define the environment variables that
-	# it needs to run standalone.
-	echo CONFIGFRAG="$CONFIGFRAG; export CONFIGFRAG"
-	echo KVM="$KVM; export KVM"
-	echo KVPATH="$KVPATH; export KVPATH"
-	echo PATH="$PATH; export PATH"
-	echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY"
-	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
-	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
-	echo TORTURE_QEMU_CMD="$TORTURE_QEMU_CMD; export TORTURE_QEMU_CMD"
-	echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE;
-		export TORTURE_QEMU_INTERACTIVE"
-	echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
-	echo "mkdir -p "$resdir" || :"
-	echo "mkdir $resdir/$ds"
 	cat $T/script
 	exit 0
 elif test "$dryrun" = sched

Signature · 1 line

1.8.1.5

Quoted 8 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

In a normal torture-test run, the script inherits its environment variables, but this does not work when producing a script that is to run later. Therefore, definitions and exports are prepended to a dryrun script but not to a script that is run immediately. This commit reconciles this by placing definitions and exports at the beginning of the script in both cases.

Cleanup idea, not needed in this commit: This has gotten sufficiently long to warrant a loop over a list of environment variables, or possibly a loop over all environment variable starting with TORTURE_* .

Quoted 1 line

Signed-off-by Paul E. McKenney <[email protected]>

Reviewed-by Josh Triplett <[email protected]>

Quoted 54 lines

---
 tools/testing/selftests/rcutorture/bin/kvm.sh | 28 ++++++++++++---------------
 1 file changed, 12 insertions(+), 16 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm.sh +12 -16

index 8aa62a2dccb5..93a6c5a8517d 100644
@@ -241,8 +241,19 @@ END {
 
 # Generate a script to execute the tests in appropriate batches.
 cat << ___EOF___ > $T/script
-TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
+CONFIGFRAG="$CONFIGFRAG"; export CONFIGFRAG
+KVM="$KVM"; export KVM
+KVPATH="$KVPATH"; export KVPATH
+PATH="$PATH"; export PATH
+TORTURE_BUILDONLY="$TORTURE_BUILDONLY"; export TORTURE_BUILDONLY
 TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
+TORTURE_INITRD="$TORTURE_INITRD"; export TORTURE_INITRD
+TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG"; export TORTURE_KMAKE_ARG
+TORTURE_QEMU_CMD="$TORTURE_QEMU_CMD"; export TORTURE_QEMU_CMD
+TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE";
+	export TORTURE_QEMU_INTERACTIVE
+TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC"; export TORTURE_QEMU_MAC
+TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE
 if ! test -e $resdir
 then
 	mkdir -p "$resdir" || :

@@ -371,21 +382,6 @@ ___EOF___
 
 if test "$dryrun" = script
 then
-	# Dump out the script, but define the environment variables that
-	# it needs to run standalone.
-	echo CONFIGFRAG="$CONFIGFRAG; export CONFIGFRAG"
-	echo KVM="$KVM; export KVM"
-	echo KVPATH="$KVPATH; export KVPATH"
-	echo PATH="$PATH; export PATH"
-	echo TORTURE_BUILDONLY="$TORTURE_BUILDONLY; export TORTURE_BUILDONLY"
-	echo TORTURE_INITRD="$TORTURE_INITRD; export TORTURE_INITRD"
-	echo TORTURE_KMAKE_ARG="$TORTURE_KMAKE_ARG; export TORTURE_KMAKE_ARG"
-	echo TORTURE_QEMU_CMD="$TORTURE_QEMU_CMD; export TORTURE_QEMU_CMD"
-	echo TORTURE_QEMU_INTERACTIVE="$TORTURE_QEMU_INTERACTIVE;
-		export TORTURE_QEMU_INTERACTIVE"
-	echo TORTURE_QEMU_MAC="$TORTURE_QEMU_MAC; export TORTURE_QEMU_MAC"
-	echo "mkdir -p "$resdir" || :"
-	echo "mkdir $resdir/$ds"
 	cat $T/script
 	exit 0
 elif test "$dryrun" = sched

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

The srcu_torture_stats() function prints SRCU's per-CPU c[] array with an unsigned format, which means that the number one less than zero is a very large number. This commit therefore prints this array with a signed format in order to improve readability of the rcutorture output.

Signed-off-by Paul E. McKenney <[email protected]>

 kernel/rcu/rcutorture.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

kernel/rcu/rcutorture.c +1 -0

index 3845ea99ccd4..0141fcff6bb9 100644
@@ -486,15 +486,16 @@ static void srcu_torture_barrier(void)
 
 static void srcu_torture_stats(char *page)
 {
+	long c0, c1;
 	int cpu;
 	int idx = srcu_ctl.completed & 0x1;

Quoted 8 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

The srcu_torture_stats() function prints SRCU's per-CPU c[] array with an unsigned format, which means that the number one less than zero is a very large number. This commit therefore prints this array with a signed format in order to improve readability of the rcutorture output.

Signed-off-by Paul E. McKenney <[email protected]>

Nit below; with that:

Reviewed-by Josh Triplett <[email protected]>

Quoted 15 lines

 kernel/rcu/rcutorture.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

kernel/rcu/rcutorture.c +1 -0

index 3845ea99ccd4..0141fcff6bb9 100644
@@ -486,15 +486,16 @@ static void srcu_torture_barrier(void)
 
 static void srcu_torture_stats(char *page)
 {
+	long c0, c1;
 	int cpu;
 	int idx = srcu_ctl.completed & 0x1;
 

kernel/rcu/rcutorture.c static void srcu_torture_barrier(void) · line 498

Quoted 9 lines

kernel/rcu/rcutorture.c +3 -3

 	page += sprintf(page, "%s%s per-CPU(idx=%d):",
 		       torture_type, TORTURE_FLAG, idx);
 	for_each_possible_cpu(cpu) {
-		page += sprintf(page, " %d(%lu,%lu)", cpu,
-			       per_cpu_ptr(srcu_ctl.per_cpu_ref, cpu)->c[!idx],
-			       per_cpu_ptr(srcu_ctl.per_cpu_ref, cpu)->c[idx]);
+		c0 = (long)per_cpu_ptr(srcu_ctl.per_cpu_ref, cpu)->c[!idx];
+		c1 = (long)per_cpu_ptr(srcu_ctl.per_cpu_ref, cpu)->c[idx];
+		page += sprintf(page, " %d(%ld,%ld)", cpu, c0, c1);

Nit: I'd suggest declaring the variables inside the loop, or not using intermediate variables at all.

From: "Paul E. McKenney" <[email protected]>

Currently, torture_kthread_stopping() prints only the name of the kthread that is stopping, which can be unedifying. This commit therefore adds "Stopping" to make things more evident.

Signed-off-by Paul E. McKenney <[email protected]>

 kernel/torture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

kernel/torture.c +0 -0

index acc9afc2f26e..f329848c3eee 100644

kernel/torture.c +0 -0

 	while (!kthread_should_stop()) {
 		torture_shutdown_absorb(title);
 		schedule_timeout_uninterruptible(1);

Signature · 1 line

1.8.1.5

Quoted 7 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Currently, torture_kthread_stopping() prints only the name of the kthread that is stopping, which can be unedifying. This commit therefore adds "Stopping" to make things more evident.

Signed-off-by Paul E. McKenney <[email protected]>

Feedback below.

Quoted 8 lines

 kernel/torture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

kernel/torture.c +0 -0

index acc9afc2f26e..f329848c3eee 100644

kernel/torture.c EXPORT_SYMBOL_GPL(torture_must_stop_irq); · line 681

Quoted 9 lines

kernel/torture.c +4 -1

@@ -674,8 +674,11 @@ EXPORT_SYMBOL_GPL(torture_must_stop_irq);
  */
 void torture_kthread_stopping(char *title)
 {
+	char buf[128];
+
+	snprintf(buf, sizeof(buf), "Stopping %s", title);
 	if (verbose)
-		VERBOSE_TOROUT_STRING(title);
+		VERBOSE_TOROUT_STRING(buf);

This seems like a case where the macro has led to poorer code; rather than using sprintf into a temporary buffer, this should just print. Please consider fixing the output macros to allow formats, as the pr_* macros do.

Also, why do you need "if (verbose)" if the name of the macro has VERBOSE_ in it; shouldn't that mean it checks verbosity itself? (Another good reason not to create a unique verbosity level mechanism, and to use the kernel mechanisms instead.)

Quoted 6 lines

kernel/torture.c +0 -0

 	while (!kthread_should_stop()) {
 		torture_shutdown_absorb(title);
 		schedule_timeout_uninterruptible(1);

Signature · 1 line

1.8.1.5

Quoted 34 lines · On Wed, May 07, 2014 at 02:37:36PM -0700, [email protected] wrote:

Quoted 7 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Currently, torture_kthread_stopping() prints only the name of the kthread that is stopping, which can be unedifying. This commit therefore adds "Stopping" to make things more evident.

Signed-off-by Paul E. McKenney <[email protected]>

Feedback below.

Quoted 8 lines

 kernel/torture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

kernel/torture.c +0 -0

index acc9afc2f26e..f329848c3eee 100644

kernel/torture.c EXPORT_SYMBOL_GPL(torture_must_stop_irq); · line 681

Quoted 9 lines

kernel/torture.c +4 -1

@@ -674,8 +674,11 @@ EXPORT_SYMBOL_GPL(torture_must_stop_irq);
  */
 void torture_kthread_stopping(char *title)
 {
+	char buf[128];
+
+	snprintf(buf, sizeof(buf), "Stopping %s", title);
 	if (verbose)
-		VERBOSE_TOROUT_STRING(title);
+		VERBOSE_TOROUT_STRING(buf);

This seems like a case where the macro has led to poorer code; rather than using sprintf into a temporary buffer, this should just print. Please consider fixing the output macros to allow formats, as the pr_* macros do.

Quoted 4 lines

Also, why do you need "if (verbose)" if the name of the macro has VERBOSE_ in it; shouldn't that mean it checks verbosity itself? (Another good reason not to create a unique verbosity level mechanism, and to use the kernel mechanisms instead.)

Good catch, removed the redundant "if (verbose)".

My attempts in the past to leverage existing in-kernel verbosity controls has caused problems such as the output appearing or not depending on the distro in question.

Quoted 40 lines · Paul E. McKenney

Quoted 38 lines · On Wed, May 07, 2014 at 02:37:36PM -0700, [email protected] wrote:

Quoted 7 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Currently, torture_kthread_stopping() prints only the name of the kthread that is stopping, which can be unedifying. This commit therefore adds "Stopping" to make things more evident.

Signed-off-by Paul E. McKenney <[email protected]>

Feedback below.

Quoted 8 lines

 kernel/torture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

kernel/torture.c +0 -0

index acc9afc2f26e..f329848c3eee 100644

kernel/torture.c EXPORT_SYMBOL_GPL(torture_must_stop_irq); · line 681

Quoted 9 lines

kernel/torture.c +4 -1

@@ -674,8 +674,11 @@ EXPORT_SYMBOL_GPL(torture_must_stop_irq);
  */
 void torture_kthread_stopping(char *title)
 {
+	char buf[128];
+
+	snprintf(buf, sizeof(buf), "Stopping %s", title);
 	if (verbose)
-		VERBOSE_TOROUT_STRING(title);
+		VERBOSE_TOROUT_STRING(buf);

This seems like a case where the macro has led to poorer code; rather than using sprintf into a temporary buffer, this should just print. Please consider fixing the output macros to allow formats, as the pr_* macros do.

Also, why do you need "if (verbose)" if the name of the macro has VERBOSE_ in it; shouldn't that mean it checks verbosity itself? (Another good reason not to create a unique verbosity level mechanism, and to use the kernel mechanisms instead.)

Quoted 5 lines

Good catch, removed the redundant "if (verbose)".

My attempts in the past to leverage existing in-kernel verbosity controls has caused problems such as the output appearing or not depending on the distro in question.

That aside, though, what do you think about making the macros accept format strings and arguments, in the style of pr_* and pr_fmt?

Quoted 47 lines · Josh Triplett

Quoted 45 lines · Paul E. McKenney

Quoted 34 lines · On Wed, May 07, 2014 at 02:37:36PM -0700, [email protected] wrote:

Quoted 7 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Currently, torture_kthread_stopping() prints only the name of the kthread that is stopping, which can be unedifying. This commit therefore adds "Stopping" to make things more evident.

Signed-off-by Paul E. McKenney <[email protected]>

Feedback below.

Quoted 8 lines

 kernel/torture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

kernel/torture.c +0 -0

index acc9afc2f26e..f329848c3eee 100644

kernel/torture.c EXPORT_SYMBOL_GPL(torture_must_stop_irq); · line 681

Quoted 9 lines

kernel/torture.c +4 -1

@@ -674,8 +674,11 @@ EXPORT_SYMBOL_GPL(torture_must_stop_irq);
  */
 void torture_kthread_stopping(char *title)
 {
+	char buf[128];
+
+	snprintf(buf, sizeof(buf), "Stopping %s", title);
 	if (verbose)
-		VERBOSE_TOROUT_STRING(title);
+		VERBOSE_TOROUT_STRING(buf);

This seems like a case where the macro has led to poorer code; rather than using sprintf into a temporary buffer, this should just print. Please consider fixing the output macros to allow formats, as the pr_* macros do.

Quoted 4 lines

Also, why do you need "if (verbose)" if the name of the macro has VERBOSE_ in it; shouldn't that mean it checks verbosity itself? (Another good reason not to create a unique verbosity level mechanism, and to use the kernel mechanisms instead.)

Good catch, removed the redundant "if (verbose)".

My attempts in the past to leverage existing in-kernel verbosity controls has caused problems such as the output appearing or not depending on the distro in question.

Quoted 2 lines

That aside, though, what do you think about making the macros accept format strings and arguments, in the style of pr_* and pr_fmt?

If I end up needing this in a few more cases, then it would indeed be worth it.

Quoted 51 lines · Paul E. McKenney

Quoted 49 lines · Josh Triplett

Quoted 40 lines · Paul E. McKenney

Quoted 34 lines · On Wed, May 07, 2014 at 02:37:36PM -0700, [email protected] wrote:

Quoted 7 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Currently, torture_kthread_stopping() prints only the name of the kthread that is stopping, which can be unedifying. This commit therefore adds "Stopping" to make things more evident.

Signed-off-by Paul E. McKenney <[email protected]>

Feedback below.

Quoted 8 lines

 kernel/torture.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

kernel/torture.c +0 -0

index acc9afc2f26e..f329848c3eee 100644

kernel/torture.c EXPORT_SYMBOL_GPL(torture_must_stop_irq); · line 681

Quoted 9 lines

kernel/torture.c +4 -1

@@ -674,8 +674,11 @@ EXPORT_SYMBOL_GPL(torture_must_stop_irq);
  */
 void torture_kthread_stopping(char *title)
 {
+	char buf[128];
+
+	snprintf(buf, sizeof(buf), "Stopping %s", title);
 	if (verbose)
-		VERBOSE_TOROUT_STRING(title);
+		VERBOSE_TOROUT_STRING(buf);

This seems like a case where the macro has led to poorer code; rather than using sprintf into a temporary buffer, this should just print. Please consider fixing the output macros to allow formats, as the pr_* macros do.

Quoted 4 lines

Also, why do you need "if (verbose)" if the name of the macro has VERBOSE_ in it; shouldn't that mean it checks verbosity itself? (Another good reason not to create a unique verbosity level mechanism, and to use the kernel mechanisms instead.)

Quoted 5 lines

Good catch, removed the redundant "if (verbose)".

My attempts in the past to leverage existing in-kernel verbosity controls has caused problems such as the output appearing or not depending on the distro in question.

That aside, though, what do you think about making the macros accept format strings and arguments, in the style of pr_* and pr_fmt?

Quoted 2 lines

If I end up needing this in a few more cases, then it would indeed be worth it.

I'd argue that it's worth it already: doing snprintf into a temporary buffer seems ridiculous here, when without these macros you'd just call pr_foo("Stopping %s\n", title);

From: "Paul E. McKenney" <[email protected]>

The current script does record qemu diagnostics, but the user has to know where to look for them. This commit therefore puts them into the Warnings file so that kvm-recheck.sh will display them. This change is especially useful if you are in the habit of killing the qemu process when you realize that you messed something up, but then later on wonder why the process terminated early.

Signed-off-by Paul E. McKenney <[email protected]>

Quoted 10 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

The current script does record qemu diagnostics, but the user has to know where to look for them. This commit therefore puts them into the Warnings file so that kvm-recheck.sh will display them. This change is especially useful if you are in the habit of killing the qemu process when you realize that you messed something up, but then later on wonder why the process terminated early.

Signed-off-by Paul E. McKenney <[email protected]>

A couple of issues below.

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh do · line 176

Quoted 6 lines

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -0

@@ -172,6 +172,14 @@ do
 		if test $kruntime -lt $seconds
 		then
 			echo Completed in $kruntime vs. $seconds >> $resdir/Warnings 2>&1
+			grep "^(qemu) qemu:" $resdir/kvm-test-1-run.sh.out >> $resdir/Warnings 2>&1
+			killpid="`grep "^(qemu) qemu: terminating on signal [0-9]* from pid" $resdir/kvm-test-1-run.sh.out`"

You already searched for lines like this and put them in Warnings in the previous line, so you don't need to search the entire output. Also, you use grep here and sed below; you could just use sed here to directly obtain the PID:

killpid="$(sed -n "s/^(qemu) qemu: terminating on signal [0-9]* from pid \([0-9]*\).*$/\1/p" $resdir/Warnings)"

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh do · line 182

Quoted 6 lines

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +6 -0

+			if test -n "$killpid"
+			then
+				pscmd="`echo $killpid | sed -e 's/^.*from pid/ps -ef | grep/'`"
+				echo $pscmd >> $resdir/Warnings
+				echo $pscmd | sh >> $resdir/Warnings 2>&1
+			fi

Grepping for a PID is a bad idea; it'll turn up anything that contains that PID anywhere on the line, including as a substring. Given the above change to obtain a numeric $killpid, you can instead pass the PID to ps directly:
if test -n "$killpid"
then
ps -fp $killpid >> $resdir/Warnings 2>&1
fi

From: "Paul E. McKenney" <[email protected]>

Currently, the scripts hard-code arch/x86/boot/bzImage, which does not work well for other architectures. This commit therefore provides a identify_boot_image function that selects the correct bzImage location relative to the top of the Linux source tree. This commit also adds a --bootimage argument that allows selecting some other file, for example, "vmlinux".

Signed-off-by Paul E. McKenney <[email protected]>

 tools/testing/selftests/rcutorture/bin/functions.sh | 21 +++++++++++++++++++++
 .../selftests/rcutorture/bin/kvm-test-1-run.sh      | 11 +++++------
 tools/testing/selftests/rcutorture/bin/kvm.sh       |  8 ++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

tools/testing/selftests/rcutorture/bin/functions.sh +7 -0

index 6b2adb29b073..efa95867e1cc 100644
@@ -76,6 +76,27 @@ configfrag_hotplug_cpu () {
 	grep -q '^CONFIG_HOTPLUG_CPU=y$' "$1"
 }
 
+# identify_boot_image qemu-cmd
+#
+# Returns the relative path to the kernel build image.  This will be
+# arch/<arch>/boot/bzImage unless overridden with the TORTURE_BOOT_IMAGE
+# environment variable.
+identify_boot_image () {
+	if test -n "$TORTURE_BOOT_IMAGE"

tools/testing/selftests/rcutorture/bin/functions.sh +4 -0

+		esac
+	fi
+}
+
 # identify_qemu builddir
 #
 # Returns our best guess as to which qemu command is appropriate for

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +3 -1

index 7848227aa4c1..7a95f86cc85a 100755
@@ -94,9 +94,11 @@ fi
 # CONFIG_YENTA=n
 if kvm-build.sh $config_template $builddir $T
 then
+	QEMU="`identify_qemu $builddir/vmlinux`"
+	BOOT_IMAGE="`identify_boot_image $QEMU`"
 	cp $builddir/Make*.out $resdir
 	cp $builddir/.config $resdir
-	cp $builddir/arch/x86/boot/bzImage $resdir
+	cp $builddir/$BOOT_IMAGE $resdir
 	parse-build.sh $resdir/Make.out $title
 	if test -f $builddir.wait
 	then

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -2

 # Generate -smp qemu argument.
 qemu_args="-nographic $qemu_args"
 cpu_count=`configNR_CPUS.sh $config_template`

@@ -151,13 +150,13 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
 # Generate kernel-version-specific boot parameters
 boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
 
-echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
+echo $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
 if test -n "$TORTURE_BUILDONLY"
 then
 	echo Build-only run specified, boot/test omitted.
 	exit 0
 fi
-$QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval &
+$QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval &
 qemu_pid=$!
 commandcompleted=0
 echo Monitoring qemu job at pid $qemu_pid

tools/testing/selftests/rcutorture/bin/kvm.sh +8 -0

index 9b838c372698..4eed2a4f42c7 100644
@@ -39,6 +39,7 @@ dryrun=""
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
 TORTURE_DEFCONFIG=defconfig
+TORTURE_BOOT_IMAGE=""
 TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
 TORTURE_KMAKE_ARG=""
 TORTURE_SUITE=rcu

@@ -53,6 +54,7 @@ kversion=""
 usage () {
 	echo "Usage: $scriptname optional arguments:"
 	echo "       --bootargs kernel-boot-arguments"
+	echo "       --bootimage relative-path-to-kernel-boot-image"
 	echo "       --buildonly"
 	echo "       --configs \"config-file list\""
 	echo "       --cpus N"

@@ -80,6 +82,11 @@ do
 		TORTURE_BOOTARGS="$2"
 		shift
 		;;
+	--bootimage)
+		checkarg --bootimage "(relative path to kernel boot image)" "$#" "$2" '[a-zA-Z0-9][a-zA-Z0-9_]*' '^--'
+		TORTURE_BOOT_IMAGE="$2"
+		shift
+		;;
 	--buildonly)
 		TORTURE_BUILDONLY=1
 		;;

@@ -245,6 +252,7 @@ CONFIGFRAG="$CONFIGFRAG"; export CONFIGFRAG
 KVM="$KVM"; export KVM
 KVPATH="$KVPATH"; export KVPATH
 PATH="$PATH"; export PATH
+TORTURE_BOOT_IMAGE="$TORTURE_BOOT_IMAGE"; export TORTURE_BOOT_IMAGE
 TORTURE_BUILDONLY="$TORTURE_BUILDONLY"; export TORTURE_BUILDONLY
 TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
 TORTURE_INITRD="$TORTURE_INITRD"; export TORTURE_INITRD

Signature · 1 line

1.8.1.5

Quoted 10 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

Currently, the scripts hard-code arch/x86/boot/bzImage, which does not work well for other architectures. This commit therefore provides a identify_boot_image function that selects the correct bzImage location relative to the top of the Linux source tree. This commit also adds a --bootimage argument that allows selecting some other file, for example, "vmlinux".

Signed-off-by Paul E. McKenney <[email protected]>

Two issues below; with those fixed,

Reviewed-by Josh Triplett <[email protected]>

Quoted 25 lines

 tools/testing/selftests/rcutorture/bin/functions.sh | 21 +++++++++++++++++++++
 .../selftests/rcutorture/bin/kvm-test-1-run.sh      | 11 +++++------
 tools/testing/selftests/rcutorture/bin/kvm.sh       |  8 ++++++++
 3 files changed, 34 insertions(+), 6 deletions(-)

tools/testing/selftests/rcutorture/bin/functions.sh +12 -0

index 6b2adb29b073..efa95867e1cc 100644
@@ -76,6 +76,27 @@ configfrag_hotplug_cpu () {
 	grep -q '^CONFIG_HOTPLUG_CPU=y$' "$1"
 }
 
+# identify_boot_image qemu-cmd
+#
+# Returns the relative path to the kernel build image.  This will be
+# arch/<arch>/boot/bzImage unless overridden with the TORTURE_BOOT_IMAGE
+# environment variable.
+identify_boot_image () {
+	if test -n "$TORTURE_BOOT_IMAGE"
+	then
+		echo $TORTURE_BOOT_IMAGE
+	else
+		case "$1" in
+		qemu-system-x86_64|qemu-system-i386)

tools/testing/selftests/rcutorture/bin/functions.sh configfrag_hotplug_cpu () { · line 95

Quoted 5 lines

tools/testing/selftests/rcutorture/bin/functions.sh +5 -0

+			echo arch/x86/boot/bzImage
+			;;
+		qemu-system-ppc64)
+			echo arch/powerpc/boot/bzImage
+			;;

*)
(fail noisily rather than silently)

Quoted 28 lines

tools/testing/selftests/rcutorture/bin/functions.sh +4 -0

+		esac
+	fi
+}
+
 # identify_qemu builddir
 #
 # Returns our best guess as to which qemu command is appropriate for

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +3 -1

index 7848227aa4c1..7a95f86cc85a 100755
@@ -94,9 +94,11 @@ fi
 # CONFIG_YENTA=n
 if kvm-build.sh $config_template $builddir $T
 then
+	QEMU="`identify_qemu $builddir/vmlinux`"
+	BOOT_IMAGE="`identify_boot_image $QEMU`"
 	cp $builddir/Make*.out $resdir
 	cp $builddir/.config $resdir
-	cp $builddir/arch/x86/boot/bzImage $resdir
+	cp $builddir/$BOOT_IMAGE $resdir
 	parse-build.sh $resdir/Make.out $title
 	if test -f $builddir.wait
 	then

@@ -124,9 +126,6 @@ cd $KVM
 kstarttime=`awk 'BEGIN { print systime() }' < /dev/null`
 echo ' ---' `date`: Starting kernel
 

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh cd $KVM · line 129

Quoted 3 lines

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +0 -3

-# Determine the appropriate flavor of qemu command.
-QEMU="`identify_qemu $builddir/vmlinux`"
-

This change seems related but undocumented.

Quoted 62 lines

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +2 -2

 # Generate -smp qemu argument.
 qemu_args="-nographic $qemu_args"
 cpu_count=`configNR_CPUS.sh $config_template`

@@ -151,13 +150,13 @@ boot_args="`configfrag_boot_params "$boot_args" "$config_template"`"
 # Generate kernel-version-specific boot parameters
 boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`"
 
-echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
+echo $QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd
 if test -n "$TORTURE_BUILDONLY"
 then
 	echo Build-only run specified, boot/test omitted.
 	exit 0
 fi
-$QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval &
+$QEMU $qemu_args -m 512 -kernel $builddir/$BOOT_IMAGE -append "$qemu_append $boot_args"; echo $? > $resdir/qemu-retval &
 qemu_pid=$!
 commandcompleted=0
 echo Monitoring qemu job at pid $qemu_pid

tools/testing/selftests/rcutorture/bin/kvm.sh +8 -0

index 9b838c372698..4eed2a4f42c7 100644
@@ -39,6 +39,7 @@ dryrun=""
 KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM
 PATH=${KVM}/bin:$PATH; export PATH
 TORTURE_DEFCONFIG=defconfig
+TORTURE_BOOT_IMAGE=""
 TORTURE_INITRD="$KVM/initrd"; export TORTURE_INITRD
 TORTURE_KMAKE_ARG=""
 TORTURE_SUITE=rcu

@@ -53,6 +54,7 @@ kversion=""
 usage () {
 	echo "Usage: $scriptname optional arguments:"
 	echo "       --bootargs kernel-boot-arguments"
+	echo "       --bootimage relative-path-to-kernel-boot-image"
 	echo "       --buildonly"
 	echo "       --configs \"config-file list\""
 	echo "       --cpus N"

@@ -80,6 +82,11 @@ do
 		TORTURE_BOOTARGS="$2"
 		shift
 		;;
+	--bootimage)
+		checkarg --bootimage "(relative path to kernel boot image)" "$#" "$2" '[a-zA-Z0-9][a-zA-Z0-9_]*' '^--'
+		TORTURE_BOOT_IMAGE="$2"
+		shift
+		;;
 	--buildonly)
 		TORTURE_BUILDONLY=1
 		;;

@@ -245,6 +252,7 @@ CONFIGFRAG="$CONFIGFRAG"; export CONFIGFRAG
 KVM="$KVM"; export KVM
 KVPATH="$KVPATH"; export KVPATH
 PATH="$PATH"; export PATH
+TORTURE_BOOT_IMAGE="$TORTURE_BOOT_IMAGE"; export TORTURE_BOOT_IMAGE
 TORTURE_BUILDONLY="$TORTURE_BUILDONLY"; export TORTURE_BUILDONLY
 TORTURE_DEFCONFIG="$TORTURE_DEFCONFIG"; export TORTURE_DEFCONFIG
 TORTURE_INITRD="$TORTURE_INITRD"; export TORTURE_INITRD

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

This commit allows rcutorture to print additional state for the RCU grace-period kthreads in cases where RCU seems reluctant to start a new grace period.

Signed-off-by Paul E. McKenney <[email protected]>

 include/linux/rcutiny.h |  4 ++++
 include/linux/rcutree.h |  1 +
 kernel/rcu/rcutorture.c |  1 +
 kernel/rcu/tree.c       | 17 +++++++++++++++++
 kernel/rcu/tree.h       |  8 +++++++-
 5 files changed, 30 insertions(+), 1 deletion(-)

include/linux/rcutiny.h +4 -0

index 425c659d54e5..d40a6a451330 100644
@@ -119,6 +119,10 @@ static inline void rcu_sched_force_quiescent_state(void)
 {
 }
 
+static inline void show_rcu_gp_kthreads(void)
+{
+}
+
 static inline void rcu_cpu_stall_reset(void)
 {
 }

include/linux/rcutree.h +1 -0

index a59ca05fd4e3..3e2f5d432743 100644
@@ -84,6 +84,7 @@ extern unsigned long rcutorture_vernum;
 long rcu_batches_completed(void);
 long rcu_batches_completed_bh(void);
 long rcu_batches_completed_sched(void);
+void show_rcu_gp_kthreads(void);
 
 void rcu_force_quiescent_state(void);
 void rcu_bh_force_quiescent_state(void);

kernel/rcu/rcutorture.c +1 -0

index 50c26a7b6d97..15af04177e7e 100644
@@ -1033,6 +1033,7 @@ rcu_torture_printk(char *page)
 				"??? Writer stall state %d g%lu c%lu f%#x\n",
 				rcu_torture_writer_state,
 				gpnum, completed, flags);
+		show_rcu_gp_kthreads();
 		rcutorture_trace_dump();
 	}
 	rtcv_snap = rcu_torture_current_version;

kernel/rcu/tree.c +17 -0

index 032106df7391..3107bd935b2b 100644
@@ -280,6 +280,21 @@ void rcu_bh_force_quiescent_state(void)
 EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
 
 /*
+ * Show the state of the grace-period kthreads.
+ */
+void show_rcu_gp_kthreads(void)
+{
+	struct rcu_state *rsp;
+
+	for_each_rcu_flavor(rsp) {
+		pr_info("%s: wait state: %d ->state: %#lx\n",
+			rsp->name, rsp->gp_state, rsp->gp_kthread->state);
+		/* sched_show_task(rsp->gp_kthread); */
+	}
+}
+EXPORT_SYMBOL_GPL(show_rcu_gp_kthreads);
+
+/*
  * Record the number of times rcutorture tests have been initiated and
  * terminated.  This information allows the debugfs tracing stats to be
  * correlated to the rcutorture messages, even when the rcutorture module

@@ -1611,6 +1626,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
 			trace_rcu_grace_period(rsp->name,
 					       ACCESS_ONCE(rsp->gpnum),
 					       TPS("reqwait"));
+			rsp->gp_state = RCU_GP_WAIT_GPS;
 			wait_event_interruptible(rsp->gp_wq,
 						 ACCESS_ONCE(rsp->gp_flags) &
 						 RCU_GP_FLAG_INIT);

@@ -1638,6 +1654,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
 			trace_rcu_grace_period(rsp->name,
 					       ACCESS_ONCE(rsp->gpnum),
 					       TPS("fqswait"));
+			rsp->gp_state = RCU_GP_WAIT_FQS;
 			ret = wait_event_interruptible_timeout(rsp->gp_wq,
 					((gf = ACCESS_ONCE(rsp->gp_flags)) &
 					 RCU_GP_FLAG_FQS) ||

kernel/rcu/tree.h +7 -1

index 75dc3c39a02a..c2fd1e722879 100644
@@ -406,7 +406,8 @@ struct rcu_state {
 	unsigned long completed;		/* # of last completed gp. */
 	struct task_struct *gp_kthread;		/* Task for grace periods. */
 	wait_queue_head_t gp_wq;		/* Where GP task waits. */
-	int gp_flags;				/* Commands for GP task. */
+	short gp_flags;				/* Commands for GP task. */
+	short gp_state;				/* GP kthread sleep state. */
 
 	/* End of fields guarded by root rcu_node's lock. */
 

@@ -469,6 +470,11 @@ struct rcu_state {
 #define RCU_GP_FLAG_INIT 0x1	/* Need grace-period initialization. */
 #define RCU_GP_FLAG_FQS  0x2	/* Need grace-period quiescent-state forcing. */
 
+/* Values for rcu_state structure's gp_flags field. */
+#define RCU_GP_WAIT_INIT 0	/* Initial state. */
+#define RCU_GP_WAIT_GPS  1	/* Wait for grace-period start. */
+#define RCU_GP_WAIT_FQS  2	/* Wait for force-quiescent-state time. */
+
 extern struct list_head rcu_struct_flavors;
 
 /* Sequence through rcu_state structures for each RCU flavor. */

Signature · 1 line

1.8.1.5

Quoted 7 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

This commit allows rcutorture to print additional state for the RCU grace-period kthreads in cases where RCU seems reluctant to start a new grace period.

Signed-off-by Paul E. McKenney <[email protected]>

Should something reset gp_state after fqs finishes?

Reviewed-by Josh Triplett <[email protected]>

Quoted 117 lines

 include/linux/rcutiny.h |  4 ++++
 include/linux/rcutree.h |  1 +
 kernel/rcu/rcutorture.c |  1 +
 kernel/rcu/tree.c       | 17 +++++++++++++++++
 kernel/rcu/tree.h       |  8 +++++++-
 5 files changed, 30 insertions(+), 1 deletion(-)

include/linux/rcutiny.h +4 -0

index 425c659d54e5..d40a6a451330 100644
@@ -119,6 +119,10 @@ static inline void rcu_sched_force_quiescent_state(void)
 {
 }
 
+static inline void show_rcu_gp_kthreads(void)
+{
+}
+
 static inline void rcu_cpu_stall_reset(void)
 {
 }

include/linux/rcutree.h +1 -0

index a59ca05fd4e3..3e2f5d432743 100644
@@ -84,6 +84,7 @@ extern unsigned long rcutorture_vernum;
 long rcu_batches_completed(void);
 long rcu_batches_completed_bh(void);
 long rcu_batches_completed_sched(void);
+void show_rcu_gp_kthreads(void);
 
 void rcu_force_quiescent_state(void);
 void rcu_bh_force_quiescent_state(void);

kernel/rcu/rcutorture.c +1 -0

index 50c26a7b6d97..15af04177e7e 100644
@@ -1033,6 +1033,7 @@ rcu_torture_printk(char *page)
 				"??? Writer stall state %d g%lu c%lu f%#x\n",
 				rcu_torture_writer_state,
 				gpnum, completed, flags);
+		show_rcu_gp_kthreads();
 		rcutorture_trace_dump();
 	}
 	rtcv_snap = rcu_torture_current_version;

kernel/rcu/tree.c +17 -0

index 032106df7391..3107bd935b2b 100644
@@ -280,6 +280,21 @@ void rcu_bh_force_quiescent_state(void)
 EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
 
 /*
+ * Show the state of the grace-period kthreads.
+ */
+void show_rcu_gp_kthreads(void)
+{
+	struct rcu_state *rsp;
+
+	for_each_rcu_flavor(rsp) {
+		pr_info("%s: wait state: %d ->state: %#lx\n",
+			rsp->name, rsp->gp_state, rsp->gp_kthread->state);
+		/* sched_show_task(rsp->gp_kthread); */
+	}
+}
+EXPORT_SYMBOL_GPL(show_rcu_gp_kthreads);
+
+/*
  * Record the number of times rcutorture tests have been initiated and
  * terminated.  This information allows the debugfs tracing stats to be
  * correlated to the rcutorture messages, even when the rcutorture module

@@ -1611,6 +1626,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
 			trace_rcu_grace_period(rsp->name,
 					       ACCESS_ONCE(rsp->gpnum),
 					       TPS("reqwait"));
+			rsp->gp_state = RCU_GP_WAIT_GPS;
 			wait_event_interruptible(rsp->gp_wq,
 						 ACCESS_ONCE(rsp->gp_flags) &
 						 RCU_GP_FLAG_INIT);

@@ -1638,6 +1654,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
 			trace_rcu_grace_period(rsp->name,
 					       ACCESS_ONCE(rsp->gpnum),
 					       TPS("fqswait"));
+			rsp->gp_state = RCU_GP_WAIT_FQS;
 			ret = wait_event_interruptible_timeout(rsp->gp_wq,
 					((gf = ACCESS_ONCE(rsp->gp_flags)) &
 					 RCU_GP_FLAG_FQS) ||

kernel/rcu/tree.h +7 -1

index 75dc3c39a02a..c2fd1e722879 100644
@@ -406,7 +406,8 @@ struct rcu_state {
 	unsigned long completed;		/* # of last completed gp. */
 	struct task_struct *gp_kthread;		/* Task for grace periods. */
 	wait_queue_head_t gp_wq;		/* Where GP task waits. */
-	int gp_flags;				/* Commands for GP task. */
+	short gp_flags;				/* Commands for GP task. */
+	short gp_state;				/* GP kthread sleep state. */
 
 	/* End of fields guarded by root rcu_node's lock. */
 

@@ -469,6 +470,11 @@ struct rcu_state {
 #define RCU_GP_FLAG_INIT 0x1	/* Need grace-period initialization. */
 #define RCU_GP_FLAG_FQS  0x2	/* Need grace-period quiescent-state forcing. */
 
+/* Values for rcu_state structure's gp_flags field. */
+#define RCU_GP_WAIT_INIT 0	/* Initial state. */
+#define RCU_GP_WAIT_GPS  1	/* Wait for grace-period start. */
+#define RCU_GP_WAIT_FQS  2	/* Wait for force-quiescent-state time. */
+
 extern struct list_head rcu_struct_flavors;
 
 /* Sequence through rcu_state structures for each RCU flavor. */

Signature · 1 line

1.8.1.5

From: "Paul E. McKenney" <[email protected]>

The reaction of kvm-recheck.sh is obscure at best, and easy to miss completely. This commit therefore prints "BUG: Build failed" in the summary at the end of a run.

Signed-off-by Paul E. McKenney <[email protected]>

---
 .../selftests/rcutorture/bin/kvm-recheck-lock.sh   |  2 +-
 .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |  2 +-
 .../selftests/rcutorture/bin/kvm-recheck.sh        | 24 ++++++++++++++++------
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  1 +
 4 files changed, 21 insertions(+), 8 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh +1 -1

index 829186e19eb1..7f1ff1a8fc4b 100755
@@ -35,7 +35,7 @@ configfile=`echo $i | sed -e 's/^.*\///'`
 ncs=`grep "Writes:  Total:" $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* Total: //' -e 's/ .*$//'`
 if test -z "$ncs"
 then
-	echo $configfile
+	echo "$configfile -------"
 else
 	title="$configfile ------- $ncs acquisitions/releases"
 	dur=`sed -e 's/^.* locktorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`

tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh +1 -1

index d75b1dc5ae53..307c4b95f325 100755
@@ -35,7 +35,7 @@ configfile=`echo $i | sed -e 's/^.*\///'`
 ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
 if test -z "$ngps"
 then
-	echo $configfile
+	echo "$configfile -------"
 else
 	title="$configfile ------- $ngps grace periods"
 	dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`

tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +18 -6

index 26d78b7eaccf..ee1f6cae3d70 100755
@@ -25,6 +25,7 @@
 # Authors: Paul E. McKenney <[email protected]>
 
 PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
+. tools/testing/selftests/rcutorture/bin/functions.sh
 for rd in "$@"
 do
 	firsttime=1

@@ -39,13 +40,24 @@ do
 		fi
 		TORTURE_SUITE="`cat $i/../TORTURE_SUITE`"
 		kvm-recheck-${TORTURE_SUITE}.sh $i
-		configcheck.sh $i/.config $i/ConfigFragment
-		parse-build.sh $i/Make.out $configfile
-		parse-torture.sh $i/console.log $configfile
-		parse-console.sh $i/console.log $configfile
-		if test -r $i/Warnings
+		if test -f "$i/console.log"
 		then
-			cat $i/Warnings
+			configcheck.sh $i/.config $i/ConfigFragment
+			parse-build.sh $i/Make.out $configfile
+			parse-torture.sh $i/console.log $configfile
+			parse-console.sh $i/console.log $configfile
+			if test -r $i/Warnings
+			then
+				cat $i/Warnings
+			fi
+		else
+			if test -f "$i/qemu-cmd"
+			then
+				print_bug qemu failed
+			else
+				print_bug Build failed
+			fi
+			echo "   $i"
 		fi
 	done
 done

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +1 -0

index 7a95f86cc85a..51c34a91a375 100755
@@ -106,6 +106,7 @@ then
 	fi
 else
 	cp $builddir/Make*.out $resdir
+	cp $builddir/.config $resdir || :
 	echo Build failed, not running KVM, see $resdir.
 	if test -f $builddir.wait
 	then

Signature · 1 line

1.8.1.5

Quoted 5 lines · Paul E. McKenney

From: "Paul E. McKenney" <[email protected]>

The reaction of kvm-recheck.sh is obscure at best, and easy to miss completely. This commit therefore prints "BUG: Build failed" in the summary at the end of a run.

This commit also changes a dozen other things about the output that this commit message does not document. :)

Quoted 92 lines

Signed-off-by Paul E. McKenney <[email protected]>

---
 .../selftests/rcutorture/bin/kvm-recheck-lock.sh   |  2 +-
 .../selftests/rcutorture/bin/kvm-recheck-rcu.sh    |  2 +-
 .../selftests/rcutorture/bin/kvm-recheck.sh        | 24 ++++++++++++++++------
 .../selftests/rcutorture/bin/kvm-test-1-run.sh     |  1 +
 4 files changed, 21 insertions(+), 8 deletions(-)

tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh +1 -1

index 829186e19eb1..7f1ff1a8fc4b 100755
@@ -35,7 +35,7 @@ configfile=`echo $i | sed -e 's/^.*\///'`
 ncs=`grep "Writes:  Total:" $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* Total: //' -e 's/ .*$//'`
 if test -z "$ncs"
 then
-	echo $configfile
+	echo "$configfile -------"
 else
 	title="$configfile ------- $ncs acquisitions/releases"
 	dur=`sed -e 's/^.* locktorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`

tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh +1 -1

index d75b1dc5ae53..307c4b95f325 100755
@@ -35,7 +35,7 @@ configfile=`echo $i | sed -e 's/^.*\///'`
 ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'`
 if test -z "$ngps"
 then
-	echo $configfile
+	echo "$configfile -------"
 else
 	title="$configfile ------- $ngps grace periods"
 	dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null`

tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +18 -6

index 26d78b7eaccf..ee1f6cae3d70 100755
@@ -25,6 +25,7 @@
 # Authors: Paul E. McKenney <[email protected]>
 
 PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH
+. tools/testing/selftests/rcutorture/bin/functions.sh
 for rd in "$@"
 do
 	firsttime=1

@@ -39,13 +40,24 @@ do
 		fi
 		TORTURE_SUITE="`cat $i/../TORTURE_SUITE`"
 		kvm-recheck-${TORTURE_SUITE}.sh $i
-		configcheck.sh $i/.config $i/ConfigFragment
-		parse-build.sh $i/Make.out $configfile
-		parse-torture.sh $i/console.log $configfile
-		parse-console.sh $i/console.log $configfile
-		if test -r $i/Warnings
+		if test -f "$i/console.log"
 		then
-			cat $i/Warnings
+			configcheck.sh $i/.config $i/ConfigFragment
+			parse-build.sh $i/Make.out $configfile
+			parse-torture.sh $i/console.log $configfile
+			parse-console.sh $i/console.log $configfile
+			if test -r $i/Warnings
+			then
+				cat $i/Warnings
+			fi
+		else
+			if test -f "$i/qemu-cmd"
+			then
+				print_bug qemu failed
+			else
+				print_bug Build failed
+			fi
+			echo "   $i"
 		fi
 	done
 done

tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +1 -0

index 7a95f86cc85a..51c34a91a375 100755
@@ -106,6 +106,7 @@ then
 	fi
 else
 	cp $builddir/Make*.out $resdir
+	cp $builddir/.config $resdir || :
 	echo Build failed, not running KVM, see $resdir.
 	if test -f $builddir.wait
 	then

Signature · 1 line

1.8.1.5