Skip to contentSkip to conversation

dynamic_debug: provide dynamic_hex_dump stub

PATCH In review Arnd Bergmann 3 participants 4 messages Sep 18, 2019 – Oct 22, 2019

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

PATCH 1/1 dynamic_debug: provide dynamic_hex_dump stub

The ionic driver started using dymamic_hex_dump(), but that is not always defined:

drivers/net/ethernet/pensando/ionic/ionic_main.c:229:2: error: implicit declaration of function 'dynamic_hex_dump' [-Werror,-Wimplicit-function-declaration]

Add a dummy implementation to use when CONFIG_DYNAMIC_DEBUG is disabled, printing nothing.

Fixes 938962d55229 ("ionic: Add adminq action")
---
 drivers/net/ethernet/pensando/ionic/ionic_lif.c  | 2 ++
 drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 ++
 include/linux/dynamic_debug.h                    | 6 ++++++
 3 files changed, 10 insertions(+)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +2 -0
index db7c82742828..a255d24c8e40 100644
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2017 - 2019 Pensando Systems, Inc */
 
+#include <linux/printk.h>
+#include <linux/dynamic_debug.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/rtnetlink.h>
drivers/net/ethernet/pensando/ionic/ionic_main.c +2 -0
index 15e432386b35..aab311413412 100644
@@ -1,6 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 /* Copyright(c) 2017 - 2019 Pensando Systems, Inc */
 
+#include <linux/printk.h>
+#include <linux/dynamic_debug.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/utsname.h>
include/linux/dynamic_debug.h +6 -0
index 6c809440f319..4cf02ecd67de 100644
@@ -204,6 +204,12 @@ static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
 	do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
 #define dynamic_dev_dbg(dev, fmt, ...)					\
 	do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)
+#define dynamic_hex_dump(prefix_str, prefix_type, rowsize,		\
+			 groupsize, buf, len, ascii)			\
+	do { if (0)							\
+		print_hex_dump(KERN_DEBUG, prefix_str, prefix_type,	\
+				rowsize, groupsize, buf, len, ascii);	\
+	} while (0)
 #endif
 
 #endif
Signature · 1 line
2.20.0
Acked-by on v1 1/1
#1 lore raw
Quoted 49 lines · Arnd Bergmann

The ionic driver started using dymamic_hex_dump(), but that is not always defined:

drivers/net/ethernet/pensando/ionic/ionic_main.c:229:2: error: implicit declaration of function 'dynamic_hex_dump' [-Werror,-Wimplicit-function-declaration]

Add a dummy implementation to use when CONFIG_DYNAMIC_DEBUG is disabled, printing nothing.

Fixes 938962d55229 ("ionic: Add adminq action")
---
  drivers/net/ethernet/pensando/ionic/ionic_lif.c  | 2 ++
  drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 ++
  include/linux/dynamic_debug.h                    | 6 ++++++
  3 files changed, 10 insertions(+)
drivers/net/ethernet/pensando/ionic/ionic_lif.c +2 -0
index db7c82742828..a255d24c8e40 100644
@@ -1,6 +1,8 @@
  // SPDX-License-Identifier: GPL-2.0
  /* Copyright(c) 2017 - 2019 Pensando Systems, Inc */
 
+#include <linux/printk.h>
+#include <linux/dynamic_debug.h>
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  #include <linux/rtnetlink.h>
drivers/net/ethernet/pensando/ionic/ionic_main.c +2 -0
index 15e432386b35..aab311413412 100644
@@ -1,6 +1,8 @@
  // SPDX-License-Identifier: GPL-2.0
  /* Copyright(c) 2017 - 2019 Pensando Systems, Inc */
 
+#include <linux/printk.h>
+#include <linux/dynamic_debug.h>
  #include <linux/module.h>
  #include <linux/netdevice.h>
  #include <linux/utsname.h>
include/linux/dynamic_debug.h +0 -0
index 6c809440f319..4cf02ecd67de 100644
@@ -204,6 +204,12 @@ static inline int ddebug_dyndbg_module_param_cb(char *param, char *val,
  	do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
  #define dynamic_dev_dbg(dev, fmt, ...)					\

include/linux/dynamic_debug.h static inline int ddebug_dyndbg_module_param_cb(char *param, char *val, · line 215

Quoted 10 lines
include/linux/dynamic_debug.h +6 -0
  	do { if (0) dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__); } while (0)
+#define dynamic_hex_dump(prefix_str, prefix_type, rowsize,		\
+			 groupsize, buf, len, ascii)			\
+	do { if (0)							\
+		print_hex_dump(KERN_DEBUG, prefix_str, prefix_type,	\
+				rowsize, groupsize, buf, len, ascii);	\
+	} while (0)
  #endif
 
  #endif

Thanks, I hadn't had a chance to look into that one yet.

#2 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

The ionic driver started using dymamic_hex_dump(), but that is not always defined:

drivers/net/ethernet/pensando/ionic/ionic_main.c:229:2: error: implicit declaration of function 'dynamic_hex_dump' [-Werror,-Wimplicit-function-declaration]

Add a dummy implementation to use when CONFIG_DYNAMIC_DEBUG is disabled, printing nothing.

Fixes 938962d55229 ("ionic: Add adminq action")

Looks like this still doesn't appear in any tree, after a month (judging by linux-next).

Can we take this into the networking tree? Please scream at me if I'm missing something or this would not be appropriate.

#3 lore raw
In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

The ionic driver started using dymamic_hex_dump(), but that is not always defined:

drivers/net/ethernet/pensando/ionic/ionic_main.c:229:2: error: implicit declaration of function 'dynamic_hex_dump' [-Werror,-Wimplicit-function-declaration]

Add a dummy implementation to use when CONFIG_DYNAMIC_DEBUG is disabled, printing nothing.

Fixes 938962d55229 ("ionic: Add adminq action")

Patch applied to net/master, thanks!