tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'trace-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

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

Linus Torvalds c041f087 e69be8c2

+16
+16
kernel/trace/trace_events.c
··· 582 582 unregister_trace_sched_wakeup(event_filter_pid_sched_wakeup_probe_pre, tr); 583 583 unregister_trace_sched_wakeup(event_filter_pid_sched_wakeup_probe_post, tr); 584 584 585 + unregister_trace_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_pre, tr); 586 + unregister_trace_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_post, tr); 587 + 588 + unregister_trace_sched_waking(event_filter_pid_sched_wakeup_probe_pre, tr); 589 + unregister_trace_sched_waking(event_filter_pid_sched_wakeup_probe_post, tr); 590 + 585 591 list_for_each_entry(file, &tr->events, list) { 586 592 clear_bit(EVENT_FILE_FL_PID_FILTER_BIT, &file->flags); 587 593 } ··· 1734 1728 register_trace_prio_sched_wakeup(event_filter_pid_sched_wakeup_probe_pre, 1735 1729 tr, INT_MAX); 1736 1730 register_trace_prio_sched_wakeup(event_filter_pid_sched_wakeup_probe_post, 1731 + tr, 0); 1732 + 1733 + register_trace_prio_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_pre, 1734 + tr, INT_MAX); 1735 + register_trace_prio_sched_wakeup_new(event_filter_pid_sched_wakeup_probe_post, 1736 + tr, 0); 1737 + 1738 + register_trace_prio_sched_waking(event_filter_pid_sched_wakeup_probe_pre, 1739 + tr, INT_MAX); 1740 + register_trace_prio_sched_waking(event_filter_pid_sched_wakeup_probe_post, 1737 1741 tr, 0); 1738 1742 } 1739 1743