lkml.org 
[lkml]   [2023]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[for-next][PATCH 08/25] selftests: use canonical ftrace path
    From: Ross Zwisler <zwisler@google.com>

    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>
    ---
    tools/testing/selftests/mm/protection_keys.c | 4 ++--
    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 ++++----
    4 files changed, 12 insertions(+), 12 deletions(-)

    diff --git a/tools/testing/selftests/mm/protection_keys.c b/tools/testing/selftests/mm/protection_keys.c
    index 95f403a0c46d..0381c34fdd56 100644
    --- a/tools/testing/selftests/mm/protection_keys.c
    +++ b/tools/testing/selftests/mm/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
    }

    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;
    --
    2.39.1
    \
     
     \ /
      Last update: 2023-03-29 21:46    [W:2.839 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site