From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E2DDF557EB for ; Mon, 20 Apr 2026 08:57:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2240110F4A6; Mon, 20 Apr 2026 08:57:20 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="JdCjpaxV"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) by gabe.freedesktop.org (Postfix) with ESMTPS id B1F2010F4A6 for ; Mon, 20 Apr 2026 08:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1776675427; x=1808211427; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oAjy8P0GdqqNcT8l9iP5JxhS4HUSm5f2T7lf5lSTodg=; b=JdCjpaxVT2TkAJiP1shMgRtpnZplGZBJtnC2PC0fQ4MA21q+1YEvgkZw ggoZxHmsO7HTfMoWBpvTSpxh54vGu1aJhEck0qSVx/FdMT6PlUUIujrrS okF8CyRSYjnBW4DmeJLt4TeCyZ2Dud16I8kWZWEPxpBszjAF2hkhVH1+j skklyBq9G00vWNBEjWkgXDhnhN+FVZ4HHHzGVhPQUzzSHGyhjJX+McvPl JtHE6z0Hvcz62OI+IZAlCfnBErrDsEOk8jwW2j8bjAwOvFFJVSby6O37Y hM0YtBsTRdUadzGOlFEXfJNWay9EE2Fri9iKRHVYFstSfa05Qguk4tNqI g==; X-CSE-ConnectionGUID: zSP+YQ8YQ+y7iwYQjPCg+g== X-CSE-MsgGUID: SvW6Ve8LSN2Kp1M+gY9LAQ== X-IronPort-AV: E=McAfee;i="6800,10657,11762"; a="76613853" X-IronPort-AV: E=Sophos;i="6.23,189,1770624000"; d="scan'208";a="76613853" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2026 01:57:06 -0700 X-CSE-ConnectionGUID: +HoWZr1aSjqqpMUGXWpOYw== X-CSE-MsgGUID: BqUFL0ASR5SsOL0DzwKuFw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,189,1770624000"; d="scan'208";a="231539675" Received: from klitkey1-mobl1.ger.corp.intel.com (HELO localhost) ([10.245.244.56]) by orviesa009-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2026 01:57:04 -0700 From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Cc: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= , Kamil Konieczny , Ryszard Knop , Krzysztof Karas Subject: [PATCH i-g-t v4 2/4] runner: Create attachments directory to use by hooks Date: Mon, 20 Apr 2026 10:56:56 +0200 Message-ID: <20260420085653.2587750-8-zbigniew.kempczynski@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260420085653.2587750-6-zbigniew.kempczynski@intel.com> References: <20260420085653.2587750-6-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Results parsing is currently limited to few predefined files. Create "attachments" directory and export full path of created directory to be used within hooks. From now on environment variable IGT_RUNNER_ATTACHMENTS_DIR become visible when igt_runner is used to execute tests. This env contains directory where subtests/dynsubtests may write auxiliary files which filenames will be included in results.json. Signed-off-by: Zbigniew Kempczyński Cc: Kamil Konieczny Cc: Ryszard Knop Cc: Krzysztof Karas --- v2: - simplify attachment dirname concatenation (Kamil) - remove files in attachments dir when overwrite is set (Kamil) v3: - unify 'attdir*' variables (Krzysztof) - do recursive removal in attachments directories (Gustavo) v4: - remove noise newline leftover (Krzysztof) - pass path instead of fd to clear function and simplify the code (compact attachments function within main clear) (Gustavo) --- lib/igt_hook.c | 4 +++ runner/executor.c | 77 +++++++++++++++++++++++++++++++++++++++-------- runner/executor.h | 2 ++ 3 files changed, 71 insertions(+), 12 deletions(-) diff --git a/lib/igt_hook.c b/lib/igt_hook.c index f86ed56f72..b8f25b6c7a 100644 --- a/lib/igt_hook.c +++ b/lib/igt_hook.c @@ -518,5 +518,9 @@ available to the command:\n\ \n\ Note that %s can be passed multiple times. Each descriptor is evaluated in turn\n\ when matching events and running hook commands.\n\ +\n\ +When executed by the igt_runner, environment IGT_RUNNER_ATTACHMENTS_DIR\n\ +is passed additionally to the hook script. It contains directory where\n\ +script may write additional attachments like guc logs, etc.\n\ ", option_name); } diff --git a/runner/executor.c b/runner/executor.c index 1485b59d1f..496ca1a4ea 100644 --- a/runner/executor.c +++ b/runner/executor.c @@ -1,6 +1,7 @@ #include #include #include +#include #ifdef ANDROID #include "android/glib.h" #else @@ -1779,17 +1780,22 @@ static int execute_next_entry(struct execute_state *state, int errpipe[2] = { -1, -1 }; int socket[2] = { -1, -1 }; int outfd, errfd, socketfd; - char name[32]; + char name[32], attname[32]; + char attdirname[PATH_MAX]; pid_t child; int result; size_t idx = state->next; snprintf(name, sizeof(name), "%zd", idx); + snprintf(attname, sizeof(attname), "%zd/%s", idx, DIR_ATTACHMENTS); mkdirat(resdirfd, name, 0777); + mkdirat(resdirfd, attname, 0777); if ((idirfd = openat(resdirfd, name, O_DIRECTORY | O_RDONLY | O_CLOEXEC)) < 0) { errf("Error accessing individual test result directory\n"); return -1; } + snprintf(attdirname, sizeof(attdirname), "%s/%s", + settings->results_path, attname); if (!open_output_files(idirfd, outputs, true)) { errf("Error opening output files\n"); @@ -1870,6 +1876,7 @@ static int execute_next_entry(struct execute_state *state, setenv("IGT_RUNNER_SOCKET_FD", envstring, 1); } setenv("IGT_SENTINEL_ON_STDERR", "1", 1); + setenv("IGT_RUNNER_ATTACHMENTS_DIR", attdirname, 1); execute_test_process(outfd, errfd, socketfd, settings, entry); /* unreachable */ @@ -1948,19 +1955,66 @@ static int remove_file(int dirfd, const char *name) return unlinkat(dirfd, name, 0) && errno != ENOENT; } -static bool clear_test_result_directory(int dirfd) +static int ftw_attachment_removal(const char *fpath, const struct stat *sb, + int typeflag, struct FTW *ftwbuf) { - int i; + (void)sb; + (void)ftwbuf; + + switch (typeflag) { + case FTW_F: + case FTW_SL: + if (unlink(fpath)) { + errf("Error removing file %s: %s\n", + fpath, strerror(errno)); + return -1; + } + break; + case FTW_DP: + if (rmdir(fpath)) { + errf("Error removing directory %s: %s\n", + fpath, strerror(errno)); + return -1; + } + break; + default: + errf("Cannot remove %s (unsupported file type)\n", fpath); + return -1; + } + + return 0; +} + +static bool clear_test_result_directory(const char *name) +{ + char *attdirname; + int i, resdirfd; + int ret; + + if ((resdirfd = open(name, O_DIRECTORY | O_RDONLY)) < 0) + return false; for (i = 0; i < _F_LAST; i++) { - if (remove_file(dirfd, filenames[i])) { + if (remove_file(resdirfd, filenames[i])) { errf("Error deleting %s from test result directory: %m\n", filenames[i]); + close(resdirfd); return false; } } - return true; + close(resdirfd); + + if (strlen(name) + strlen(DIR_ATTACHMENTS) + 1 >= PATH_MAX) { + errf("Attachments directory length exceeds PATH_MAX\n"); + return false; + } + + asprintf(&attdirname, "%s/%s", name, DIR_ATTACHMENTS); + ret = nftw(attdirname, ftw_attachment_removal, 4, FTW_PHYS | FTW_DEPTH); + free(attdirname); + + return ret ? false : true; } static bool clear_old_results(char *path) @@ -1990,20 +2044,19 @@ static bool clear_old_results(char *path) return false; } + for (i = 0; true; i++) { - int resdirfd; + struct stat st; - snprintf(name, sizeof(name), "%zd", i); - if ((resdirfd = openat(dirfd, name, O_DIRECTORY | O_RDONLY)) < 0) + snprintf(name, sizeof(name), "%s/%zd", path, i); + if (stat(name, &st)) break; - if (!clear_test_result_directory(resdirfd)) { - close(resdirfd); + if (!clear_test_result_directory(name)) { close(dirfd); return false; } - close(resdirfd); - if (unlinkat(dirfd, name, AT_REMOVEDIR)) { + if (rmdir(name)) { errf("Warning: Result directory %s contains extra files\n", name); } diff --git a/runner/executor.h b/runner/executor.h index 3b1cabcf55..bc6ac80dc4 100644 --- a/runner/executor.h +++ b/runner/executor.h @@ -25,6 +25,8 @@ enum { _F_LAST, }; +#define DIR_ATTACHMENTS "attachments" + bool open_output_files(int dirfd, int *fds, bool write); bool open_output_files_rdonly(int dirfd, int *fds); void close_outputs(int *fds); -- 2.43.0