The following commit has been merged into the core/rcu branch of tip:

Commit-ID:     08c7974293851da6a64989b5ce7a0750e58178b1
Gitweb:        
https://git.kernel.org/tip/08c7974293851da6a64989b5ce7a0750e58178b1
Author:        Paul E. McKenney <[email protected]>
AuthorDate:    Fri, 28 Aug 2020 06:46:03 -07:00
Committer:     Paul E. McKenney <[email protected]>
CommitterDate: Mon, 02 Nov 2020 17:13:30 -08:00

torture: Don't kill gdb sessions

The rcutorture scripting will do a "kill -9" on any guest OS that exceeds
its --duration by more than a few minutes, which is very valuable when
bugs result in hangs.  However, this is a problem when the "hang" was due
to a --gdb debugging session.

This commit therefore refrains from killing the guest OS when a debugging
session is in progress.  This means that the user must manually kill the
kvm.sh process group if a hang really does occur.

Signed-off-by: Paul E. McKenney <[email protected]>
---
 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 6dc2b49..d04966a 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -206,7 +206,10 @@ do
        kruntime=`gawk 'BEGIN { print systime() - '"$kstarttime"' }' < 
/dev/null`
        if test -z "$qemu_pid" || kill -0 "$qemu_pid" > /dev/null 2>&1
        then
-               if test $kruntime -ge $seconds -o -f "$TORTURE_STOPFILE"
+               if test -n "$TORTURE_KCONFIG_GDB_ARG"
+               then
+                       :
+               elif test $kruntime -ge $seconds || test -f "$TORTURE_STOPFILE"
                then
                        break;
                fi

Reply via email to