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 64BA1C369BD for ; Wed, 16 Apr 2025 23:16:45 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BC76B10E9ED; Wed, 16 Apr 2025 23:16:42 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="I8qxrgb0"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32DA310E9E4 for ; Wed, 16 Apr 2025 23:16:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1744845401; x=1776381401; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version; bh=CZguXvE+CMw8ZuBrNp5dyUn5Tx52B3p4RcP630Mo6TY=; b=I8qxrgb0uaALIoWpcJuH+hNMeFcXenqmMM6385rdgdCooLhKWi3CA/XR IQ33r1Z4sIWWtgBWWNOCs1fpr36DPNr3xMNtevaH/io0C4gYxaaR+nfLB CRu7ROv4ZSOhY2fZFGKXMY37h5Xp2PzTbeP9vTXV+6Uk3xH8V0XOiFgb5 PyxwnBbj3tl66VFkdovx/t7d4ZaGJR4V6kR+P/d3+Un5Y7fXK/YN2wLRo xOCHy+n/8LEdo396KNK57uDDVwOM1jf8eUmc3HtzZTMLs2cQEx7wmLSmr cOrDMt/uFgHHo2lGIqeWp7eQcyV70SV30GNanz3qFHg7DtDQj8gZdDk2x g==; X-CSE-ConnectionGUID: 47fjvwirTQuOwYl6Aaj+zQ== X-CSE-MsgGUID: G5h7gwrbQ8SM2VSn1gmUxA== X-IronPort-AV: E=McAfee;i="6700,10204,11405"; a="57058259" X-IronPort-AV: E=Sophos;i="6.15,217,1739865600"; d="scan'208";a="57058259" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2025 16:16:41 -0700 X-CSE-ConnectionGUID: 9hu+Za/cS/KWa4lawpGjwg== X-CSE-MsgGUID: u9BKGfZ6ReKTITsgOdN2Gw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.15,217,1739865600"; d="scan'208";a="130599514" Received: from rsgollap-mobl.amr.corp.intel.com (HELO adixit-MOBL3.intel.com) ([10.125.180.11]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2025 16:16:40 -0700 Date: Wed, 16 Apr 2025 16:16:40 -0700 Message-ID: <87cydbhf3b.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Umesh Nerlige Ramappa Cc: Subject: Re: [PATCH i-g-t] tests/intel/xe_oa: Call get_stream_status only on EIO In-Reply-To: <20250416231203.13916-1-umesh.nerlige.ramappa@intel.com> References: <20250416231203.13916-1-umesh.nerlige.ramappa@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII 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" On Wed, 16 Apr 2025 16:12:02 -0700, Umesh Nerlige Ramappa wrote: > > Turns out that get_stream_status resets errno and anything that checks > errno afterwards fails. This resulted in a bunch of test failures. Fix > it by calling get_stream_status only if errno is EIO and also save and > restore errno within get_stream_status. > > Closes: https://gitlab.freedesktop.org/drm/xe/kernel/issues/4804 > Signed-off-by: Umesh Nerlige Ramappa > --- > tests/intel/xe_oa.c | 20 ++++++++++++++------ > 1 file changed, 14 insertions(+), 6 deletions(-) > > diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c > index 1fc8bfaafee2..360dd8ba00d9 100644 > --- a/tests/intel/xe_oa.c > +++ b/tests/intel/xe_oa.c > @@ -380,9 +380,11 @@ static void set_fd_flags(int fd, int flags) > static u32 get_stream_status(int fd) > { > struct drm_xe_oa_stream_status status; > + int _e = errno; > > do_ioctl(fd, DRM_XE_OBSERVATION_IOCTL_STATUS, &status); > igt_debug("oa status %llx\n", status.oa_status); > + errno = _e; > > return status.oa_status; > } > @@ -2294,7 +2296,8 @@ static void test_polling_small_buf(void) > errno = 0; > ret = read(stream_fd, buf, sizeof(buf)); > igt_assert_eq(ret, -1); > - get_stream_status(stream_fd); > + if (errno == EIO) > + get_stream_status(stream_fd); Hi Umesh, if we are saving/restoring errno in get_stream_status(), do we still need to check for EIO? Or you just want to check for EIO anyhow? Thanks. -- Ashutosh