diff mbox series

[5.15,1/2] torture: Avoid torture-test reboot loops

Message ID 20230827215741.246948-1-joel@joelfernandes.org (mailing list archive)
State Mainlined
Commit 10f84c2cfb5045e37d78cb5d4c8e8321e06ae18f
Headers show
Series [5.15,1/2] torture: Avoid torture-test reboot loops | expand

Commit Message

Joel Fernandes Aug. 27, 2023, 9:57 p.m. UTC 
From: "Paul E. McKenney" <paulmck@kernel.org>

[ Upstream commit 10f84c2cfb5045e37d78cb5d4c8e8321e06ae18f ]

Currently, the various torture tests sometimes react to an early-boot
bug by rebooting.  This is almost always counterproductive, needlessly
consuming CPU time and bloating the console log.  This commit therefore
adds the "-no-reboot" argument to qemu so that reboot requests will
cause qemu to exit.

Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Greg KH Aug. 27, 2023, 10:27 p.m. UTC | #1 
On Sun, Aug 27, 2023 at 09:57:39PM +0000, Joel Fernandes (Google) wrote:
> From: "Paul E. McKenney" <paulmck@kernel.org>
> 
> [ Upstream commit 10f84c2cfb5045e37d78cb5d4c8e8321e06ae18f ]

I don't see this commit in Linus's tree, am I just missing it somewhere?

thanks,

greg k-h
Joel Fernandes Aug. 27, 2023, 10:31 p.m. UTC | #2 
On Sun, Aug 27, 2023 at 6:27 PM Greg KH <gregkh@linuxfoundation.org> wrote:
>
> On Sun, Aug 27, 2023 at 09:57:39PM +0000, Joel Fernandes (Google) wrote:
> > From: "Paul E. McKenney" <paulmck@kernel.org>
> >
> > [ Upstream commit 10f84c2cfb5045e37d78cb5d4c8e8321e06ae18f ]
>
> I don't see this commit in Linus's tree, am I just missing it somewhere?
>

Ah, this particular patch might not be in Linus's tree yet. It is in
Paul's tree. Feel free to ignore it for now if you want and I'll
resend it later (and likewise for the 5.10 one).

thanks,

 - Joel
Greg KH Aug. 28, 2023, 9:56 a.m. UTC | #3 
On Sun, Aug 27, 2023 at 06:31:55PM -0400, Joel Fernandes wrote:
> On Sun, Aug 27, 2023 at 6:27 PM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > On Sun, Aug 27, 2023 at 09:57:39PM +0000, Joel Fernandes (Google) wrote:
> > > From: "Paul E. McKenney" <paulmck@kernel.org>
> > >
> > > [ Upstream commit 10f84c2cfb5045e37d78cb5d4c8e8321e06ae18f ]
> >
> > I don't see this commit in Linus's tree, am I just missing it somewhere?
> >
> 
> Ah, this particular patch might not be in Linus's tree yet. It is in
> Paul's tree. Feel free to ignore it for now if you want and I'll
> resend it later (and likewise for the 5.10 one).

Yeah, please just send it later, once it has landed in a -rc release
otherwise there's nothing we can do with it now, sorry.

thanks,

greg k-h
diff mbox series

Patch

diff --git a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
index f4c8055dbf7a..c57be9563214 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -9,9 +9,10 @@ 
 #
 # Usage: kvm-test-1-run.sh config resdir seconds qemu-args boot_args_in
 #
-# qemu-args defaults to "-enable-kvm -nographic", along with arguments
-#			specifying the number of CPUs and other options
-#			generated from the underlying CPU architecture.
+# qemu-args defaults to "-enable-kvm -nographic -no-reboot", along with
+#			arguments specifying the number of CPUs and
+#			other options generated from the underlying
+#			CPU architecture.
 # boot_args_in defaults to value returned by the per_version_boot_params
 #			shell function.
 #
@@ -141,7 +142,7 @@  then
 fi
 
 # Generate -smp qemu argument.
-qemu_args="-enable-kvm -nographic $qemu_args"
+qemu_args="-enable-kvm -nographic -no-reboot $qemu_args"
 cpu_count=`configNR_CPUS.sh $resdir/ConfigFragment`
 cpu_count=`configfrag_boot_cpus "$boot_args_in" "$config_template" "$cpu_count"`
 if test "$cpu_count" -gt "$TORTURE_ALLOTED_CPUS"