Commit 34597c85 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-v5.5-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace 

Pull tracing fixes from Steven Rostedt:
 "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()

   - A fix to a bug found with the double perf_event linking patch"

* tag 'trace-v5.5-rc6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/uprobe: Fix to make trace_uprobe_filter alignment safe
  tracing: Do not set trace clock if tracefs lockdown is in effect
  tracing: Fix histogram code when expression has same var as value
  tracing: trigger: Replace unneeded RCU-list traversals
  tracing/uprobe: Fix double perf_event linking on multiprobe uprobe
  tracing: xen: Ordered comparison of function pointers
parents fa0a4e3b b61387cb

include/trace/events/xen.h

+5 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ struct hist_field { 
	struct ftrace_event_field	*field;

	unsigned long			flags;

	hist_field_fn_t			fn;

	unsigned int			ref;

	unsigned int			size;

	unsigned int			offset;

	unsigned int                    is_signed;
@@ -1766,11 +1767,13 @@ static struct hist_field *find_var(struct hist_trigger_data *hist_data, 
	struct event_trigger_data *test;

	struct hist_field *hist_field;



	lockdep_assert_held(&event_mutex);



	hist_field = find_var_field(hist_data, var_name);

	if (hist_field)

		return hist_field;



	list_for_each_entry_rcu(test, &file->triggers, list) {

	list_for_each_entry(test, &file->triggers, list) {

		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {

			test_data = test->private_data;

			hist_field = find_var_field(test_data, var_name);
@@ -1820,7 +1823,9 @@ static struct hist_field *find_file_var(struct trace_event_file *file, 
	struct event_trigger_data *test;

	struct hist_field *hist_field;



	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 == ETT_EVENT_HIST) {

			test_data = test->private_data;

			hist_field = find_var_field(test_data, var_name);
@@ -2423,8 +2428,16 @@ static int contains_operator(char *str) 
	return field_op;

}



static void get_hist_field(struct hist_field *hist_field)

{

	hist_field->ref++;

}



static void __destroy_hist_field(struct hist_field *hist_field)

{

	if (--hist_field->ref > 1)

		return;



	kfree(hist_field->var.name);

	kfree(hist_field->name);

	kfree(hist_field->type);
@@ -2466,6 +2479,8 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, 
	if (!hist_field)

		return NULL;



	hist_field->ref = 1;



	hist_field->hist_data = hist_data;



	if (flags & HIST_FIELD_FL_EXPR || flags & HIST_FIELD_FL_ALIAS)
@@ -2661,6 +2676,17 @@ static struct hist_field *create_var_ref(struct hist_trigger_data *hist_data, 
{

	unsigned long flags = HIST_FIELD_FL_VAR_REF;

	struct hist_field *ref_field;

	int i;



	/* Check if the variable already exists */

	for (i = 0; i < hist_data->n_var_refs; i++) {

		ref_field = hist_data->var_refs[i];

		if (ref_field->var.idx == var_field->var.idx &&

		    ref_field->var.hist_data == var_field->hist_data) {

			get_hist_field(ref_field);

			return ref_field;

		}

	}



	ref_field = create_hist_field(var_field->hist_data, NULL, flags, NULL);

	if (ref_field) {
@@ -3115,7 +3141,9 @@ static char *find_trigger_filter(struct hist_trigger_data *hist_data, 
{

	struct event_trigger_data *test;



	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 == ETT_EVENT_HIST) {

			if (test->private_data == hist_data)

				return test->filter_str;
@@ -3166,9 +3194,11 @@ find_compatible_hist(struct hist_trigger_data *target_hist_data, 
	struct event_trigger_data *test;

	unsigned int n_keys;



	lockdep_assert_held(&event_mutex);



	n_keys = target_hist_data->n_fields - target_hist_data->n_vals;



	list_for_each_entry_rcu(test, &file->triggers, list) {

	list_for_each_entry(test, &file->triggers, list) {

		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {

			hist_data = test->private_data;
@@ -5528,7 +5558,7 @@ static int hist_show(struct seq_file *m, void *v) 
		goto out_unlock;

	}



	list_for_each_entry_rcu(data, &event_file->triggers, list) {

	list_for_each_entry(data, &event_file->triggers, list) {

		if (data->cmd_ops->trigger_type == ETT_EVENT_HIST)

			hist_trigger_show(m, data, n++);

	}
@@ -5921,7 +5951,9 @@ static int hist_register_trigger(char *glob, struct event_trigger_ops *ops, 
	if (hist_data->attrs->name && !named_data)

		goto new;



	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 == ETT_EVENT_HIST) {

			if (!hist_trigger_match(data, test, named_data, false))

				continue;
@@ -6005,10 +6037,12 @@ static bool have_hist_trigger_match(struct event_trigger_data *data, 
	struct event_trigger_data *test, *named_data = NULL;

	bool match = false;



	lockdep_assert_held(&event_mutex);



	if (hist_data->attrs->name)

		named_data = find_named_trigger(hist_data->attrs->name);



	list_for_each_entry_rcu(test, &file->triggers, list) {

	list_for_each_entry(test, &file->triggers, list) {

		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {

			if (hist_trigger_match(data, test, named_data, false)) {

				match = true;
@@ -6026,10 +6060,12 @@ static bool hist_trigger_check_refs(struct event_trigger_data *data, 
	struct hist_trigger_data *hist_data = data->private_data;

	struct event_trigger_data *test, *named_data = NULL;



	lockdep_assert_held(&event_mutex);



	if (hist_data->attrs->name)

		named_data = find_named_trigger(hist_data->attrs->name);



	list_for_each_entry_rcu(test, &file->triggers, list) {

	list_for_each_entry(test, &file->triggers, list) {

		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {

			if (!hist_trigger_match(data, test, named_data, false))

				continue;
@@ -6051,10 +6087,12 @@ static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops, 
	struct event_trigger_data *test, *named_data = NULL;

	bool unregistered = false;



	lockdep_assert_held(&event_mutex);



	if (hist_data->attrs->name)

		named_data = find_named_trigger(hist_data->attrs->name);



	list_for_each_entry_rcu(test, &file->triggers, list) {

	list_for_each_entry(test, &file->triggers, list) {

		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {

			if (!hist_trigger_match(data, test, named_data, false))

				continue;
@@ -6080,7 +6118,9 @@ static bool hist_file_check_refs(struct trace_event_file *file) 
	struct hist_trigger_data *hist_data;

	struct event_trigger_data *test;



	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 == ETT_EVENT_HIST) {

			hist_data = test->private_data;

			if (check_var_refs(hist_data))
@@ -6323,7 +6363,8 @@ hist_enable_trigger(struct event_trigger_data *data, void *rec, 
	struct enable_trigger_data *enable_data = data->private_data;

	struct event_trigger_data *test;



	list_for_each_entry_rcu(test, &enable_data->file->triggers, list) {

	list_for_each_entry_rcu(test, &enable_data->file->triggers, list,

				lockdep_is_held(&event_mutex)) {

		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {

			if (enable_data->enable)

				test->paused = false;

kernel/trace/trace_events_trigger.c

+15 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE