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 C212BCD5BD0 for ; Wed, 27 May 2026 22:58:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F79D10EA8F; Wed, 27 May 2026 22:58:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="c6eLq5cF"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 94CDB10EA8C for ; Wed, 27 May 2026 22:58:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1779922710; x=1811458710; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=Fr4kUadYF35blTFChQ+cqp7WX18pV5wa+UMyOSxKVC4=; b=c6eLq5cF0t+dqknm5e/Ock4hxSs+f5otYn6beTgDOSPWq1FftgGrej8y fZHM9ey6BOSSX3+dyJA+nni3oPanBWFFximUJsIOVLpcKXJu/fqs7CAAZ ax+OAJTBHhIKCq+xsjugrEPKqwY7O4BDsJAehnAmJJpdciR8nF02nPG9n OunADBgp+RxOlr2RwOW8593DNP5Su73pS83dVJumTDFyrg3Y6Ns0nwGSP be/HF/uqNDtlwpoS3lj5bTk71A5yupS4d15vvypI43BM/N4N6Qp6j4/qj vMDJk7HlIkYt6j8tttgkm6QIMmLD9xXLplMo6cDPlgGtzl8yi42eNXXhL g==; X-CSE-ConnectionGUID: REKQvkEYRfa5K8IiW6d8cQ== X-CSE-MsgGUID: 1i/yl0j+QvGBxJascjiRDg== X-IronPort-AV: E=McAfee;i="6800,10657,11799"; a="80668879" X-IronPort-AV: E=Sophos;i="6.24,172,1774335600"; d="scan'208";a="80668879" Received: from orviesa010.jf.intel.com ([10.64.159.150]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2026 15:58:30 -0700 X-CSE-ConnectionGUID: q8hMs9QDS6CHSc7Y5nDS7g== X-CSE-MsgGUID: nb9sKtpyQI64TT5lUlgZdA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,172,1774335600"; d="scan'208";a="241539650" Received: from nkwan-mobl.amr.corp.intel.com (HELO [10.125.134.218]) ([10.125.134.218]) by orviesa010-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 May 2026 15:58:29 -0700 Message-ID: <4c19194d-2686-4d3c-bc71-f021b28a305c@linux.intel.com> Date: Wed, 27 May 2026 15:58:24 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH i-g-t] Revert "lib/intel_wa: Assert on error instead of returning -1" To: Ashutosh Dixit , igt-dev@lists.freedesktop.org Cc: gustavo.sousa@intel.com References: <20260527170827.1963198-1-ashutosh.dixit@intel.com> Content-Language: en-US From: Ngai-Mint Kwan In-Reply-To: <20260527170827.1963198-1-ashutosh.dixit@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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" Hi Ashutosh, On 2026-05-27 10:08, Ashutosh Dixit wrote: > This reverts commit b360115af75ac702b4f776aa3db0ac8a2a620657. > > There are cases (e.g. igt@core_setmaster@master-drop-set-user) which drop > root before accessing debugfs, where we don't want to assert. > > Also fix the igt_has_intel_wa() call in tests/intel/xe_oa.c. > > Signed-off-by: Ashutosh Dixit This looks good to me. Reviewed-by: Ngai-Mint Kwan Thanks, Ngai-Mint Kwan > --- > lib/intel_wa.c | 19 ++++++++++--------- > lib/intel_wa.h | 2 +- > tests/intel/xe_oa.c | 2 +- > 3 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/lib/intel_wa.c b/lib/intel_wa.c > index a16ea62a4c..727dd6c988 100644 > --- a/lib/intel_wa.c > +++ b/lib/intel_wa.c > @@ -7,18 +7,18 @@ > #include > #include > > -#include "igt_core.h" > #include "igt_debugfs.h" > #include "igt_sysfs.h" > #include "intel_wa.h" > #include "xe/xe_query.h" > > -static bool debugfs_file_has_wa(int drm_fd, int debugfs_fd, > +static int debugfs_file_has_wa(int drm_fd, int debugfs_fd, > const char *debugfs_name, const char *wa) > { > char *debugfs_dump; > > - igt_assert(igt_debugfs_exists(drm_fd, debugfs_name, O_RDONLY)); > + if (!igt_debugfs_exists(drm_fd, debugfs_name, O_RDONLY)) > + return -1; > > debugfs_dump = igt_sysfs_get(debugfs_fd, debugfs_name); > if (debugfs_dump) { > @@ -27,10 +27,10 @@ static bool debugfs_file_has_wa(int drm_fd, int debugfs_fd, > free(debugfs_dump); > > if (has_wa) > - return true; > + return 1; > } > > - return false; > + return 0; > } > > /** > @@ -38,17 +38,18 @@ static bool debugfs_file_has_wa(int drm_fd, int debugfs_fd, > * @drm_fd: A drm file descriptor > * @check_wa: Workaround to be checked > * > - * Returns: true if WA present, false otherwise > + * Returns: 0 if no WA, 1 if WA present, -1 on error > */ > -bool igt_has_intel_wa(int drm_fd, const char *check_wa) > +int igt_has_intel_wa(int drm_fd, const char *check_wa) > { > - bool ret = false; > + int ret = 0; > int debugfs_fd; > unsigned int xe; > char name[256]; > > debugfs_fd = igt_debugfs_dir(drm_fd); > - igt_assert(debugfs_fd >= 0); > + if (debugfs_fd == -1) > + return -1; > > xe_for_each_gt(drm_fd, xe) { > sprintf(name, "gt%d/workarounds", xe); > diff --git a/lib/intel_wa.h b/lib/intel_wa.h > index 34cafecc41..765a5948ef 100644 > --- a/lib/intel_wa.h > +++ b/lib/intel_wa.h > @@ -6,6 +6,6 @@ > #ifndef __INTEL_WA_H__ > #define __INTEL_WA_H__ > > -bool igt_has_intel_wa(int drm_fd, const char *check_wa); > +int igt_has_intel_wa(int drm_fd, const char *check_wa); > > #endif /* __INTEL_WA_H__ */ > diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c > index 56d818d860..e59fe953b0 100644 > --- a/tests/intel/xe_oa.c > +++ b/tests/intel/xe_oa.c > @@ -2678,7 +2678,7 @@ test_non_zero_reason(const struct drm_xe_oa_unit *oau, size_t oa_buffer_size) > * can result in buffer overflows. > */ > if (oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_MERT && > - igt_has_intel_wa(drm_fd, "14026633728")) { > + igt_has_intel_wa(drm_fd, "14026633728") > 0) { > oa_exponent = max(oa_exponent, 8); > properties[9] = oa_exponent; > }