Skip to contentSkip to conversation

drm/amdkfd: fix build failure without CONFIG_DYNAMIC_DEBUG

PATCH In review Arnd Bergmann 2 participants 2 messages Aug 4, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdkfd: fix build failure without CONFIG_DYNAMIC_DEBUG

From: Arnd Bergmann <[email protected]>

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")
---
 drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +6 -0
index 308384dbc502d..44e710821b6d9 100644
@@ -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
Signature · 1 line
2.39.2
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

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);
       |         ^~~~~~~~~~~~~~~~~~~~~~
Quoted 4 lines

Add a compile-time conditional in addition to the runtime check.

Fixes 8923137dbe4b2 ("drm/amdkfd: avoid svm dump when dynamic debug disabled")

The patch is

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

Thanks,
  Felix

Quoted 30 lines
---
  drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 6 ++++++
  1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdkfd/kfd_svm.c +6 -0
index 308384dbc502d..44e710821b6d9 100644
@@ -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