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 9D1CAE7F154 for ; Fri, 29 Sep 2023 11:11:09 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2C5D910E6F2; Fri, 29 Sep 2023 11:11:09 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 82E1910E114; Fri, 29 Sep 2023 11:11:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695985865; x=1727521865; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=o1VUrQA9ZQUG7eHs3WkF4DmRiVbUe9WS8kougc6AqjA=; b=KXSK/a3Y4WFIuqNR0XuMpwauLfCiKao5Dp3vC9ohFB7eofxb+wxV444Q HuDRWJ9w/zvFlcClDQ5UyDRJgNWXDevmMBXDEBS2nM/tgkX7z68E6EVkF 43Blbfq+PnrqREysRiIzbtHEuFaP4jrfHym6GU8m/Gaq0hUoGHBfIHF1Z BZ0EEu14qlMY1i3ACgH3RxQhY2E4ByOHjCwH8jPTeKRaPhFoTDlhWD+BW ZfXkC7NuF90PAkrYhNPWoioaj+gUY0gBZOimimvc2O/H5VGSGCvWufuEK tYzpGxUMcTc4x0m03GfeGSV6fT3qQbjZGAE8ckQzOLHKeK7am5AkFjIjv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="382180436" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="382180436" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2023 04:11:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10847"; a="815571793" X-IronPort-AV: E=Sophos;i="6.03,187,1694761200"; d="scan'208";a="815571793" Received: from pbrady4x-mobl1.ger.corp.intel.com (HELO [10.213.203.84]) ([10.213.203.84]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2023 04:11:03 -0700 Message-ID: <8644156f-219a-22c4-913e-84c3092d42db@linux.intel.com> Date: Fri, 29 Sep 2023 12:11:01 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.15.1 Content-Language: en-US To: Umesh Nerlige Ramappa References: <20230922134437.234888-1-tvrtko.ursulin@linux.intel.com> <20230922134437.234888-4-tvrtko.ursulin@linux.intel.com> <6a9b5529-6b41-a29b-3608-81be00934fbf@linux.intel.com> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH i-g-t 03/12] tools/intel_gpu_top: Restore user friendly error message X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 28/09/2023 22:31, Umesh Nerlige Ramappa wrote: > On Thu, Sep 28, 2023 at 09:16:23AM +0100, Tvrtko Ursulin wrote: >> >> On 27/09/2023 21:13, Umesh Nerlige Ramappa wrote: >>> On Fri, Sep 22, 2023 at 02:44:28PM +0100, Tvrtko Ursulin wrote: >>>> From: Tvrtko Ursulin >>>> >>>> We have a nice error message displayed when an user with insufficient >>>> permissions tries to run the tool, but that got lost while Meteorlake >>>> support was added. Bring it back in. >>>> >>>> Signed-off-by: Tvrtko Ursulin >>>> Cc: Umesh Nerlige Ramappa >>>> --- >>>> tools/intel_gpu_top.c | 10 +++++++--- >>>> 1 file changed, 7 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c >>>> index 87e9681e53b4..e01355f90458 100644 >>>> --- a/tools/intel_gpu_top.c >>>> +++ b/tools/intel_gpu_top.c >>>> @@ -554,9 +554,11 @@ static int get_num_gts(uint64_t type) >>>> >>>>         close(fd); >>>>     } >>>> -    assert(!errno || errno == ENOENT); >>>> -    assert(cnt > 0); >>>> -    errno = 0; >>>> + >>>> +    if (!cnt) >>>> +        cnt = errno; >>>> +    else >>>> +        errno = 0; >>> >>> ENOENT is the only way this logic is checking for num_gts. >>> >>> In this case error is propagated only if cnt == 0. What if cnt=1 and >>> we get an error (other than ENOENT)? Should we ignore that? >> >> If cnt >= 1 then at least one tile was found so the errno happened >> while probing for further tiles. So on single tile parts it can be >> ignored. > > I am actually only referring to single tile parts. The for loop iterates > over MAX_GTs (4), so I am expecting an ENOENT from a single tile part > when cnt >= 1. Anything else is an error/failure that we should flag. Yes I think that worked fine in v1. Only thing I did not do is bother to pass on the unexpected errno on multi-tile. Anyway, I have sent v2 with the below condition. Regards, Tvrtko > >> On multi-tile parts it cannot really happen, or even if it happens >> situation would simply be "why is only one tile showing". If we want >> to cover this impossible/unlikely case then maybe like this: >> >>     if (!cnt || (errno && errno != ENOENT)) >>         cnt = -errno; > > If you agree to the above logic, then this condition should do the trick. > > Regards, > Umesh >> >>> I had something like this in mind for the regression (and sorry this >>> fell through the cracks) >>> >>> https://patchwork.freedesktop.org/patch/541406/?series=118973&rev=1 >> >> Oh back in June! >> >> I think yours work too, in which case it's a matter of a style choice >> with which one to go. I don't have a strong preference - above would >> be a bit more compact, while I think it still succinctly expresses the >> failure condition ("nothing found or unexpected error while probing >> for remote tiles"). >> >> Regards, >> >> Tvrtko >> >>> >>> Regards, >>> Umesh >>> >>>> >>>>     return cnt; >>>> } >>>> @@ -590,6 +592,8 @@ static int pmu_init(struct engines *engines) >>>>     engines->fd = -1; >>>>     engines->num_counters = 0; >>>>     engines->num_gts = get_num_gts(type); >>>> +    if (engines->num_gts <= 0) >>>> +        return -1; >>>> >>>>     engines->irq.config = I915_PMU_INTERRUPTS; >>>>     fd = _open_pmu(type, engines->num_counters, &engines->irq, >>>> engines->fd); >>>> -- >>>> 2.39.2 >>>>