Merge tag 'trace-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace (c041f087) · Commits · 戴 / test

Pull tracing fix from Steven Rostedt: "During the merge window I added a new file that is used to filter trace events on pids. It filters all events where only tasks with their pid in that file exists. It also handles the sched_switch and sched_wakeup trace events where the current task does not have its pid in the file, but the task either being switched to or awaken does. Unfortunately, I forgot about sched_wakeup_new and sched_waking. Both of these tracepoints use the same class as the sched_wakeup tracepoint, and they too should be included in what gets filtered by the set_event_pid file" * tag 'trace-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: tracing: Add sched_wakeup_new and sched_waking tracepoints for pid filter

kernel/trace/trace_events.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -582,6 +582,12 @@ static void __ftrace_clear_event_pids(struct trace_array *tr)
		unregister_trace_sched_wakeup(event_filter_pid_sched_wakeup_probe_pre, tr);
		unregister_trace_sched_wakeup(event_filter_pid_sched_wakeup_probe_post, tr);

		unregister_trace_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_pre, tr);
		unregister_trace_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_post, tr);

		unregister_trace_sched_waking(event_filter_pid_sched_wakeup_probe_pre, tr);
		unregister_trace_sched_waking(event_filter_pid_sched_wakeup_probe_post, tr);

		list_for_each_entry(file, &tr->events, list) {
		clear_bit(EVENT_FILE_FL_PID_FILTER_BIT, &file->flags);
		}
		@@ -1729,6 +1735,16 @@ ftrace_event_pid_write(struct file filp, const char __user ubuf,
		tr, INT_MAX);
		register_trace_prio_sched_wakeup(event_filter_pid_sched_wakeup_probe_post,
		tr, 0);

		register_trace_prio_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_pre,
		tr, INT_MAX);
		register_trace_prio_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_post,
		tr, 0);

		register_trace_prio_sched_waking(event_filter_pid_sched_wakeup_probe_pre,
		tr, INT_MAX);
		register_trace_prio_sched_waking(event_filter_pid_sched_wakeup_probe_post,
		tr, 0);
		}

		/*

Admin message