perf events: Remove CONFIG_EVENT_PROFILE
Subsystems (4)
PATCH 1/1 perf events: Remove CONFIG_EVENT_PROFILE
Quote from Ingo:
| This reminds me - i think we should eliminate CONFIG_EVENT_PROFILE - | it's an unnecessary Kconfig complication. If both PERF_EVENTS and | EVENT_TRACING is enabled we should expose generic tracepoints. | | Nor is it limited to event 'profiling', so it has become a misnomer as | well.
--- include/linux/ftrace_event.h | 2 +- include/linux/perf_event.h | 2 +- include/linux/syscalls.h | 4 ++-- include/trace/ftrace.h | 12 ++++++------ include/trace/syscall.h | 4 ++-- init/Kconfig | 13 ------------- kernel/perf_event.c | 4 ++-- kernel/trace/Makefile | 4 +++- kernel/trace/trace_events_filter.c | 4 ++-- kernel/trace/trace_kprobe.c | 14 +++++++------- kernel/trace/trace_syscalls.c | 4 ++-- 11 files changed, 28 insertions(+), 39 deletions(-)
include/linux/ftrace_event.h +1 -1
@@ -187,7 +187,7 @@ do { \ __trace_printk(ip, fmt, ##args); \ } while (0) -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS struct perf_event ;extern int ftrace_profile_enable (int event_id);extern void ftrace_profile_disable (int event_id);
include/linux/perf_event.h +1 -1
@@ -635,7 +635,7 @@ struct perf_event {struct pid_namespace *ns;u64 id; -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_EVENT_TRACING struct event_filter *filter;#endif
include/linux/syscalls.h +2 -2
@@ -98,7 +98,7 @@ struct perf_event_attr;#define __SC_TEST5 (t5, a5, ...) __SC_TEST(t5); __SC_TEST4(__VA_ARGS__)#define __SC_TEST6 (t6, a6, ...) __SC_TEST(t6); __SC_TEST5(__VA_ARGS__) -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS #define TRACE_SYS_ENTER_PROFILE (sname) \ static int prof_sysenter_enable_##sname(struct ftrace_event_call *unused) \ { \
@@ -135,7 +135,7 @@ static void prof_sysexit_disable_##sname(struct ftrace_event_call *unused) \#define TRACE_SYS_ENTER_PROFILE_INIT (sname)#define TRACE_SYS_EXIT_PROFILE (sname)#define TRACE_SYS_EXIT_PROFILE_INIT (sname) -#endif +#endif /* CONFIG_PERF_EVENTS */ #ifdef CONFIG_FTRACE_SYSCALLS #define __SC_STR_ADECL1 (t, a) #a
include/trace/ftrace.h +6 -6
@@ -378,7 +378,7 @@ static inline int ftrace_get_offsets_##call( \#include TRACE_INCLUDE (TRACE_INCLUDE_FILE ) -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS /* * Generate the functions needed for tracepoint perf_event support.
@@ -414,7 +414,7 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *unused)\#include TRACE_INCLUDE (TRACE_INCLUDE_FILE ) -#endif +#endif /* CONFIG_PERF_EVENTS */ /* * Stage 4 of the trace events.
@@ -519,7 +519,7 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *unused)\#undef TP_FMT #define TP_FMT(fmt, args...) fmt "\n", ##args -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS #define _TRACE_PROFILE_INIT (call) \ .profile_count = ATOMIC_INIT(-1), \
@@ -528,7 +528,7 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *unused)\#else #define _TRACE_PROFILE_INIT (call) -#endif +#endif /* CONFIG_PERF_EVENTS */ #undef __entry#define __entry entry
@@ -699,7 +699,7 @@ __attribute__((section("_ftrace_events"))) event_##call = { \* } */ -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS #undef __perf_addr#define __perf_addr (a) __addr = (a)
@@ -767,7 +767,7 @@ end: \ }#include TRACE_INCLUDE (TRACE_INCLUDE_FILE ) -#endif /* CONFIG_EVENT_PROFILE */ +#endif /* CONFIG_PERF_EVENTS */ #undef _TRACE_PROFILE_INIT
include/trace/syscall.h +2 -2
@@ -55,12 +55,12 @@ ftrace_format_syscall(struct ftrace_event_call *call, struct trace_seq *s);enum print_line_t print_syscall_enter (struct trace_iterator *iter,int flags);enum print_line_t print_syscall_exit (struct trace_iterator *iter,int flags);#endif -#ifdef CONFIG_EVENT_PROFILE + +#ifdef CONFIG_PERF_EVENTS int reg_prof_syscall_enter (char *name);void unreg_prof_syscall_enter (char *name);int reg_prof_syscall_exit (char *name);void unreg_prof_syscall_exit (char *name); -#endif #endif /* _TRACE_SYSCALL_H */
init/Kconfig +0 -13
@@ -965,19 +965,6 @@ config PERF_EVENTS Say Y if unsure. -config EVENT_PROFILE - bool "Tracepoint profiling sources" - depends on PERF_EVENTS && EVENT_TRACING - default y - help - Allow the use of tracepoints as software performance events. - - When this is enabled, you can create perf events based on - tracepoints using PERF_TYPE_TRACEPOINT and the tracepoint ID - found in debugfs://tracing/events/*/*/id. (The -e/--events - option to the perf tool can parse and interpret symbolic - tracepoints, in the subsystem:tracepoint_name format.) - config PERF_COUNTERS bool "Kernel performance counters (old config option)" depends on HAVE_PERF_EVENTS
kernel/perf_event.c +2 -2
@@ -4124,7 +4124,7 @@ static const struct pmu perf_ops_task_clock = { .read = task_clock_perf_event_read, }; -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_EVENT_TRACING void perf_tp_event (int event_id,u64 addr,u64 count,void *record,int entry_size)
@@ -4228,7 +4228,7 @@ static void perf_event_free_filter(struct perf_event *event) { } -#endif /* CONFIG_EVENT_PROFILE */ +#endif /* CONFIG_EVENT_TRACING */ atomic_t perf_swevent_enabled[PERF_COUNT_SW_MAX ];
kernel/trace/Makefile +3 -1
@@ -51,7 +51,9 @@ endif obj-$(CONFIG_EVENT_TRACING) += trace_events.o obj-$(CONFIG_EVENT_TRACING) += trace_export.o obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o -obj-$(CONFIG_EVENT_PROFILE) += trace_event_profile.o +ifeq ($(CONFIG_PERF_EVENTS),y) +obj-$(CONFIG_EVENT_TRACING) += trace_event_profile.o +endif obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o obj-$(CONFIG_KPROBE_TRACER) += trace_kprobe.o obj-$(CONFIG_EVENT_TRACING) += power-traces.o
kernel/trace/trace_events_filter.c +2 -2
@@ -1360,7 +1360,7 @@ out_unlock:return err; } -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS void ftrace_profile_free_filter (struct perf_event *event) {
@@ -1428,5 +1428,5 @@ out_unlock: return err; } -#endif /* CONFIG_EVENT_PROFILE */ +#endif /* CONFIG_PERF_EVENTS */
kernel/trace/trace_kprobe.c +7 -7
@@ -1199,7 +1199,7 @@ static int kretprobe_event_show_format(struct ftrace_event_call *call, ", REC->" FIELD_STRING_RETIP); } -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS /* Kprobe profile handler */ static __kprobes int kprobe_profile_func(struct kprobe *kp,
@@ -1333,7 +1333,7 @@ static void probe_profile_disable(struct ftrace_event_call *call) disable_kprobe(&tp->rp.kp); } } -#endif /* CONFIG_EVENT_PROFILE */ +#endif /* CONFIG_PERF_EVENTS */ static __kprobes
@@ -1343,10 +1343,10 @@ int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs)if (tp->flags &TP_FLAG_TRACE )kprobe_trace_func (kp, regs); -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS if (tp->flags &TP_FLAG_PROFILE )kprobe_profile_func (kp, regs); -#endif /* CONFIG_EVENT_PROFILE */ +#endif return 0 ;/* We don't tweek kernel, so just return 0 */ }
@@ -1357,10 +1357,10 @@ int kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs)if (tp->flags &TP_FLAG_TRACE )kretprobe_trace_func (ri, regs); -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS if (tp->flags &TP_FLAG_PROFILE )kretprobe_profile_func (ri, regs); -#endif /* CONFIG_EVENT_PROFILE */ +#endif return 0 ;/* We don't tweek kernel, so just return 0 */ }
@@ -1389,7 +1389,7 @@ static int register_probe_event(struct trace_probe *tp) call->regfunc = probe_event_enable; call->unregfunc = probe_event_disable; -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS atomic_set (&call->profile_count,-1 ); call->profile_enable = probe_profile_enable; call->profile_disable = probe_profile_disable;
kernel/trace/trace_syscalls.c +2 -2
@@ -467,7 +467,7 @@ int __init init_ftrace_syscalls(void) }core_initcall (init_ftrace_syscalls); -#ifdef CONFIG_EVENT_PROFILE +#ifdef CONFIG_PERF_EVENTS static DECLARE_BITMAP(enabled_prof_enter_syscalls, NR_syscalls); static DECLARE_BITMAP(enabled_prof_exit_syscalls, NR_syscalls);
@@ -669,6 +669,6 @@ void unreg_prof_syscall_exit(char *name) mutex_unlock(&syscall_trace_lock); } -#endif +#endif /* CONFIG_PERF_EVENTS */
Signature · 1 line
1.6.3
Quoted 10 lines · Li Zefan
Quote from Ingo:
| This reminds me - i think we should eliminate CONFIG_EVENT_PROFILE - | it's an unnecessary Kconfig complication. If both PERF_EVENTS and | EVENT_TRACING is enabled we should expose generic tracepoints. | | Nor is it limited to event 'profiling', so it has become a misnomer as | well.Signed-off-by Li Zefan <[email protected]>
Quoted 13 lines
--- include/linux/ftrace_event.h | 2 +- include/linux/perf_event.h | 2 +- include/linux/syscalls.h | 4 ++-- include/trace/ftrace.h | 12 ++++++------ include/trace/syscall.h | 4 ++-- init/Kconfig | 13 ------------- kernel/perf_event.c | 4 ++-- kernel/trace/Makefile | 4 +++- kernel/trace/trace_events_filter.c | 4 ++-- kernel/trace/trace_kprobe.c | 14 +++++++------- kernel/trace/trace_syscalls.c | 4 ++-- 11 files changed, 28 insertions(+), 39 deletions(-)
Thanks!
There's a logistical complication: this rename couples the pending perf tree with the pending tracing tree and that makes dependencies a bit awkward.
Would you mind to resend this patch in the merge window, to be merged soon after both the perf events and the tracing tree went uptream?
The rename/elimination itself looks fine and simple and shouldnt break anything, so we dont need to have it in the tracing and perf trees for long.
Ingo
Quoted 11 lines
There's a logistical complication: this rename couples the pending perf tree with the pending tracing tree and that makes dependencies a bit awkward.
Would you mind to resend this patch in the merge window, to be merged soon after both the perf events and the tracing tree went uptream?
The rename/elimination itself looks fine and simple and shouldnt break anything, so we dont need to have it in the tracing and perf trees for long.
Sure, I'll keep the patch for now.
Quoted 8 lines · Li Zefan
Quoted 8 lines
There's a logistical complication: this rename couples the pending perf tree with the pending tracing tree and that makes dependencies a bit awkward.
Would you mind to resend this patch in the merge window, to be merged soon after both the perf events and the tracing tree went uptream?
Quoted 6 lines
Quoted 4 lines
The rename/elimination itself looks fine and simple and shouldnt break anything, so we dont need to have it in the tracing and perf trees for long.
Sure, I'll keep the patch for now.
Thanks!
Ingo