| Message ID | 20230215223350.2658616-3-zwisler@google.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | use canonical ftrace path whenever possible | expand |
On Wed, 15 Feb 2023 15:33:46 -0700 Ross Zwisler <zwisler@chromium.org> wrote: > 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. Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Shuah, Care to pull this in through your tree? -- Steve > > Signed-off-by: Ross Zwisler <zwisler@google.com> > --- > tools/testing/selftests/user_events/dyn_test.c | 2 +- > tools/testing/selftests/user_events/ftrace_test.c | 10 +++++----- > tools/testing/selftests/user_events/perf_test.c | 8 ++++---- > tools/testing/selftests/vm/protection_keys.c | 4 ++-- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/tools/testing/selftests/user_events/dyn_test.c b/tools/testing/selftests/user_events/dyn_test.c > index d6265d14cd51..8879a7b04c6a 100644 > --- a/tools/testing/selftests/user_events/dyn_test.c > +++ b/tools/testing/selftests/user_events/dyn_test.c > @@ -16,7 +16,7 @@ > > #include "../kselftest_harness.h" > > -const char *dyn_file = "/sys/kernel/debug/tracing/dynamic_events"; > +const char *dyn_file = "/sys/kernel/tracing/dynamic_events"; > const char *clear = "!u:__test_event"; > > static int Append(const char *value) > diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c > index 404a2713dcae..a0b2c96eb252 100644 > --- a/tools/testing/selftests/user_events/ftrace_test.c > +++ b/tools/testing/selftests/user_events/ftrace_test.c > @@ -16,11 +16,11 @@ > > #include "../kselftest_harness.h" > > -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; > -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; > -const char *enable_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/enable"; > -const char *trace_file = "/sys/kernel/debug/tracing/trace"; > -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; > +const char *data_file = "/sys/kernel/tracing/user_events_data"; > +const char *status_file = "/sys/kernel/tracing/user_events_status"; > +const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable"; > +const char *trace_file = "/sys/kernel/tracing/trace"; > +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; > > static inline int status_check(char *status_page, int status_bit) > { > diff --git a/tools/testing/selftests/user_events/perf_test.c b/tools/testing/selftests/user_events/perf_test.c > index 8b4c7879d5a7..31505642aa9b 100644 > --- a/tools/testing/selftests/user_events/perf_test.c > +++ b/tools/testing/selftests/user_events/perf_test.c > @@ -18,10 +18,10 @@ > > #include "../kselftest_harness.h" > > -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; > -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; > -const char *id_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/id"; > -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; > +const char *data_file = "/sys/kernel/tracing/user_events_data"; > +const char *status_file = "/sys/kernel/tracing/user_events_status"; > +const char *id_file = "/sys/kernel/tracing/events/user_events/__test_event/id"; > +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; > > struct event { > __u32 index; > diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c > index 95f403a0c46d..0381c34fdd56 100644 > --- a/tools/testing/selftests/vm/protection_keys.c > +++ b/tools/testing/selftests/vm/protection_keys.c > @@ -98,7 +98,7 @@ int tracing_root_ok(void) > void tracing_on(void) > { > #if CONTROL_TRACING > 0 > -#define TRACEDIR "/sys/kernel/debug/tracing" > +#define TRACEDIR "/sys/kernel/tracing" > char pidstr[32]; > > if (!tracing_root_ok()) > @@ -124,7 +124,7 @@ void tracing_off(void) > #if CONTROL_TRACING > 0 > if (!tracing_root_ok()) > return; > - cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on"); > + cat_into_file("0", "/sys/kernel/tracing/tracing_on"); > #endif > } >
On 2/16/2023 4:03 AM, Ross Zwisler wrote: > 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. > > Signed-off-by: Ross Zwisler <zwisler@google.com> > --- > tools/testing/selftests/user_events/dyn_test.c | 2 +- > tools/testing/selftests/user_events/ftrace_test.c | 10 +++++----- > tools/testing/selftests/user_events/perf_test.c | 8 ++++---- > tools/testing/selftests/vm/protection_keys.c | 4 ++-- > 4 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/tools/testing/selftests/user_events/dyn_test.c b/tools/testing/selftests/user_events/dyn_test.c > index d6265d14cd51..8879a7b04c6a 100644 > --- a/tools/testing/selftests/user_events/dyn_test.c > +++ b/tools/testing/selftests/user_events/dyn_test.c > @@ -16,7 +16,7 @@ > > #include "../kselftest_harness.h" > > -const char *dyn_file = "/sys/kernel/debug/tracing/dynamic_events"; > +const char *dyn_file = "/sys/kernel/tracing/dynamic_events"; > const char *clear = "!u:__test_event"; > > static int Append(const char *value) > diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c > index 404a2713dcae..a0b2c96eb252 100644 > --- a/tools/testing/selftests/user_events/ftrace_test.c > +++ b/tools/testing/selftests/user_events/ftrace_test.c > @@ -16,11 +16,11 @@ > > #include "../kselftest_harness.h" > > -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; > -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; > -const char *enable_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/enable"; > -const char *trace_file = "/sys/kernel/debug/tracing/trace"; > -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; > +const char *data_file = "/sys/kernel/tracing/user_events_data"; > +const char *status_file = "/sys/kernel/tracing/user_events_status"; > +const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable"; > +const char *trace_file = "/sys/kernel/tracing/trace"; > +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; > > static inline int status_check(char *status_page, int status_bit) > { > diff --git a/tools/testing/selftests/user_events/perf_test.c b/tools/testing/selftests/user_events/perf_test.c > index 8b4c7879d5a7..31505642aa9b 100644 > --- a/tools/testing/selftests/user_events/perf_test.c > +++ b/tools/testing/selftests/user_events/perf_test.c > @@ -18,10 +18,10 @@ > > #include "../kselftest_harness.h" > > -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; > -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; > -const char *id_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/id"; > -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; > +const char *data_file = "/sys/kernel/tracing/user_events_data"; > +const char *status_file = "/sys/kernel/tracing/user_events_status"; > +const char *id_file = "/sys/kernel/tracing/events/user_events/__test_event/id"; > +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; > > struct event { > __u32 index; > diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c > index 95f403a0c46d..0381c34fdd56 100644 > --- a/tools/testing/selftests/vm/protection_keys.c > +++ b/tools/testing/selftests/vm/protection_keys.c > @@ -98,7 +98,7 @@ int tracing_root_ok(void) > void tracing_on(void) > { > #if CONTROL_TRACING > 0 > -#define TRACEDIR "/sys/kernel/debug/tracing" > +#define TRACEDIR "/sys/kernel/tracing" > char pidstr[32]; > > if (!tracing_root_ok()) > @@ -124,7 +124,7 @@ void tracing_off(void) > #if CONTROL_TRACING > 0 > if (!tracing_root_ok()) > return; > - cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on"); > + cat_into_file("0", "/sys/kernel/tracing/tracing_on"); > #endif > } > Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com> -Mukesh
diff --git a/tools/testing/selftests/user_events/dyn_test.c b/tools/testing/selftests/user_events/dyn_test.c index d6265d14cd51..8879a7b04c6a 100644 --- a/tools/testing/selftests/user_events/dyn_test.c +++ b/tools/testing/selftests/user_events/dyn_test.c @@ -16,7 +16,7 @@ #include "../kselftest_harness.h" -const char *dyn_file = "/sys/kernel/debug/tracing/dynamic_events"; +const char *dyn_file = "/sys/kernel/tracing/dynamic_events"; const char *clear = "!u:__test_event"; static int Append(const char *value) diff --git a/tools/testing/selftests/user_events/ftrace_test.c b/tools/testing/selftests/user_events/ftrace_test.c index 404a2713dcae..a0b2c96eb252 100644 --- a/tools/testing/selftests/user_events/ftrace_test.c +++ b/tools/testing/selftests/user_events/ftrace_test.c @@ -16,11 +16,11 @@ #include "../kselftest_harness.h" -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; -const char *enable_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/enable"; -const char *trace_file = "/sys/kernel/debug/tracing/trace"; -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; +const char *data_file = "/sys/kernel/tracing/user_events_data"; +const char *status_file = "/sys/kernel/tracing/user_events_status"; +const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable"; +const char *trace_file = "/sys/kernel/tracing/trace"; +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; static inline int status_check(char *status_page, int status_bit) { diff --git a/tools/testing/selftests/user_events/perf_test.c b/tools/testing/selftests/user_events/perf_test.c index 8b4c7879d5a7..31505642aa9b 100644 --- a/tools/testing/selftests/user_events/perf_test.c +++ b/tools/testing/selftests/user_events/perf_test.c @@ -18,10 +18,10 @@ #include "../kselftest_harness.h" -const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; -const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; -const char *id_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/id"; -const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; +const char *data_file = "/sys/kernel/tracing/user_events_data"; +const char *status_file = "/sys/kernel/tracing/user_events_status"; +const char *id_file = "/sys/kernel/tracing/events/user_events/__test_event/id"; +const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format"; struct event { __u32 index; diff --git a/tools/testing/selftests/vm/protection_keys.c b/tools/testing/selftests/vm/protection_keys.c index 95f403a0c46d..0381c34fdd56 100644 --- a/tools/testing/selftests/vm/protection_keys.c +++ b/tools/testing/selftests/vm/protection_keys.c @@ -98,7 +98,7 @@ int tracing_root_ok(void) void tracing_on(void) { #if CONTROL_TRACING > 0 -#define TRACEDIR "/sys/kernel/debug/tracing" +#define TRACEDIR "/sys/kernel/tracing" char pidstr[32]; if (!tracing_root_ok()) @@ -124,7 +124,7 @@ void tracing_off(void) #if CONTROL_TRACING > 0 if (!tracing_root_ok()) return; - cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on"); + cat_into_file("0", "/sys/kernel/tracing/tracing_on"); #endif }
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. Signed-off-by: Ross Zwisler <zwisler@google.com> --- tools/testing/selftests/user_events/dyn_test.c | 2 +- tools/testing/selftests/user_events/ftrace_test.c | 10 +++++----- tools/testing/selftests/user_events/perf_test.c | 8 ++++---- tools/testing/selftests/vm/protection_keys.c | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-)