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 3C66CC36002 for ; Mon, 24 Mar 2025 09:08:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id EA1FA10E095; Mon, 24 Mar 2025 09:08:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="kAiofry1"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id A228310E095 for ; Mon, 24 Mar 2025 09:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1742807296; x=1774343296; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=iqHb9xaj32ok7uAnDSWFL2JqnImUtIw1ZhHtqdOFYII=; b=kAiofry1LYzP1ZF6OXnJ5U1qn37LfLCLFOgT2/TA3ml8Pgl6HUSm3/PK 8JRZZOQXfPidPtwghYfDaXeww36PuajauLD4Wl1RI07eaadk+ZBKGPC1z 4Fq5pUEAyLWEAzfJy6RSKcSj+G6JeVUMPl0DgMAFr8Ya3gKikHt4hPtf4 X7ZWtvhx0hxjAu/Sl+aaZUJnk621+xYVXA+pMh1tMBnnR4MqIN6OdUM+W Ole7vHS/sEMngL+exCwnf3aSIzsy0P25lxdtf9TYaxDeoK16kP/w/TYGX DGrNH1eDLzRmlw4QxQrJFyaPYo/lWYmyOtizFfZQK/ZNJgxAiSyDfg4CQ A==; X-CSE-ConnectionGUID: pK4oL1UNT/OSClCkWIBonQ== X-CSE-MsgGUID: CddAfnFuR5WAGQpcA73shw== X-IronPort-AV: E=McAfee;i="6700,10204,11382"; a="47783874" X-IronPort-AV: E=Sophos;i="6.14,271,1736841600"; d="scan'208";a="47783874" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2025 02:08:16 -0700 X-CSE-ConnectionGUID: yuEe0Fl5Qzqcv3k+9YZg8w== X-CSE-MsgGUID: 7QYOkb50Ttirz1b8VgOHag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,271,1736841600"; d="scan'208";a="124516167" Received: from unknown (HELO nakshtra-System-Product-Name.iind.intel.com) ([10.190.238.69]) by orviesa007.jf.intel.com with ESMTP; 24 Mar 2025 02:08:14 -0700 From: nakshtra.goyal@intel.com To: igt-dev@lists.freedesktop.org, ramadevi.gandi@intel.com Cc: francois.dugast@intel.com, sai.teja.pottumuttu@intel.com, ashutosh.dixit@intel.com, umesh.nerlige.ramappa@intel.com Subject: [PATCH v5 i-g-t] tests/intel/xe_fault_injection: Inject errors during observation IOCTL Date: Mon, 24 Mar 2025 14:38:01 +0530 Message-Id: <20250324090801.3121551-1-nakshtra.goyal@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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" From: Nakshtra Goyal Use the fault injection infrastructure to make targeted internal KMD functions fail when executing xe_observation_ioctl() so that more code paths are tested, such as error handling and unwinding. v1: Adding remove config at end of test , Adding igt_sysfs into igt_assert so test fails if sysfs read fails (Sai Teja) v2: Run sysfs check before creating config to destroy prev. config if present, add one check before creating new config after destroying old one (Sai Teja) Signed-off-by: Nakshtra Goyal --- tests/intel/xe_fault_injection.c | 62 +++++++++++++++++++++++++++++++- tests/meson.build | 1 + 2 files changed, 62 insertions(+), 1 deletion(-) diff --git a/tests/intel/xe_fault_injection.c b/tests/intel/xe_fault_injection.c index 5409d19a6..eaf93a0b2 100644 --- a/tests/intel/xe_fault_injection.c +++ b/tests/intel/xe_fault_injection.c @@ -20,6 +20,7 @@ #include "lib/igt_syncobj.h" #include "lib/intel_pat.h" #include "xe/xe_ioctl.h" +#include "xe/xe_oa.h" #include "xe/xe_query.h" #define INJECT_ERRNO -ENOMEM @@ -314,10 +315,57 @@ vm_bind_fail(int fd, const char function_name[]) igt_assert_eq(simple_vm_bind(fd, vm), 0); } +/** + * SUBTEST: oa-add-config-fail-%s + * Description: inject an error in function %arg[1] used in oa add config IOCTL to make it fail + * Functionality: fault + * + * arg[1]: + * @xe_oa_alloc_regs: xe_oa_alloc_regs + */ +static void +oa_add_config_fail(int fd, int sysfs, int devid, const char function_name[]) +{ + char path[512]; + uint64_t config_id; +#define SAMPLE_MUX_REG (intel_graphics_ver(devid) >= IP_VER(20, 0) ? \ + 0x13000 /* PES* */ : 0x9888 /* NOA_WRITE */) + + uint32_t mux_regs[] = { SAMPLE_MUX_REG, 0x0 }; + struct drm_xe_oa_config config; + const char *uuid = "01234567-0123-0123-0123-0123456789ab"; + + snprintf(path, sizeof(path), "metrics/%s/id", uuid); + /* Destroy previous configuration if present */ + if (igt_sysfs_scanf(sysfs, path, "%"PRIu64, &config_id) == 1) + igt_assert_eq(intel_xe_perf_ioctl(fd, DRM_XE_OBSERVATION_OP_REMOVE_CONFIG, + &config_id), 0); + + memset(&config, 0, sizeof(config)); + memcpy(config.uuid, uuid, sizeof(config.uuid)); + config.n_regs = 1; + config.regs_ptr = to_user_pointer(mux_regs); + + igt_assert_lt(0, intel_xe_perf_ioctl(fd, DRM_XE_OBSERVATION_OP_ADD_CONFIG, &config)); + igt_assert(igt_sysfs_scanf(sysfs, path, "%"PRIu64, &config_id) == 1); + igt_assert_eq(intel_xe_perf_ioctl(fd, DRM_XE_OBSERVATION_OP_REMOVE_CONFIG, &config_id), 0); + + ignore_faults_in_dmesg(function_name); + injection_list_do(INJECTION_LIST_ADD, function_name); + set_retval(function_name, INJECT_ERRNO); + igt_assert_lt(intel_xe_perf_ioctl(fd, DRM_XE_OBSERVATION_OP_ADD_CONFIG, &config), 0); + injection_list_do(INJECTION_LIST_REMOVE, function_name); + + igt_assert_lt(0, intel_xe_perf_ioctl(fd, DRM_XE_OBSERVATION_OP_ADD_CONFIG, &config)); + igt_assert(igt_sysfs_scanf(sysfs, path, "%"PRIu64, &config_id) == 1); + igt_assert_eq(intel_xe_perf_ioctl(fd, DRM_XE_OBSERVATION_OP_REMOVE_CONFIG, &config_id), 0); +} + igt_main { - int fd; + int fd, sysfs; struct drm_xe_engine_class_instance *hwe; + static uint32_t devid; char pci_slot[NAME_MAX]; const struct section { const char *name; @@ -366,9 +414,16 @@ igt_main { } }; + const struct section oa_add_config_fail_functions[] = { + { "xe_oa_alloc_regs"}, + { } + }; + igt_fixture { igt_require(fail_function_injection_enabled()); fd = drm_open_driver(DRIVER_XE); + devid = intel_get_drm_devid(fd); + sysfs = igt_sysfs_open(fd); igt_device_get_pci_slot_name(fd, pci_slot); setup_injection_fault(); } @@ -393,6 +448,10 @@ igt_main if (hwe->engine_class == DRM_XE_ENGINE_CLASS_VM_BIND) exec_queue_create_fail(fd, hwe, s->name, s->flags); + for (const struct section *s = oa_add_config_fail_functions; s->name; s++) + igt_subtest_f("oa-add-config-fail-%s", s->name) + oa_add_config_fail(fd, sysfs, devid, s->name); + igt_fixture { xe_sysfs_driver_do(fd, pci_slot, XE_SYSFS_DRIVER_UNBIND); } @@ -402,6 +461,7 @@ igt_main inject_fault_probe(fd, pci_slot, s->name); igt_fixture { + close(sysfs); drm_close_driver(fd); xe_sysfs_driver_do(fd, pci_slot, XE_SYSFS_DRIVER_BIND); } diff --git a/tests/meson.build b/tests/meson.build index 2f5406523..c4a9093c4 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -401,6 +401,7 @@ extra_dependencies = { 'perf_pmu': [ lib_igt_perf ], 'sw_sync': [ libatomic ], 'xe_oa': [ lib_igt_xe_oa ], + 'xe_fault_injection': [ lib_igt_xe_oa ], } test_executables = [] -- 2.34.1