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 6D35CC35FFF for ; Fri, 21 Mar 2025 12:04:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 217A310E123; Fri, 21 Mar 2025 12:04:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="KZD7WXv4"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A45B10E123 for ; Fri, 21 Mar 2025 12:04:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742558640; x=1774094640; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=qy7hRbU2Vg0+X7RxRv87RmgAjTxDLiErSSUrxG3pNKQ=; b=KZD7WXv4Y+UX8TW4eGIYNWKdgtl2fMnxQg4EXQQVU/zn1OdoImqfgwar TSFsIkBPH9GqEoDh/Z4a6NicLRVtzhFjoRCNPxPobHTVuSpIWnHoeGO3X Ne2Q9hVH7wDA0SGkE246HFD/Me2x2lCgAdN7iCa8fVXvFLH0iHxUoxdcQ WlL0JP7m2YqBa7pjrygWirgY3AkZlw92fNzq+zub4lV8GJp5qjsi+TZFg hh7WjevREarNHOB8U6ZNgsu5MPsbH+7Z9hHBO5+r1xZPKoke2VOcIsuvU qXlfdAs2cWiAsNF1ELcU3GDTcmmsFDYC1MwkmvAHW22M9UcOadpbmMGSR w==; X-CSE-ConnectionGUID: Q8O4NtUNTJyVNu2is2vCjw== X-CSE-MsgGUID: smVc+bl7SduWJLr4KTnyuA== X-IronPort-AV: E=McAfee;i="6700,10204,11379"; a="43985503" X-IronPort-AV: E=Sophos;i="6.14,264,1736841600"; d="scan'208";a="43985503" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 05:04:00 -0700 X-CSE-ConnectionGUID: D/NSDiBDQFqjBhd7PiANjA== X-CSE-MsgGUID: YhyVoGvNQiqbrV47DveBnw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,264,1736841600"; d="scan'208";a="128439114" Received: from dhhellew-desk2.ger.corp.intel.com.ger.corp.intel.com (HELO localhost) ([10.245.245.40]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Mar 2025 05:03:57 -0700 From: Pawel Sikora To: igt-dev@lists.freedesktop.org Cc: Kamil Konieczny , Zbigniew Kempczynski , Petri Latvala , Ashutosh Dixit Subject: [PATCH i-g-t v3 1/1] lib/igt_core: capture logs for child processes Date: Fri, 21 Mar 2025 13:03:44 +0100 Message-Id: <20250321120344.737080-2-pawel.sikora@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250321120344.737080-1-pawel.sikora@linux.intel.com> References: <20250321120344.737080-1-pawel.sikora@linux.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" This change addresses the issue of missing logs for child processes in the IGT runner. The '_igt_log_buffer_dump()' function is now called before exiting child processes, ensuring that logs are properly captured and not lost when IGT fails and child processes dump logs before exiting. v2: Make the dump conditional based on active comms (Kamil) Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/2178 Reviewed-by: Zbigniew Kempczyński Signed-off-by: Pawel Sikora --- lib/igt_core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/igt_core.c b/lib/igt_core.c index c19689a51..512d88437 100644 --- a/lib/igt_core.c +++ b/lib/igt_core.c @@ -296,6 +296,7 @@ static bool in_fixture = false; static bool test_with_subtests = false; static bool in_atexit_handler = false; static bool show_ftrace = false; +static bool has_comms = false; static enum { CONT = 0, SKIP, FAIL } skip_subtests_henceforth = CONT; @@ -1905,11 +1906,17 @@ void igt_fail(int exitcode) failed_one = true; } - /* Silent exit, parent will do the yelling. */ + /* If igt_runner uses comms, it could grab each child's logs without + * them interleaving in stdout/stderr. */ + has_comms = runner_connected(); + if (has_comms) + _igt_log_buffer_dump(); + if (test_child) exit(exitcode); - _igt_log_buffer_dump(); + if (!has_comms) + _igt_log_buffer_dump(); if (test_multi_fork_child) exit(exitcode); -- 2.34.1