1 files changed, 33 insertions, 14 deletions

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 94b28bb37d36..27e544e29510 100755
--- a/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
+++ b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
@@ -94,9 +94,17 @@ 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
+        if test -n "$BOOT_IMAGE"
+        then
+                cp $builddir/$BOOT_IMAGE $resdir
+        else
+                echo No identifiable boot image, not running KVM, see $resdir.
+                echo Do the torture scripts know about your architecture?
+        fi
         parse-build.sh $resdir/Make.out $title
         if test -f $builddir.wait
         then
@@ -104,6 +112,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
@@ -124,9 +133,6 @@ cd $KVM
 kstarttime=`awk 'BEGIN { print systime() }' < /dev/null`
 echo ' ---' `date`: Starting kernel
 
-# Determine the appropriate flavor of qemu command.
-QEMU="`identify_qemu $builddir/vmlinux`"
-
 # Generate -smp qemu argument.
 qemu_args="-nographic $qemu_args"
 cpu_count=`configNR_CPUS.sh $config_template`
@@ -151,27 +157,38 @@ 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
-if test -n "$RCU_BUILDONLY"
+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" &
+( $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
-for ((i=0;i<$seconds;i++))
+while :
 do
+        kruntime=`awk 'BEGIN { print systime() - '"$kstarttime"' }' < /dev/null`
         if kill -0 $qemu_pid > /dev/null 2>&1
         then
+                if test $kruntime -ge $seconds
+                then
+                        break;
+                fi
                 sleep 1
         else
                 commandcompleted=1
-                kruntime=`awk 'BEGIN { print systime() - '"$kstarttime"' }' < /dev/null`
                 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="`sed -n "s/^(qemu) qemu: terminating on signal [0-9]* from pid \([0-9]*\).*$/\1/p" $resdir/Warnings`"
+                        if test -n "$killpid"
+                        then
+                                echo "ps -fp $killpid" >> $resdir/Warnings 2>&1
+                                ps -fp $killpid >> $resdir/Warnings 2>&1
+                        fi
                 else
                         echo ' ---' `date`: Kernel done
                 fi
@@ -181,23 +198,25 @@ done
 if test $commandcompleted -eq 0
 then
         echo Grace period for qemu job at pid $qemu_pid
-        for ((i=0;i<=$grace;i++))
+        while :
         do
+                kruntime=`awk 'BEGIN { print systime() - '"$kstarttime"' }' < /dev/null`
                 if kill -0 $qemu_pid > /dev/null 2>&1
                 then
-                        sleep 1
+                        :
                 else
                         break
                 fi
-                if test $i -eq $grace
+                if test $kruntime -ge $((seconds + grace))
                 then
-                        kruntime=`awk 'BEGIN { print systime() - '"$kstarttime"' }'`
                         echo "!!! Hang at $kruntime vs. $seconds seconds" >> $resdir/Warnings 2>&1
                         kill -KILL $qemu_pid
+                        break
                 fi
+                sleep 1
         done
 fi
 
 cp $builddir/console.log $resdir
-parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title
+parse-torture.sh $resdir/console.log $title
 parse-console.sh $resdir/console.log $title