diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-28 08:50:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-28 08:50:53 -0800 |
| commit | f8132d62a2deedca1b7558028cfe72f93ad5ba2d (patch) | |
| tree | 7a42a1f24d170699ce6e1439332ca0f4a4c2fd8a | |
| parent | 0757ca01d944001254a94ac1b25ced702a1e9ac5 (diff) | |
| parent | 27ff768fa21ca3286fcc87c3f38ac67d1a2cbe2d (diff) | |
| download | linux-f8132d62a2deedca1b7558028cfe72f93ad5ba2d.tar.gz | |
Merge tag 'trace-v5.16-rc2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull another tracing fix from Steven Rostedt:
"Fix the fix of pid filtering
The setting of the pid filtering flag tested the "trace only this pid"
case twice, and ignored the "trace everything but this pid" case.
The 5.15 kernel does things a little differently due to the new sparse
pid mask introduced in 5.16, and as the bug was discovered running the
5.15 kernel, and the first fix was initially done for that kernel,
that fix handled both cases (only pid and all but pid), but the
forward port to 5.16 created this bug"
* tag 'trace-v5.16-rc2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Test the 'Do not trace this pid' case in create event
| -rw-r--r-- | kernel/trace/trace_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index f8965fd50d3be4..92be9cb1d7d4bc 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2693,7 +2693,7 @@ trace_create_new_event(struct trace_event_call *call, lockdep_is_held(&event_mutex)); if (!trace_pid_list_first(pid_list, &first) || - !trace_pid_list_first(pid_list, &first)) + !trace_pid_list_first(no_pid_list, &first)) file->flags |= EVENT_FILE_FL_PID_FILTER; file->event_call = call; |