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 E7E9AC71135 for ; Mon, 16 Jun 2025 07:43:52 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 95A3810E2A6; Mon, 16 Jun 2025 07:43:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="KPG5iYMY"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3435910E2A6 for ; Mon, 16 Jun 2025 07:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750059831; x=1781595831; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Mz6mzbhfi7SIWibRfv3b+/TExtAs+EAu84tOQRZLyaM=; b=KPG5iYMYZBUHpAZN3rzV6YbzxBp5mk9RT9CE9U3D5A1209y3ByEKuMj8 7OsZgMw/BzcI5FvJTsF/kPooNwHozCzUiLxusi3Kfr0aTJpcAQSPbz2Gm No5E5cEFsxYqu/8amzF2hkpkc0MYJTLgAZfj2OBPgBj6Z/N4MzE6XRitp SYYTwp/Fh0gbRuqZSPwm6xOZJQbJuuEkurz75JWvk/A3V8LK6MOtBpQQL fLcQfNz6+Osfld3SKUhm+RInHla2/EQ7qZNtE2oplNDD3FGKJh17T1xOS lZon/3f7tn6hV2W2TdtDCl8/mcziyyGFISXzW+sUeX859uQeu73MloOvK g==; X-CSE-ConnectionGUID: UPme7DctSKiO/Krm+lHP5Q== X-CSE-MsgGUID: Zrket6bLQOOQx01unJcBJQ== X-IronPort-AV: E=McAfee;i="6800,10657,11465"; a="77589919" X-IronPort-AV: E=Sophos;i="6.16,240,1744095600"; d="scan'208";a="77589919" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2025 00:43:51 -0700 X-CSE-ConnectionGUID: 37wDp/gmRB628WTBu45M1w== X-CSE-MsgGUID: DqdilyVGSvuzGMT4KklC0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,240,1744095600"; d="scan'208";a="153360460" Received: from mstancu-mobl1.ger.corp.intel.com (HELO friendship7-home.clients.intel.com) ([10.245.118.0]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Jun 2025 00:43:49 -0700 From: Peter Senna Tschudin To: igt-dev@lists.freedesktop.org Cc: Peter Senna Tschudin , michal.wajdeczko@intel.com, marcin.bernatowicz@intel.com, kamil.konieczny@linux.intel.com, katarzyna.piecielska@intel.com, zbigniew.kempczynski@intel.com, ewelina.musial@intel.com Subject: [PATCH v3 resend i-g-t 6/6] tests/intel: Remove intel_sysfs_debugfs Date: Mon, 16 Jun 2025 09:42:38 +0200 Message-ID: <20250616074240.45818-7-peter.senna@linux.intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250616074240.45818-1-peter.senna@linux.intel.com> References: <20250616074240.45818-1-peter.senna@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" The intel_sysfs_debugfs test was originally introduced to unify testing for both i915 and Xe drivers, aiming to prevent gaps in test coverage. However, the implementation fell short in addressing scenarios where both i915 and Xe were present in the system. To address these limitations, it was replaced by: - tests/core_debugfs (gpu agnostic) - tests/core_sysfs (gpu agnostic) - tests/intel/xe_debugfs (complementary to core_debugfs) Cc: michal.wajdeczko@intel.com Cc: marcin.bernatowicz@intel.com Cc: kamil.konieczny@linux.intel.com Cc: katarzyna.piecielska@intel.com Cc: zbigniew.kempczynski@intel.com Cc: ewelina.musial@intel.com Signed-off-by: Peter Senna Tschudin --- v3: - unchanged from v2 v2: - changed style of comparison to NULL tests/intel-ci/fast-feedback.testlist | 2 - tests/intel-ci/xe-fast-feedback.testlist | 4 - tests/intel/intel_sysfs_debugfs.c | 430 ----------------------- tests/intel/xe_test_config.json | 2 +- tests/meson.build | 1 - 5 files changed, 1 insertion(+), 438 deletions(-) delete mode 100644 tests/intel/intel_sysfs_debugfs.c diff --git a/tests/intel-ci/fast-feedback.testlist b/tests/intel-ci/fast-feedback.testlist index 5d4d101ef..2799bbaa5 100644 --- a/tests/intel-ci/fast-feedback.testlist +++ b/tests/intel-ci/fast-feedback.testlist @@ -55,8 +55,6 @@ igt@i915_getparams_basic@basic-subslice-total igt@i915_hangman@error-state-basic igt@i915_pciid igt@intel_hwmon -igt@intel_sysfs_debugfs@i915-debugfs-read-all-entries -igt@intel_sysfs_debugfs@i915-sysfs-read-all-entries igt@kms_addfb_basic@addfb25-4-tiled igt@kms_addfb_basic@addfb25-bad-modifier igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling diff --git a/tests/intel-ci/xe-fast-feedback.testlist b/tests/intel-ci/xe-fast-feedback.testlist index c52f08953..017e3ba2a 100644 --- a/tests/intel-ci/xe-fast-feedback.testlist +++ b/tests/intel-ci/xe-fast-feedback.testlist @@ -9,10 +9,6 @@ igt@fbdev@write igt@core_debugfs@read-all-entries igt@core_sysfs@read-all-entries -igt@intel_sysfs_debugfs@xe-base -igt@intel_sysfs_debugfs@xe-debugfs-read-all-entries -igt@intel_sysfs_debugfs@xe-forcewake -igt@intel_sysfs_debugfs@xe-sysfs-read-all-entries igt@kms_addfb_basic@addfb25-4-tiled igt@kms_addfb_basic@addfb25-bad-modifier igt@kms_addfb_basic@addfb25-modifier-no-flag diff --git a/tests/intel/intel_sysfs_debugfs.c b/tests/intel/intel_sysfs_debugfs.c deleted file mode 100644 index dfd8d52d8..000000000 --- a/tests/intel/intel_sysfs_debugfs.c +++ /dev/null @@ -1,430 +0,0 @@ -// SPDX-License-Identifier: MIT -/* - * Copyright © 2025 Intel Corporation - */ - -#include -#include - -#include "i915/gem.h" -#include "igt.h" -#include "igt_sysfs.h" -#include "xe/xe_query.h" - -struct { - bool warn_on_not_hit; -} opt = { 0 }; - -/** - * TEST: debugfs test - * Description: Read entries from debugfs, and sysfs paths. - * Category: Core - * Mega feature: General Core features - * Sub-category: uapi - * Functionality: debugfs - * Feature: core - * Test category: uapi - * - * SUBTEST: i915-debugfs-read-all-entries - * Description: Read all entries from debugfs path validating debugfs entries - * - * SUBTEST: i915-debugfs-read-all-entries-display-off - * Description: Read all debugfs entries with display off. - * - * SUBTEST: i915-debugfs-read-all-entries-display-on - * Description: Read all debugfs entries with display on. - * - * SUBTEST: i915-sysfs-read-all-entries - * Description: Read all entries from sysfs path validating debugfs entries - * - * SUBTEST: xe-debugfs-read-all-entries - * Description: Read all entries from debugfs path validating debugfs entries - * - * SUBTEST: xe-debugfs-read-all-entries-display-off - * Description: Read all debugfs entries with display off. - * - * SUBTEST: xe-debugfs-read-all-entries-display-on - * Description: Read all debugfs entries with display on. - * - * SUBTEST: xe-sysfs-read-all-entries - * Description: Read all entries from sysfs path validating debugfs entries - * - */ - -IGT_TEST_DESCRIPTION("Read entries from debugfs, and sysfs paths."); - -static void read_and_discard_sysfs_entries(int path_fd, int indent) -{ - struct dirent *dirent; - DIR *dir; - char tabs[8]; - int i; - - igt_assert(indent < sizeof(tabs) - 1); - - for (i = 0; i < indent; i++) - tabs[i] = '\t'; - tabs[i] = '\0'; - - dir = fdopendir(path_fd); - if (!dir) - return; - - while ((dirent = readdir(dir))) { - if (!strcmp(dirent->d_name, ".") || - !strcmp(dirent->d_name, "..")) - continue; - - if (dirent->d_type == DT_DIR) { - int sub_fd; - - sub_fd = openat(path_fd, dirent->d_name, - O_RDONLY | O_DIRECTORY); - if (sub_fd < 0) - continue; - - igt_debug("%sEntering subdir %s\n", tabs, dirent->d_name); - read_and_discard_sysfs_entries(sub_fd, indent + 1); - close(sub_fd); - } else if (dirent->d_type == DT_REG) { - char buf[512]; - int sub_fd; - ssize_t ret; - - igt_kmsg(KMSG_DEBUG "Reading file \"%s\"\n", dirent->d_name); - igt_debug("%sReading file \"%s\"\n", tabs, dirent->d_name); - - sub_fd = openat(path_fd, dirent->d_name, O_RDONLY | O_NONBLOCK); - if (sub_fd == -1) { - igt_debug("%sCould not open file \"%s\" with error: %m\n", - tabs, dirent->d_name); - continue; - } - - do { - ret = read(sub_fd, buf, sizeof(buf)); - } while (ret == sizeof(buf)); - - if (ret == -1) - igt_debug("%sCould not read file \"%s\" with error: %m\n", - tabs, dirent->d_name); - - close(sub_fd); - } - } - closedir(dir); -} - -static void kms_tests(int fd, int debugfs, const char *card_name) -{ - igt_display_t display; - struct igt_fb fb[IGT_MAX_PIPES]; - enum pipe pipe; - int ret; - char test_name[64]; - - igt_fixture - igt_display_require(&display, fd); - - snprintf(test_name, sizeof(test_name), - "%s-debugfs-read-all-entries-display-on", card_name); - - igt_subtest(test_name) { - /* try to light all pipes */ -retry: - for_each_pipe(&display, pipe) { - igt_output_t *output; - - for_each_valid_output_on_pipe(&display, pipe, output) { - igt_plane_t *primary; - drmModeModeInfo *mode; - - if (output->pending_pipe != PIPE_NONE) - continue; - - igt_output_set_pipe(output, pipe); - primary = igt_output_get_plane_type(output, DRM_PLANE_TYPE_PRIMARY); - mode = igt_output_get_mode(output); - igt_create_pattern_fb(display.drm_fd, - mode->hdisplay, mode->vdisplay, - DRM_FORMAT_XRGB8888, - DRM_FORMAT_MOD_LINEAR, &fb[pipe]); - - /* Set a valid fb as some debugfs like to - * inspect it on a active pipe - */ - igt_plane_set_fb(primary, &fb[pipe]); - break; - } - } - - if (display.is_atomic) - ret = igt_display_try_commit_atomic(&display, - DRM_MODE_ATOMIC_TEST_ONLY | - DRM_MODE_ATOMIC_ALLOW_MODESET, - NULL); - else - ret = igt_display_try_commit2(&display, COMMIT_LEGACY); - - if (ret) { - igt_output_t *output; - bool found = igt_override_all_active_output_modes_to_fit_bw(&display); - - igt_require_f(found, "No valid mode combo found.\n"); - - for_each_connected_output(&display, output) - igt_output_set_pipe(output, PIPE_NONE); - - goto retry; - } - - igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); - - read_and_discard_sysfs_entries(debugfs, 0); - } - - snprintf(test_name, sizeof(test_name), - "%s-debugfs-read-all-entries-display-off", card_name); - - igt_subtest(test_name) { - igt_output_t *output; - igt_plane_t *plane; - - for_each_connected_output(&display, output) - igt_output_set_pipe(output, PIPE_NONE); - - for_each_pipe(&display, pipe) - for_each_plane_on_pipe(&display, pipe, plane) - igt_plane_set_fb(plane, NULL); - - igt_display_commit2(&display, display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); - - read_and_discard_sysfs_entries(debugfs, 0); - } - - igt_fixture - igt_display_fini(&display); -} - -static int xe_validate_entries(int fd, const char *add_path, - const char * const str_val[], int str_cnt) -{ - int i; - int hit; - int found = 0; - int not_found = 0; - DIR *dir; - struct dirent *de; - char path[PATH_MAX]; - - if (!igt_debugfs_path(fd, path, sizeof(path))) - return -1; - - strcat(path, add_path); - dir = opendir(path); - if (!dir) - return -1; - - while ((de = readdir(dir))) { - if (de->d_name[0] == '.') - continue; - hit = 0; - for (i = 0; i < str_cnt; i++) { - if (!strcmp(str_val[i], de->d_name)) { - hit = 1; - break; - } - } - if (hit) { - found++; - } else if (opt.warn_on_not_hit) { - not_found++; - igt_warn("no test for: %s/%s\n", path, de->d_name); - } - } - closedir(dir); - return 0; -} - -/** - * SUBTEST: xe-base - * Description: Check if various debugfs devnodes exist and test reading them - */ -static void -xe_test_base(int fd, struct drm_xe_query_config *config) -{ - uint16_t devid = intel_get_drm_devid(fd); - static const char * const expected_files[] = { - "gt0", - "gt1", - "stolen_mm", - "gtt_mm", - "vram0_mm", - "forcewake_all", - "info", - "gem_names", - "clients", - "name" - }; - char reference[4096]; - int val = 0; - - igt_assert(config); - sprintf(reference, "devid 0x%llx", - config->info[DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID] & 0xffff); - igt_assert(igt_debugfs_search(fd, "info", reference)); - - sprintf(reference, "revid %lld", - config->info[DRM_XE_QUERY_CONFIG_REV_AND_DEVICE_ID] >> 16); - igt_assert(igt_debugfs_search(fd, "info", reference)); - - sprintf(reference, "is_dgfx %s", config->info[DRM_XE_QUERY_CONFIG_FLAGS] & - DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM ? "yes" : "no"); - - igt_assert(igt_debugfs_search(fd, "info", reference)); - - if (intel_gen(devid) < 20) { - switch (config->info[DRM_XE_QUERY_CONFIG_VA_BITS]) { - case 48: - val = 3; - break; - case 57: - val = 4; - break; - } - - sprintf(reference, "vm_max_level %d", val); - igt_assert(igt_debugfs_search(fd, "info", reference)); - } - - snprintf(reference, sizeof(reference), "tile_count %d", xe_sysfs_get_num_tiles(fd)); - igt_assert(igt_debugfs_search(fd, "info", reference)); - - igt_assert(igt_debugfs_exists(fd, "gt0", O_RDONLY)); - - igt_assert(igt_debugfs_exists(fd, "gtt_mm", O_RDONLY)); - igt_debugfs_dump(fd, "gtt_mm"); - - if (config->info[DRM_XE_QUERY_CONFIG_FLAGS] & DRM_XE_QUERY_CONFIG_FLAG_HAS_VRAM) { - igt_assert(igt_debugfs_exists(fd, "vram0_mm", O_RDONLY)); - igt_debugfs_dump(fd, "vram0_mm"); - } - - if (igt_debugfs_exists(fd, "stolen_mm", O_RDONLY)) - igt_debugfs_dump(fd, "stolen_mm"); - - igt_assert(igt_debugfs_exists(fd, "clients", O_RDONLY)); - igt_debugfs_dump(fd, "clients"); - - igt_assert(igt_debugfs_exists(fd, "gem_names", O_RDONLY)); - igt_debugfs_dump(fd, "gem_names"); - - xe_validate_entries(fd, "", expected_files, ARRAY_SIZE(expected_files)); -} - -/** - * SUBTEST: xe-forcewake - * Description: Check forcewake debugfs devnode - */ -static void -xe_test_forcewake(int fd) -{ - int handle = igt_debugfs_open(fd, "forcewake_all", O_WRONLY); - - igt_assert_neq(handle, -1); - close(handle); -} - -const char *help_str = - " -w\t--warn-not-hit Produce warnings if it founds a devfs node without tests"; - -struct option long_options[] = { - { "--warn-not-hit", no_argument, NULL, 'w'}, - { 0, 0, 0, 0 } -}; - -static int opt_handler(int option, int option_index, void *input) -{ - switch (option) { - case 'w': - opt.warn_on_not_hit = true; - break; - default: - return IGT_OPT_HANDLER_ERROR; - } - - return IGT_OPT_HANDLER_SUCCESS; -} - -igt_main_args("", long_options, help_str, opt_handler, NULL) -{ - int debugfs = -1; - int fd = -1; - int sysfs = -1; - - igt_subtest_group { - igt_fixture { - fd = drm_open_driver_master(DRIVER_INTEL); - igt_require_gem(fd); - debugfs = igt_debugfs_dir(fd); - sysfs = igt_sysfs_open(fd); - - kmstest_set_vt_graphics_mode(); - } - - igt_describe("Read all entries from sysfs path."); - igt_subtest("i915-sysfs-read-all-entries") - read_and_discard_sysfs_entries(sysfs, 0); - igt_describe("Read all entries from debugfs path."); - igt_subtest("i915-debugfs-read-all-entries") - read_and_discard_sysfs_entries(debugfs, 0); - - igt_describe("Read all debugfs entries with display on/off."); - igt_subtest_group - kms_tests(fd, debugfs, "i915"); - - igt_fixture { - close(sysfs); - close(debugfs); - drm_close_driver(fd); - } - } - - igt_subtest_group { - igt_fixture { - fd = drm_open_driver_master(DRIVER_XE); - __igt_debugfs_dump(fd, "info", IGT_LOG_INFO); - debugfs = igt_debugfs_dir(fd); - sysfs = igt_sysfs_open(fd); - - kmstest_set_vt_graphics_mode(); - } - - igt_describe("Read all entries from sysfs path."); - igt_subtest("xe-sysfs-read-all-entries") - read_and_discard_sysfs_entries(sysfs, 0); - igt_describe("Read all entries from debugfs path."); - igt_subtest("xe-debugfs-read-all-entries") - read_and_discard_sysfs_entries(debugfs, 0); - - igt_describe("Read all debugfs entries with display on/off."); - igt_subtest_group - kms_tests(fd, debugfs, "xe"); - - igt_describe("Check if various debugfs devnodes exist and test reading them."); - igt_subtest("xe-base") { - xe_test_base(fd, xe_config(fd)); - } - - igt_describe("Check forcewake debugfs devnode"); - igt_subtest("xe-forcewake") { - xe_test_forcewake(fd); - } - - igt_fixture { - close(sysfs); - close(debugfs); - drm_close_driver(fd); - } - } -} diff --git a/tests/intel/xe_test_config.json b/tests/intel/xe_test_config.json index edca243f1..27de0efaa 100644 --- a/tests/intel/xe_test_config.json +++ b/tests/intel/xe_test_config.json @@ -2,7 +2,7 @@ "description": "JSON file to be used to parse Xe documentation", "name": "Tests for Xe Driver", "drivers": [ "xe" ], - "files": [ "xe_*.c", "../core_*.c", "../device_*.c", "../sriov_basic.c", "intel_hwmon.c", "intel_sysfs_debugfs.c" ], + "files": [ "xe_*.c", "../core_*.c", "../device_*.c", "../sriov_basic.c", "intel_hwmon.c" ], "fields": { "Run type": { "_properties_": { diff --git a/tests/meson.build b/tests/meson.build index 847598255..c8f586982 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -86,7 +86,6 @@ test_progs = [ intel_i915_xe_progs = [ 'api_intel_allocator', 'intel_hwmon', - 'intel_sysfs_debugfs', ] intel_i915_progs = [ -- 2.43.0