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 5DF0EC05027 for ; Mon, 23 Jan 2023 11:13:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FE8A10E341; Mon, 23 Jan 2023 11:13:49 +0000 (UTC) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7B27E10E33E; Mon, 23 Jan 2023 11:13:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674472426; x=1706008426; h=message-id:date:mime-version:subject:from:to:references: in-reply-to:content-transfer-encoding; bh=vVIWhzkSw6CxTkoVyuiMKP3S03ooUELo46t1usaO05I=; b=XaGCvaRKX/7GPrkSdyZGU2XUb+2pxbvECaPGxA0/8AsEGOwzAiYvLG7f vhGK6wol8/bug/GOrAiQPlRS3ebI8wZD7HdTl25urThz0zt/W78lh8L0N 31e6WwL9x/lbAaBKwsRO3pyMdn3dxuA9dfFlQZQVjgVj6sJ2rx/VcUHIF SDXA/fHl+73zw0tIIH2w8BdPsY6OYuhyCrefzG9kduWUYCaEytJ3TTrfQ bpR0urxRdDtTSbfiQk8mMYhvqjSD/ZWjP7KOZmo+T5lCs2xHKPvxBXtgB isYa2ULjpT33Id4VksfX7SlbeiG/2oYoWLLYxIiM4bQP5tRTHezOilrj7 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10598"; a="388370704" X-IronPort-AV: E=Sophos;i="5.97,239,1669104000"; d="scan'208";a="388370704" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 03:13:45 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10598"; a="769765220" X-IronPort-AV: E=Sophos;i="5.97,239,1669104000"; d="scan'208";a="769765220" Received: from nirmoyda-mobl.ger.corp.intel.com (HELO [10.252.57.143]) ([10.252.57.143]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 03:13:44 -0800 Message-ID: <96c657de-e29e-e234-66e5-14ab96060f5a@linux.intel.com> Date: Mon, 23 Jan 2023 12:13:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.6.1 Content-Language: en-US From: "Das, Nirmoy" To: Tvrtko Ursulin , igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org References: <20230119155428.3260937-1-tvrtko.ursulin@linux.intel.com> <46f7db49-eb5c-515f-b450-75cac53d770e@linux.intel.com> <3d3c7982-5ad3-d5a7-0574-ec1b9848dd2a@linux.intel.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [Intel-gfx] [PATCH i-g-t] intel_gpu_top: Fix cleanup on old kernels / unsupported GPU 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 1/23/2023 12:09 PM, Das, Nirmoy wrote: > Hi Tvrtko, > > On 1/23/2023 11:24 AM, Tvrtko Ursulin wrote: >> >> On 20/01/2023 14:29, Das, Nirmoy wrote: >>> Hi Tvrtko, >>> >>> On 1/19/2023 4:54 PM, Tvrtko Ursulin wrote: >>>> From: Tvrtko Ursulin >>>> >>>> Avoid trying to dereference null engines on exit when there are either >>>> none which are supported, or kernel does not have i915 PMU support. >>>> >>>> Signed-off-by: Tvrtko Ursulin >>>> --- >>>>   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 7aa233570463..517dc2995d26 100644 >>>> --- a/tools/intel_gpu_top.c >>>> +++ b/tools/intel_gpu_top.c >>>> @@ -448,6 +448,9 @@ static void free_engines(struct engines *engines) >>>>       }; >>>>       unsigned int i; >>>> +    if (!engines) >>>> +        return; >>>> + >>> >>> >>> This check should happen before the  struct pmu_counter free_list >>> generation. >> >> I could, but it doesn't have to, not sure what reasons for should you >> have in mind? > > In my tree, I see: > > " > > static void free_engines(struct engines *engines) > > { >         struct pmu_counter **pmu, *free_list[] = { >                 &engines->r_gpu, >                 &engines->r_pkg, >                 &engines->imc_reads, >                 &engines->imc_writes, >                 NULL >         }; > >         unsigned int i; > > " > > Maybe I am missing something here, wouldn't those dereferences of > "engines" segfault if the engines  is NULL. Ah never mind it shouldn't matter. > > > Regards, > > Nirmoy > >> >> Regards, >> >> Tvrtko >> >>> >>> Regards, >>> >>> Nirmoy >>> >>>>       for (pmu = &free_list[0]; *pmu; pmu++) { >>>>           if ((*pmu)->present) >>>>               free((char *)(*pmu)->units); >>>> @@ -2568,7 +2571,7 @@ int main(int argc, char **argv) >>>>               "Failed to detect engines! (%s)\n(Kernel 4.16 or >>>> newer is required for i915 PMU support.)\n", >>>>               strerror(errno)); >>>>           ret = EXIT_FAILURE; >>>> -        goto err; >>>> +        goto err_engines; >>>>       } >>>>       ret = pmu_init(engines); >>>> @@ -2585,7 +2588,7 @@ int main(int argc, char **argv) >>>>   "More information can be found at 'Perf events and tool security' >>>> document:\n" >>>> "https://www.kernel.org/doc/html/latest/admin-guide/perf-security.html\n"); >>>> >>>>           ret = EXIT_FAILURE; >>>> -        goto err; >>>> +        goto err_pmu; >>>>       } >>>>       ret = EXIT_SUCCESS; >>>> @@ -2699,8 +2702,9 @@ int main(int argc, char **argv) >>>>           free_clients(clients); >>>>       free(codename); >>>> -err: >>>> +err_pmu: >>>>       free_engines(engines); >>>> +err_engines: >>>>       free(pmu_device); >>>>   exit: >>>>       igt_devices_free(); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <96c657de-e29e-e234-66e5-14ab96060f5a@linux.intel.com> Date: Mon, 23 Jan 2023 12:13:42 +0100 MIME-Version: 1.0 Content-Language: en-US From: "Das, Nirmoy" To: Tvrtko Ursulin , igt-dev@lists.freedesktop.org, Intel-gfx@lists.freedesktop.org References: <20230119155428.3260937-1-tvrtko.ursulin@linux.intel.com> <46f7db49-eb5c-515f-b450-75cac53d770e@linux.intel.com> <3d3c7982-5ad3-d5a7-0574-ec1b9848dd2a@linux.intel.com> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [igt-dev] [Intel-gfx] [PATCH i-g-t] intel_gpu_top: Fix cleanup on old kernels / unsupported GPU List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 1/23/2023 12:09 PM, Das, Nirmoy wrote: > Hi Tvrtko, > > On 1/23/2023 11:24 AM, Tvrtko Ursulin wrote: >> >> On 20/01/2023 14:29, Das, Nirmoy wrote: >>> Hi Tvrtko, >>> >>> On 1/19/2023 4:54 PM, Tvrtko Ursulin wrote: >>>> From: Tvrtko Ursulin >>>> >>>> Avoid trying to dereference null engines on exit when there are either >>>> none which are supported, or kernel does not have i915 PMU support. >>>> >>>> Signed-off-by: Tvrtko Ursulin >>>> --- >>>>   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 7aa233570463..517dc2995d26 100644 >>>> --- a/tools/intel_gpu_top.c >>>> +++ b/tools/intel_gpu_top.c >>>> @@ -448,6 +448,9 @@ static void free_engines(struct engines *engines) >>>>       }; >>>>       unsigned int i; >>>> +    if (!engines) >>>> +        return; >>>> + >>> >>> >>> This check should happen before the  struct pmu_counter free_list >>> generation. >> >> I could, but it doesn't have to, not sure what reasons for should you >> have in mind? > > In my tree, I see: > > " > > static void free_engines(struct engines *engines) > > { >         struct pmu_counter **pmu, *free_list[] = { >                 &engines->r_gpu, >                 &engines->r_pkg, >                 &engines->imc_reads, >                 &engines->imc_writes, >                 NULL >         }; > >         unsigned int i; > > " > > Maybe I am missing something here, wouldn't those dereferences of > "engines" segfault if the engines  is NULL. Ah never mind it shouldn't matter. > > > Regards, > > Nirmoy > >> >> Regards, >> >> Tvrtko >> >>> >>> Regards, >>> >>> Nirmoy >>> >>>>       for (pmu = &free_list[0]; *pmu; pmu++) { >>>>           if ((*pmu)->present) >>>>               free((char *)(*pmu)->units); >>>> @@ -2568,7 +2571,7 @@ int main(int argc, char **argv) >>>>               "Failed to detect engines! (%s)\n(Kernel 4.16 or >>>> newer is required for i915 PMU support.)\n", >>>>               strerror(errno)); >>>>           ret = EXIT_FAILURE; >>>> -        goto err; >>>> +        goto err_engines; >>>>       } >>>>       ret = pmu_init(engines); >>>> @@ -2585,7 +2588,7 @@ int main(int argc, char **argv) >>>>   "More information can be found at 'Perf events and tool security' >>>> document:\n" >>>> "https://www.kernel.org/doc/html/latest/admin-guide/perf-security.html\n"); >>>> >>>>           ret = EXIT_FAILURE; >>>> -        goto err; >>>> +        goto err_pmu; >>>>       } >>>>       ret = EXIT_SUCCESS; >>>> @@ -2699,8 +2702,9 @@ int main(int argc, char **argv) >>>>           free_clients(clients); >>>>       free(codename); >>>> -err: >>>> +err_pmu: >>>>       free_engines(engines); >>>> +err_engines: >>>>       free(pmu_device); >>>>   exit: >>>>       igt_devices_free();