Skip to content

Commit 1874d3d

Browse files
nickdesaulniersgregkh
authored andcommitted
tracepoint: Mark __tracepoint_string's __used
commit f3751ad upstream. __tracepoint_string's have their string data stored in .rodata, and an address to that data stored in the "__tracepoint_str" section. Functions that refer to those strings refer to the symbol of the address. Compiler optimization can replace those address references with references directly to the string data. If the address doesn't appear to have other uses, then it appears dead to the compiler and is removed. This can break the /tracing/printk_formats sysfs node which iterates the addresses stored in the "__tracepoint_str" section. Like other strings stored in custom sections in this header, mark these __used to inform the compiler that there are other non-obvious users of the address, so they should still be emitted. Link: https://lkml.kernel.org/r/20200730224555.2142154-2-ndesaulniers@google.com Cc: Ingo Molnar <mingo@redhat.com> Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> Cc: stable@vger.kernel.org Fixes: 102c932 ("tracing: Add __tracepoint_string() to export string pointers") Reported-by: Tim Murray <timmurray@google.com> Reported-by: Simon MacMullen <simonmacm@google.com> Suggested-by: Greg Hackmann <ghackmann@google.com> Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent c14d30d commit 1874d3d

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

include/linux/tracepoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
364364
static const char *___tp_str __tracepoint_string = str; \
365365
___tp_str; \
366366
})
367-
#define __tracepoint_string __attribute__((section("__tracepoint_str")))
367+
#define __tracepoint_string __attribute__((section("__tracepoint_str"), used))
368368
#else
369369
/*
370370
* tracepoint_string() is used to save the string address for userspace

0 commit comments

Comments
 (0)