Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffa10cb4 authored by Jason Baron's avatar Jason Baron Committed by Greg Kroah-Hartman
Browse files

dynamic_debug: make netdev_dbg() call __netdev_printk() 



Previously, if dynamic debug was enabled netdev_dbg() was using
dynamic_dev_dbg() to print out the underlying msg. Fix this by making
sure netdev_dbg() uses __netdev_printk().

Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ac0ac38f

include/linux/dynamic_debug.h

+17 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,13 @@ extern int __dynamic_dev_dbg(struct _ddebug *descriptor, 
			     const char *fmt, ...)

			     const char *fmt, ...)

	__attribute__ ((format (printf, 3, 4)));

	__attribute__ ((format (printf, 3, 4)));





struct net_device;



extern int __dynamic_netdev_dbg(struct _ddebug *descriptor,

			     const struct net_device *dev,

			     const char *fmt, ...)

	__attribute__ ((format (printf, 3, 4)));



#define dynamic_pr_debug(fmt, ...) do {					\

#define dynamic_pr_debug(fmt, ...) do {					\

	static struct _ddebug descriptor				\

	static struct _ddebug descriptor				\

	__used								\

	__used								\
@@ -67,6 +74,16 @@ extern int __dynamic_dev_dbg(struct _ddebug *descriptor, 
		__dynamic_dev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);	\

		__dynamic_dev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);	\

	} while (0)

	} while (0)





#define dynamic_netdev_dbg(dev, fmt, ...) do {				\

	static struct _ddebug descriptor				\

	__used								\

	__attribute__((section("__verbose"), aligned(8))) =		\

	{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,		\

		_DPRINTK_FLAGS_DEFAULT };				\

	if (unlikely(descriptor.enabled))				\

		__dynamic_netdev_dbg(&descriptor, dev, fmt, ##__VA_ARGS__);\

	} while (0)



#else

#else





static inline int ddebug_remove_module(const char *mod)

static inline int ddebug_remove_module(const char *mod)

include/linux/netdevice.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -2617,6 +2617,9 @@ static inline const char *netdev_name(const struct net_device *dev) 
	return dev->name;

	return dev->name;

}

}





extern int __netdev_printk(const char *level, const struct net_device *dev,

			struct va_format *vaf);



extern int netdev_printk(const char *level, const struct net_device *dev,

extern int netdev_printk(const char *level, const struct net_device *dev,

			 const char *format, ...)

			 const char *format, ...)

	__attribute__ ((format (printf, 3, 4)));

	__attribute__ ((format (printf, 3, 4)));
@@ -2644,8 +2647,7 @@ extern int netdev_info(const struct net_device *dev, const char *format, ...) 
#elif defined(CONFIG_DYNAMIC_DEBUG)

#elif defined(CONFIG_DYNAMIC_DEBUG)

#define netdev_dbg(__dev, format, args...)			\

#define netdev_dbg(__dev, format, args...)			\

do {								\

do {								\

	dynamic_dev_dbg((__dev)->dev.parent, "%s: " format,	\

	dynamic_netdev_dbg(__dev, format, ##args);		\

			netdev_name(__dev), ##args);		\

} while (0)

} while (0)

#else

#else

#define netdev_dbg(__dev, format, args...)			\

#define netdev_dbg(__dev, format, args...)			\

lib/dynamic_debug.c

+25 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/hardirq.h>

#include <linux/hardirq.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/netdevice.h>





extern struct _ddebug __start___verbose[];

extern struct _ddebug __start___verbose[];

extern struct _ddebug __stop___verbose[];

extern struct _ddebug __stop___verbose[];
@@ -503,6 +504,30 @@ int __dynamic_dev_dbg(struct _ddebug *descriptor, 
}

}

EXPORT_SYMBOL(__dynamic_dev_dbg);

EXPORT_SYMBOL(__dynamic_dev_dbg);





int __dynamic_netdev_dbg(struct _ddebug *descriptor,

		      const struct net_device *dev, const char *fmt, ...)

{

	struct va_format vaf;

	va_list args;

	int res;



	BUG_ON(!descriptor);

	BUG_ON(!fmt);



	va_start(args, fmt);



	vaf.fmt = fmt;

	vaf.va = &args;



	res = dynamic_emit_prefix(descriptor);

	res += __netdev_printk(KERN_CONT, dev, &vaf);



	va_end(args);



	return res;

}

EXPORT_SYMBOL(__dynamic_netdev_dbg);



static __initdata char ddebug_setup_string[1024];

static __initdata char ddebug_setup_string[1024];

static __init int ddebug_setup_query(char *str)

static __init int ddebug_setup_query(char *str)

{

{

net/core/dev.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -6290,7 +6290,7 @@ const char *netdev_drivername(const struct net_device *dev) 
	return empty;

	return empty;

}

}





static int __netdev_printk(const char *level, const struct net_device *dev,

int __netdev_printk(const char *level, const struct net_device *dev,

			   struct va_format *vaf)

			   struct va_format *vaf)

{

{

	int r;

	int r;
@@ -6305,6 +6305,7 @@ static int __netdev_printk(const char *level, const struct net_device *dev, 




	return r;

	return r;

}

}

EXPORT_SYMBOL(__netdev_printk);





int netdev_printk(const char *level, const struct net_device *dev,

int netdev_printk(const char *level, const struct net_device *dev,

		  const char *format, ...)

		  const char *format, ...)