From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5939510E2F7 for ; Fri, 28 Apr 2023 09:13:38 +0000 (UTC) From: Kamil Konieczny To: igt-dev@lists.freedesktop.org Date: Fri, 28 Apr 2023 11:13:32 +0200 Message-Id: <20230428091332.12330-1-kamil.konieczny@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t] Revert "runner: check disk limit at dumping kmsg" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: This reverts commit 3bd8bf9bca97bbfb7b4b408f9fccd0cf6f742d4c. After some tests it seems that runner is not reporting failures properly from i915_selftest due to this change, also after re-thinking I come to conclusion that clipping may be applied after runner/resume processes a tests dmesg from a run into rusults.json Fixes: 3bd8bf9bca97 ("runner: check disk limit at dumping kmsg") Cc: Andrzej Hajda Cc: Petri Latvala Signed-off-by: Kamil Konieczny --- runner/executor.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/runner/executor.c b/runner/executor.c index ae6cf1bba..597cd7f58 100644 --- a/runner/executor.c +++ b/runner/executor.c @@ -584,7 +584,7 @@ void close_outputs(int *fds) } /* Returns the number of bytes written to disk, or a negative number on error */ -static long dump_dmesg(int kmsgfd, int outfd, size_t disk_limit) +static long dump_dmesg(int kmsgfd, int outfd) { /* * Write kernel messages to the log file until we reach @@ -599,18 +599,12 @@ static long dump_dmesg(int kmsgfd, int outfd, size_t disk_limit) bool underflow_once = false; char cont; char buf[2048]; - ssize_t r, disk_written; + ssize_t r; long written = 0; if (kmsgfd < 0) return 0; - disk_written = lseek(outfd, 0, SEEK_SET); - if (disk_written > disk_limit) { - errf("Error dumping kmsg: disk limit already exceeded\n"); - return 0; /* number of written bytes */ - } - comparefd = open("/dev/kmsg", O_RDONLY | O_NONBLOCK); if (comparefd < 0) { errf("Error opening another fd for /dev/kmsg\n"); @@ -661,13 +655,6 @@ static long dump_dmesg(int kmsgfd, int outfd, size_t disk_limit) write(outfd, buf, r); written += r; - disk_written += r; - - if (disk_written > disk_limit) { - close(comparefd); - errf("Error dumping kmsg: disk limit exceeded\n"); - return written; - } if (comparefd < 0 && sscanf(buf, "%u,%llu,%llu,%c;", &flags, &seq, &usec, &cont) == 4) { @@ -903,7 +890,6 @@ static int monitor_output(pid_t child, unsigned long taints = 0; bool aborting = false; size_t disk_usage = 0; - const size_t mon_disk_limit = settings->disk_usage_limit ? : (~(size_t)0); bool socket_comms_used = false; /* whether the test actually uses comms */ bool results_received = false; /* whether we already have test results that might need overriding if we detect an abort condition */ @@ -1233,7 +1219,7 @@ static int monitor_output(pid_t child, time_last_activity = time_now; - dmesgwritten = dump_dmesg(kmsgfd, outputs[_F_DMESG], mon_disk_limit); + dmesgwritten = dump_dmesg(kmsgfd, outputs[_F_DMESG]); if (settings->sync) fdatasync(outputs[_F_DMESG]); @@ -1471,7 +1457,7 @@ static int monitor_output(pid_t child, asprintf(abortreason, "Child refuses to die, tainted 0x%lx.", taints); } - dump_dmesg(kmsgfd, outputs[_F_DMESG], mon_disk_limit); + dump_dmesg(kmsgfd, outputs[_F_DMESG]); if (settings->sync) fdatasync(outputs[_F_DMESG]); @@ -1497,7 +1483,7 @@ static int monitor_output(pid_t child, } } - dump_dmesg(kmsgfd, outputs[_F_DMESG], mon_disk_limit); + dump_dmesg(kmsgfd, outputs[_F_DMESG]); if (settings->sync) fdatasync(outputs[_F_DMESG]); -- 2.37.2