Skip to content

Commit 4336cc1

Browse files
rzwislerrostedt
authored andcommitted
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>
1 parent 8be098a commit 4336cc1

4 files changed

Lines changed: 12 additions & 12 deletions

File tree

tools/testing/selftests/mm/protection_keys.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ int tracing_root_ok(void)
9898
void tracing_on(void)
9999
{
100100
#if CONTROL_TRACING > 0
101-
#define TRACEDIR "/sys/kernel/debug/tracing"
101+
#define TRACEDIR "/sys/kernel/tracing"
102102
char pidstr[32];
103103

104104
if (!tracing_root_ok())
@@ -124,7 +124,7 @@ void tracing_off(void)
124124
#if CONTROL_TRACING > 0
125125
if (!tracing_root_ok())
126126
return;
127-
cat_into_file("0", "/sys/kernel/debug/tracing/tracing_on");
127+
cat_into_file("0", "/sys/kernel/tracing/tracing_on");
128128
#endif
129129
}
130130

tools/testing/selftests/user_events/dyn_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "../kselftest_harness.h"
1818

19-
const char *dyn_file = "/sys/kernel/debug/tracing/dynamic_events";
19+
const char *dyn_file = "/sys/kernel/tracing/dynamic_events";
2020
const char *clear = "!u:__test_event";
2121

2222
static int Append(const char *value)

tools/testing/selftests/user_events/ftrace_test.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
#include "../kselftest_harness.h"
1818

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";
2424

2525
static inline int status_check(char *status_page, int status_bit)
2626
{

tools/testing/selftests/user_events/perf_test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818

1919
#include "../kselftest_harness.h"
2020

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";
2525

2626
struct event {
2727
__u32 index;

0 commit comments

Comments
 (0)