tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

selftests: use canonical ftrace path

The canonical location for the tracefs filesystem is at /sys/kernel/tracing.

But, from Documentation/trace/ftrace.rst:

Before 4.1, all ftrace tracing control files were within the debugfs
file system, which is typically located at /sys/kernel/debug/tracing.
For backward compatibility, when mounting the debugfs file system,
the tracefs file system will be automatically mounted at:

/sys/kernel/debug/tracing

A few spots in tools/testing/selftests still refer to this older debugfs
path, so let's update them to avoid confusion.

Link: https://lkml.kernel.org/r/20230313211746.1541525-1-zwisler@kernel.org

Cc: "Tobin C. Harding" <me@tobin.cc>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Tycho Andersen <tycho@tycho.pizza>
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: Ross Zwisler <zwisler@google.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

authored by

Ross Zwisler and committed by
Steven Rostedt (Google) 4336cc15 8be098a9

+12 -12
+2 -2
tools/testing/selftests/mm/protection_keys.c
··· 98 98 void tracing_on(void) 99 99 { 100 100 #if CONTROL_TRACING > 0 101 - #define TRACEDIR "/sys/kernel/debug/tracing" 101 + #define TRACEDIR "/sys/kernel/tracing" 102 102 char pidstr[32]; 103 103 104 104 if (!tracing_root_ok()) ··· 124 124 #if CONTROL_TRACING > 0 125 125 if (!tracing_root_ok()) 126 126 return; 127 - cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on"); 127 + cat_into_file("0", "/sys/kernel/tracing/tracing_on"); 128 128 #endif 129 129 } 130 130
+1 -1
tools/testing/selftests/user_events/dyn_test.c
··· 16 16 17 17 #include "../kselftest_harness.h" 18 18 19 - const char *dyn_file = "/sys/kernel/debug/tracing/dynamic_events"; 19 + const char *dyn_file = "/sys/kernel/tracing/dynamic_events"; 20 20 const char *clear = "!u:__test_event"; 21 21 22 22 static int Append(const char *value)
+5 -5
tools/testing/selftests/user_events/ftrace_test.c
··· 16 16 17 17 #include "../kselftest_harness.h" 18 18 19 - const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; 20 - const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; 21 - const char *enable_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/enable"; 22 - const char *trace_file = "/sys/kernel/debug/tracing/trace"; 23 - const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; 19 + const char *data_file = "/sys/kernel/tracing/user_events_data"; 20 + const char *status_file = "/sys/kernel/tracing/user_events_status"; 21 + const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable"; 22 + const char *trace_file = "/sys/kernel/tracing/trace"; 23 + const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; 24 24 25 25 static inline int status_check(char *status_page, int status_bit) 26 26 {
+4 -4
tools/testing/selftests/user_events/perf_test.c
··· 18 18 19 19 #include "../kselftest_harness.h" 20 20 21 - const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; 22 - const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; 23 - const char *id_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/id"; 24 - const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; 21 + const char *data_file = "/sys/kernel/tracing/user_events_data"; 22 + const char *status_file = "/sys/kernel/tracing/user_events_status"; 23 + const char *id_file = "/sys/kernel/tracing/events/user_events/__test_event/id"; 24 + const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; 25 25 26 26 struct event { 27 27 __u32 index;