Commit 4336cc15 authored by Ross Zwisler's avatar Ross Zwisler Committed by Steven Rostedt (Google)

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: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Reviewed-by: default avatarMukesh Ojha <quic_mojha@quicinc.com>
Signed-off-by: default avatarRoss Zwisler <zwisler@google.com>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 8be098a9
...@@ -98,7 +98,7 @@ int tracing_root_ok(void) ...@@ -98,7 +98,7 @@ int tracing_root_ok(void)
void tracing_on(void) void tracing_on(void)
{ {
#if CONTROL_TRACING > 0 #if CONTROL_TRACING > 0
#define TRACEDIR "/sys/kernel/debug/tracing" #define TRACEDIR "/sys/kernel/tracing"
char pidstr[32]; char pidstr[32];
if (!tracing_root_ok()) if (!tracing_root_ok())
...@@ -124,7 +124,7 @@ void tracing_off(void) ...@@ -124,7 +124,7 @@ void tracing_off(void)
#if CONTROL_TRACING > 0 #if CONTROL_TRACING > 0
if (!tracing_root_ok()) if (!tracing_root_ok())
return; return;
cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on"); cat_into_file("0", "/sys/kernel/tracing/tracing_on");
#endif #endif
} }
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "../kselftest_harness.h" #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"; const char *clear = "!u:__test_event";
static int Append(const char *value) static int Append(const char *value)
......
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
#include "../kselftest_harness.h" #include "../kselftest_harness.h"
const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; const char *data_file = "/sys/kernel/tracing/user_events_data";
const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; const char *status_file = "/sys/kernel/tracing/user_events_status";
const char *enable_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/enable"; const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable";
const char *trace_file = "/sys/kernel/debug/tracing/trace"; const char *trace_file = "/sys/kernel/tracing/trace";
const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format";
static inline int status_check(char *status_page, int status_bit) static inline int status_check(char *status_page, int status_bit)
{ {
......
...@@ -18,10 +18,10 @@ ...@@ -18,10 +18,10 @@
#include "../kselftest_harness.h" #include "../kselftest_harness.h"
const char *data_file = "/sys/kernel/debug/tracing/user_events_data"; const char *data_file = "/sys/kernel/tracing/user_events_data";
const char *status_file = "/sys/kernel/debug/tracing/user_events_status"; const char *status_file = "/sys/kernel/tracing/user_events_status";
const char *id_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/id"; const char *id_file = "/sys/kernel/tracing/events/user_events/__test_event/id";
const char *fmt_file = "/sys/kernel/debug/tracing/events/user_events/__test_event/format"; const char *fmt_file = "/sys/kernel/tracing/events/user_events/__test_event/format";
struct event { struct event {
__u32 index; __u32 index;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment