Skip to content

Commit de394e7

Browse files
peterz@infradead.orgingomolnar
authored andcommitted
tracepoint: Fix overly long tracepoint names
Stephen Rothwell reported: > Exported symbols need to be <= (64 - sizeof(Elf_Addr)) long. This is > presumably 56 on 64 bit arches and the above symbol (including the '.') > is 56 characters long. Shorten the tracepoint symbol name. Fixes: d25e37d ("tracepoint: Optimize using static_call()") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20200908105743.GW2674@hirez.programming.kicks-ass.net
1 parent 7c9903c commit de394e7

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

include/linux/tracepoint.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
154154
#ifdef CONFIG_HAVE_STATIC_CALL
155155
#define __DO_TRACE_CALL(name) static_call(tp_func_##name)
156156
#else
157-
#define __DO_TRACE_CALL(name) __tracepoint_iter_##name
157+
#define __DO_TRACE_CALL(name) __traceiter_##name
158158
#endif /* CONFIG_HAVE_STATIC_CALL */
159159

160160
/*
@@ -232,8 +232,8 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
232232
* poking RCU a bit.
233233
*/
234234
#define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args) \
235-
extern int __tracepoint_iter_##name(data_proto); \
236-
DECLARE_STATIC_CALL(tp_func_##name, __tracepoint_iter_##name); \
235+
extern int __traceiter_##name(data_proto); \
236+
DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name); \
237237
extern struct tracepoint __tracepoint_##name; \
238238
static inline void trace_##name(proto) \
239239
{ \
@@ -288,19 +288,19 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
288288
static const char __tpstrtab_##_name[] \
289289
__section(__tracepoints_strings) = #_name; \
290290
extern struct static_call_key STATIC_CALL_KEY(tp_func_##_name); \
291-
int __tracepoint_iter_##_name(void *__data, proto); \
291+
int __traceiter_##_name(void *__data, proto); \
292292
struct tracepoint __tracepoint_##_name __used \
293293
__section(__tracepoints) = { \
294294
.name = __tpstrtab_##_name, \
295295
.key = STATIC_KEY_INIT_FALSE, \
296296
.static_call_key = &STATIC_CALL_KEY(tp_func_##_name), \
297297
.static_call_tramp = STATIC_CALL_TRAMP_ADDR(tp_func_##_name), \
298-
.iterator = &__tracepoint_iter_##_name, \
298+
.iterator = &__traceiter_##_name, \
299299
.regfunc = _reg, \
300300
.unregfunc = _unreg, \
301301
.funcs = NULL }; \
302302
__TRACEPOINT_ENTRY(_name); \
303-
int __tracepoint_iter_##_name(void *__data, proto) \
303+
int __traceiter_##_name(void *__data, proto) \
304304
{ \
305305
struct tracepoint_func *it_func_ptr; \
306306
void *it_func; \
@@ -314,18 +314,18 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
314314
} while ((++it_func_ptr)->func); \
315315
return 0; \
316316
} \
317-
DEFINE_STATIC_CALL(tp_func_##_name, __tracepoint_iter_##_name);
317+
DEFINE_STATIC_CALL(tp_func_##_name, __traceiter_##_name);
318318

319319
#define DEFINE_TRACE(name, proto, args) \
320320
DEFINE_TRACE_FN(name, NULL, NULL, PARAMS(proto), PARAMS(args));
321321

322322
#define EXPORT_TRACEPOINT_SYMBOL_GPL(name) \
323323
EXPORT_SYMBOL_GPL(__tracepoint_##name); \
324-
EXPORT_SYMBOL_GPL(__tracepoint_iter_##name); \
324+
EXPORT_SYMBOL_GPL(__traceiter_##name); \
325325
EXPORT_STATIC_CALL_GPL(tp_func_##name)
326326
#define EXPORT_TRACEPOINT_SYMBOL(name) \
327327
EXPORT_SYMBOL(__tracepoint_##name); \
328-
EXPORT_SYMBOL(__tracepoint_iter_##name); \
328+
EXPORT_SYMBOL(__traceiter_##name); \
329329
EXPORT_STATIC_CALL(tp_func_##name)
330330

331331

0 commit comments

Comments
 (0)