tracing: Have bpf and perf reuse the tracefs TRACE_EVENT macros
Steven Rostedt
maintainercover tracing: Have bpf and perf reuse the tracefs TRACE_EVENT macros
When reviewing Linyu Yuan patches[1] where the change was to move most the macros from perf and bpf into stages, I realized that the macros that makes up perf and bpf events are duplicated from the tracefs macros that were moved into the stages directory. One reason to move them into that directory was to remove duplicate code.
Remove the macros that are duplicated in the bpf and perf code and use stage 6, which is the macros used to build the data needed to record the TRACE_EVENT() TP_fast_assign() into the trace. This will mean they will pick up bug fixes, as well as any enhacements that are added.
[1] https://lore.kernel.org/lkml/[email protected]/
Steven Rostedt (Google) (2):
perf/tracing: Use stage6 of tracing to not duplicate macros bpf/tracing: Use stage6 of tracing to not duplicate macros
----
include/trace/bpf_probe.h | 45 +-------------------------- include/trace/perf.h | 46 +--------------------------- include/trace/stages/stage6_event_callback.h | 3 ++ 3 files changed, 5 insertions(+), 89 deletions(-)
Steven Rostedt
maintainerPATCH 1/2 perf/tracing: Use stage6 of tracing to not duplicate macros
From: "Steven Rostedt (Google)" <[email protected]>
The perf events are created by the same macro magic as tracefs trace events are. But to hook into perf, it has its own code. It duplicates many of the same macros as the tracefs macros and this is an issue because it misses bug fixes as well as any new enhancements that come with the other trace macros.
As the trace macros have been put into their own staging files, have perf take advantage of this and use the tracefs stage 6 macros that the "fast assign" portion of the trace event macro uses.
--- include/trace/perf.h | 46 +------------------- include/trace/stages/stage6_event_callback.h | 3 ++ 2 files changed, 4 insertions(+), 45 deletions(-)
include/trace/perf.h +1 -45
@@ -4,51 +4,7 @@#ifdef CONFIG_PERF_EVENTS -#undef __entry -#define __entry entry - -#undef __get_dynamic_array -#define __get_dynamic_array (field) \ - ((void *)__entry + (__entry->__data_loc_##field & 0xffff)) - -#undef __get_dynamic_array_len -#define __get_dynamic_array_len (field) \ - ((__entry->__data_loc_##field >> 16) & 0xffff) - -#undef __get_str -#define __get_str (field) ((char *)__get_dynamic_array(field)) - -#undef __get_bitmask -#define __get_bitmask (field) (char *)__get_dynamic_array(field) - -#undef __get_cpumask -#define __get_cpumask (field) (char *)__get_dynamic_array(field) - -#undef __get_sockaddr -#define __get_sockaddr (field) ((struct sockaddr *)__get_dynamic_array(field)) - -#undef __get_rel_dynamic_array -#define __get_rel_dynamic_array (field) \ - ((void *)__entry + \ - offsetof(typeof(*__entry), __rel_loc_##field) + \ - sizeof(__entry->__rel_loc_##field) + \ - (__entry->__rel_loc_##field & 0xffff)) - -#undef __get_rel_dynamic_array_len -#define __get_rel_dynamic_array_len (field) \ - ((__entry->__rel_loc_##field >> 16) & 0xffff) - -#undef __get_rel_str -#define __get_rel_str (field) ((char *)__get_rel_dynamic_array(field)) - -#undef __get_rel_bitmask -#define __get_rel_bitmask (field) (char *)__get_rel_dynamic_array(field) - -#undef __get_rel_cpumask -#define __get_rel_cpumask (field) (char *)__get_rel_dynamic_array(field) - -#undef __get_rel_sockaddr -#define __get_rel_sockaddr (field) ((struct sockaddr *)__get_rel_dynamic_array(field)) +#include "stages/stage6_event_callback.h" #undef __perf_count#define __perf_count (c) (__count = (c))
include/trace/stages/stage6_event_callback.h +3 -0
@@ -2,6 +2,9 @@/* Stage 6 definitions for creating trace events */ +/* Reuse some of the stage 3 macros */ +#include "stage3_trace_output.h" +#undef __entry#define __entry entry
Signature · 1 line
2.39.0
Re: [PATCH 1/2] perf/tracing: Use stage6 of tracing to not duplicate macros
Quoted 12 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
The perf events are created by the same macro magic as tracefs trace events are. But to hook into perf, it has its own code. It duplicates many of the same macros as the tracefs macros and this is an issue because it misses bug fixes as well as any new enhancements that come with the other trace macros.
As the trace macros have been put into their own staging files, have perf take advantage of this and use the tracefs stage 6 macros that the "fast assign" portion of the trace event macro uses.
Quoted 8 lines
Cc Frederic Weisbecker <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Ingo Molnar <[email protected]>Reported-by Linyu Yuan <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Steven Rostedt
maintainerPATCH 2/2 bpf/tracing: Use stage6 of tracing to not duplicate macros
In reply to Steven RostedtFrom: "Steven Rostedt (Google)" <[email protected]>
The bpf events are created by the same macro magic as tracefs trace events are. But to hook into bpf, it has its own code. It duplicates many of the same macros as the tracefs macros and this is an issue because it misses bug fixes as well as any new enhancements that come with the other trace macros.
As the trace macros have been put into their own staging files, have bpf take advantage of this and use the tracefs stage 6 macros that the "fast ssign" portion of the trace event macro uses.
--- include/trace/bpf_probe.h | 45 +-------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-)
include/trace/bpf_probe.h +1 -44
@@ -4,50 +4,7 @@#ifdef CONFIG_BPF_EVENTS -#undef __entry -#define __entry entry - -#undef __get_dynamic_array -#define __get_dynamic_array (field) \ - ((void *)__entry + (__entry->__data_loc_##field & 0xffff)) - -#undef __get_dynamic_array_len -#define __get_dynamic_array_len (field) \ - ((__entry->__data_loc_##field >> 16) & 0xffff) - -#undef __get_str -#define __get_str (field) ((char *)__get_dynamic_array(field)) - -#undef __get_bitmask -#define __get_bitmask (field) (char *)__get_dynamic_array(field) - -#undef __get_cpumask -#define __get_cpumask (field) (char *)__get_dynamic_array(field) - -#undef __get_sockaddr -#define __get_sockaddr (field) ((struct sockaddr *)__get_dynamic_array(field)) - -#undef __get_rel_dynamic_array -#define __get_rel_dynamic_array (field) \ - ((void *)(&__entry->__rel_loc_##field) + \ - sizeof(__entry->__rel_loc_##field) + \ - (__entry->__rel_loc_##field & 0xffff)) - -#undef __get_rel_dynamic_array_len -#define __get_rel_dynamic_array_len (field) \ - ((__entry->__rel_loc_##field >> 16) & 0xffff) - -#undef __get_rel_str -#define __get_rel_str (field) ((char *)__get_rel_dynamic_array(field)) - -#undef __get_rel_bitmask -#define __get_rel_bitmask (field) (char *)__get_rel_dynamic_array(field) - -#undef __get_rel_cpumask -#define __get_rel_cpumask (field) (char *)__get_rel_dynamic_array(field) - -#undef __get_rel_sockaddr -#define __get_rel_sockaddr (field) ((struct sockaddr *)__get_rel_dynamic_array(field)) +#include "stages/stage6_event_callback.h" #undef __perf_count#define __perf_count (c) (c)
Signature · 1 line
2.39.0
Re: [PATCH 2/2] bpf/tracing: Use stage6 of tracing to not duplicate macros
Quoted 13 lines · Steven Rostedt
From: "Steven Rostedt (Google)" <[email protected]>
The bpf events are created by the same macro magic as tracefs trace events are. But to hook into bpf, it has its own code. It duplicates many of the same macros as the tracefs macros and this is an issue because it misses bug fixes as well as any new enhancements that come with the other trace macros.
As the trace macros have been put into their own staging files, have bpf take advantage of this and use the tracefs stage 6 macros that the "fast ssign" portion of the trace event macro uses.
Quoted 7 lines
Cc Alexei Starovoitov <[email protected]>Cc Daniel Borkmann <[email protected]>Reported-by Linyu Yuan <[email protected]>Signed-off-by Steven Rostedt (Google) <[email protected]>
Nice cleanup.