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 X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8986AC48BD3 for ; Wed, 26 Jun 2019 11:35:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FC752080C for ; Wed, 26 Jun 2019 11:35:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727185AbfFZLfx (ORCPT ); Wed, 26 Jun 2019 07:35:53 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:48536 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725930AbfFZLfw (ORCPT ); Wed, 26 Jun 2019 07:35:52 -0400 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 85506CFD3134A0E4BC1F; Wed, 26 Jun 2019 19:35:50 +0800 (CST) Received: from [127.0.0.1] (10.177.96.96) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.439.0; Wed, 26 Jun 2019 19:35:45 +0800 Subject: Re: [PATCH -next v4] drm/amdgpu: return 'ret' immediately if failed in amdgpu_pmu_init To: "Kim, Jonathan" , "airlied@linux.ie" , "daniel@ffwll.ch" , "Deucher, Alexander" , "Koenig, Christian" , "Zhou, David(ChunMing)" , "dan.carpenter@oracle.com" , "julia.lawall@lip6.fr" References: <20190624094850.GQ18776@kadam> <20190624112318.149299-1-maowenan@huawei.com> CC: "kernel-janitors@vger.kernel.org" , "amd-gfx@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" From: maowenan Message-ID: <2d7c2525-4503-3706-7d00-0b9bf230266d@huawei.com> Date: Wed, 26 Jun 2019 19:35:40 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.177.96.96] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019/6/25 1:42, Kim, Jonathan wrote: > Immediate return should be ok since perf registration isn't dependent on gpu hw. > > Reviewed-by: Jonathan Kim thanks for review. > > -----Original Message----- > From: Mao Wenan > Sent: Monday, June 24, 2019 7:23 AM > To: airlied@linux.ie; daniel@ffwll.ch; Deucher, Alexander ; Koenig, Christian ; Zhou, David(ChunMing) ; dan.carpenter@oracle.com; julia.lawall@lip6.fr > Cc: kernel-janitors@vger.kernel.org; amd-gfx@lists.freedesktop.org; linux-kernel@vger.kernel.org; Kim, Jonathan ; Mao Wenan > Subject: [PATCH -next v4] drm/amdgpu: return 'ret' immediately if failed in amdgpu_pmu_init > > [CAUTION: External Email] > > There is one warning: > drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c: In function ‘amdgpu_pmu_init’: > drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:249:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable] > int ret = 0; > ^ > amdgpu_pmu_init() is called by amdgpu_device_init() in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c, > which will use the return value. So it should return 'ret' immediately if init_pmu_by_type() failed. > amdgpu_device_init() > r = amdgpu_pmu_init(adev); > > Fixes: 9c7c85f7ea1f ("drm/amdgpu: add pmu counters") > > Signed-off-by: Mao Wenan > --- > v1->v2: change the subject for this patch; change the indenting when it calls init_pmu_by_type; use the value 'ret' in amdgpu_pmu_init(). > v2->v3: change the subject for this patch; return 'ret' immediately if failed to call init_pmu_by_type(). > v3->v4: delete the indenting for init_pmu_by_type() arguments. The original indenting is correct. > > drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c > index 0e6dba9f60f0..c98cf77a37f3 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c > @@ -254,6 +254,8 @@ int amdgpu_pmu_init(struct amdgpu_device *adev) > ret = init_pmu_by_type(adev, df_v3_6_attr_groups, > "DF", "amdgpu_df", PERF_TYPE_AMDGPU_DF, > DF_V3_6_MAX_COUNTERS); > + if (ret) > + return ret; > > /* other pmu types go here*/ > break; > -- > 2.20.1 >