diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2009-08-17 04:56:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-17 05:25:08 -0400 |
commit | 7ead8b8313d92b3a69a1a61b0dcbc4cd66c960dc (patch) | |
tree | 614759ec1b24ea9f6d1409b866c80df0611e5d6b /kernel | |
parent | 60d970c254b95ec7a0fc4c590b510253987b64a0 (diff) |
tracing/events: Add module tracepoints
Add trace points to trace module_load, module_free, module_get,
module_put and module_request, and use trace_event facility to
get the trace output.
Here's the sample output:
TASK-PID CPU# TIMESTAMP FUNCTION
| | | | |
<...>-42 [000] 1.758380: module_request: fb0 wait=1 call_site=fb_open
...
<...>-60 [000] 3.269403: module_load: scsi_wait_scan
<...>-60 [000] 3.269432: module_put: scsi_wait_scan call_site=sys_init_module refcnt=0
<...>-61 [001] 3.273168: module_free: scsi_wait_scan
...
<...>-1021 [000] 13.836081: module_load: sunrpc
<...>-1021 [000] 13.840589: module_put: sunrpc call_site=sys_init_module refcnt=-1
<...>-1027 [000] 13.848098: module_get: sunrpc call_site=try_module_get refcnt=0
<...>-1027 [000] 13.848308: module_get: sunrpc call_site=get_filesystem refcnt=1
<...>-1027 [000] 13.848692: module_put: sunrpc call_site=put_filesystem refcnt=0
...
modprobe-2587 [001] 1088.437213: module_load: trace_events_sample F
modprobe-2587 [001] 1088.437786: module_put: trace_events_sample call_site=sys_init_module refcnt=0
Note:
- the taints flag can be 'F', 'C' and/or 'P' if mod->taints != 0
- the module refcnt is percpu, so it can be negative in a
specific cpu
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <4A891B3C.5030608@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/kmod.c | 4 | ||||
-rw-r--r-- | kernel/module.c | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/kernel/kmod.c b/kernel/kmod.c index 385c31a1bdbf..a92280870e30 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c | |||
@@ -37,6 +37,8 @@ | |||
37 | #include <linux/suspend.h> | 37 | #include <linux/suspend.h> |
38 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
39 | 39 | ||
40 | #include <trace/events/module.h> | ||
41 | |||
40 | extern int max_threads; | 42 | extern int max_threads; |
41 | 43 | ||
42 | static struct workqueue_struct *khelper_wq; | 44 | static struct workqueue_struct *khelper_wq; |
@@ -108,6 +110,8 @@ int __request_module(bool wait, const char *fmt, ...) | |||
108 | return -ENOMEM; | 110 | return -ENOMEM; |
109 | } | 111 | } |
110 | 112 | ||
113 | trace_module_request(module_name, wait, _RET_IP_); | ||
114 | |||
111 | ret = call_usermodehelper(modprobe_path, argv, envp, | 115 | ret = call_usermodehelper(modprobe_path, argv, envp, |
112 | wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC); | 116 | wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC); |
113 | atomic_dec(&kmod_concurrent); | 117 | atomic_dec(&kmod_concurrent); |
diff --git a/kernel/module.c b/kernel/module.c index fd1411403558..b1821438694e 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
@@ -55,6 +55,11 @@ | |||
55 | #include <linux/percpu.h> | 55 | #include <linux/percpu.h> |
56 | #include <linux/kmemleak.h> | 56 | #include <linux/kmemleak.h> |
57 | 57 | ||
58 | #define CREATE_TRACE_POINTS | ||
59 | #include <trace/events/module.h> | ||
60 | |||
61 | EXPORT_TRACEPOINT_SYMBOL(module_get); | ||
62 | |||
58 | #if 0 | 63 | #if 0 |
59 | #define DEBUGP printk | 64 | #define DEBUGP printk |
60 | #else | 65 | #else |
@@ -940,6 +945,8 @@ void module_put(struct module *module) | |||
940 | if (module) { | 945 | if (module) { |
941 | unsigned int cpu = get_cpu(); | 946 | unsigned int cpu = get_cpu(); |
942 | local_dec(__module_ref_addr(module, cpu)); | 947 | local_dec(__module_ref_addr(module, cpu)); |
948 | trace_module_put(module, _RET_IP_, | ||
949 | local_read(__module_ref_addr(module, cpu))); | ||
943 | /* Maybe they're waiting for us to drop reference? */ | 950 | /* Maybe they're waiting for us to drop reference? */ |
944 | if (unlikely(!module_is_live(module))) | 951 | if (unlikely(!module_is_live(module))) |
945 | wake_up_process(module->waiter); | 952 | wake_up_process(module->waiter); |
@@ -1491,6 +1498,8 @@ static int __unlink_module(void *_mod) | |||
1491 | /* Free a module, remove from lists, etc (must hold module_mutex). */ | 1498 | /* Free a module, remove from lists, etc (must hold module_mutex). */ |
1492 | static void free_module(struct module *mod) | 1499 | static void free_module(struct module *mod) |
1493 | { | 1500 | { |
1501 | trace_module_free(mod); | ||
1502 | |||
1494 | /* Delete from various lists */ | 1503 | /* Delete from various lists */ |
1495 | stop_machine(__unlink_module, mod, NULL); | 1504 | stop_machine(__unlink_module, mod, NULL); |
1496 | remove_notes_attrs(mod); | 1505 | remove_notes_attrs(mod); |
@@ -2358,6 +2367,8 @@ static noinline struct module *load_module(void __user *umod, | |||
2358 | /* Get rid of temporary copy */ | 2367 | /* Get rid of temporary copy */ |
2359 | vfree(hdr); | 2368 | vfree(hdr); |
2360 | 2369 | ||
2370 | trace_module_load(mod); | ||
2371 | |||
2361 | /* Done! */ | 2372 | /* Done! */ |
2362 | return mod; | 2373 | return mod; |
2363 | 2374 | ||