ktest.pl: Add RUN_TIMEOUT option with default unlimited

commit 4e7d2a8f0b52abf23b1dc13b3d88bc0923383cd5 upstream.

There is a disconnect between the run_command function and the
wait_for_input. The wait_for_input has a default timeout of 2 minutes. But
if that happens, the run_command loop will exit out to the waitpid() of
the executing command. This fails in that it no longer monitors the
command, and also, the ssh to the test box can hang when its finished, as
it's waiting for the pipe it's writing to to flush, but the loop that
reads that pipe has already exited, leaving the command stuck, and the
test hangs.

Instead, make the default "wait_for_input" of the run_command infinite,
and allow the user to override it if they want with a default timeout
option "RUN_TIMEOUT".

But this fixes the hang that happens when the pipe is full and the ssh
session never exits.

Cc: stable@vger.kernel.org
Fixes: 3cc0566330d35 ("ktest: Add timeout to ssh command")
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 84676249886a7ec6219f8984f67ad46afbc0e94e..698b99e25f980eb4be777231512e4ccd5fdd7ef3 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -174,6 +174,7 @@ my $store_failures;
 my $store_successes;
 my $test_name;
 my $timeout;
+my $run_timeout;
 my $connect_timeout;
 my $config_bisect_exec;
 my $booted_timeout;
@@ -333,6 +334,7 @@ my %option_map = (
     "STORE_SUCCESSES"          => \$store_successes,
     "TEST_NAME"                        => \$test_name,
     "TIMEOUT"                  => \$timeout,
+    "RUN_TIMEOUT"              => \$run_timeout,
     "CONNECT_TIMEOUT"          => \$connect_timeout,
     "CONFIG_BISECT_EXEC"       => \$config_bisect_exec,
     "BOOTED_TIMEOUT"           => \$booted_timeout,
@@ -1766,6 +1768,14 @@ sub run_command {
     $command =~ s/\$SSH_USER/$ssh_user/g;
     $command =~ s/\$MACHINE/$machine/g;
 
+    if (!defined($timeout)) {
+       $timeout = $run_timeout;
+    }
+
+    if (!defined($timeout)) {
+       $timeout = -1; # tell wait_for_input to wait indefinitely
+    }
+
     doprint("$command ... ");
     $start_time = time;
 
@@ -1794,13 +1804,10 @@ sub run_command {
 
     while (1) {
        my $fp = \*CMD;
-       if (defined($timeout)) {
-           doprint "timeout = $timeout\n";
-       }
        my $line = wait_for_input($fp, $timeout);
        if (!defined($line)) {
            my $now = time;
-           if (defined($timeout) && (($now - $start_time) >= $timeout)) {
+           if ($timeout >= 0 && (($now - $start_time) >= $timeout)) {
                doprint "Hit timeout of $timeout, killing process\n";
                $hit_timeout = 1;
                kill 9, $pid;
@@ -1974,6 +1981,11 @@ sub wait_for_input
        $time = $timeout;
     }
 
+    if ($time < 0) {
+       # Negative number means wait indefinitely
+       undef $time;
+    }
+
     $rin = '';
     vec($rin, fileno($fp), 1) = 1;
     vec($rin, fileno(\*STDIN), 1) = 1;

diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index c3bc933d437b34d3f9e77029908517d6a53b0e32..a7b24fda22c12509ae8f046c8e63d2d4baff9945 100644 (file)
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -791,6 +791,11 @@
 # is issued instead of a reboot.
 # CONNECT_TIMEOUT = 25
 
+# The timeout in seconds for how long to wait for any running command
+# to timeout. If not defined, it will let it go indefinitely.
+# (default undefined)
+#RUN_TIMEOUT = 600
+
 # In between tests, a reboot of the box may occur, and this
 # is the time to wait for the console after it stops producing
 # output. Some machines may not produce a large lag on reboot