diff options
author | Ming Lei <ming.lei@canonical.com> | 2011-09-27 16:53:27 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-27 16:53:27 -0400 |
commit | 53b615ccca567ada1931eb04ad0614ac150c14a3 (patch) | |
tree | f09512d0dabaeff71b9ee66c26ca02cae2947873 | |
parent | ad3c36a534bc7b945d7bffdda1c62e13bf93489a (diff) |
PM / Runtime: Introduce trace points for tracing rpm_* functions
This patch introduces 3 trace points to prepare for tracing
rpm_idle/rpm_suspend/rpm_resume functions, so we can use these
trace points to replace the current dev_dbg().
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | include/trace/events/rpm.h | 99 | ||||
-rw-r--r-- | kernel/trace/Makefile | 1 | ||||
-rw-r--r-- | kernel/trace/rpm-traces.c | 20 |
3 files changed, 120 insertions, 0 deletions
diff --git a/include/trace/events/rpm.h b/include/trace/events/rpm.h new file mode 100644 index 000000000000..d62c558bf64b --- /dev/null +++ b/include/trace/events/rpm.h | |||
@@ -0,0 +1,99 @@ | |||
1 | |||
2 | #undef TRACE_SYSTEM | ||
3 | #define TRACE_SYSTEM rpm | ||
4 | |||
5 | #if !defined(_TRACE_RUNTIME_POWER_H) || defined(TRACE_HEADER_MULTI_READ) | ||
6 | #define _TRACE_RUNTIME_POWER_H | ||
7 | |||
8 | #include <linux/ktime.h> | ||
9 | #include <linux/tracepoint.h> | ||
10 | #include <linux/device.h> | ||
11 | |||
12 | /* | ||
13 | * The rpm_internal events are used for tracing some important | ||
14 | * runtime pm internal functions. | ||
15 | */ | ||
16 | DECLARE_EVENT_CLASS(rpm_internal, | ||
17 | |||
18 | TP_PROTO(struct device *dev, int flags), | ||
19 | |||
20 | TP_ARGS(dev, flags), | ||
21 | |||
22 | TP_STRUCT__entry( | ||
23 | __string( name, dev_name(dev) ) | ||
24 | __field( int, flags ) | ||
25 | __field( int , usage_count ) | ||
26 | __field( int , disable_depth ) | ||
27 | __field( int , runtime_auto ) | ||
28 | __field( int , request_pending ) | ||
29 | __field( int , irq_safe ) | ||
30 | __field( int , child_count ) | ||
31 | ), | ||
32 | |||
33 | TP_fast_assign( | ||
34 | __assign_str(name, dev_name(dev)); | ||
35 | __entry->flags = flags; | ||
36 | __entry->usage_count = atomic_read( | ||
37 | &dev->power.usage_count); | ||
38 | __entry->disable_depth = dev->power.disable_depth; | ||
39 | __entry->runtime_auto = dev->power.runtime_auto; | ||
40 | __entry->request_pending = dev->power.request_pending; | ||
41 | __entry->irq_safe = dev->power.irq_safe; | ||
42 | __entry->child_count = atomic_read( | ||
43 | &dev->power.child_count); | ||
44 | ), | ||
45 | |||
46 | TP_printk("%s flags-%x cnt-%-2d dep-%-2d auto-%-1d p-%-1d" | ||
47 | " irq-%-1d child-%d", | ||
48 | __get_str(name), __entry->flags, | ||
49 | __entry->usage_count, | ||
50 | __entry->disable_depth, | ||
51 | __entry->runtime_auto, | ||
52 | __entry->request_pending, | ||
53 | __entry->irq_safe, | ||
54 | __entry->child_count | ||
55 | ) | ||
56 | ); | ||
57 | DEFINE_EVENT(rpm_internal, rpm_suspend, | ||
58 | |||
59 | TP_PROTO(struct device *dev, int flags), | ||
60 | |||
61 | TP_ARGS(dev, flags) | ||
62 | ); | ||
63 | DEFINE_EVENT(rpm_internal, rpm_resume, | ||
64 | |||
65 | TP_PROTO(struct device *dev, int flags), | ||
66 | |||
67 | TP_ARGS(dev, flags) | ||
68 | ); | ||
69 | DEFINE_EVENT(rpm_internal, rpm_idle, | ||
70 | |||
71 | TP_PROTO(struct device *dev, int flags), | ||
72 | |||
73 | TP_ARGS(dev, flags) | ||
74 | ); | ||
75 | |||
76 | TRACE_EVENT(rpm_return_int, | ||
77 | TP_PROTO(struct device *dev, unsigned long ip, int ret), | ||
78 | TP_ARGS(dev, ip, ret), | ||
79 | |||
80 | TP_STRUCT__entry( | ||
81 | __string( name, dev_name(dev)) | ||
82 | __field( unsigned long, ip ) | ||
83 | __field( int, ret ) | ||
84 | ), | ||
85 | |||
86 | TP_fast_assign( | ||
87 | __assign_str(name, dev_name(dev)); | ||
88 | __entry->ip = ip; | ||
89 | __entry->ret = ret; | ||
90 | ), | ||
91 | |||
92 | TP_printk("%pS:%s ret=%d", (void *)__entry->ip, __get_str(name), | ||
93 | __entry->ret) | ||
94 | ); | ||
95 | |||
96 | #endif /* _TRACE_RUNTIME_POWER_H */ | ||
97 | |||
98 | /* This part must be outside protection */ | ||
99 | #include <trace/define_trace.h> | ||
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 761c510a06c5..56bdab5b3793 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile | |||
@@ -53,6 +53,7 @@ endif | |||
53 | obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o | 53 | obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o |
54 | obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o | 54 | obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o |
55 | obj-$(CONFIG_TRACEPOINTS) += power-traces.o | 55 | obj-$(CONFIG_TRACEPOINTS) += power-traces.o |
56 | obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o | ||
56 | ifeq ($(CONFIG_TRACING),y) | 57 | ifeq ($(CONFIG_TRACING),y) |
57 | obj-$(CONFIG_KGDB_KDB) += trace_kdb.o | 58 | obj-$(CONFIG_KGDB_KDB) += trace_kdb.o |
58 | endif | 59 | endif |
diff --git a/kernel/trace/rpm-traces.c b/kernel/trace/rpm-traces.c new file mode 100644 index 000000000000..4b3b5eaf94d1 --- /dev/null +++ b/kernel/trace/rpm-traces.c | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * Power trace points | ||
3 | * | ||
4 | * Copyright (C) 2009 Ming Lei <ming.lei@canonical.com> | ||
5 | */ | ||
6 | |||
7 | #include <linux/string.h> | ||
8 | #include <linux/types.h> | ||
9 | #include <linux/workqueue.h> | ||
10 | #include <linux/sched.h> | ||
11 | #include <linux/module.h> | ||
12 | #include <linux/usb.h> | ||
13 | |||
14 | #define CREATE_TRACE_POINTS | ||
15 | #include <trace/events/rpm.h> | ||
16 | |||
17 | EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_return_int); | ||
18 | EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_idle); | ||
19 | EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_suspend); | ||
20 | EXPORT_TRACEPOINT_SYMBOL_GPL(rpm_resume); | ||