On Thursday 02 September 2010 05:29:11 Greg KH wrote:
> On Thu, Sep 02, 2010 at 01:18:35PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
...
> > kernel/params.c: In function 'parse_args':
> > kernel/params.c:200: warning: passing argument 2 of 'snprintf' makes integer from pointer without a cast
> > include/linux/kernel.h:203: note: expected 'size_t' but argument is of type 'char *'
> >
> > Caused by commit d1aa8e2ab38942b21d543611d4f829597d8791d4 ("Dynamic
> > Debug: Introduce global fake module param module.ddebug").
> >
> > Some warnings should not be ignored ... and it does make me wonder how
> > much testing this has had ...
Strange, I tried this out and it worked, I doubt that this version could.
Possibly it slipped in when getting dddebug patches together for resending
to Greg, no idea.
Sorry about that,
Thomas
Fixed version:
---------
Dynamic Debug: Introduce global fake module param module.ddebug - V2
Dynamic Debug allows enabling of pr_debug or KERN_DEBUG messages at runtime.
This is controlled via /sys/kernel/debug/dynamic_debug/control.
One major drawback is that the whole initialization of a module cannot be
tracked, because ddebug is only aware of debug strings of loaded modules.
But this is the most interesting part...
This patch introduces a fake module parameter module.ddebug(not shown in
/sys/module/*/parameters, thus it does not use any resources/memory).
If a module passes ddebug as a module parameter (e.g. via module.ddebug
kernel boot param or via "modprobe module ddebug"), all debug strings of this
module get activated by issuing "module module_name +p" internally
(not via sysfs) when the module gets loaded.
Possible enhancements for the future if ddebug might get extended with
further flags:
module.ddebug=flags
Then module.ddebug="p" would be the same as module.ddebug, but if there
is a "x" ddebug flag added, one could pass:
module.ddebug="xp"
which would result in such a dynamic debug query:
module module_name +xp
Modules must not use "ddebug" as module parameter or it will get ignored.
If it's tried, a warning will show up at module load time that it will get
ignored (this is the only part which got added late and is compile tested only).
Tested with (additional added pr_debug messages):
options hp-wmi ddebug
in modprobe.conf
-> works and pr_debug messages issued at module initialization time show
up. Also "p" flag gets set for the whole hp-wmi module:
grep hp-wmi /sys/../dynamic_debug/control
Signed-off-by: Thomas Renninger <trenn@xxxxxxx>
Acked-by: Jason Baron <jbaron@xxxxxxxxxx>
CC: greg@xxxxxxxxx
diff --git a/Documentation/dynamic-debug-howto.txt b/Documentation/dynamic-debug-howto.txt
index 58ea64a..ebbbbdd 100644
--- a/Documentation/dynamic-debug-howto.txt
+++ b/Documentation/dynamic-debug-howto.txt
@@ -213,7 +213,7 @@ Note also that there is no convenient syntax to remove all
the flags at once, you need to use "-psc".
-Debug messages during boot process
+Debug Messages during Boot Process
==================================
To be able to activate debug messages during the boot process,
@@ -232,6 +232,32 @@ PCI (or other devices) initialization also is a hot candidate for using
this boot parameter for debugging purposes.
+Debug Messages at Module Initialization Time
+============================================
+
+Enabling debug messages inside a module is only possible if the module itself
+is loaded already. If you unload a module, the dynamic debug flags associated
+to its debug messages are lost.
+Therefore, enabling debug messages that get processed at module initialization
+time through the <debugfs>/dynamic_debug/control interface is not possible.
+Instead, a "ddebug" module paramter can be passed:
+
+ - via kernel boot parameter:
+ module.ddebug
+
+ - as an ordinary module parameter via modprobe
+ modprobe module ddebug
+
+ - or the parameter can be used permanently via modprobe.conf(.local)
+ options module ddebug
+
+The ddebug option is not implemented as an ordinary module parameter and thus
+will not show up in /sys/module/module_name/parameters/ddebug
+The settings can get reverted through the sysfs interface again when the
+module got loaded as soon as debug messages are not needed anymore:
+echo "module module_name -p" > <debugfs>/dynamic_debug/control
+as described in the "Command Language Reference" chapter above.
+
Examples
========
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h
index 52c0da4..095adf6 100644
--- a/include/linux/dynamic_debug.h
+++ b/include/linux/dynamic_debug.h
@@ -41,6 +41,7 @@ int ddebug_add_module(struct _ddebug *tab, unsigned int n,
#if defined(CONFIG_DYNAMIC_DEBUG)
extern int ddebug_remove_module(const char *mod_name);
+extern int ddebug_exec_query(char *query_string);
#define __dynamic_dbg_enabled(dd) ({ \
int __ret = 0; \
@@ -77,6 +78,10 @@ static inline int ddebug_remove_module(const char *mod)
{
return 0;
}
+static inline int ddebug_exec_query(char *query_string)
+{
+ return 0;
+}
#define dynamic_pr_debug(fmt, ...) \
do { if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); } while (0)
diff --git a/kernel/params.c b/kernel/params.c
index 0b30ecd..42f49c5 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -24,6 +24,7 @@
#include <linux/err.h>
#include <linux/slab.h>
#include <linux/ctype.h>
+#include <linux/dynamic_debug.h>
#if 0
#define DEBUGP printk
@@ -132,10 +133,17 @@ int parse_args(const char *name,
unsigned num,
int (*unknown)(char *param, char *val))
{
- char *param, *val;
+ char *param, *val, ddebug[1024];
+ int i;
DEBUGP("Parsing ARGS: %s\n", args);
+ for (i = 0; i < num; i++) {
+ if (parameq("ddebug", params[i].name))
+ pr_warning("Module %s uses reserved keyword *ddebug* as"
+ "parameter which will get ignored\n", name);
+ }
+
/* Chew leading spaces */
args = skip_spaces(args);
@@ -144,6 +152,13 @@ int parse_args(const char *name,
int irq_was_disabled;
args = next_arg(args, ¶m, &val);
+
+ if (parameq(param, "ddebug")) {
+ snprintf(ddebug, 1024, "module %s +p", name);
+ ddebug_exec_query(ddebug);
+ continue;
+ }
+
irq_was_disabled = irqs_disabled();
ret = parse_one(param, val, params, num, unknown);
if (irq_was_disabled && !irqs_disabled()) {
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c
index a687d90..7f8ba5f 100644
--- a/lib/dynamic_debug.c
+++ b/lib/dynamic_debug.c
@@ -429,7 +429,7 @@ static int ddebug_parse_flags(const char *str, unsigned int *flagsp,
return 0;
}
-static int ddebug_exec_query(char *query_string)
+int ddebug_exec_query(char *query_string)
{
unsigned int flags = 0, mask = 0;
struct ddebug_query query;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
