1 files changed, 38 insertions, 19 deletions
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
index c5bb39c7a770..757005458366 100644
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
@@ -24,8 +24,12 @@ struct tracepoint {
        const char *name;               /* Tracepoint name */
        int state;                      /* State. */
        void **funcs;
-} __attribute__((aligned(8)));
+} __attribute__((aligned(32)));         /*
+                                         * Aligned on 32 bytes because it is
+                                         * globally visible and gcc happily
+                                         * align these on the structure size.
+                                         * Keep in sync with vmlinux.lds.h.
+                                         */
 #define TPPROTO(args...)        args
 #define TPARGS(args...)         args
@@ -40,14 +44,14 @@ struct tracepoint {
        do {                                                            \
                void **it_func;                                         \
                                                                        \
-                rcu_read_lock_sched();                                  \
+                rcu_read_lock_sched_notrace();                          \
                it_func = rcu_dereference((tp)->funcs);                 \
                if (it_func) {                                          \
                        do {                                            \
                                ((void(*)(proto))(*it_func))(args);     \
                        } while (*(++it_func));                         \
                }                                                       \
-                rcu_read_unlock_sched();                                \
+                rcu_read_unlock_sched_notrace();                        \
        } while (0)
 /*
@@ -55,35 +59,40 @@ struct tracepoint {
 * not add unwanted padding between the beginning of the section and the
 * structure. Force alignment to the same alignment as the section start.
 */
-#define DEFINE_TRACE(name, proto, args)                                 \
+#define DECLARE_TRACE(name, proto, args)                                \
+        extern struct tracepoint __tracepoint_##name;                   \
        static inline void trace_##name(proto)                          \
        {                                                               \
-                static const char __tpstrtab_##name[]                   \
-                __attribute__((section("__tracepoints_strings")))       \
-                = #name ":" #proto;                                     \
-                static struct tracepoint __tracepoint_##name            \
-                __attribute__((section("__tracepoints"), aligned(8))) = \
-                { __tpstrtab_##name, 0, NULL };                         \
                if (unlikely(__tracepoint_##name.state))                \
                        __DO_TRACE(&__tracepoint_##name,                \
                                TPPROTO(proto), TPARGS(args));          \
        }                                                               \
        static inline int register_trace_##name(void (*probe)(proto))   \
        {                                                               \
-                return tracepoint_probe_register(#name ":" #proto,      \
+                return tracepoint_probe_register(#name, (void *)probe); \
-                        (void *)probe);                                 \
        }                                                               \
-        static inline void unregister_trace_##name(void (*probe)(proto))\
+        static inline int unregister_trace_##name(void (*probe)(proto)) \
        {                                                               \
-                tracepoint_probe_unregister(#name ":" #proto,           \
+                return tracepoint_probe_unregister(#name, (void *)probe);\
-                        (void *)probe);                                 \
        }
+#define DEFINE_TRACE(name)                                              \
+        static const char __tpstrtab_##name[]                           \
+        __attribute__((section("__tracepoints_strings"))) = #name;      \
+        struct tracepoint __tracepoint_##name                           \
+        __attribute__((section("__tracepoints"), aligned(32))) =        \
+                { __tpstrtab_##name, 0, NULL }
+#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)                              \
+        EXPORT_SYMBOL_GPL(__tracepoint_##name)
+#define EXPORT_TRACEPOINT_SYMBOL(name)                                  \
+        EXPORT_SYMBOL(__tracepoint_##name)
 extern void tracepoint_update_probe_range(struct tracepoint *begin,
        struct tracepoint *end);
 #else /* !CONFIG_TRACEPOINTS */
-#define DEFINE_TRACE(name, proto, args)                 \
+#define DECLARE_TRACE(name, proto, args)                                \
        static inline void _do_trace_##name(struct tracepoint *tp, proto) \
        { }                                                             \
        static inline void trace_##name(proto)                          \
@@ -92,8 +101,14 @@ extern void tracepoint_update_probe_range(struct tracepoint *begin,
        {                                                               \
                return -ENOSYS;                                         \
        }                                                               \
-        static inline void unregister_trace_##name(void (*probe)(proto))\
+        static inline int unregister_trace_##name(void (*probe)(proto)) \
-        { }
+        {                                                               \
+                return -ENOSYS;                                         \
+        }
+#define DEFINE_TRACE(name)
+#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
+#define EXPORT_TRACEPOINT_SYMBOL(name)
 static inline void tracepoint_update_probe_range(struct tracepoint *begin,
        struct tracepoint *end)
@@ -112,6 +127,10 @@ extern int tracepoint_probe_register(const char *name, void *probe);
 */
 extern int tracepoint_probe_unregister(const char *name, void *probe);
+extern int tracepoint_probe_register_noupdate(const char *name, void *probe);
+extern int tracepoint_probe_unregister_noupdate(const char *name, void *probe);
+extern void tracepoint_probe_update_all(void);
 struct tracepoint_iter {
        struct module *module;
        struct tracepoint *tracepoint;

diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index c5bb39c7a770..757005458366 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h
@@ -24,8 +24,12 @@ struct tracepoint {
24	const char name; / Tracepoint name */	24	const char name; / Tracepoint name */
25	int state; /* State. */	25	int state; /* State. */
26	void **funcs;	26	void **funcs;
27	} __attribute__((aligned(8)));	27	} __attribute__((aligned(32))); /*
28		28	* Aligned on 32 bytes because it is
		29	* globally visible and gcc happily
		30	* align these on the structure size.
		31	* Keep in sync with vmlinux.lds.h.
		32	*/
29		33
30	#define TPPROTO(args...) args	34	#define TPPROTO(args...) args
31	#define TPARGS(args...) args	35	#define TPARGS(args...) args
@@ -40,14 +44,14 @@ struct tracepoint {
40	do { \	44	do { \
41	void **it_func; \	45	void **it_func; \
42	\	46	\
43	rcu_read_lock_sched(); \	47	rcu_read_lock_sched_notrace(); \
44	it_func = rcu_dereference((tp)->funcs); \	48	it_func = rcu_dereference((tp)->funcs); \
45	if (it_func) { \	49	if (it_func) { \
46	do { \	50	do { \
47	((void()(proto))(it_func))(args); \	51	((void()(proto))(it_func))(args); \
48	} while (*(++it_func)); \	52	} while (*(++it_func)); \
49	} \	53	} \
50	rcu_read_unlock_sched(); \	54	rcu_read_unlock_sched_notrace(); \
51	} while (0)	55	} while (0)
52		56
53	/*	57	/*
@@ -55,35 +59,40 @@ struct tracepoint {
55	* not add unwanted padding between the beginning of the section and the	59	* not add unwanted padding between the beginning of the section and the
56	* structure. Force alignment to the same alignment as the section start.	60	* structure. Force alignment to the same alignment as the section start.
57	*/	61	*/
58	#define DEFINE_TRACE(name, proto, args) \	62	#define DECLARE_TRACE(name, proto, args) \
		63	extern struct tracepoint __tracepoint_##name; \
59	static inline void trace_##name(proto) \	64	static inline void trace_##name(proto) \
60	{ \	65	{ \
61	static const char __tpstrtab_##name[] \
62	__attribute__((section("__tracepoints_strings"))) \
63	= #name ":" #proto; \
64	static struct tracepoint __tracepoint_##name \
65	__attribute__((section("__tracepoints"), aligned(8))) = \
66	{ __tpstrtab_##name, 0, NULL }; \
67	if (unlikely(__tracepoint_##name.state)) \	66	if (unlikely(__tracepoint_##name.state)) \
68	__DO_TRACE(&__tracepoint_##name, \	67	__DO_TRACE(&__tracepoint_##name, \
69	TPPROTO(proto), TPARGS(args)); \	68	TPPROTO(proto), TPARGS(args)); \
70	} \	69	} \
71	static inline int register_trace_##name(void (*probe)(proto)) \	70	static inline int register_trace_##name(void (*probe)(proto)) \
72	{ \	71	{ \
73	return tracepoint_probe_register(#name ":" #proto, \	72	return tracepoint_probe_register(#name, (void *)probe); \
74	(void *)probe); \
75	} \	73	} \
76	static inline void unregister_trace_##name(void (*probe)(proto))\	74	static inline int unregister_trace_##name(void (*probe)(proto)) \
77	{ \	75	{ \
78	tracepoint_probe_unregister(#name ":" #proto, \	76	return tracepoint_probe_unregister(#name, (void *)probe);\
79	(void *)probe); \
80	}	77	}
81		78
		79	#define DEFINE_TRACE(name) \
		80	static const char __tpstrtab_##name[] \
		81	__attribute__((section("__tracepoints_strings"))) = #name; \
		82	struct tracepoint __tracepoint_##name \
		83	__attribute__((section("__tracepoints"), aligned(32))) = \
		84	{ __tpstrtab_##name, 0, NULL }
		85
		86	#define EXPORT_TRACEPOINT_SYMBOL_GPL(name) \
		87	EXPORT_SYMBOL_GPL(__tracepoint_##name)
		88	#define EXPORT_TRACEPOINT_SYMBOL(name) \
		89	EXPORT_SYMBOL(__tracepoint_##name)
		90
82	extern void tracepoint_update_probe_range(struct tracepoint *begin,	91	extern void tracepoint_update_probe_range(struct tracepoint *begin,
83	struct tracepoint *end);	92	struct tracepoint *end);
84		93
85	#else /* !CONFIG_TRACEPOINTS */	94	#else /* !CONFIG_TRACEPOINTS */
86	#define DEFINE_TRACE(name, proto, args) \	95	#define DECLARE_TRACE(name, proto, args) \
87	static inline void _do_trace_##name(struct tracepoint *tp, proto) \	96	static inline void _do_trace_##name(struct tracepoint *tp, proto) \
88	{ } \	97	{ } \
89	static inline void trace_##name(proto) \	98	static inline void trace_##name(proto) \
@@ -92,8 +101,14 @@ extern void tracepoint_update_probe_range(struct tracepoint *begin,
92	{ \	101	{ \
93	return -ENOSYS; \	102	return -ENOSYS; \
94	} \	103	} \
95	static inline void unregister_trace_##name(void (*probe)(proto))\	104	static inline int unregister_trace_##name(void (*probe)(proto)) \
96	{ }	105	{ \
		106	return -ENOSYS; \
		107	}
		108
		109	#define DEFINE_TRACE(name)
		110	#define EXPORT_TRACEPOINT_SYMBOL_GPL(name)
		111	#define EXPORT_TRACEPOINT_SYMBOL(name)
97		112
98	static inline void tracepoint_update_probe_range(struct tracepoint *begin,	113	static inline void tracepoint_update_probe_range(struct tracepoint *begin,
99	struct tracepoint *end)	114	struct tracepoint *end)
@@ -112,6 +127,10 @@ extern int tracepoint_probe_register(const char name, void probe);
112	*/	127	*/
113	extern int tracepoint_probe_unregister(const char name, void probe);	128	extern int tracepoint_probe_unregister(const char name, void probe);
114		129
		130	extern int tracepoint_probe_register_noupdate(const char name, void probe);
		131	extern int tracepoint_probe_unregister_noupdate(const char name, void probe);
		132	extern void tracepoint_probe_update_all(void);
		133
115	struct tracepoint_iter {	134	struct tracepoint_iter {
116	struct module *module;	135	struct module *module;
117	struct tracepoint *tracepoint;	136	struct tracepoint *tracepoint;