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

Commit cbc46635 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman
Browse files

dynamic_debug: Add __dynamic_dev_dbg 



Unlike dynamic_pr_debug, dynamic uses of dev_dbg can not
currently add task_pid/KBUILD_MODNAME/__func__/__LINE__
to selected debug output.

Add a new function similar to dynamic_pr_debug to
optionally emit these prefixes.

Cc: Aloisio Almeida <aloisio.almeida@openbossa.org>
Noticed-by: default avatarAloisio Almeida <aloisio.almeida@openbossa.org>
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 25b8a88c

drivers/base/core.c

+3 −2
Original line number Diff line number Diff line
@@ -1764,7 +1764,7 @@ void device_shutdown(void) 


#ifdef CONFIG_PRINTK



static int __dev_printk(const char *level, const struct device *dev,

int __dev_printk(const char *level, const struct device *dev,

		 struct va_format *vaf)

{

	if (!dev)
@@ -1773,6 +1773,7 @@ static int __dev_printk(const char *level, const struct device *dev, 
	return printk("%s%s %s: %pV",

		      level, dev_driver_string(dev), dev_name(dev), vaf);

}

EXPORT_SYMBOL(__dev_printk);



int dev_printk(const char *level, const struct device *dev,

	       const char *fmt, ...)

include/linux/device.h

+5 −0
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ extern const char *dev_driver_string(const struct device *dev); 


#ifdef CONFIG_PRINTK



extern int __dev_printk(const char *level, const struct device *dev,

			struct va_format *vaf);

extern int dev_printk(const char *level, const struct device *dev,

		      const char *fmt, ...)

	__attribute__ ((format (printf, 3, 4)));
@@ -805,6 +807,9 @@ extern int _dev_info(const struct device *dev, const char *fmt, ...) 


#else



static inline int __dev_printk(const char *level, const struct device *dev,

			       struct va_format *vaf)

	 { return 0; }

static inline int dev_printk(const char *level, const struct device *dev,

		      const char *fmt, ...)

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

include/linux/dynamic_debug.h

+8 −2
Original line number Diff line number Diff line
@@ -47,6 +47,13 @@ extern int ddebug_remove_module(const char *mod_name); 
extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...)

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



struct device;



extern int __dynamic_dev_dbg(struct _ddebug *descriptor,

			     const struct device *dev,

			     const char *fmt, ...)

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



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

	static struct _ddebug descriptor				\

	__used								\
@@ -57,7 +64,6 @@ extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) 
		__dynamic_pr_debug(&descriptor, pr_fmt(fmt), ##__VA_ARGS__); \

	} while (0)





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

	static struct _ddebug descriptor				\

	__used								\
@@ -65,7 +71,7 @@ extern int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) 
	{ KBUILD_MODNAME, __func__, __FILE__, fmt, __LINE__,		\

		_DPRINTK_FLAGS_DEFAULT };				\

	if (unlikely(descriptor.enabled))				\

		dev_printk(KERN_DEBUG, dev, fmt, ##__VA_ARGS__);	\

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

	} while (0)



#else

lib/dynamic_debug.c

+38 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <linux/jump_label.h>

#include <linux/hardirq.h>

#include <linux/sched.h>

#include <linux/device.h>



extern struct _ddebug __start___verbose[];

extern struct _ddebug __stop___verbose[];
@@ -456,6 +457,43 @@ int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...) 
}

EXPORT_SYMBOL(__dynamic_pr_debug);



int __dynamic_dev_dbg(struct _ddebug *descriptor,

		      const struct 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 = printk(KERN_DEBUG);

	if (descriptor->flags & _DPRINTK_FLAGS_INCL_TID) {

		if (in_interrupt())

			res += printk(KERN_CONT "<intr> ");

		else

			res += printk(KERN_CONT "[%d] ", task_pid_vnr(current));

	}

	if (descriptor->flags & _DPRINTK_FLAGS_INCL_MODNAME)

		res += printk(KERN_CONT "%s:", descriptor->modname);

	if (descriptor->flags & _DPRINTK_FLAGS_INCL_FUNCNAME)

		res += printk(KERN_CONT "%s:", descriptor->function);

	if (descriptor->flags & _DPRINTK_FLAGS_INCL_LINENO)

		res += printk(KERN_CONT "%d ", descriptor->lineno);



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



	va_end(args);



	return res;

}

EXPORT_SYMBOL(__dynamic_dev_dbg);



static __initdata char ddebug_setup_string[1024];

static __init int ddebug_setup_query(char *str)

{