From: Petri Latvala <petri.latvala@intel.com>
To: igt-dev@lists.freedesktop.org
Cc: Petri Latvala <petri.latvala@intel.com>
Subject: [igt-dev] [PATCH i-g-t 3/6] runner: Continue using socket comms when getting an invalid packet
Date: Tue, 8 Nov 2022 12:07:30 +0200 [thread overview]
Message-ID: <20221108100733.2378106-3-petri.latvala@intel.com> (raw)
In-Reply-To: <20221108100733.2378106-1-petri.latvala@intel.com>
If a packet of invalid size is received, inject a message in the dump,
override result to warn, and continue grabbing packets.
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arek@hiler.eu>
Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com>
Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com>
---
runner/executor.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/runner/executor.c b/runner/executor.c
index 7fa932ac..c5f03614 100644
--- a/runner/executor.c
+++ b/runner/executor.c
@@ -1082,10 +1082,21 @@ static int monitor_output(pid_t child,
packet = (struct runnerpacket *)buf;
if (s < sizeof(*packet) || s != packet->size) {
+ struct runnerpacket *message, *override;
+
errf("Socket communication error: Received %zd bytes, expected %zd\n",
s, s >= sizeof(packet->size) ? packet->size : sizeof(*packet));
- close(socketfd);
- socketfd = -1;
+ message = runnerpacket_log(STDOUT_FILENO,
+ "\nrunner: Socket communication error, invalid packet size. "
+ "Packet is discarded, test result and logs might be incorrect.\n");
+ write_packet_with_canary(outputs[_F_SOCKET], message, false);
+ free(message);
+
+ override = runnerpacket_resultoverride("warn");
+ write_packet_with_canary(outputs[_F_SOCKET], override, settings->sync);
+ free(override);
+
+ /* Continue using socket comms, hope for the best. */
goto socket_end;
}
--
2.30.2
next prev parent reply other threads:[~2022-11-08 10:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-08 10:07 [igt-dev] [PATCH i-g-t v2 1/6] runner: Use a bigger buffer for receiving test outputs Petri Latvala
2022-11-08 10:07 ` [igt-dev] [PATCH i-g-t v2 2/6] igt_core: Split too long log lines when sending to runner with comms Petri Latvala
2022-11-08 11:56 ` Kamil Konieczny
2022-11-09 12:33 ` [igt-dev] [PATCH i-g-t v3 " Petri Latvala
2022-11-08 10:07 ` Petri Latvala [this message]
2022-11-08 10:07 ` [igt-dev] [PATCH i-g-t 4/6] igt_core: Make sure test result gets to runner when test has no subtests Petri Latvala
2022-11-08 10:07 ` [igt-dev] [PATCH i-g-t 5/6] lib/runnercomms: Report empty comms dump as empty Petri Latvala
2022-11-08 10:07 ` [igt-dev] [PATCH i-g-t 6/6] Revert "runner: Disable socket communications for now" Petri Latvala
2022-11-08 11:57 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/6] runner: Use a bigger buffer for receiving test outputs Patchwork
2022-11-08 14:15 ` [igt-dev] [PATCH i-g-t v2 1/6] " Kamil Konieczny
2022-11-08 15:41 ` [igt-dev] ✗ Fi.CI.IGT: failure for series starting with [i-g-t,v2,1/6] " Patchwork
2022-11-09 13:24 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2,1/6] runner: Use a bigger buffer for receiving test outputs (rev2) Patchwork
2022-11-09 17:06 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2022-11-10 8:07 ` Petri Latvala
2022-11-10 15:23 ` Vudum, Lakshminarayana
2022-11-10 15:06 ` [igt-dev] ✓ Fi.CI.IGT: success " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2022-11-07 12:01 [igt-dev] [PATCH i-g-t 1/6] runner: Use a bigger buffer for receiving test outputs Petri Latvala
2022-11-07 12:01 ` [igt-dev] [PATCH i-g-t 3/6] runner: Continue using socket comms when getting an invalid packet Petri Latvala
2022-11-07 16:16 ` Kamil Konieczny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221108100733.2378106-3-petri.latvala@intel.com \
--to=petri.latvala@intel.com \
--cc=igt-dev@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox