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: <jbaron@akamai.com> Signed-off-by: Jim Cromie <jim.cromie@gmail.com> Link: https://lore.kernel.org/r/20200719231058.1586423-6-jim.cromie@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
481c0e33f1
commit
e5ebffe18e
|
@ -320,9 +320,9 @@
|
||||||
*(__tracepoints) \
|
*(__tracepoints) \
|
||||||
/* implement dynamic printk debug */ \
|
/* implement dynamic printk debug */ \
|
||||||
. = ALIGN(8); \
|
. = ALIGN(8); \
|
||||||
__start___verbose = .; \
|
__start___dyndbg = .; \
|
||||||
KEEP(*(__verbose)) \
|
KEEP(*(__dyndbg)) \
|
||||||
__stop___verbose = .; \
|
__stop___dyndbg = .; \
|
||||||
LIKELY_PROFILE() \
|
LIKELY_PROFILE() \
|
||||||
BRANCH_PROFILE() \
|
BRANCH_PROFILE() \
|
||||||
TRACE_PRINTKS() \
|
TRACE_PRINTKS() \
|
||||||
|
|
|
@ -80,7 +80,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
|
||||||
|
|
||||||
#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \
|
#define DEFINE_DYNAMIC_DEBUG_METADATA(name, fmt) \
|
||||||
static struct _ddebug __aligned(8) \
|
static struct _ddebug __aligned(8) \
|
||||||
__attribute__((section("__verbose"))) name = { \
|
__section(__dyndbg) name = { \
|
||||||
.modname = KBUILD_MODNAME, \
|
.modname = KBUILD_MODNAME, \
|
||||||
.function = __func__, \
|
.function = __func__, \
|
||||||
.filename = __FILE__, \
|
.filename = __FILE__, \
|
||||||
|
@ -133,7 +133,7 @@ void __dynamic_ibdev_dbg(struct _ddebug *descriptor,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* "Factory macro" for generating a call to func, guarded by a
|
* "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
|
* initialized using the fmt argument. The function will be called with
|
||||||
* the address of the descriptor as first argument, followed by all
|
* the address of the descriptor as first argument, followed by all
|
||||||
* the varargs. Note that fmt is repeated in invocations of this
|
* the varargs. Note that fmt is repeated in invocations of this
|
||||||
|
|
|
@ -3237,7 +3237,7 @@ static int find_module_sections(struct module *mod, struct load_info *info)
|
||||||
if (section_addr(info, "__obsparm"))
|
if (section_addr(info, "__obsparm"))
|
||||||
pr_warn("%s: Ignoring obsolete parameters\n", mod->name);
|
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);
|
sizeof(*info->debug), &info->num_debug);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -39,8 +39,8 @@
|
||||||
|
|
||||||
#include <rdma/ib_verbs.h>
|
#include <rdma/ib_verbs.h>
|
||||||
|
|
||||||
extern struct _ddebug __start___verbose[];
|
extern struct _ddebug __start___dyndbg[];
|
||||||
extern struct _ddebug __stop___verbose[];
|
extern struct _ddebug __stop___dyndbg[];
|
||||||
|
|
||||||
struct ddebug_table {
|
struct ddebug_table {
|
||||||
struct list_head link;
|
struct list_head link;
|
||||||
|
@ -1019,7 +1019,7 @@ static int __init dynamic_debug_init(void)
|
||||||
int n = 0, entries = 0, modct = 0;
|
int n = 0, entries = 0, modct = 0;
|
||||||
int verbose_bytes = 0;
|
int verbose_bytes = 0;
|
||||||
|
|
||||||
if (&__start___verbose == &__stop___verbose) {
|
if (&__start___dyndbg == &__stop___dyndbg) {
|
||||||
if (IS_ENABLED(CONFIG_DYNAMIC_DEBUG)) {
|
if (IS_ENABLED(CONFIG_DYNAMIC_DEBUG)) {
|
||||||
pr_warn("_ddebug table is empty in a CONFIG_DYNAMIC_DEBUG build\n");
|
pr_warn("_ddebug table is empty in a CONFIG_DYNAMIC_DEBUG build\n");
|
||||||
return 1;
|
return 1;
|
||||||
|
@ -1028,10 +1028,10 @@ static int __init dynamic_debug_init(void)
|
||||||
ddebug_init_success = 1;
|
ddebug_init_success = 1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
iter = __start___verbose;
|
iter = __start___dyndbg;
|
||||||
modname = iter->modname;
|
modname = iter->modname;
|
||||||
iter_start = iter;
|
iter_start = iter;
|
||||||
for (; iter < __stop___verbose; iter++) {
|
for (; iter < __stop___dyndbg; iter++) {
|
||||||
entries++;
|
entries++;
|
||||||
verbose_bytes += strlen(iter->modname) + strlen(iter->function)
|
verbose_bytes += strlen(iter->modname) + strlen(iter->function)
|
||||||
+ strlen(iter->filename) + strlen(iter->format);
|
+ strlen(iter->filename) + strlen(iter->format);
|
||||||
|
@ -1054,7 +1054,7 @@ static int __init dynamic_debug_init(void)
|
||||||
ddebug_init_success = 1;
|
ddebug_init_success = 1;
|
||||||
vpr_info("%d modules, %d entries and %d bytes in ddebug tables, %d bytes in (readonly) verbose section\n",
|
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)),
|
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 */
|
/* apply ddebug_query boot param, dont unload tables on err */
|
||||||
if (ddebug_setup_string[0] != '\0') {
|
if (ddebug_setup_string[0] != '\0') {
|
||||||
|
|
Loading…
Reference in New Issue