Skip to content

Commit 2e30b97

Browse files
committed
Merge tag 'trace-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing fixes from Steven Rostedt: - Fix MAINTAINERS file to point to proper mailing list for rtla and rv The mailing list pointed to linux-trace-devel instead of linux-trace-kernel. The former is for the tracing libraries and the latter is for anything in the Linux kernel tree. The wrong mailing list was used because linux-trace-kernel did not exist when rtla and rv were created. - User events: - Fix matching of dynamic events to their user events When user writes to dynamic_events file, a lookup of the registered dynamic events is made, but there were some cases that a match could be incorrectly made. - Add auto cleanup of user events Have the user events automatically get removed when the last reference (file descriptor) is closed. This was asked for to prevent leaks of user events hanging around needing admins to clean them up. - Add persistent logic (but not let user space use it yet) In some cases, having a persistent user event (one that does not get cleaned up automatically) is useful. But there's still debates about how to expose this to user space. The infrastructure is added, but the API is not. - Update the selftests Update the user event selftests to reflect the above changes" * tag 'trace-v6.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing/user_events: Document auto-cleanup and remove dyn_event refs selftests/user_events: Adapt dyn_test to non-persist events selftests/user_events: Ensure auto cleanup works as expected tracing/user_events: Add auto cleanup and future persist flag tracing/user_events: Track refcount consistently via put/get tracing/user_events: Store register flags on events tracing/user_events: Remove user_ns walk for groups selftests/user_events: Add perf self-test for empty arguments events selftests/user_events: Clear the events after perf self-test selftests/user_events: Add ftrace self-test for empty arguments events tracing/user_events: Fix the incorrect trace record for empty arguments events tracing: Modify print_fields() for fields output order tracing/user_events: Handle matching arguments that is null from dyn_events tracing/user_events: Prevent same name but different args event tracing/rv/rtla: Update MAINTAINERS file to point to proper mailing list
2 parents 4b0c7a1 + 0113d46 commit 2e30b97

File tree

7 files changed

+508
-142
lines changed

7 files changed

+508
-142
lines changed

Documentation/trace/user_events.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ Programs can view status of the events via
1414
/sys/kernel/tracing/user_events_status and can both register and write
1515
data out via /sys/kernel/tracing/user_events_data.
1616

17-
Programs can also use /sys/kernel/tracing/dynamic_events to register and
18-
delete user based events via the u: prefix. The format of the command to
19-
dynamic_events is the same as the ioctl with the u: prefix applied.
20-
2117
Typically programs will register a set of events that they wish to expose to
2218
tools that can read trace_events (such as ftrace and perf). The registration
2319
process tells the kernel which address and bit to reflect if any tool has
@@ -144,6 +140,9 @@ its name. Delete will only succeed if there are no references left to the
144140
event (in both user and kernel space). User programs should use a separate file
145141
to request deletes than the one used for registration due to this.
146142

143+
**NOTE:** By default events will auto-delete when there are no references left
144+
to the event. Flags in the future may change this logic.
145+
147146
Unregistering
148147
-------------
149148
If after registering an event it is no longer wanted to be updated then it can

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17827,7 +17827,7 @@ F: tools/testing/selftests/rtc/
1782717827
Real-time Linux Analysis (RTLA) tools
1782817828
M: Daniel Bristot de Oliveira <[email protected]>
1782917829
M: Steven Rostedt <[email protected]>
17830-
L: linux-trace-devel@vger.kernel.org
17830+
L: linux-trace-kernel@vger.kernel.org
1783117831
S: Maintained
1783217832
F: Documentation/tools/rtla/
1783317833
F: tools/tracing/rtla/
@@ -18397,7 +18397,7 @@ F: drivers/infiniband/ulp/rtrs/
1839718397
RUNTIME VERIFICATION (RV)
1839818398
M: Daniel Bristot de Oliveira <[email protected]>
1839918399
M: Steven Rostedt <[email protected]>
18400-
L: linux-trace-devel@vger.kernel.org
18400+
L: linux-trace-kernel@vger.kernel.org
1840118401
S: Maintained
1840218402
F: Documentation/trace/rv/
1840318403
F: include/linux/rv.h

0 commit comments

Comments
 (0)