tracing: Fixes for v5.5
Steven Rostedt
maintainerLinus,
Various tracing fixes:
- Fix a function comparison warning for a xen trace event macro
- Fix a double perf_event linking to a trace_uprobe_filter for multiple events
- Fix suspicious RCU warnings in trace event code for using list_for_each_entry_rcu() when the "_rcu" portion wasn't needed.
- Fix a bug in the histogram code when using the same variable
- Fix a NULL pointer dereference when tracefs lockdown enabled and calling trace_set_default_clock()
This v2 version contains:
- A fix to a bug found with the double perf_event linking patch
Please pull the latest trace-v5.5-rc6-2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.5-rc6-2
Tag SHA1: 2a27340359b615a9793b80c85e5506f75065ffd9 Head SHA1: b61387cb732cf283d318b2165c44913525fe545f
Changbin Du (1):
tracing: xen: Ordered comparison of function pointers
Masami Hiramatsu (3):
tracing/uprobe: Fix double perf_event linking on multiprobe uprobe
tracing: trigger: Replace unneeded RCU-list traversals tracing/uprobe: Fix to make trace_uprobe_filter alignment safe
Masami Ichikawa (1):
tracing: Do not set trace clock if tracefs lockdown is in effect
Steven Rostedt (VMware) (1):
tracing: Fix histogram code when expression has same var as value
----
include/trace/events/xen.h | 6 +- kernel/trace/trace.c | 5 ++ kernel/trace/trace_events_hist.c | 63 +++++++++++++++---- kernel/trace/trace_events_trigger.c | 20 ++++-- kernel/trace/trace_kprobe.c | 2 +- kernel/trace/trace_probe.c | 8 ++- kernel/trace/trace_probe.h | 9 ++- kernel/trace/trace_uprobe.c | 121 +++++++++++++++++++++--------------- 8 files changed, 163 insertions(+), 71 deletions(-)
---------------------------
include/trace/events/xen.h +5 -1
@@ -66,7 +66,11 @@ TRACE_EVENT(xen_mc_callback, TP_PROTO(xen_mc_callback_fn_t fn, void *data),TP_ARGS (fn, data),TP_STRUCT__entry ( - __field(xen_mc_callback_fn_t, fn) +/* +* Use field_struct to avoid is_signed_type() +* comparison of a function pointer. +*/ + __field_struct(xen_mc_callback_fn_t, fn)__field (void *,data ) ), TP_fast_assign(
kernel/trace/trace.c +5 -0
@@ -9420,6 +9420,11 @@ __init static int tracing_set_default_clock(void) {/* sched_clock_stable() is determined in late_initcall */ if (!trace_boot_clock && !sched_clock_stable ()) { +if (security_locked_down (LOCKDOWN_TRACEFS )) { +pr_warn ("Can not set tracing clock due to lockdown\n" ); +return -EPERM ; + } +printk (KERN_WARNING "Unstable clock detected, switching default tracing clock to \"global\"\n" "If you want to keep using the local clock, then add:\n"
kernel/trace/trace_events_hist.c +52 -11
170 lines not on this page · raw message
kernel/trace/trace_events_trigger.c +15 -5
@@ -501,7 +501,9 @@ void update_cond_flag(struct trace_event_file *file)struct event_trigger_data *data;bool set_cond = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->filter ||event_command_post_trigger (data->cmd_ops) ||event_command_needs_rec (data->cmd_ops)) { set_cond = true;
@@ -536,7 +538,9 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) {if (test->cmd_ops->trigger_type == data->cmd_ops->trigger_type) { ret = -EEXIST ; goto out;
@@ -581,7 +585,9 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) {if (data->cmd_ops->trigger_type == test->cmd_ops->trigger_type) { unregistered = true;list_del_rcu (&data->list);
@@ -1497,7 +1503,9 @@ int event_enable_register_trigger(char *glob,struct event_trigger_data *test;int ret =0 ; -list_for_each_entry_rcu (test, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (test, &file->triggers, list) { test_enable_data = test->private_data; if (test_enable_data && (test->cmd_ops->trigger_type ==
@@ -1537,7 +1545,9 @@ void event_enable_unregister_trigger(char *glob,struct event_trigger_data *data;bool unregistered = false; -list_for_each_entry_rcu (data, &file->triggers, list) { +lockdep_assert_held (&event_mutex); + +list_for_each_entry (data, &file->triggers, list) { enable_data = data->private_data; if (enable_data && (data->cmd_ops->trigger_type ==
kernel/trace/trace_kprobe.c +1 -1
@@ -290,7 +290,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group,INIT_HLIST_NODE (&tk->rp.kp.hlist);INIT_LIST_HEAD (&tk->rp.kp.list); - ret =trace_probe_init (&tk->tp, event, group); + ret =trace_probe_init (&tk->tp, event, group, false);if (ret <0 ) goto error;
kernel/trace/trace_probe.c +6 -2
@@ -984,15 +984,19 @@ void trace_probe_cleanup(struct trace_probe *tp) }int trace_probe_init (struct trace_probe *tp,const char *event, -const char *group) +const char *group,bool alloc_filter) {struct trace_event_call *call; +size_t size =sizeof (struct trace_probe_event );int ret =0 ;if (!event || !group)return -EINVAL ; - tp->event =kzalloc (sizeof (struct trace_probe_event ),GFP_KERNEL ); +if (alloc_filter) + size +=sizeof (struct trace_uprobe_filter ); + + tp->event =kzalloc (size,GFP_KERNEL );if (!tp->event)return -ENOMEM ;
kernel/trace/trace_probe.h +8 -1
@@ -223,6 +223,12 @@ struct probe_arg {const struct fetch_type *type;/* Type of this argument */ }; +struct trace_uprobe_filter { +rwlock_t rwlock; +int nr_systemwide; +struct list_head perf_events; +}; +/* Event call and class holder */ struct trace_probe_event {unsigned int flags;/* For TP_FLAG_* */
@@ -230,6 +236,7 @@ struct trace_probe_event {struct trace_event_call call;struct list_head files;struct list_head probes; +struct trace_uprobe_filter filter[0 ]; };struct trace_probe {
@@ -322,7 +329,7 @@ static inline bool trace_probe_has_single_file(struct trace_probe *tp) }int trace_probe_init (struct trace_probe *tp,const char *event, -const char *group); +const char *group,bool alloc_filter);void trace_probe_cleanup (struct trace_probe *tp);int trace_probe_append (struct trace_probe *tp,struct trace_probe *to);void trace_probe_unlink (struct trace_probe *tp);
kernel/trace/trace_uprobe.c +71 -50
226 lines not on this page · raw message
The pull request you sent on Thu, 23 Jan 2020 12:43:31 -0500:
The pull request you sent on Thu, 23 Jan 2020 12:43:31 -0500:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.gittrace-v5.5-rc6-2
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/34597c85be987cc731a840fa0c9bb969c92bd986
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker