Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <c3ae568d-f941-2b66-1e36-9d67b6a231ea@amd.com>
Date:   Fri, 4 Aug 2023 12:24:12 -0400
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
Subject: Re: [PATCH] drm/amdkfd: fix build failure without
 CONFIG_DYNAMIC_DEBUG
To:     Arnd Bergmann <arnd@kernel.org>,
        Alex Deucher <alexander.deucher@amd.com>,
        =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>,
        "Pan, Xinhui" <Xinhui.Pan@amd.com>,
        Philip Yang <Philip.Yang@amd.com>,
        Alex Sierra <alex.sierra@amd.com>
Cc:     Arnd Bergmann <arnd@arndb.de>, David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        Mukul Joshi <mukul.joshi@amd.com>,
        Graham Sider <Graham.Sider@amd.com>,
        amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
        linux-kernel@vger.kernel.org
References: <20230804132924.2314478-1-arnd@kernel.org>
Content-Language: en-US
From:   Felix Kuehling <felix.kuehling@amd.com>
In-Reply-To: <20230804132924.2314478-1-arnd@kernel.org>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cFJUemRtZzl4Nnd0Ky9kSXhMRzFOeENWMWZmTnNFOUY2MUxXRWRiTkVvZU80?=
 =?utf-8?B?WmhnekFCWGJlc2xhTXRhWDdIeHVwYldqajk4VE1SWWhvNzcra2o1aDJKaEZQ?=
 =?utf-8?B?VFVGS3BhTDdCeit2MENwR0VHVW1hcElDSkhZbGd5aTRXVUdrVUVjTC85c0hG?=
 =?utf-8?B?WGYva1pYZDE2L3dMeUhSa2NxMUVDRjFBTlJnWmNUem5EV1pzd1RBUVB3N0s5?=
 =?utf-8?B?Z01qRmx1MGN1Y3hhNVF5UGdBdlJLNjNUcG9kYkZ6S1gweEo2YXluMy9MSDBa?=
 =?utf-8?B?UzdLK1MwNEVtRUJxNGdSbTd3WW8vaDB5TTJQNHF2OTRncHRMU0poY010VmxK?=
 =?utf-8?B?aWF2M0c1c2k4OGIveTNOdU8yU1hZSTFtWHlZNVQ2ODFSY05ia0g1NlFObEdO?=
 =?utf-8?B?OWZURnYveFluWlg5cUZNN0h6cytzNlRvVWxROVMvbWpPS3JBbCtjcWR2VWgw?=
 =?utf-8?B?RVErcngvUXhYdEUrU2pyOFRpOENKVUNhS3R6ODJ3ZzdLN1hVTTdCNnRxNm16?=
 =?utf-8?B?Y0s2bExBTjdqQ2gxMkgwS3drNisrYnBTaVZ3OHRzSGVtaE5SaXBpbzZHbDht?=
 =?utf-8?B?bjlmdDNZU0l5UDl2dnlYS29nVkxLNkVGUFp6djV4eEFXdVBrV3N2OXoxbWE3?=
 =?utf-8?B?bVlCeDM3YnU5clh2ZE0xb3ZnMW1qTzk0RGNuZ0xkUnRHdS9Ecll6NEM4WFBU?=
 =?utf-8?B?MnFKdEo3N3FMK09jc1JNRzNIOXltNWpLMjRNdmdzd0ljZkw2RW96OXVFZGVw?=
 =?utf-8?B?ZEVZVlBwWkcxTnJXYXZaeXl3MjJLNDByWTlsZFBwc3NqV2EyMXJTZ3NCUXNE?=
 =?utf-8?B?QVVUOVZodS8xSE50Rzk4WWg0NitkbEYvUUpiN2hncVJ3eEhubEtOVjhmdC8y?=
 =?utf-8?B?Z1VXQ3RmSDZNdE9HN1FwSEs3ZmJoWjdadWI3ZGl0WHRiWmFmL3FySjFXME1h?=
 =?utf-8?B?enpzRTlQWVNib01BTWowSU5QTi9iMjVtL2I0MUZmanNCUGtMY3NHckFtZlRZ?=
 =?utf-8?B?VUVJTWM1TTFyQUtlYUJqN3FnS3VmTjFNK25hSzN6WktiQndvbnYvWk95cHV3?=
 =?utf-8?B?Rkh1WUFkdnE2Snh3cWo3eDA2WEk4T0JtNlFybFZJUC92emJwVk1RcktKQzNw?=
 =?utf-8?B?c2VTSHdRSGRDTTZQYm50Tk4xTTVjc2pHZ01oR0lBVWRaVTM5TjNDNkVWZUpC?=
 =?utf-8?B?QVNkUlBmV2k1R2ozOW1CdXdDamRiaGFyckxQOFljQkxha3g0bFNJeXRPYlJQ?=
 =?utf-8?B?NXVTSzhEOXpVK2MrdWJVMWsybWZ4M1N3OGxMeTlqM0hGdy9Edk10ZjVQMEcr?=
 =?utf-8?B?MHFZcEZtWnF3V3FoRk9ENjE1U3cyTTZJd0htRENna2IvYkFEeGlYMmlFd1Rm?=
 =?utf-8?B?NkxrdnJsRWlvNk1udHRuZklmUUNMRERqdEpMbGVkOFI5MlJ6WW5HTFg4Z3Rw?=
 =?utf-8?B?SVRqU3lYZXcyRGFkdG5ZUlNvVW9rODY2cUJXRG1WeDJXemR0S3BVU3Fybkt1?=
 =?utf-8?B?aitBY3JUZGhzRkRsbit4MFVoWVBndUtER3JCRlc1VHVLQWI5UUV0MUhjVVda?=
 =?utf-8?B?QXUrV2F1T2lENmRGcDJNVEk3YmVOcTFEM08zZWIrWWV4anpZU1lRbWFtcEla?=
 =?utf-8?B?NC9ydEcwU0J6MGJZc3BRUW9KRGNRcFZtTFBPMVFNUnBicXdBd0dTTEhpYVJ6?=
 =?utf-8?B?Q2pXZ3dzMzhadld4TjlyTC9oMDgyUVlHTzlNV01hT1hNOXdTZGZ4Y0pPRk9C?=
 =?utf-8?B?bmQxWHhIeFpqK3RpQVI3bXBTS3pFZUNiSFlZOFdiRVp4bko4WHl0NUVMSDZ1?=
 =?utf-8?B?YmFSNnZLTG9YbmYyS2drdWRYSE5rMHBhR2piTGRPNXB4WThnaDNoU0tRRkJI?=
 =?utf-8?B?SzNUYzNyeFFWRjlEdVQ1Yk9yQkJoelpTN2dvWm5SZDNqQ2pBT1pwRVlvVWdy?=
 =?utf-8?B?d0ptbUdLVStEdk1zS0hwL2N2ekNBTkpmUjJoR2U4ZGF3d0pFVDhhRWI0UFVT?=
 =?utf-8?B?SERzZ0FqZ0dMNC9ONXRJVk14ZCszVGhOT1JoSVg1VmVLL1RrMkdLQVV0VFVm?=
 =?utf-8?B?Rk9JaGlXbTBFSTIya3V4R015MFBUcXF5eWJtaDNiSHZiRVpZQWpPeGlLTHIv?=
 =?utf-8?Q?D3tOVhCRQnV2xtY4RgpiooFTw?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 74827918-ee64-4105-39ea-08db9507424a
