Commit 2bdde670 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

dynamic_debug: consolidate DEFINE_DYNAMIC_DEBUG_METADATA definitions 

Instead of defining DEFINE_DYNAMIC_DEBUG_METADATA in terms of a helper
DEFINE_DYNAMIC_DEBUG_METADATA_KEY, that needs another helper dd_key_init
to be properly defined, just make the various #ifdef branches define a
_DPRINTK_KEY_INIT that can be used directly, similar to
_DPRINTK_FLAGS_DEFAULT.

Link: http://lkml.kernel.org/r/20190212214150.4807-5-linux@rasmusvillemoes.dk


Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Acked-by: default avatarJason Baron <jbaron@akamai.com>
Cc: David Sterba <dsterba@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: "Rafael J . Wysocki" <rafael.j.wysocki@intel.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a9d4ab7a

include/linux/dynamic_debug.h

+7 −15
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void __dynamic_netdev_dbg(struct _ddebug *descriptor, 
			  const struct net_device *dev,

			  const char *fmt, ...);



#define DEFINE_DYNAMIC_DEBUG_METADATA_KEY(name, fmt, key, init)	\

#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)		\

	static struct _ddebug  __aligned(8)			\

	__attribute__((section("__verbose"))) name = {		\

		.modname = KBUILD_MODNAME,			\
@@ -80,35 +80,27 @@ void __dynamic_netdev_dbg(struct _ddebug *descriptor, 
		.format = (fmt),				\

		.lineno = __LINE__,				\

		.flags = _DPRINTK_FLAGS_DEFAULT,		\

		dd_key_init(key, init)				\

		_DPRINTK_KEY_INIT				\

	}



#ifdef CONFIG_JUMP_LABEL



#define dd_key_init(key, init) key = (init)



#ifdef DEBUG

#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \

	DEFINE_DYNAMIC_DEBUG_METADATA_KEY(name, fmt, .key.dd_key_true, \

					  (STATIC_KEY_TRUE_INIT))



#define _DPRINTK_KEY_INIT .key.dd_key_true = (STATIC_KEY_TRUE_INIT)



#define DYNAMIC_DEBUG_BRANCH(descriptor) \

	static_branch_likely(&descriptor.key.dd_key_true)

#else

#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \

	DEFINE_DYNAMIC_DEBUG_METADATA_KEY(name, fmt, .key.dd_key_false, \

					  (STATIC_KEY_FALSE_INIT))

#define _DPRINTK_KEY_INIT .key.dd_key_false = (STATIC_KEY_FALSE_INIT)



#define DYNAMIC_DEBUG_BRANCH(descriptor) \

	static_branch_unlikely(&descriptor.key.dd_key_false)

#endif



#else



#define dd_key_init(key, init)

#else /* !HAVE_JUMP_LABEL */



#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \

	DEFINE_DYNAMIC_DEBUG_METADATA_KEY(name, fmt, 0, 0)

#define _DPRINTK_KEY_INIT



#ifdef DEBUG

#define DYNAMIC_DEBUG_BRANCH(descriptor) \

CRA Git | Maintained and supported by SUSTech CRA and CCSE