Commit 86155d6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull tracing fixes from Steven Rostedt:
 "Two fixes to event pid filtering:

   - Make sure newly created events reflect the current state of pid
     filtering

   - Take pid filtering into account when recording trigger events.
     (Also clean up the if statement to be cleaner)"

* tag 'trace-v5.16-rc2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing: Fix pid filtering when triggers are attached
  tracing: Check pid filtering when creating events
parents 86799cdf a55f224f

kernel/trace/trace.h

+18 −6
Original line number Diff line number Diff line
@@ -1366,14 +1366,26 @@ __event_trigger_test_discard(struct trace_event_file *file, 
	if (eflags & EVENT_FILE_FL_TRIGGER_COND)

		*tt = event_triggers_call(file, buffer, entry, event);



	if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||

	    (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&

	     !filter_match_preds(file->filter, entry))) {

		__trace_event_discard_commit(buffer, event);

		return true;

	}

	if (likely(!(file->flags & (EVENT_FILE_FL_SOFT_DISABLED |

				    EVENT_FILE_FL_FILTERED |

				    EVENT_FILE_FL_PID_FILTER))))

		return false;



	if (file->flags & EVENT_FILE_FL_SOFT_DISABLED)

		goto discard;



	if (file->flags & EVENT_FILE_FL_FILTERED &&

	    !filter_match_preds(file->filter, entry))

		goto discard;



	if ((file->flags & EVENT_FILE_FL_PID_FILTER) &&

	    trace_event_ignore_this_pid(file))

		goto discard;



	return false;

 discard:

	__trace_event_discard_commit(buffer, event);

	return true;

}



/**

kernel/trace/trace_events.c

+12 −0
Original line number Diff line number Diff line
@@ -2678,12 +2678,24 @@ static struct trace_event_file * 
trace_create_new_event(struct trace_event_call *call,

		       struct trace_array *tr)

{

	struct trace_pid_list *no_pid_list;

	struct trace_pid_list *pid_list;

	struct trace_event_file *file;

	unsigned int first;



	file = kmem_cache_alloc(file_cachep, GFP_TRACE);

	if (!file)

		return NULL;



	pid_list = rcu_dereference_protected(tr->filtered_pids,

					     lockdep_is_held(&event_mutex));

	no_pid_list = rcu_dereference_protected(tr->filtered_no_pids,

					     lockdep_is_held(&event_mutex));



	if (!trace_pid_list_first(pid_list, &first) ||

	    !trace_pid_list_first(pid_list, &first))

		file->flags |= EVENT_FILE_FL_PID_FILTER;



	file->event_call = call;

	file->tr = tr;

	atomic_set(&file->sm_ref, 0);