summaryrefslogtreecommitdiffstats
path: root/include/linux/tracepoint.h
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>2014-04-08 17:26:21 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-04-08 20:43:28 -0400
commitde7b2973903c6cc50b31ee5682a69b2219b9919d (patch)
treea5b9d78102854b0073f5893cafb29920f8fb55e1 /include/linux/tracepoint.h
parent68114e5eb862ad0a7a261b91497281b026102715 (diff)
tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints
Register/unregister tracepoint probes with struct tracepoint pointer rather than tracepoint name. This change, which vastly simplifies tracepoint.c, has been proposed by Steven Rostedt. It also removes 8.8kB (mostly of text) to the vmlinux size. From this point on, the tracers need to pass a struct tracepoint pointer to probe register/unregister. A probe can now only be connected to a tracepoint that exists. Moreover, tracers are responsible for unregistering the probe before the module containing its associated tracepoint is unloaded. text data bss dec hex filename 10443444 4282528 10391552 25117524 17f4354 vmlinux.orig 10434930 4282848 10391552 25109330 17f2352 vmlinux Link: http://lkml.kernel.org/r/1396992381-23785-2-git-send-email-mathieu.desnoyers@efficios.com CC: Ingo Molnar <mingo@kernel.org> CC: Frederic Weisbecker <fweisbec@gmail.com> CC: Andrew Morton <akpm@linux-foundation.org> CC: Frank Ch. Eigler <fche@redhat.com> CC: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> [ SDR - fixed return val in void func in tracepoint_module_going() ] Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/linux/tracepoint.h')
-rw-r--r--include/linux/tracepoint.h41
1 files changed, 25 insertions, 16 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index 812b2553dfd8..08150e265761 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -6,7 +6,7 @@
6 * 6 *
7 * See Documentation/trace/tracepoints.txt. 7 * See Documentation/trace/tracepoints.txt.
8 * 8 *
9 * (C) Copyright 2008 Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> 9 * Copyright (C) 2008-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
10 * 10 *
11 * Heavily inspired from the Linux Kernel Markers. 11 * Heavily inspired from the Linux Kernel Markers.
12 * 12 *
@@ -21,6 +21,7 @@
21 21
22struct module; 22struct module;
23struct tracepoint; 23struct tracepoint;
24struct notifier_block;
24 25
25struct tracepoint_func { 26struct tracepoint_func {
26 void *func; 27 void *func;
@@ -35,18 +36,13 @@ struct tracepoint {
35 struct tracepoint_func __rcu *funcs; 36 struct tracepoint_func __rcu *funcs;
36}; 37};
37 38
38/*
39 * Connect a probe to a tracepoint.
40 * Internal API, should not be used directly.
41 */
42extern int tracepoint_probe_register(const char *name, void *probe, void *data);
43
44/*
45 * Disconnect a probe from a tracepoint.
46 * Internal API, should not be used directly.
47 */
48extern int 39extern int
49tracepoint_probe_unregister(const char *name, void *probe, void *data); 40tracepoint_probe_register(struct tracepoint *tp, void *probe, void *data);
41extern int
42tracepoint_probe_unregister(struct tracepoint *tp, void *probe, void *data);
43extern void
44for_each_kernel_tracepoint(void (*fct)(struct tracepoint *tp, void *priv),
45 void *priv);
50 46
51#ifdef CONFIG_MODULES 47#ifdef CONFIG_MODULES
52struct tp_module { 48struct tp_module {
@@ -54,12 +50,25 @@ struct tp_module {
54 unsigned int num_tracepoints; 50 unsigned int num_tracepoints;
55 struct tracepoint * const *tracepoints_ptrs; 51 struct tracepoint * const *tracepoints_ptrs;
56}; 52};
53
57bool trace_module_has_bad_taint(struct module *mod); 54bool trace_module_has_bad_taint(struct module *mod);
55extern int register_tracepoint_module_notifier(struct notifier_block *nb);
56extern int unregister_tracepoint_module_notifier(struct notifier_block *nb);
58#else 57#else
59static inline bool trace_module_has_bad_taint(struct module *mod) 58static inline bool trace_module_has_bad_taint(struct module *mod)
60{ 59{
61 return false; 60 return false;
62} 61}
62static inline
63int register_tracepoint_module_notifier(struct notifier_block *nb)
64{
65 return 0;
66}
67static inline
68int unregister_tracepoint_module_notifier(struct notifier_block *nb)
69{
70 return 0;
71}
63#endif /* CONFIG_MODULES */ 72#endif /* CONFIG_MODULES */
64 73
65/* 74/*
@@ -160,14 +169,14 @@ static inline void tracepoint_synchronize_unregister(void)
160 static inline int \ 169 static inline int \
161 register_trace_##name(void (*probe)(data_proto), void *data) \ 170 register_trace_##name(void (*probe)(data_proto), void *data) \
162 { \ 171 { \
163 return tracepoint_probe_register(#name, (void *)probe, \ 172 return tracepoint_probe_register(&__tracepoint_##name, \
164 data); \ 173 (void *)probe, data); \
165 } \ 174 } \
166 static inline int \ 175 static inline int \
167 unregister_trace_##name(void (*probe)(data_proto), void *data) \ 176 unregister_trace_##name(void (*probe)(data_proto), void *data) \
168 { \ 177 { \
169 return tracepoint_probe_unregister(#name, (void *)probe, \ 178 return tracepoint_probe_unregister(&__tracepoint_##name,\
170 data); \ 179 (void *)probe, data); \
171 } \ 180 } \
172 static inline void \ 181 static inline void \
173 check_trace_callback_type_##name(void (*cb)(data_proto)) \ 182 check_trace_callback_type_##name(void (*cb)(data_proto)) \