X-MS-Exchange-CrossTenant-AuthSource: BN9PR12MB5115.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Aug 2023 16:24:21.5561
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: a+DS3lnhPDfZ4Q2bjKWB90dqcuZPlNqYvatVXOkNPJTKXJZL1DrFQ9LYBvBm6va3ril9OzlcxYUhjMO/PXqW8A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8081
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 2023-08-04 9:29, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When CONFIG_DYNAMIC_DEBUG is disabled altogether, calling
> _dynamic_func_call_no_desc() does not work:
>
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_svm.c: In function 'svm_range_set_attr':
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_svm.c:52:9: error: implicit declaration of function '_dynamic_func_call_no_desc' [-Werror=implicit-function-declaration]
>     52 |         _dynamic_func_call_no_desc("svm_range_dump", svm_range_debug_dump, svms)
>        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_svm.c:3564:9: note: in expansion of macro 'dynamic_svm_range_dump'
>   3564 |         dynamic_svm_range_dump(svms);
>        |         ^~~~~~~~~~~~~~~~~~~~~~
>
> Add a compile-time conditional in addition to the runtime check.
>
> Fixes: 8923137dbe4b2 ("drm/amdkfd: avoid svm dump when dynamic debug disabled")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

The patch is

Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>

I'm applying it to amd-staging-drm-next.

Thanks,
   Felix


> ---
>   drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 ++++++
>   1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> index 308384dbc502d..44e710821b6d9 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
> @@ -23,6 +23,7 @@
>   
>   #include <linux/types.h>
>   #include <linux/sched/task.h>
> +#include <linux/dynamic_debug.h>
>   #include <drm/ttm/ttm_tt.h>
>   #include <drm/drm_exec.h>
>   
> @@ -48,8 +49,13 @@
>    * page table is updated.
>    */
>   #define AMDGPU_SVM_RANGE_RETRY_FAULT_PENDING	(2UL * NSEC_PER_MSEC)
> +#if IS_ENABLED(CONFIG_DYNAMIC_DEBUG)
>   #define dynamic_svm_range_dump(svms) \
>   	_dynamic_func_call_no_desc("svm_range_dump", svm_range_debug_dump, svms)
> +#else
> +#define dynamic_svm_range_dump(svms) \
> +	do { if (0) svm_range_debug_dump(svms); } while (0)
> +#endif
>   
>   /* Giant svm range split into smaller ranges based on this, it is decided using
>    * minimum of all dGPU/APU 1/32 VRAM size, between 2MB to 1GB and alignment to