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 821B81061219 for ; Wed, 11 Mar 2026 11:07:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3067510E88C; Wed, 11 Mar 2026 11:07:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jZ9EZAa8"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9D08B10E0C6 for ; Wed, 11 Mar 2026 11:07:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1773227223; x=1804763223; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HLZjjx0PEdcASAJ/cNYSQQnDStS5CiUG1nExF8j52tE=; b=jZ9EZAa8gLMQigtPSzFX8Vq73BiLYT9gTRAZDf/eD/pu41T1LlIyktCK DA/Vtwxzm7+1j+Lzgpyc33Si7YFaWcWiqEapU5sxJLbH/2gAVrIAu0FA1 TDzTvejOdcRygPedozdN+Oc7Kkh+NhvoqrsaLRr1l7mDhd+zkvehqAFN/ pnp0Clx8u7onirdT/LRjWi5BkH1bXYuAc5V0ZIwHSK0I0oAhRPMO2qyVM m7hf1/xabP8NmmOxnDj7nuGuNJRcMxfy8AOGAV/uW6RX10AsJpLV/RvcE kjCJJkzSLCak9VY1cf5UeCmHFpqNsqo+gfMlAVuQ255/7UrlavplH0uh7 A==; X-CSE-ConnectionGUID: iwTt6yIdQ0a9LkSiLlDUDQ== X-CSE-MsgGUID: 10NOCp6QSZqW/UjN0XhpVQ== X-IronPort-AV: E=McAfee;i="6800,10657,11725"; a="85378242" X-IronPort-AV: E=Sophos;i="6.23,113,1770624000"; d="scan'208";a="85378242" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2026 04:07:03 -0700 X-CSE-ConnectionGUID: Ebd9P6NHQVapNgk7Od8UfQ== X-CSE-MsgGUID: IdZjhy4tSzmmcol0K9BNhQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,113,1770624000"; d="scan'208";a="258344697" Received: from cmanszew-dev.igk.intel.com ([10.91.214.222]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Mar 2026 04:07:02 -0700 From: Christoph Manszewski To: igt-dev@lists.freedesktop.org Cc: Piotr Rudnicki , =?UTF-8?q?Dominik=20Karol=20Pi=C4=85tkowski?= , Jan Sokolowski Subject: [PATCH i-g-t v5 4/5] lib/xe/xe_eudebug: Track active debugger sessions and close when disabling Date: Wed, 11 Mar 2026 12:06:41 +0100 Message-ID: <20260311110636.798120-11-christoph.manszewski@intel.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260311110636.798120-7-christoph.manszewski@intel.com> References: <20260311110636.798120-7-christoph.manszewski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 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" Active debugger sessions prevent disabling EU Debug via the sysfs toggle. As a result when a test fails the igt_fixture will fail to disable EU Debug if the worker threads have open debugger fds. Introduce active debugger session (debugger fd) tracking and use it to close leftover sessions before attempting to disable eudebug. The kernel 'struct drm_driver.postclose' handler which removes the debugger sessions tracked by Xe EU Debug runs asynchronously to 'close' so retry disabling in a loop on '-EBUSY'. Signed-off-by: Dominik Karol Piątkowski Reviewed-by: Piotr Rudnicki Link: https://lore.kernel.org/r/20260220153748.210381-11-christoph.manszewski@intel.com Signed-off-by: Christoph Manszewski --- lib/xe/xe_eudebug.c | 73 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/lib/xe/xe_eudebug.c b/lib/xe/xe_eudebug.c index 7a641d2bd..c722a968a 100644 --- a/lib/xe/xe_eudebug.c +++ b/lib/xe/xe_eudebug.c @@ -18,6 +18,57 @@ #include "xe_ioctl.h" #include "xe/xe_query.h" +struct debugger_fd_entry { + int fd; + struct igt_list_head link; +}; + +static IGT_LIST_HEAD(active_debugger_fds); +static pthread_mutex_t active_debugger_fds_lock = PTHREAD_MUTEX_INITIALIZER; + +static void register_debugger_fd(int fd) +{ + struct debugger_fd_entry *entry; + + entry = calloc(1, sizeof(*entry)); + igt_assert(entry); + entry->fd = fd; + IGT_INIT_LIST_HEAD(&entry->link); + + pthread_mutex_lock(&active_debugger_fds_lock); + igt_list_add(&entry->link, &active_debugger_fds); + pthread_mutex_unlock(&active_debugger_fds_lock); +} + +static void unregister_debugger_fd(int fd) +{ + struct debugger_fd_entry *entry, *tmp; + + pthread_mutex_lock(&active_debugger_fds_lock); + igt_list_for_each_entry_safe(entry, tmp, &active_debugger_fds, link) { + if (entry->fd == fd) { + igt_list_del(&entry->link); + free(entry); + break; + } + } + pthread_mutex_unlock(&active_debugger_fds_lock); +} + +static void close_all_debugger_fds(void) +{ + struct debugger_fd_entry *entry, *tmp; + + pthread_mutex_lock(&active_debugger_fds_lock); + igt_list_for_each_entry_safe(entry, tmp, &active_debugger_fds, link) { + igt_debug("closing leftover debugger fd %d\n", entry->fd); + close(entry->fd); + igt_list_del(&entry->link); + free(entry); + } + pthread_mutex_unlock(&active_debugger_fds_lock); +} + struct event_trigger { xe_eudebug_trigger_fn fn; int type; @@ -1270,6 +1321,8 @@ static int __xe_eudebug_debugger_attach(struct xe_eudebug_debugger *d, pid_t pid d->fd = ret; d->target_pid = pid; + register_debugger_fd(d->fd); + return 0; } @@ -1323,6 +1376,7 @@ int xe_eudebug_debugger_attach(struct xe_eudebug_debugger *d, void xe_eudebug_debugger_detach(struct xe_eudebug_debugger *d) { igt_assert(d->target_pid); + unregister_debugger_fd(d->fd); close(d->fd); d->target_pid = 0; d->fd = -1; @@ -1909,7 +1963,24 @@ bool xe_eudebug_enable(int fd, bool enable) { char sysfs_path[PATH_MAX]; bool old = false; - int ret = __xe_eudebug_enable_getset(fd, &old, &enable); + int ret = 0; + + /* When disabling eudebug, close all active debugger sessions first. */ + if (!enable) + close_all_debugger_fds(); + + /* 'struct drm_driver.postclose' runs asynchronously to 'close', wait for it to complete */ + for (int i = 0; i < 10; ++i) { + ret = __xe_eudebug_enable_getset(fd, &old, &enable); + + if (ret != -EBUSY) + break; + + if (i < 9) { + igt_debug("xe_eudebug_enable: Failed (%d), retrying...\n", ret); + sleep(1); + } + } if (ret == -ENOENT) { igt_assert(igt_sysfs_path(fd, sysfs_path, sizeof(sysfs_path))); -- 2.47.1