From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9F2716E5D4 for ; Tue, 7 Apr 2020 08:42:06 +0000 (UTC) From: Jani Nikula In-Reply-To: <20200407083533.1692277-1-chris@chris-wilson.co.uk> References: <20200407083105.1692124-1-chris@chris-wilson.co.uk> <20200407083533.1692277-1-chris@chris-wilson.co.uk> Date: Tue, 07 Apr 2020 11:42:01 +0300 Message-ID: <875zeblmau.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [igt-dev] [PATCH i-g-t] runner: Show why we dump the task state List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: Chris Wilson , igt-dev@lists.freedesktop.org Cc: Petri Latvala , Chris Wilson List-ID: On Tue, 07 Apr 2020, Chris Wilson wrote: > Include the reason why we are dumping the task state (test timeout) in > the kmsg log prior to the task state. Hopefully this helps when reading > the dump. > > Signed-off-by: Chris Wilson > Cc: Petri Latvala > --- > runner/executor.c | 25 ++++++++++++++++--------- > 1 file changed, 16 insertions(+), 9 deletions(-) > > diff --git a/runner/executor.c b/runner/executor.c > index 1b69f9c57..7061b28d3 100644 > --- a/runner/executor.c > +++ b/runner/executor.c > @@ -678,9 +678,20 @@ static bool sysrq(char cmd) > return success; > } > > -static void show_kernel_task_state(void) > +static const char *show_kernel_task_state(const char *msg) > { > + int fd; > + > + fd = open("/dev/kmsg", O_WRONLY); > + if (fd != -1) { > + write(fd, "<4>[IGT] ", 7); > + write(fd, msg, strlen(msg)); > + close(fd); > + } > + igt_kmsg(KMSG_WARNING "%s\n", msg); BR, Jani. > sysrq('t'); > + > + return msg; > } > > static const char *need_to_timeout(struct settings *settings, > @@ -725,16 +736,12 @@ static const char *need_to_timeout(struct settings *settings, > return "Killing the test because the kernel is tainted.\n"; > > if (settings->per_test_timeout != 0 && > - time_since_subtest > settings->per_test_timeout) { > - show_kernel_task_state(); > - return "Per-test timeout exceeded. Killing the current test with SIGQUIT.\n"; > - } > + time_since_subtest > settings->per_test_timeout) > + return show_kernel_task_state("Per-test timeout exceeded. Killing the current test with SIGQUIT.\n"); > > if (settings->inactivity_timeout != 0 && > - time_since_activity > settings->inactivity_timeout) { > - show_kernel_task_state(); > - return "Inactivity timeout exceeded. Killing the current test with SIGQUIT.\n"; > - } > + time_since_activity > settings->inactivity_timeout) > + return show_kernel_task_state("Inactivity timeout exceeded. Killing the current test with SIGQUIT.\n"); > > return NULL; > } -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ igt-dev mailing list igt-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/igt-dev