Documentation/trace/user_events.rst | 86 +++++--- include/linux/ring_buffer.h | 2 +- include/linux/trace_events.h | 1 + include/linux/user_events.h | 15 +- kernel/trace/ftrace.c | 6 +- kernel/trace/ring_buffer.c | 54 ++++- kernel/trace/trace.c | 45 ++++- kernel/trace/trace_events_user.c | 228 +++++++++++++++------- samples/user_events/example.c | 25 ++- tools/testing/selftests/user_events/ftrace_test.c | 47 ++++- tools/testing/selftests/user_events/perf_test.c | 11 +- 11 files changed, 383 insertions(+), 137 deletions(-)