From: Steven Rostedt <rostedt@goodmis.org>
To: Ross Zwisler <zwisler@chromium.org>,
Shuah Khan <skhan@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, Ross Zwisler <zwisler@google.com>,
Shuah Khan <shuah@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kselftest@vger.kernel.org, linux-mm@kvack.org,
linux-trace-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/6] selftests: use canonical ftrace path
Date: Thu, 16 Feb 2023 15:58:54 -0500 [thread overview]
Message-ID: <20230216155854.424bcdd7@rorschach.local.home> (raw)
In-Reply-To: <20230215223350.2658616-3-zwisler@google.com>
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
> }
>
next prev parent reply other threads:[~2023-02-16 20:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 22:33 [PATCH v2 0/6] use canonical ftrace path whenever possible Ross Zwisler
2023-02-15 22:33 ` [PATCH v2 1/6] tracing: always use canonical ftrace path Ross Zwisler
2023-02-16 15:13 ` Masami Hiramatsu
2023-02-17 15:34 ` Mukesh Ojha
2023-02-15 22:33 ` [PATCH v2 2/6] selftests: " Ross Zwisler
2023-02-16 20:58 ` Steven Rostedt [this message]
2023-02-17 15:40 ` Mukesh Ojha
2023-02-15 22:33 ` [PATCH v2 3/6] leaking_addresses: also skip " Ross Zwisler
2023-02-15 22:33 ` [PATCH v2 4/6] tools/kvm_stat: use " Ross Zwisler
2023-02-16 21:08 ` Steven Rostedt
2023-02-17 11:32 ` Paolo Bonzini
2023-02-17 15:41 ` Mukesh Ojha
2023-02-15 22:33 ` [PATCH v2 5/6] tools/virtio: " Ross Zwisler
2023-02-17 15:46 ` Mukesh Ojha
2023-06-02 11:15 ` Michael S. Tsirkin
2023-02-15 22:33 ` [PATCH v2 6/6] tools/virtio: fix typo in README instructions Ross Zwisler
2023-03-10 8:29 ` [PATCH v2 0/6] use canonical ftrace path whenever possible Michael S. Tsirkin
2023-03-10 19:06 ` Ross Zwisler
2023-03-10 19:37 ` Steven Rostedt
2023-03-22 2:32 ` Michael S. Tsirkin
2023-03-22 16:52 ` Ross Zwisler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230216155854.424bcdd7@rorschach.local.home \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=zwisler@chromium.org \
--cc=zwisler@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox