Commit e5ebffe1 authored by Jim Cromie's avatar Jim Cromie Committed by Greg Kroah-Hartman
Browse files

dyndbg: rename __verbose section to __dyndbg 



dyndbg populates its callsite info into __verbose section, change that
to a more specific and descriptive name, __dyndbg.

Also, per checkpatch:
  simplify __attribute(..) to __section(__dyndbg) declaration.

and 1 spelling fix, decriptor

Acked-by: default avatar <jbaron@akamai.com>
Signed-off-by: default avatarJim Cromie <jim.cromie@gmail.com>
Link: https://lore.kernel.org/r/20200719231058.1586423-6-jim.cromie@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 481c0e33

include/asm-generic/vmlinux.lds.h

+3 −3
Original line number Diff line number Diff line
@@ -320,9 +320,9 @@ 
	*(__tracepoints)						\

	/* implement dynamic printk debug */				\

	. = ALIGN(8);							\

	__start___verbose = .;						\

	KEEP(*(__verbose))                                              \

	__stop___verbose = .;						\

	__start___dyndbg = .;						\

	KEEP(*(__dyndbg))						\

	__stop___dyndbg = .;						\

	LIKELY_PROFILE()		       				\

	BRANCH_PROFILE()						\

	TRACE_PRINTKS()							\

include/linux/dynamic_debug.h

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, 


#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt)		\

	static struct _ddebug  __aligned(8)			\

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

	__section(__dyndbg) name = {				\

		.modname = KBUILD_MODNAME,			\

		.function = __func__,				\

		.filename = __FILE__,				\
@@ -133,7 +133,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor, 


/*

 * "Factory macro" for generating a call to func, guarded by a

 * DYNAMIC_DEBUG_BRANCH. The dynamic debug decriptor will be

 * DYNAMIC_DEBUG_BRANCH. The dynamic debug descriptor will be

 * initialized using the fmt argument. The function will be called with

 * the address of the descriptor as first argument, followed by all

 * the varargs. Note that fmt is repeated in invocations of this

kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -3237,7 +3237,7 @@ static int find_module_sections(struct module *mod, struct load_info *info) 
	if (section_addr(info, "__obsparm"))

		pr_warn("%s: Ignoring obsolete parameters\n", mod->name);



	info->debug = section_objs(info, "__verbose",

	info->debug = section_objs(info, "__dyndbg",

				   sizeof(*info->debug), &info->num_debug);



	return 0;

lib/dynamic_debug.c

+6 −6
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


#include <rdma/ib_verbs.h>



extern struct _ddebug __start___verbose[];

extern struct _ddebug __stop___verbose[];

extern struct _ddebug __start___dyndbg[];

extern struct _ddebug __stop___dyndbg[];



struct ddebug_table {

	struct list_head link;
@@ -1019,7 +1019,7 @@ static int __init dynamic_debug_init(void) 
	int n = 0, entries = 0, modct = 0;

	int verbose_bytes = 0;



	if (&__start___verbose == &__stop___verbose) {

	if (&__start___dyndbg == &__stop___dyndbg) {

		if (IS_ENABLED(CONFIG_DYNAMIC_DEBUG)) {

			pr_warn("_ddebug table is empty in a CONFIG_DYNAMIC_DEBUG build\n");

			return 1;
@@ -1028,10 +1028,10 @@ static int __init dynamic_debug_init(void) 
		ddebug_init_success = 1;

		return 0;

	}

	iter = __start___verbose;

	iter = __start___dyndbg;

	modname = iter->modname;

	iter_start = iter;

	for (; iter < __stop___verbose; iter++) {

	for (; iter < __stop___dyndbg; iter++) {

		entries++;

		verbose_bytes += strlen(iter->modname) + strlen(iter->function)

			+ strlen(iter->filename) + strlen(iter->format);
@@ -1054,7 +1054,7 @@ static int __init dynamic_debug_init(void) 
	ddebug_init_success = 1;

	vpr_info("%d modules, %d entries and %d bytes in ddebug tables, %d bytes in (readonly) verbose section\n",

		 modct, entries, (int)(modct * sizeof(struct ddebug_table)),

		 verbose_bytes + (int)(__stop___verbose - __start___verbose));

		 verbose_bytes + (int)(__stop___dyndbg - __start___dyndbg));



	/* apply ddebug_query boot param, dont unload tables on err */

	if (ddebug_setup_string[0] != '\0') {

CRA Git | Maintained and supported by SUSTech CRA and CCSE