Merge tag 'trace-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull tracing updates from Steven Rostedt: "Major changes: - Changed location of tracing repo from personal git repo to: git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git - Added Masami Hiramatsu as co-maintainer - Updated MAINTAINERS file to separate out FTRACE as it is more than just TRACING. Minor changes: - Added Mark Rutland as FTRACE reviewer - Updated user_events to make it on its way to remove the BROKEN tag. The changes should now be acceptable but will run it through a cycle and hopefully we can remove the BROKEN tag next release. - Added filtering to eprobes - Added a delta time to the benchmark trace event - Have the histogram and filter callbacks called via a switch statement instead of indirect functions. This speeds it up to avoid retpolines. - Add a way to wake up ring buffer waiters waiting for the ring buffer to fill up to its watermark. - New ioctl() on the trace_pipe_raw file to wake up ring buffer waiters. - Wake up waiters when the ring buffer is disabled. A reader may block when the ring buffer is disabled, but if it was blocked when the ring buffer is disabled it should then wake up. Fixes: - Allow splice to read partially read ring buffer pages. This fixes splice never moving forward. - Fix inverted compare that made the "shortest" ring buffer wait queue actually the longest. - Fix a race in the ring buffer between resetting a page when a writer goes to another page, and the reader. - Fix ftrace accounting bug when function hooks are added at boot up before the weak functions are set to "disabled". - Fix bug that freed a user allocated snapshot buffer when enabling a tracer. - Fix possible recursive locks in osnoise tracer - Fix recursive locking direct functions - Other minor clean ups and fixes" * tag 'trace-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: (44 commits) ftrace: Create separate entry in MAINTAINERS for function hooks tracing: Update MAINTAINERS to reflect new tracing git repo tracing: Do not free snapshot if tracer is on cmdline ftrace: Still disable enabled records marked as disabled tracing/user_events: Move pages/locks into groups to prepare for namespaces tracing: Add Masami Hiramatsu as co-maintainer tracing: Remove unused variable 'dups' MAINTAINERS: add myself as a tracing reviewer ring-buffer: Fix race between reset page and reading page tracing/user_events: Update ABI documentation to align to bits vs bytes tracing/user_events: Use bits vs bytes for enabled status page data tracing/user_events: Use refcount instead of atomic for ref tracking tracing/user_events: Ensure user provided strings are safely formatted tracing/user_events: Use WRITE instead of READ for io vector import tracing/user_events: Use NULL for strstr checks tracing: Fix spelling mistake "preapre" -> "prepare" tracing: Wake up waiters when tracing is disabled tracing: Add ioctl() to force ring buffer waiters to wake up tracing: Wake up ring buffer waiters on closing of the file ring-buffer: Add ring_buffer_wake_waiters() ...
No related branches found
No related tags found
Showing
- Documentation/trace/user_events.rst 58 additions, 28 deletionsDocumentation/trace/user_events.rst
- MAINTAINERS 18 additions, 8 deletionsMAINTAINERS
- arch/x86/include/asm/ftrace.h 0 additions, 1 deletionarch/x86/include/asm/ftrace.h
- arch/x86/include/asm/kprobes.h 0 additions, 2 deletionsarch/x86/include/asm/kprobes.h
- arch/x86/kernel/kprobes/core.c 0 additions, 2 deletionsarch/x86/kernel/kprobes/core.c
- include/linux/ftrace.h 0 additions, 41 deletionsinclude/linux/ftrace.h
- include/linux/ring_buffer.h 1 addition, 1 deletioninclude/linux/ring_buffer.h
- include/linux/sched.h 0 additions, 3 deletionsinclude/linux/sched.h
- include/linux/trace_events.h 1 addition, 0 deletionsinclude/linux/trace_events.h
- include/linux/user_events.h 3 additions, 12 deletionsinclude/linux/user_events.h
- kernel/trace/ftrace.c 27 additions, 7 deletionskernel/trace/ftrace.c
- kernel/trace/kprobe_event_gen_test.c 44 additions, 5 deletionskernel/trace/kprobe_event_gen_test.c
- kernel/trace/ring_buffer.c 84 additions, 3 deletionskernel/trace/ring_buffer.c
- kernel/trace/rv/monitors/wip/wip.c 4 additions, 4 deletionskernel/trace/rv/monitors/wip/wip.c
- kernel/trace/rv/monitors/wwnr/wwnr.c 4 additions, 4 deletionskernel/trace/rv/monitors/wwnr/wwnr.c
- kernel/trace/trace.c 73 additions, 5 deletionskernel/trace/trace.c
- kernel/trace/trace.h 0 additions, 13 deletionskernel/trace/trace.h
- kernel/trace/trace_benchmark.c 1 addition, 1 deletionkernel/trace/trace_benchmark.c
- kernel/trace/trace_benchmark.h 5 additions, 3 deletionskernel/trace/trace_benchmark.h
- kernel/trace/trace_eprobe.c 97 additions, 10 deletionskernel/trace/trace_eprobe.c
Loading
Please register or sign in to comment