2009-02-05 17:51:38 +01:00
|
|
|
/*
|
|
|
|
* lib/dynamic_debug.c
|
|
|
|
*
|
|
|
|
* make pr_debug()/dev_dbg() calls runtime configurable based upon their
|
|
|
|
* source module.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2008 Jason Baron <jbaron@redhat.com>
|
|
|
|
* By Greg Banks <gnb@melbourne.sgi.com>
|
|
|
|
* Copyright (c) 2008 Silicon Graphics Inc. All Rights Reserved.
|
2011-01-23 17:17:24 +01:00
|
|
|
* Copyright (C) 2011 Bart Van Assche. All Rights Reserved.
|
2009-02-05 17:51:38 +01:00
|
|
|
*/
|
|
|
|
|
2011-08-11 20:36:33 +02:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
|
|
|
|
|
2009-02-05 17:51:38 +01:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/moduleparam.h>
|
|
|
|
#include <linux/kallsyms.h>
|
|
|
|
#include <linux/types.h>
|
2009-02-05 17:51:38 +01:00
|
|
|
#include <linux/mutex.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/proc_fs.h>
|
2009-02-05 17:51:38 +01:00
|
|
|
#include <linux/seq_file.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/list.h>
|
|
|
|
#include <linux/sysctl.h>
|
2009-02-05 17:51:38 +01:00
|
|
|
#include <linux/ctype.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/string.h>
|
2013-05-01 00:27:32 +02:00
|
|
|
#include <linux/string_helpers.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/uaccess.h>
|
2009-02-05 17:51:38 +01:00
|
|
|
#include <linux/dynamic_debug.h>
|
|
|
|
#include <linux/debugfs.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/slab.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/jump_label.h>
|
2011-01-23 17:17:24 +01:00
|
|
|
#include <linux/hardirq.h>
|
2011-02-04 00:59:58 +01:00
|
|
|
#include <linux/sched.h>
|
2012-05-08 01:47:32 +02:00
|
|
|
#include <linux/device.h>
|
2011-08-11 20:36:48 +02:00
|
|
|
#include <linux/netdevice.h>
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
extern struct _ddebug __start___verbose[];
|
|
|
|
extern struct _ddebug __stop___verbose[];
|
|
|
|
|
|
|
|
struct ddebug_table {
|
|
|
|
struct list_head link;
|
|
|
|
char *mod_name;
|
|
|
|
unsigned int num_ddebugs;
|
|
|
|
struct _ddebug *ddebugs;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ddebug_query {
|
|
|
|
const char *filename;
|
|
|
|
const char *module;
|
|
|
|
const char *function;
|
|
|
|
const char *format;
|
|
|
|
unsigned int first_lineno, last_lineno;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ddebug_iter {
|
|
|
|
struct ddebug_table *table;
|
|
|
|
unsigned int idx;
|
|
|
|
};
|
|
|
|
|
|
|
|
static DEFINE_MUTEX(ddebug_lock);
|
|
|
|
static LIST_HEAD(ddebug_tables);
|
2012-12-05 22:48:26 +01:00
|
|
|
static int verbose;
|
2011-12-19 23:12:24 +01:00
|
|
|
module_param(verbose, int, 0644);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
2011-12-19 23:13:12 +01:00
|
|
|
/* Return the path relative to source root */
|
|
|
|
static inline const char *trim_prefix(const char *path)
|
|
|
|
{
|
|
|
|
int skip = strlen(__FILE__) - strlen("lib/dynamic_debug.c");
|
|
|
|
|
|
|
|
if (strncmp(path, __FILE__, skip))
|
|
|
|
skip = 0; /* prefix mismatch, don't skip */
|
|
|
|
|
|
|
|
return path + skip;
|
|
|
|
}
|
|
|
|
|
2011-01-23 17:17:24 +01:00
|
|
|
static struct { unsigned flag:8; char opt_char; } opt_array[] = {
|
|
|
|
{ _DPRINTK_FLAGS_PRINT, 'p' },
|
|
|
|
{ _DPRINTK_FLAGS_INCL_MODNAME, 'm' },
|
|
|
|
{ _DPRINTK_FLAGS_INCL_FUNCNAME, 'f' },
|
|
|
|
{ _DPRINTK_FLAGS_INCL_LINENO, 'l' },
|
|
|
|
{ _DPRINTK_FLAGS_INCL_TID, 't' },
|
2011-12-19 23:12:44 +01:00
|
|
|
{ _DPRINTK_FLAGS_NONE, '_' },
|
2011-01-23 17:17:24 +01:00
|
|
|
};
|
|
|
|
|
2009-02-05 17:51:38 +01:00
|
|
|
/* format a string into buf[] which describes the _ddebug's flags */
|
|
|
|
static char *ddebug_describe_flags(struct _ddebug *dp, char *buf,
|
|
|
|
size_t maxlen)
|
|
|
|
{
|
|
|
|
char *p = buf;
|
2011-01-23 17:17:24 +01:00
|
|
|
int i;
|
2009-02-05 17:51:38 +01:00
|
|
|
|
2011-12-19 23:12:44 +01:00
|
|
|
BUG_ON(maxlen < 6);
|
2011-01-23 17:17:24 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(opt_array); ++i)
|
|
|
|
if (dp->flags & opt_array[i].flag)
|
|
|
|
*p++ = opt_array[i].opt_char;
|
2009-02-05 17:51:38 +01:00
|
|
|
if (p == buf)
|
2011-12-19 23:12:44 +01:00
|
|
|
*p++ = '_';
|
2009-02-05 17:51:38 +01:00
|
|
|
*p = '\0';
|
|
|
|
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2012-12-05 22:48:26 +01:00
|
|
|
#define vpr_info(fmt, ...) \
|
2012-04-27 22:30:32 +02:00
|
|
|
do { \
|
2012-12-05 22:48:26 +01:00
|
|
|
if (verbose) \
|
|
|
|
pr_info(fmt, ##__VA_ARGS__); \
|
2011-12-19 23:13:16 +01:00
|
|
|
} while (0)
|
|
|
|
|
2012-12-05 22:48:26 +01:00
|
|
|
static void vpr_info_dq(const struct ddebug_query *query, const char *msg)
|
|
|
|
{
|
|
|
|
/* trim any trailing newlines */
|
|
|
|
int fmtlen = 0;
|
|
|
|
|
|
|
|
if (query->format) {
|
|
|
|
fmtlen = strlen(query->format);
|
|
|
|
while (fmtlen && query->format[fmtlen - 1] == '\n')
|
|
|
|
fmtlen--;
|
|
|
|
}
|
|
|
|
|
|
|
|
vpr_info("%s: func=\"%s\" file=\"%s\" module=\"%s\" format=\"%.*s\" lineno=%u-%u\n",
|
|
|
|
msg,
|
|
|
|
query->function ? query->function : "",
|
|
|
|
query->filename ? query->filename : "",
|
|
|
|
query->module ? query->module : "",
|
|
|
|
fmtlen, query->format ? query->format : "",
|
|
|
|
query->first_lineno, query->last_lineno);
|
|
|
|
}
|
|
|
|
|
2009-02-05 17:51:38 +01:00
|
|
|
/*
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
* Search the tables for _ddebug's which match the given `query' and
|
|
|
|
* apply the `flags' and `mask' to them. Returns number of matching
|
|
|
|
* callsites, normally the same as number of changes. If verbose,
|
|
|
|
* logs the changes. Takes ddebug_lock.
|
2009-02-05 17:51:38 +01:00
|
|
|
*/
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
static int ddebug_change(const struct ddebug_query *query,
|
|
|
|
unsigned int flags, unsigned int mask)
|
2009-02-05 17:51:38 +01:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct ddebug_table *dt;
|
|
|
|
unsigned int newflags;
|
|
|
|
unsigned int nfound = 0;
|
2011-12-19 23:12:44 +01:00
|
|
|
char flagbuf[10];
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
/* search for matching ddebugs */
|
|
|
|
mutex_lock(&ddebug_lock);
|
|
|
|
list_for_each_entry(dt, &ddebug_tables, link) {
|
|
|
|
|
|
|
|
/* match against the module name */
|
2011-12-19 23:12:39 +01:00
|
|
|
if (query->module && strcmp(query->module, dt->mod_name))
|
2009-02-05 17:51:38 +01:00
|
|
|
continue;
|
|
|
|
|
2012-12-05 22:48:26 +01:00
|
|
|
for (i = 0; i < dt->num_ddebugs; i++) {
|
2009-02-05 17:51:38 +01:00
|
|
|
struct _ddebug *dp = &dt->ddebugs[i];
|
|
|
|
|
|
|
|
/* match against the source filename */
|
2011-12-19 23:12:39 +01:00
|
|
|
if (query->filename &&
|
2009-02-05 17:51:38 +01:00
|
|
|
strcmp(query->filename, dp->filename) &&
|
2012-12-18 01:01:21 +01:00
|
|
|
strcmp(query->filename, kbasename(dp->filename)) &&
|
2011-12-19 23:13:12 +01:00
|
|
|
strcmp(query->filename, trim_prefix(dp->filename)))
|
2009-02-05 17:51:38 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* match against the function */
|
2011-12-19 23:12:39 +01:00
|
|
|
if (query->function &&
|
2009-02-05 17:51:38 +01:00
|
|
|
strcmp(query->function, dp->function))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* match against the format */
|
2011-12-19 23:12:39 +01:00
|
|
|
if (query->format &&
|
|
|
|
!strstr(dp->format, query->format))
|
2009-02-05 17:51:38 +01:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* match against the line number range */
|
|
|
|
if (query->first_lineno &&
|
|
|
|
dp->lineno < query->first_lineno)
|
|
|
|
continue;
|
|
|
|
if (query->last_lineno &&
|
|
|
|
dp->lineno > query->last_lineno)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
nfound++;
|
|
|
|
|
|
|
|
newflags = (dp->flags & mask) | flags;
|
|
|
|
if (newflags == dp->flags)
|
|
|
|
continue;
|
|
|
|
dp->flags = newflags;
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("changed %s:%d [%s]%s =%s\n",
|
2012-12-05 22:48:26 +01:00
|
|
|
trim_prefix(dp->filename), dp->lineno,
|
|
|
|
dt->mod_name, dp->function,
|
|
|
|
ddebug_describe_flags(dp, flagbuf,
|
|
|
|
sizeof(flagbuf)));
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
mutex_unlock(&ddebug_lock);
|
|
|
|
|
|
|
|
if (!nfound && verbose)
|
2011-08-11 20:36:33 +02:00
|
|
|
pr_info("no matches for query\n");
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
|
|
|
|
return nfound;
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Split the buffer `buf' into space-separated words.
|
2009-02-06 02:54:26 +01:00
|
|
|
* Handles simple " and ' quoting, i.e. without nested,
|
|
|
|
* embedded or escaped \". Return the number of words
|
|
|
|
* or <0 on error.
|
2009-02-05 17:51:38 +01:00
|
|
|
*/
|
|
|
|
static int ddebug_tokenize(char *buf, char *words[], int maxwords)
|
|
|
|
{
|
|
|
|
int nwords = 0;
|
|
|
|
|
2009-02-06 02:54:26 +01:00
|
|
|
while (*buf) {
|
|
|
|
char *end;
|
|
|
|
|
|
|
|
/* Skip leading whitespace */
|
2009-12-15 03:01:06 +01:00
|
|
|
buf = skip_spaces(buf);
|
2009-02-06 02:54:26 +01:00
|
|
|
if (!*buf)
|
|
|
|
break; /* oh, it was trailing whitespace */
|
2011-12-19 23:13:03 +01:00
|
|
|
if (*buf == '#')
|
|
|
|
break; /* token starts comment, skip rest of line */
|
2009-02-06 02:54:26 +01:00
|
|
|
|
2011-12-19 23:11:09 +01:00
|
|
|
/* find `end' of word, whitespace separated or quoted */
|
2009-02-06 02:54:26 +01:00
|
|
|
if (*buf == '"' || *buf == '\'') {
|
|
|
|
int quote = *buf++;
|
2012-12-05 22:48:26 +01:00
|
|
|
for (end = buf; *end && *end != quote; end++)
|
2009-02-06 02:54:26 +01:00
|
|
|
;
|
2012-12-05 22:48:27 +01:00
|
|
|
if (!*end) {
|
|
|
|
pr_err("unclosed quote: %s\n", buf);
|
2009-02-06 02:54:26 +01:00
|
|
|
return -EINVAL; /* unclosed quote */
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
2009-02-06 02:54:26 +01:00
|
|
|
} else {
|
2012-12-05 22:48:26 +01:00
|
|
|
for (end = buf; *end && !isspace(*end); end++)
|
2009-02-06 02:54:26 +01:00
|
|
|
;
|
|
|
|
BUG_ON(end == buf);
|
|
|
|
}
|
|
|
|
|
2011-12-19 23:11:09 +01:00
|
|
|
/* `buf' is start of word, `end' is one past its end */
|
2012-12-05 22:48:27 +01:00
|
|
|
if (nwords == maxwords) {
|
|
|
|
pr_err("too many words, legal max <=%d\n", maxwords);
|
2009-02-06 02:54:26 +01:00
|
|
|
return -EINVAL; /* ran out of words[] before bytes */
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
2009-02-06 02:54:26 +01:00
|
|
|
if (*end)
|
|
|
|
*end++ = '\0'; /* terminate the word */
|
|
|
|
words[nwords++] = buf;
|
|
|
|
buf = end;
|
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
if (verbose) {
|
|
|
|
int i;
|
2011-08-11 20:36:33 +02:00
|
|
|
pr_info("split into words:");
|
2012-12-05 22:48:26 +01:00
|
|
|
for (i = 0; i < nwords; i++)
|
2011-08-11 20:36:33 +02:00
|
|
|
pr_cont(" \"%s\"", words[i]);
|
|
|
|
pr_cont("\n");
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return nwords;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse a single line number. Note that the empty string ""
|
|
|
|
* is treated as a special case and converted to zero, which
|
|
|
|
* is later treated as a "don't care" value.
|
|
|
|
*/
|
|
|
|
static inline int parse_lineno(const char *str, unsigned int *val)
|
|
|
|
{
|
|
|
|
char *end = NULL;
|
|
|
|
BUG_ON(str == NULL);
|
|
|
|
if (*str == '\0') {
|
|
|
|
*val = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
*val = simple_strtoul(str, &end, 10);
|
2012-12-05 22:48:27 +01:00
|
|
|
if (end == NULL || end == str || *end != '\0') {
|
|
|
|
pr_err("bad line-number: %s\n", str);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
return 0;
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
|
|
|
|
2011-12-19 23:12:49 +01:00
|
|
|
static int check_set(const char **dest, char *src, char *name)
|
|
|
|
{
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (*dest) {
|
|
|
|
rc = -EINVAL;
|
2012-12-05 22:48:26 +01:00
|
|
|
pr_err("match-spec:%s val:%s overridden by %s\n",
|
|
|
|
name, *dest, src);
|
2011-12-19 23:12:49 +01:00
|
|
|
}
|
|
|
|
*dest = src;
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2009-02-05 17:51:38 +01:00
|
|
|
/*
|
|
|
|
* Parse words[] as a ddebug query specification, which is a series
|
|
|
|
* of (keyword, value) pairs chosen from these possibilities:
|
|
|
|
*
|
|
|
|
* func <function-name>
|
|
|
|
* file <full-pathname>
|
|
|
|
* file <base-filename>
|
|
|
|
* module <module-name>
|
|
|
|
* format <escaped-string-to-find-in-format>
|
|
|
|
* line <lineno>
|
|
|
|
* line <first-lineno>-<last-lineno> // where either may be empty
|
2011-12-19 23:12:49 +01:00
|
|
|
*
|
|
|
|
* Only 1 of each type is allowed.
|
|
|
|
* Returns 0 on success, <0 on error.
|
2009-02-05 17:51:38 +01:00
|
|
|
*/
|
|
|
|
static int ddebug_parse_query(char *words[], int nwords,
|
2012-04-27 22:30:40 +02:00
|
|
|
struct ddebug_query *query, const char *modname)
|
2009-02-05 17:51:38 +01:00
|
|
|
{
|
|
|
|
unsigned int i;
|
2011-12-19 23:12:49 +01:00
|
|
|
int rc;
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
/* check we have an even number of words */
|
2012-12-05 22:48:27 +01:00
|
|
|
if (nwords % 2 != 0) {
|
|
|
|
pr_err("expecting pairs of match-spec <value>\n");
|
2009-02-05 17:51:38 +01:00
|
|
|
return -EINVAL;
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
memset(query, 0, sizeof(*query));
|
|
|
|
|
2012-04-27 22:30:40 +02:00
|
|
|
if (modname)
|
|
|
|
/* support $modname.dyndbg=<multiple queries> */
|
|
|
|
query->module = modname;
|
|
|
|
|
2012-12-05 22:48:26 +01:00
|
|
|
for (i = 0; i < nwords; i += 2) {
|
|
|
|
if (!strcmp(words[i], "func")) {
|
2011-12-19 23:12:49 +01:00
|
|
|
rc = check_set(&query->function, words[i+1], "func");
|
2012-12-05 22:48:26 +01:00
|
|
|
} else if (!strcmp(words[i], "file")) {
|
2011-12-19 23:12:49 +01:00
|
|
|
rc = check_set(&query->filename, words[i+1], "file");
|
2012-12-05 22:48:26 +01:00
|
|
|
} else if (!strcmp(words[i], "module")) {
|
2011-12-19 23:12:49 +01:00
|
|
|
rc = check_set(&query->module, words[i+1], "module");
|
2012-12-05 22:48:26 +01:00
|
|
|
} else if (!strcmp(words[i], "format")) {
|
2013-05-01 00:27:32 +02:00
|
|
|
string_unescape_inplace(words[i+1], UNESCAPE_SPACE |
|
|
|
|
UNESCAPE_OCTAL |
|
|
|
|
UNESCAPE_SPECIAL);
|
|
|
|
rc = check_set(&query->format, words[i+1], "format");
|
2012-12-05 22:48:26 +01:00
|
|
|
} else if (!strcmp(words[i], "line")) {
|
2009-02-05 17:51:38 +01:00
|
|
|
char *first = words[i+1];
|
|
|
|
char *last = strchr(first, '-');
|
2011-12-19 23:12:49 +01:00
|
|
|
if (query->first_lineno || query->last_lineno) {
|
2012-12-05 22:48:27 +01:00
|
|
|
pr_err("match-spec: line used 2x\n");
|
2011-12-19 23:12:49 +01:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
if (last)
|
|
|
|
*last++ = '\0';
|
2012-12-05 22:48:27 +01:00
|
|
|
if (parse_lineno(first, &query->first_lineno) < 0) {
|
|
|
|
pr_err("line-number is <0\n");
|
2009-02-05 17:51:38 +01:00
|
|
|
return -EINVAL;
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
2011-12-19 23:12:49 +01:00
|
|
|
if (last) {
|
2009-02-05 17:51:38 +01:00
|
|
|
/* range <first>-<last> */
|
2011-12-19 23:12:49 +01:00
|
|
|
if (parse_lineno(last, &query->last_lineno)
|
|
|
|
< query->first_lineno) {
|
2012-12-05 22:48:27 +01:00
|
|
|
pr_err("last-line:%d < 1st-line:%d\n",
|
|
|
|
query->last_lineno,
|
|
|
|
query->first_lineno);
|
2009-02-05 17:51:38 +01:00
|
|
|
return -EINVAL;
|
2011-12-19 23:12:49 +01:00
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
} else {
|
|
|
|
query->last_lineno = query->first_lineno;
|
|
|
|
}
|
|
|
|
} else {
|
2011-12-19 23:12:34 +01:00
|
|
|
pr_err("unknown keyword \"%s\"\n", words[i]);
|
2009-02-05 17:51:38 +01:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2011-12-19 23:12:49 +01:00
|
|
|
if (rc)
|
|
|
|
return rc;
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
2011-12-19 23:13:16 +01:00
|
|
|
vpr_info_dq(query, "parsed");
|
2009-02-05 17:51:38 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Parse `str' as a flags specification, format [-+=][p]+.
|
|
|
|
* Sets up *maskp and *flagsp to be used when changing the
|
|
|
|
* flags fields of matched _ddebug's. Returns 0 on success
|
|
|
|
* or <0 on error.
|
|
|
|
*/
|
|
|
|
static int ddebug_parse_flags(const char *str, unsigned int *flagsp,
|
|
|
|
unsigned int *maskp)
|
|
|
|
{
|
|
|
|
unsigned flags = 0;
|
2011-01-23 17:17:24 +01:00
|
|
|
int op = '=', i;
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
switch (*str) {
|
|
|
|
case '+':
|
|
|
|
case '-':
|
|
|
|
case '=':
|
|
|
|
op = *str++;
|
|
|
|
break;
|
|
|
|
default:
|
2012-12-05 22:48:27 +01:00
|
|
|
pr_err("bad flag-op %c, at start of %s\n", *str, str);
|
2009-02-05 17:51:38 +01:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("op='%c'\n", op);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
2012-12-05 22:48:26 +01:00
|
|
|
for (; *str ; ++str) {
|
2011-01-23 17:17:24 +01:00
|
|
|
for (i = ARRAY_SIZE(opt_array) - 1; i >= 0; i--) {
|
|
|
|
if (*str == opt_array[i].opt_char) {
|
|
|
|
flags |= opt_array[i].flag;
|
|
|
|
break;
|
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
2012-12-05 22:48:27 +01:00
|
|
|
if (i < 0) {
|
|
|
|
pr_err("unknown flag '%c' in \"%s\"\n", *str, str);
|
2011-01-23 17:17:24 +01:00
|
|
|
return -EINVAL;
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("flags=0x%x\n", flags);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
/* calculate final *flagsp, *maskp according to mask and op */
|
|
|
|
switch (op) {
|
|
|
|
case '=':
|
|
|
|
*maskp = 0;
|
|
|
|
*flagsp = flags;
|
|
|
|
break;
|
|
|
|
case '+':
|
|
|
|
*maskp = ~0U;
|
|
|
|
*flagsp = flags;
|
|
|
|
break;
|
|
|
|
case '-':
|
|
|
|
*maskp = ~flags;
|
|
|
|
*flagsp = 0;
|
|
|
|
break;
|
|
|
|
}
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("*flagsp=0x%x *maskp=0x%x\n", *flagsp, *maskp);
|
2009-02-05 17:51:38 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-04-27 22:30:40 +02:00
|
|
|
static int ddebug_exec_query(char *query_string, const char *modname)
|
2010-08-06 16:11:01 +02:00
|
|
|
{
|
|
|
|
unsigned int flags = 0, mask = 0;
|
|
|
|
struct ddebug_query query;
|
|
|
|
#define MAXWORDS 9
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
int nwords, nfound;
|
2010-08-06 16:11:01 +02:00
|
|
|
char *words[MAXWORDS];
|
|
|
|
|
|
|
|
nwords = ddebug_tokenize(query_string, words, MAXWORDS);
|
2012-12-05 22:48:27 +01:00
|
|
|
if (nwords <= 0) {
|
|
|
|
pr_err("tokenize failed\n");
|
2010-08-06 16:11:01 +02:00
|
|
|
return -EINVAL;
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
|
|
|
/* check flags 1st (last arg) so query is pairs of spec,val */
|
|
|
|
if (ddebug_parse_flags(words[nwords-1], &flags, &mask)) {
|
|
|
|
pr_err("flags parse failed\n");
|
2010-08-06 16:11:01 +02:00
|
|
|
return -EINVAL;
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
|
|
|
if (ddebug_parse_query(words, nwords-1, &query, modname)) {
|
|
|
|
pr_err("query parse failed\n");
|
2010-08-06 16:11:01 +02:00
|
|
|
return -EINVAL;
|
2012-12-05 22:48:27 +01:00
|
|
|
}
|
2010-08-06 16:11:01 +02:00
|
|
|
/* actually go and implement the change */
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
nfound = ddebug_change(&query, flags, mask);
|
2012-12-05 22:48:26 +01:00
|
|
|
vpr_info_dq(&query, nfound ? "applied" : "no-match");
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
|
|
|
|
return nfound;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* handle multiple queries in query string, continue on error, return
|
|
|
|
last error or number of matching callsites. Module name is either
|
|
|
|
in param (for boot arg) or perhaps in query string.
|
|
|
|
*/
|
2012-04-27 22:30:40 +02:00
|
|
|
static int ddebug_exec_queries(char *query, const char *modname)
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
{
|
|
|
|
char *split;
|
|
|
|
int i, errs = 0, exitcode = 0, rc, nfound = 0;
|
|
|
|
|
|
|
|
for (i = 0; query; query = split) {
|
|
|
|
split = strpbrk(query, ";\n");
|
|
|
|
if (split)
|
|
|
|
*split++ = '\0';
|
|
|
|
|
|
|
|
query = skip_spaces(query);
|
|
|
|
if (!query || !*query || *query == '#')
|
|
|
|
continue;
|
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("query %d: \"%s\"\n", i, query);
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
|
2012-04-27 22:30:40 +02:00
|
|
|
rc = ddebug_exec_query(query, modname);
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
if (rc < 0) {
|
|
|
|
errs++;
|
|
|
|
exitcode = rc;
|
2012-12-05 22:48:26 +01:00
|
|
|
} else {
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
nfound += rc;
|
2012-12-05 22:48:26 +01:00
|
|
|
}
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
i++;
|
|
|
|
}
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("processed %d queries, with %d matches, %d errs\n",
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
i, nfound, errs);
|
|
|
|
|
|
|
|
if (exitcode)
|
|
|
|
return exitcode;
|
|
|
|
return nfound;
|
2010-08-06 16:11:01 +02:00
|
|
|
}
|
|
|
|
|
2011-10-04 23:13:19 +02:00
|
|
|
#define PREFIX_SIZE 64
|
|
|
|
|
|
|
|
static int remaining(int wrote)
|
|
|
|
{
|
|
|
|
if (PREFIX_SIZE - wrote > 0)
|
|
|
|
return PREFIX_SIZE - wrote;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *dynamic_emit_prefix(const struct _ddebug *desc, char *buf)
|
2011-01-23 17:17:24 +01:00
|
|
|
{
|
2011-10-04 23:13:19 +02:00
|
|
|
int pos_after_tid;
|
|
|
|
int pos = 0;
|
2011-01-23 17:17:24 +01:00
|
|
|
|
2012-09-13 05:11:29 +02:00
|
|
|
*buf = '\0';
|
|
|
|
|
2011-10-04 23:13:19 +02:00
|
|
|
if (desc->flags & _DPRINTK_FLAGS_INCL_TID) {
|
2011-01-23 17:17:24 +01:00
|
|
|
if (in_interrupt())
|
2012-09-13 05:11:29 +02:00
|
|
|
pos += snprintf(buf + pos, remaining(pos), "<intr> ");
|
2011-01-23 17:17:24 +01:00
|
|
|
else
|
2011-10-04 23:13:19 +02:00
|
|
|
pos += snprintf(buf + pos, remaining(pos), "[%d] ",
|
2012-09-13 05:11:29 +02:00
|
|
|
task_pid_vnr(current));
|
2011-01-23 17:17:24 +01:00
|
|
|
}
|
2011-10-04 23:13:19 +02:00
|
|
|
pos_after_tid = pos;
|
|
|
|
if (desc->flags & _DPRINTK_FLAGS_INCL_MODNAME)
|
|
|
|
pos += snprintf(buf + pos, remaining(pos), "%s:",
|
2012-09-13 05:11:29 +02:00
|
|
|
desc->modname);
|
2011-10-04 23:13:19 +02:00
|
|
|
if (desc->flags & _DPRINTK_FLAGS_INCL_FUNCNAME)
|
|
|
|
pos += snprintf(buf + pos, remaining(pos), "%s:",
|
2012-09-13 05:11:29 +02:00
|
|
|
desc->function);
|
2011-10-04 23:13:19 +02:00
|
|
|
if (desc->flags & _DPRINTK_FLAGS_INCL_LINENO)
|
2011-12-19 23:11:09 +01:00
|
|
|
pos += snprintf(buf + pos, remaining(pos), "%d:",
|
2012-09-13 05:11:29 +02:00
|
|
|
desc->lineno);
|
2011-10-04 23:13:19 +02:00
|
|
|
if (pos - pos_after_tid)
|
|
|
|
pos += snprintf(buf + pos, remaining(pos), " ");
|
|
|
|
if (pos >= PREFIX_SIZE)
|
|
|
|
buf[PREFIX_SIZE - 1] = '\0';
|
2011-08-11 20:36:25 +02:00
|
|
|
|
2011-10-04 23:13:19 +02:00
|
|
|
return buf;
|
2011-08-11 20:36:25 +02:00
|
|
|
}
|
|
|
|
|
2011-01-23 17:17:24 +01:00
|
|
|
int __dynamic_pr_debug(struct _ddebug *descriptor, const char *fmt, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
int res;
|
2011-10-04 23:13:19 +02:00
|
|
|
struct va_format vaf;
|
|
|
|
char buf[PREFIX_SIZE];
|
2011-01-23 17:17:24 +01:00
|
|
|
|
|
|
|
BUG_ON(!descriptor);
|
|
|
|
BUG_ON(!fmt);
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
2012-09-13 05:11:29 +02:00
|
|
|
|
2011-10-04 23:13:19 +02:00
|
|
|
vaf.fmt = fmt;
|
|
|
|
vaf.va = &args;
|
2012-09-13 05:11:29 +02:00
|
|
|
|
|
|
|
res = printk(KERN_DEBUG "%s%pV",
|
|
|
|
dynamic_emit_prefix(descriptor, buf), &vaf);
|
|
|
|
|
2011-01-23 17:17:24 +01:00
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__dynamic_pr_debug);
|
|
|
|
|
2011-08-11 20:36:21 +02:00
|
|
|
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);
|
2012-09-13 05:11:29 +02:00
|
|
|
|
2011-08-11 20:36:21 +02:00
|
|
|
vaf.fmt = fmt;
|
|
|
|
vaf.va = &args;
|
2012-09-13 05:11:29 +02:00
|
|
|
|
|
|
|
if (!dev) {
|
|
|
|
res = printk(KERN_DEBUG "(NULL device *): %pV", &vaf);
|
|
|
|
} else {
|
|
|
|
char buf[PREFIX_SIZE];
|
|
|
|
|
2012-09-13 05:14:11 +02:00
|
|
|
res = dev_printk_emit(7, dev, "%s%s %s: %pV",
|
|
|
|
dynamic_emit_prefix(descriptor, buf),
|
|
|
|
dev_driver_string(dev), dev_name(dev),
|
|
|
|
&vaf);
|
2012-09-13 05:11:29 +02:00
|
|
|
}
|
|
|
|
|
2011-08-11 20:36:21 +02:00
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__dynamic_dev_dbg);
|
|
|
|
|
2011-10-04 23:13:22 +02:00
|
|
|
#ifdef CONFIG_NET
|
|
|
|
|
2011-08-11 20:36:48 +02:00
|
|
|
int __dynamic_netdev_dbg(struct _ddebug *descriptor,
|
2012-09-13 05:12:19 +02:00
|
|
|
const struct net_device *dev, const char *fmt, ...)
|
2011-08-11 20:36:48 +02:00
|
|
|
{
|
|
|
|
struct va_format vaf;
|
|
|
|
va_list args;
|
|
|
|
int res;
|
|
|
|
|
|
|
|
BUG_ON(!descriptor);
|
|
|
|
BUG_ON(!fmt);
|
|
|
|
|
|
|
|
va_start(args, fmt);
|
2012-09-13 05:12:19 +02:00
|
|
|
|
2011-08-11 20:36:48 +02:00
|
|
|
vaf.fmt = fmt;
|
|
|
|
vaf.va = &args;
|
2012-09-13 05:12:19 +02:00
|
|
|
|
|
|
|
if (dev && dev->dev.parent) {
|
|
|
|
char buf[PREFIX_SIZE];
|
2012-09-13 05:14:11 +02:00
|
|
|
|
|
|
|
res = dev_printk_emit(7, dev->dev.parent,
|
|
|
|
"%s%s %s %s: %pV",
|
|
|
|
dynamic_emit_prefix(descriptor, buf),
|
|
|
|
dev_driver_string(dev->dev.parent),
|
|
|
|
dev_name(dev->dev.parent),
|
|
|
|
netdev_name(dev), &vaf);
|
2012-09-13 05:12:19 +02:00
|
|
|
} else if (dev) {
|
|
|
|
res = printk(KERN_DEBUG "%s: %pV", netdev_name(dev), &vaf);
|
|
|
|
} else {
|
|
|
|
res = printk(KERN_DEBUG "(NULL net_device): %pV", &vaf);
|
|
|
|
}
|
|
|
|
|
2011-08-11 20:36:48 +02:00
|
|
|
va_end(args);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(__dynamic_netdev_dbg);
|
|
|
|
|
2011-10-04 23:13:22 +02:00
|
|
|
#endif
|
|
|
|
|
2011-12-19 23:12:29 +01:00
|
|
|
#define DDEBUG_STRING_SIZE 1024
|
|
|
|
static __initdata char ddebug_setup_string[DDEBUG_STRING_SIZE];
|
|
|
|
|
2010-08-06 16:11:02 +02:00
|
|
|
static __init int ddebug_setup_query(char *str)
|
|
|
|
{
|
2011-12-19 23:12:29 +01:00
|
|
|
if (strlen(str) >= DDEBUG_STRING_SIZE) {
|
2011-08-11 20:36:33 +02:00
|
|
|
pr_warn("ddebug boot param string too large\n");
|
2010-08-06 16:11:02 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2011-12-19 23:12:29 +01:00
|
|
|
strlcpy(ddebug_setup_string, str, DDEBUG_STRING_SIZE);
|
2010-08-06 16:11:02 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
__setup("ddebug_query=", ddebug_setup_query);
|
|
|
|
|
2009-02-05 17:51:38 +01:00
|
|
|
/*
|
|
|
|
* File_ops->write method for <debugfs>/dynamic_debug/conrol. Gathers the
|
|
|
|
* command text from userspace, parses and executes it.
|
|
|
|
*/
|
2011-12-19 23:13:07 +01:00
|
|
|
#define USER_BUF_PAGE 4096
|
2009-02-05 17:51:38 +01:00
|
|
|
static ssize_t ddebug_proc_write(struct file *file, const char __user *ubuf,
|
|
|
|
size_t len, loff_t *offp)
|
|
|
|
{
|
2011-12-19 23:13:07 +01:00
|
|
|
char *tmpbuf;
|
2010-08-06 16:11:01 +02:00
|
|
|
int ret;
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
if (len == 0)
|
|
|
|
return 0;
|
2011-12-19 23:13:07 +01:00
|
|
|
if (len > USER_BUF_PAGE - 1) {
|
|
|
|
pr_warn("expected <%d bytes into control\n", USER_BUF_PAGE);
|
2009-02-05 17:51:38 +01:00
|
|
|
return -E2BIG;
|
2011-12-19 23:13:07 +01:00
|
|
|
}
|
|
|
|
tmpbuf = kmalloc(len + 1, GFP_KERNEL);
|
|
|
|
if (!tmpbuf)
|
|
|
|
return -ENOMEM;
|
|
|
|
if (copy_from_user(tmpbuf, ubuf, len)) {
|
|
|
|
kfree(tmpbuf);
|
2009-02-05 17:51:38 +01:00
|
|
|
return -EFAULT;
|
2011-12-19 23:13:07 +01:00
|
|
|
}
|
2009-02-05 17:51:38 +01:00
|
|
|
tmpbuf[len] = '\0';
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("read %d bytes from userspace\n", (int)len);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
2012-04-27 22:30:40 +02:00
|
|
|
ret = ddebug_exec_queries(tmpbuf, NULL);
|
2011-12-19 23:13:07 +01:00
|
|
|
kfree(tmpbuf);
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
if (ret < 0)
|
2010-08-06 16:11:01 +02:00
|
|
|
return ret;
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
*offp += len;
|
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the iterator to point to the first _ddebug object
|
|
|
|
* and return a pointer to that first object. Returns
|
|
|
|
* NULL if there are no _ddebugs at all.
|
|
|
|
*/
|
|
|
|
static struct _ddebug *ddebug_iter_first(struct ddebug_iter *iter)
|
|
|
|
{
|
|
|
|
if (list_empty(&ddebug_tables)) {
|
|
|
|
iter->table = NULL;
|
|
|
|
iter->idx = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
iter->table = list_entry(ddebug_tables.next,
|
|
|
|
struct ddebug_table, link);
|
|
|
|
iter->idx = 0;
|
|
|
|
return &iter->table->ddebugs[iter->idx];
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Advance the iterator to point to the next _ddebug
|
|
|
|
* object from the one the iterator currently points at,
|
|
|
|
* and returns a pointer to the new _ddebug. Returns
|
|
|
|
* NULL if the iterator has seen all the _ddebugs.
|
|
|
|
*/
|
|
|
|
static struct _ddebug *ddebug_iter_next(struct ddebug_iter *iter)
|
|
|
|
{
|
|
|
|
if (iter->table == NULL)
|
|
|
|
return NULL;
|
|
|
|
if (++iter->idx == iter->table->num_ddebugs) {
|
|
|
|
/* iterate to next table */
|
|
|
|
iter->idx = 0;
|
|
|
|
if (list_is_last(&iter->table->link, &ddebug_tables)) {
|
|
|
|
iter->table = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
iter->table = list_entry(iter->table->link.next,
|
|
|
|
struct ddebug_table, link);
|
|
|
|
}
|
|
|
|
return &iter->table->ddebugs[iter->idx];
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Seq_ops start method. Called at the start of every
|
|
|
|
* read() call from userspace. Takes the ddebug_lock and
|
|
|
|
* seeks the seq_file's iterator to the given position.
|
|
|
|
*/
|
|
|
|
static void *ddebug_proc_start(struct seq_file *m, loff_t *pos)
|
|
|
|
{
|
|
|
|
struct ddebug_iter *iter = m->private;
|
|
|
|
struct _ddebug *dp;
|
|
|
|
int n = *pos;
|
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("called m=%p *pos=%lld\n", m, (unsigned long long)*pos);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
mutex_lock(&ddebug_lock);
|
|
|
|
|
|
|
|
if (!n)
|
|
|
|
return SEQ_START_TOKEN;
|
|
|
|
if (n < 0)
|
|
|
|
return NULL;
|
|
|
|
dp = ddebug_iter_first(iter);
|
|
|
|
while (dp != NULL && --n > 0)
|
|
|
|
dp = ddebug_iter_next(iter);
|
|
|
|
return dp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Seq_ops next method. Called several times within a read()
|
|
|
|
* call from userspace, with ddebug_lock held. Walks to the
|
|
|
|
* next _ddebug object with a special case for the header line.
|
|
|
|
*/
|
|
|
|
static void *ddebug_proc_next(struct seq_file *m, void *p, loff_t *pos)
|
|
|
|
{
|
|
|
|
struct ddebug_iter *iter = m->private;
|
|
|
|
struct _ddebug *dp;
|
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("called m=%p p=%p *pos=%lld\n",
|
2012-12-05 22:48:26 +01:00
|
|
|
m, p, (unsigned long long)*pos);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
if (p == SEQ_START_TOKEN)
|
|
|
|
dp = ddebug_iter_first(iter);
|
|
|
|
else
|
|
|
|
dp = ddebug_iter_next(iter);
|
|
|
|
++*pos;
|
|
|
|
return dp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Seq_ops show method. Called several times within a read()
|
|
|
|
* call from userspace, with ddebug_lock held. Formats the
|
|
|
|
* current _ddebug as a single human-readable line, with a
|
|
|
|
* special case for the header line.
|
|
|
|
*/
|
|
|
|
static int ddebug_proc_show(struct seq_file *m, void *p)
|
|
|
|
{
|
|
|
|
struct ddebug_iter *iter = m->private;
|
|
|
|
struct _ddebug *dp = p;
|
2011-12-19 23:12:44 +01:00
|
|
|
char flagsbuf[10];
|
2009-02-05 17:51:38 +01:00
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("called m=%p p=%p\n", m, p);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
if (p == SEQ_START_TOKEN) {
|
|
|
|
seq_puts(m,
|
2012-12-05 22:48:26 +01:00
|
|
|
"# filename:lineno [module]function flags format\n");
|
2009-02-05 17:51:38 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-12-19 23:12:44 +01:00
|
|
|
seq_printf(m, "%s:%u [%s]%s =%s \"",
|
2012-12-05 22:48:26 +01:00
|
|
|
trim_prefix(dp->filename), dp->lineno,
|
|
|
|
iter->table->mod_name, dp->function,
|
|
|
|
ddebug_describe_flags(dp, flagsbuf, sizeof(flagsbuf)));
|
2009-02-05 17:51:38 +01:00
|
|
|
seq_escape(m, dp->format, "\t\r\n\"");
|
|
|
|
seq_puts(m, "\"\n");
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Seq_ops stop method. Called at the end of each read()
|
|
|
|
* call from userspace. Drops ddebug_lock.
|
|
|
|
*/
|
|
|
|
static void ddebug_proc_stop(struct seq_file *m, void *p)
|
|
|
|
{
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("called m=%p p=%p\n", m, p);
|
2009-02-05 17:51:38 +01:00
|
|
|
mutex_unlock(&ddebug_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct seq_operations ddebug_proc_seqops = {
|
|
|
|
.start = ddebug_proc_start,
|
|
|
|
.next = ddebug_proc_next,
|
|
|
|
.show = ddebug_proc_show,
|
|
|
|
.stop = ddebug_proc_stop
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
2011-12-19 23:11:09 +01:00
|
|
|
* File_ops->open method for <debugfs>/dynamic_debug/control. Does
|
|
|
|
* the seq_file setup dance, and also creates an iterator to walk the
|
|
|
|
* _ddebugs. Note that we create a seq_file always, even for O_WRONLY
|
|
|
|
* files where it's not needed, as doing so simplifies the ->release
|
|
|
|
* method.
|
2009-02-05 17:51:38 +01:00
|
|
|
*/
|
|
|
|
static int ddebug_proc_open(struct inode *inode, struct file *file)
|
|
|
|
{
|
|
|
|
struct ddebug_iter *iter;
|
|
|
|
int err;
|
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("called\n");
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
iter = kzalloc(sizeof(*iter), GFP_KERNEL);
|
|
|
|
if (iter == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
err = seq_open(file, &ddebug_proc_seqops);
|
|
|
|
if (err) {
|
|
|
|
kfree(iter);
|
|
|
|
return err;
|
|
|
|
}
|
2012-12-05 22:48:26 +01:00
|
|
|
((struct seq_file *)file->private_data)->private = iter;
|
2009-02-05 17:51:38 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct file_operations ddebug_proc_fops = {
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.open = ddebug_proc_open,
|
|
|
|
.read = seq_read,
|
|
|
|
.llseek = seq_lseek,
|
|
|
|
.release = seq_release_private,
|
|
|
|
.write = ddebug_proc_write
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Allocate a new ddebug_table for the given module
|
|
|
|
* and add it to the global list.
|
|
|
|
*/
|
|
|
|
int ddebug_add_module(struct _ddebug *tab, unsigned int n,
|
|
|
|
const char *name)
|
|
|
|
{
|
|
|
|
struct ddebug_table *dt;
|
|
|
|
char *new_name;
|
|
|
|
|
|
|
|
dt = kzalloc(sizeof(*dt), GFP_KERNEL);
|
|
|
|
if (dt == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
new_name = kstrdup(name, GFP_KERNEL);
|
|
|
|
if (new_name == NULL) {
|
|
|
|
kfree(dt);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
dt->mod_name = new_name;
|
|
|
|
dt->num_ddebugs = n;
|
|
|
|
dt->ddebugs = tab;
|
|
|
|
|
|
|
|
mutex_lock(&ddebug_lock);
|
|
|
|
list_add_tail(&dt->link, &ddebug_tables);
|
|
|
|
mutex_unlock(&ddebug_lock);
|
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("%u debug prints in module %s\n", n, dt->mod_name);
|
2009-02-05 17:51:38 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ddebug_add_module);
|
|
|
|
|
2012-04-27 22:30:37 +02:00
|
|
|
/* helper for ddebug_dyndbg_(boot|module)_param_cb */
|
|
|
|
static int ddebug_dyndbg_param_cb(char *param, char *val,
|
|
|
|
const char *modname, int on_err)
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
{
|
|
|
|
char *sep;
|
|
|
|
|
|
|
|
sep = strchr(param, '.');
|
|
|
|
if (sep) {
|
2012-04-27 22:30:37 +02:00
|
|
|
/* needed only for ddebug_dyndbg_boot_param_cb */
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
*sep = '\0';
|
|
|
|
modname = param;
|
|
|
|
param = sep + 1;
|
|
|
|
}
|
|
|
|
if (strcmp(param, "dyndbg"))
|
2012-04-27 22:30:37 +02:00
|
|
|
return on_err; /* determined by caller */
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
|
2012-04-27 22:30:40 +02:00
|
|
|
ddebug_exec_queries((val ? val : "+p"), modname);
|
|
|
|
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
return 0; /* query failure shouldnt stop module load */
|
|
|
|
}
|
|
|
|
|
2012-04-27 22:30:37 +02:00
|
|
|
/* handle both dyndbg and $module.dyndbg params at boot */
|
|
|
|
static int ddebug_dyndbg_boot_param_cb(char *param, char *val,
|
|
|
|
const char *unused)
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
{
|
2012-04-27 22:30:37 +02:00
|
|
|
vpr_info("%s=\"%s\"\n", param, val);
|
|
|
|
return ddebug_dyndbg_param_cb(param, val, NULL, 0);
|
|
|
|
}
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
|
2012-04-27 22:30:37 +02:00
|
|
|
/*
|
|
|
|
* modprobe foo finds foo.params in boot-args, strips "foo.", and
|
|
|
|
* passes them to load_module(). This callback gets unknown params,
|
|
|
|
* processes dyndbg params, rejects others.
|
|
|
|
*/
|
|
|
|
int ddebug_dyndbg_module_param_cb(char *param, char *val, const char *module)
|
|
|
|
{
|
|
|
|
vpr_info("module: %s %s=\"%s\"\n", module, param, val);
|
|
|
|
return ddebug_dyndbg_param_cb(param, val, module, -ENOENT);
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
}
|
|
|
|
|
2009-02-05 17:51:38 +01:00
|
|
|
static void ddebug_table_free(struct ddebug_table *dt)
|
|
|
|
{
|
|
|
|
list_del_init(&dt->link);
|
|
|
|
kfree(dt->mod_name);
|
|
|
|
kfree(dt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Called in response to a module being unloaded. Removes
|
|
|
|
* any ddebug_table's which point at the module.
|
|
|
|
*/
|
2010-07-03 05:07:35 +02:00
|
|
|
int ddebug_remove_module(const char *mod_name)
|
2009-02-05 17:51:38 +01:00
|
|
|
{
|
|
|
|
struct ddebug_table *dt, *nextdt;
|
|
|
|
int ret = -ENOENT;
|
|
|
|
|
2012-04-27 22:30:32 +02:00
|
|
|
vpr_info("removing module \"%s\"\n", mod_name);
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
mutex_lock(&ddebug_lock);
|
|
|
|
list_for_each_entry_safe(dt, nextdt, &ddebug_tables, link) {
|
|
|
|
if (!strcmp(dt->mod_name, mod_name)) {
|
|
|
|
ddebug_table_free(dt);
|
|
|
|
ret = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
mutex_unlock(&ddebug_lock);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(ddebug_remove_module);
|
|
|
|
|
|
|
|
static void ddebug_remove_all_tables(void)
|
|
|
|
{
|
|
|
|
mutex_lock(&ddebug_lock);
|
|
|
|
while (!list_empty(&ddebug_tables)) {
|
|
|
|
struct ddebug_table *dt = list_entry(ddebug_tables.next,
|
|
|
|
struct ddebug_table,
|
|
|
|
link);
|
|
|
|
ddebug_table_free(dt);
|
|
|
|
}
|
|
|
|
mutex_unlock(&ddebug_lock);
|
|
|
|
}
|
|
|
|
|
2010-08-06 16:11:03 +02:00
|
|
|
static __initdata int ddebug_init_success;
|
|
|
|
|
|
|
|
static int __init dynamic_debug_init_debugfs(void)
|
2009-02-05 17:51:38 +01:00
|
|
|
{
|
|
|
|
struct dentry *dir, *file;
|
2010-08-06 16:11:03 +02:00
|
|
|
|
|
|
|
if (!ddebug_init_success)
|
|
|
|
return -ENODEV;
|
2009-02-05 17:51:38 +01:00
|
|
|
|
|
|
|
dir = debugfs_create_dir("dynamic_debug", NULL);
|
|
|
|
if (!dir)
|
|
|
|
return -ENOMEM;
|
|
|
|
file = debugfs_create_file("control", 0644, dir, NULL,
|
|
|
|
&ddebug_proc_fops);
|
|
|
|
if (!file) {
|
|
|
|
debugfs_remove(dir);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-08-06 16:11:03 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int __init dynamic_debug_init(void)
|
|
|
|
{
|
|
|
|
struct _ddebug *iter, *iter_start;
|
|
|
|
const char *modname = NULL;
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
char *cmdline;
|
2010-08-06 16:11:03 +02:00
|
|
|
int ret = 0;
|
2012-04-27 22:30:39 +02:00
|
|
|
int n = 0, entries = 0, modct = 0;
|
|
|
|
int verbose_bytes = 0;
|
2010-08-06 16:11:03 +02:00
|
|
|
|
2011-12-19 23:12:54 +01:00
|
|
|
if (__start___verbose == __stop___verbose) {
|
2012-12-05 22:48:26 +01:00
|
|
|
pr_warn("_ddebug table is empty in a CONFIG_DYNAMIC_DEBUG build\n");
|
2011-12-19 23:12:54 +01:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
iter = __start___verbose;
|
|
|
|
modname = iter->modname;
|
|
|
|
iter_start = iter;
|
|
|
|
for (; iter < __stop___verbose; iter++) {
|
2012-04-27 22:30:39 +02:00
|
|
|
entries++;
|
|
|
|
verbose_bytes += strlen(iter->modname) + strlen(iter->function)
|
|
|
|
+ strlen(iter->filename) + strlen(iter->format);
|
|
|
|
|
2011-12-19 23:12:54 +01:00
|
|
|
if (strcmp(modname, iter->modname)) {
|
2012-04-27 22:30:39 +02:00
|
|
|
modct++;
|
2011-12-19 23:12:54 +01:00
|
|
|
ret = ddebug_add_module(iter_start, n, modname);
|
|
|
|
if (ret)
|
2012-04-27 22:30:38 +02:00
|
|
|
goto out_err;
|
2011-12-19 23:12:54 +01:00
|
|
|
n = 0;
|
|
|
|
modname = iter->modname;
|
|
|
|
iter_start = iter;
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
2011-12-19 23:12:54 +01:00
|
|
|
n++;
|
2009-02-05 17:51:38 +01:00
|
|
|
}
|
2011-12-19 23:12:54 +01:00
|
|
|
ret = ddebug_add_module(iter_start, n, modname);
|
|
|
|
if (ret)
|
2012-04-27 22:30:38 +02:00
|
|
|
goto out_err;
|
2010-08-06 16:11:02 +02:00
|
|
|
|
2012-04-27 22:30:38 +02:00
|
|
|
ddebug_init_success = 1;
|
2012-12-05 22:48:26 +01:00
|
|
|
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));
|
2012-04-27 22:30:38 +02:00
|
|
|
|
|
|
|
/* apply ddebug_query boot param, dont unload tables on err */
|
2010-08-06 16:11:02 +02:00
|
|
|
if (ddebug_setup_string[0] != '\0') {
|
2012-12-05 22:48:26 +01:00
|
|
|
pr_warn("ddebug_query param name is deprecated, change it to dyndbg\n");
|
2012-04-27 22:30:40 +02:00
|
|
|
ret = ddebug_exec_queries(ddebug_setup_string, NULL);
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
if (ret < 0)
|
2012-12-05 22:48:26 +01:00
|
|
|
pr_warn("Invalid ddebug boot param %s\n",
|
2011-08-11 20:36:33 +02:00
|
|
|
ddebug_setup_string);
|
2010-08-06 16:11:02 +02:00
|
|
|
else
|
dynamic_debug: process multiple debug-queries on a line
Insert ddebug_exec_queries() in place of ddebug_exec_query(). It
splits the query string on [;\n], and calls ddebug_exec_query() on
each. All queries are processed independent of errors, allowing a
query to fail, for example when a module is not installed. Empty
lines and comments are skipped. Errors are counted, and the last
error seen (negative) or the number of callsites found (0 or positive)
is returned. Return code checks are altered accordingly.
With this, multiple queries can be given in ddebug_query, allowing
more selective enabling of callsites. As a side effect, a set of
commands can be batched in:
cat cmd-file > $DBGMT/dynamic_debug/control
We dont want a ddebug_query syntax error to kill the dynamic debug
facility, so dynamic_debug_init() zeros ddebug_exec_queries()'s return
code after logging the appropriate message, so that ddebug tables are
preserved and $DBGMT/dynamic_debug/control file is created. This
would be appropriate even without accepting multiple queries.
This patch also alters ddebug_change() to return number of callsites
matched (which typically is the same as number of callsites changed).
ddebug_exec_query() also returns the number found, or a negative value
if theres a parse error on the query.
Splitting on [;\n] prevents their use in format-specs, but selecting
callsites on punctuation is brittle anyway, meaningful and selective
substrings are more typical.
Note: splitting queries on ';' before handling trailing #comments
means that a ';' also terminates a comment, and text after the ';' is
treated as another query. This trailing query will almost certainly
result in a parse error and thus have no effect other than the error
message. The double corner case with unexpected results is:
ddebug_query="func foo +p # enable foo ; +p"
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-12-19 23:13:21 +01:00
|
|
|
pr_info("%d changes by ddebug_query\n", ret);
|
2010-08-06 16:11:02 +02:00
|
|
|
}
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
/* now that ddebug tables are loaded, process all boot args
|
|
|
|
* again to find and activate queries given in dyndbg params.
|
|
|
|
* While this has already been done for known boot params, it
|
|
|
|
* ignored the unknown ones (dyndbg in particular). Reusing
|
|
|
|
* parse_args avoids ad-hoc parsing. This will also attempt
|
|
|
|
* to activate queries for not-yet-loaded modules, which is
|
|
|
|
* slightly noisy if verbose, but harmless.
|
|
|
|
*/
|
|
|
|
cmdline = kstrdup(saved_command_line, GFP_KERNEL);
|
|
|
|
parse_args("dyndbg params", cmdline, NULL,
|
|
|
|
0, 0, 0, &ddebug_dyndbg_boot_param_cb);
|
|
|
|
kfree(cmdline);
|
2012-04-27 22:30:38 +02:00
|
|
|
return 0;
|
2010-08-06 16:11:02 +02:00
|
|
|
|
2012-04-27 22:30:38 +02:00
|
|
|
out_err:
|
|
|
|
ddebug_remove_all_tables();
|
2009-02-05 17:51:38 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2010-08-06 16:11:03 +02:00
|
|
|
/* Allow early initialization for boot messages via boot param */
|
2012-04-27 22:30:42 +02:00
|
|
|
early_initcall(dynamic_debug_init);
|
dynamic_debug: make dynamic-debug work for module initialization
This introduces a fake module param $module.dyndbg. Its based upon
Thomas Renninger's $module.ddebug boot-time debugging patch from
https://lkml.org/lkml/2010/9/15/397
The 'fake' module parameter is provided for all modules, whether or
not they need it. It is not explicitly added to each module, but is
implemented in callbacks invoked from parse_args.
For builtin modules, dynamic_debug_init() now directly calls
parse_args(..., &ddebug_dyndbg_boot_params_cb), to process the params
undeclared in the modules, just after the ddebug tables are processed.
While its slightly weird to reprocess the boot params, parse_args() is
already called repeatedly by do_initcall_levels(). More importantly,
the dyndbg queries (given in ddebug_query or dyndbg params) cannot be
activated until after the ddebug tables are ready, and reusing
parse_args is cleaner than doing an ad-hoc parse. This reparse would
break options like inc_verbosity, but they probably should be params,
like verbosity=3.
ddebug_dyndbg_boot_params_cb() handles both bare dyndbg (aka:
ddebug_query) and module-prefixed dyndbg params, and ignores all other
parameters. For example, the following will enable pr_debug()s in 4
builtin modules, in the order given:
dyndbg="module params +p; module aio +p" module.dyndbg=+p pci.dyndbg
For loadable modules, parse_args() in load_module() calls
ddebug_dyndbg_module_params_cb(). This handles bare dyndbg params as
passed from modprobe, and errors on other unknown params.
Note that modprobe reads /proc/cmdline, so "modprobe foo" grabs all
foo.params, strips the "foo.", and passes these to the kernel.
ddebug_dyndbg_module_params_cb() is again called for the unknown
params; it handles dyndbg, and errors on others. The "doing" arg
added previously contains the module name.
For non CONFIG_DYNAMIC_DEBUG builds, the stub function accepts
and ignores $module.dyndbg params, other unknowns get -ENOENT.
If no param value is given (as in pci.dyndbg example above), "+p" is
assumed, which enables all pr_debug callsites in the module.
The dyndbg fake parameter is not shown in /sys/module/*/parameters,
thus it does not use any resources. Changes to it are made via the
control file.
Also change pr_info in ddebug_exec_queries to vpr_info,
no need to see it all the time.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
CC: Thomas Renninger <trenn@suse.de>
CC: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-04-27 22:30:35 +02:00
|
|
|
|
2010-08-06 16:11:03 +02:00
|
|
|
/* Debugfs setup must be done later */
|
2012-04-27 22:30:42 +02:00
|
|
|
fs_initcall(dynamic_debug_init_debugfs);
|