* [PATCH 0/9] use canonical ftrace path whenever possible
@ 2023-01-30 18:19 Ross Zwisler
2023-01-30 18:19 ` [PATCH 6/9] selftests: use canonical ftrace path Ross Zwisler
2023-01-30 19:26 ` [PATCH 0/9] use canonical ftrace path whenever possible Michael S. Tsirkin
0 siblings, 2 replies; 3+ messages in thread
From: Ross Zwisler @ 2023-01-30 18:19 UTC (permalink / raw)
To: linux-kernel
Cc: Ross Zwisler, Michael S. Tsirkin, Tobin C. Harding,
Alexander Shishkin, Alexei Starovoitov, Andrew Morton,
Andrii Nakryiko, Arnaldo Carvalho de Melo, Daniel Borkmann,
Hao Luo, Huang Rui, Ingo Molnar, Jason Gunthorpe, Jason Wang,
Jiri Olsa, John Fastabend, KP Singh, Leon Romanovsky,
Mark Rutland, Martin KaFai Lau, Masami Hiramatsu, Mykola Lysenko,
Namhyung Kim, Paolo Bonzini, Peter Zijlstra, Shuah Khan,
Song Liu, Stanislav Fomichev, Steven Rostedt, Todd E Brandt,
Tycho Andersen, Yonghong Song, bpf, kvm, linux-hardening,
linux-kselftest, linux-mm, linux-perf-users, linux-pm,
linux-rdma, virtualization, linux-trace-kernel
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
There are many places where this older debugfs path is still used in
code comments, selftests, examples and tools, so let's update them to
avoid confusion.
I've broken up the series as best I could by maintainer or directory,
and I've only sent people the patches that I think they care about to
avoid spamming everyone.
Ross Zwisler (9):
tracing: always use canonical ftrace path
bpf: use canonical ftrace path
selftests/bpf: use canonical ftrace path
perf docs: use canonical ftrace path
tools/power: use canonical ftrace path
selftests: use canonical ftrace path
tools/virtio: use canonical ftrace path
leaking_addresses: also skip canonical ftrace path
tools/kvm_stat: use canonical ftrace path
include/linux/kernel.h | 2 +-
include/linux/tracepoint.h | 4 ++--
include/uapi/linux/bpf.h | 8 ++++----
kernel/trace/Kconfig | 20 +++++++++----------
kernel/trace/kprobe_event_gen_test.c | 2 +-
kernel/trace/ring_buffer.c | 2 +-
kernel/trace/synth_event_gen_test.c | 2 +-
kernel/trace/trace.c | 2 +-
samples/bpf/cpustat_kern.c | 4 ++--
samples/bpf/hbm.c | 4 ++--
samples/bpf/ibumad_kern.c | 4 ++--
samples/bpf/lwt_len_hist.sh | 2 +-
samples/bpf/offwaketime_kern.c | 2 +-
samples/bpf/task_fd_query_user.c | 4 ++--
samples/bpf/test_lwt_bpf.sh | 2 +-
samples/bpf/test_overhead_tp_kern.c | 4 ++--
samples/user_events/example.c | 4 ++--
scripts/leaking_addresses.pl | 1 +
scripts/tracing/draw_functrace.py | 6 +++---
scripts/tracing/ftrace-bisect.sh | 4 ++--
tools/include/uapi/linux/bpf.h | 8 ++++----
tools/kvm/kvm_stat/kvm_stat | 2 +-
tools/lib/api/fs/tracing_path.c | 4 ++--
tools/lib/traceevent/event-parse.c | 8 ++++----
tools/perf/Documentation/perf-list.txt | 2 +-
tools/perf/Documentation/perf-script-perl.txt | 2 +-
.../perf/Documentation/perf-script-python.txt | 4 ++--
tools/power/pm-graph/sleepgraph.py | 4 ++--
.../x86/amd_pstate_tracer/amd_pstate_trace.py | 4 ++--
.../intel_pstate_tracer.py | 10 +++++-----
.../selftests/bpf/get_cgroup_id_user.c | 2 +-
.../bpf/prog_tests/kprobe_multi_test.c | 2 +-
.../bpf/prog_tests/task_fd_query_tp.c | 2 +-
.../bpf/prog_tests/tp_attach_query.c | 2 +-
.../selftests/bpf/prog_tests/trace_printk.c | 2 +-
.../selftests/bpf/prog_tests/trace_vprintk.c | 2 +-
.../selftests/bpf/progs/test_stacktrace_map.c | 2 +-
.../selftests/bpf/progs/test_tracepoint.c | 2 +-
tools/testing/selftests/bpf/test_ftrace.sh | 2 +-
tools/testing/selftests/bpf/test_tunnel.sh | 8 ++++----
tools/testing/selftests/bpf/trace_helpers.c | 4 ++--
.../testing/selftests/user_events/dyn_test.c | 2 +-
.../selftests/user_events/ftrace_test.c | 10 +++++-----
.../testing/selftests/user_events/perf_test.c | 8 ++++----
tools/testing/selftests/vm/protection_keys.c | 4 ++--
tools/tracing/latency/latency-collector.c | 2 +-
tools/virtio/virtio-trace/README | 2 +-
tools/virtio/virtio-trace/trace-agent.c | 2 +-
48 files changed, 96 insertions(+), 95 deletions(-)
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 6/9] selftests: use canonical ftrace path
2023-01-30 18:19 [PATCH 0/9] use canonical ftrace path whenever possible Ross Zwisler
@ 2023-01-30 18:19 ` Ross Zwisler
2023-01-30 19:26 ` [PATCH 0/9] use canonical ftrace path whenever possible Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Ross Zwisler @ 2023-01-30 18:19 UTC (permalink / raw)
To: linux-kernel
Cc: Ross Zwisler, Shuah Khan, Steven Rostedt, linux-trace-kernel,
Andrew Morton, linux-kselftest, linux-mm
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 291bc1e07842..0d421015fbc1 100644
--- a/tools/testing/selftests/vm/protection_keys.c
+++ b/tools/testing/selftests/vm/protection_keys.c
@@ -97,7 +97,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())
@@ -123,7 +123,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
}
--
2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 0/9] use canonical ftrace path whenever possible
2023-01-30 18:19 [PATCH 0/9] use canonical ftrace path whenever possible Ross Zwisler
2023-01-30 18:19 ` [PATCH 6/9] selftests: use canonical ftrace path Ross Zwisler
@ 2023-01-30 19:26 ` Michael S. Tsirkin
1 sibling, 0 replies; 3+ messages in thread
From: Michael S. Tsirkin @ 2023-01-30 19:26 UTC (permalink / raw)
To: Ross Zwisler
Cc: linux-kernel, Ross Zwisler, Tobin C. Harding, Alexander Shishkin,
Alexei Starovoitov, Andrew Morton, Andrii Nakryiko,
Arnaldo Carvalho de Melo, Daniel Borkmann, Hao Luo, Huang Rui,
Ingo Molnar, Jason Gunthorpe, Jason Wang, Jiri Olsa,
John Fastabend, KP Singh, Leon Romanovsky, Mark Rutland,
Martin KaFai Lau, Masami Hiramatsu, Mykola Lysenko, Namhyung Kim,
Paolo Bonzini, Peter Zijlstra, Shuah Khan, Song Liu,
Stanislav Fomichev, Steven Rostedt, Todd E Brandt,
Tycho Andersen, Yonghong Song, bpf, kvm, linux-hardening,
linux-kselftest, linux-mm, linux-perf-users, linux-pm,
linux-rdma, virtualization, linux-trace-kernel
On Mon, Jan 30, 2023 at 11:19:06AM -0700, Ross Zwisler wrote:
> The canonical location for the tracefs filesystem is at /sys/kernel/tracing.
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> 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
>
> There are many places where this older debugfs path is still used in
> code comments, selftests, examples and tools, so let's update them to
> avoid confusion.
>
> I've broken up the series as best I could by maintainer or directory,
> and I've only sent people the patches that I think they care about to
> avoid spamming everyone.
>
> Ross Zwisler (9):
> tracing: always use canonical ftrace path
> bpf: use canonical ftrace path
> selftests/bpf: use canonical ftrace path
> perf docs: use canonical ftrace path
> tools/power: use canonical ftrace path
> selftests: use canonical ftrace path
> tools/virtio: use canonical ftrace path
> leaking_addresses: also skip canonical ftrace path
> tools/kvm_stat: use canonical ftrace path
>
> include/linux/kernel.h | 2 +-
> include/linux/tracepoint.h | 4 ++--
> include/uapi/linux/bpf.h | 8 ++++----
> kernel/trace/Kconfig | 20 +++++++++----------
> kernel/trace/kprobe_event_gen_test.c | 2 +-
> kernel/trace/ring_buffer.c | 2 +-
> kernel/trace/synth_event_gen_test.c | 2 +-
> kernel/trace/trace.c | 2 +-
> samples/bpf/cpustat_kern.c | 4 ++--
> samples/bpf/hbm.c | 4 ++--
> samples/bpf/ibumad_kern.c | 4 ++--
> samples/bpf/lwt_len_hist.sh | 2 +-
> samples/bpf/offwaketime_kern.c | 2 +-
> samples/bpf/task_fd_query_user.c | 4 ++--
> samples/bpf/test_lwt_bpf.sh | 2 +-
> samples/bpf/test_overhead_tp_kern.c | 4 ++--
> samples/user_events/example.c | 4 ++--
> scripts/leaking_addresses.pl | 1 +
> scripts/tracing/draw_functrace.py | 6 +++---
> scripts/tracing/ftrace-bisect.sh | 4 ++--
> tools/include/uapi/linux/bpf.h | 8 ++++----
> tools/kvm/kvm_stat/kvm_stat | 2 +-
> tools/lib/api/fs/tracing_path.c | 4 ++--
> tools/lib/traceevent/event-parse.c | 8 ++++----
> tools/perf/Documentation/perf-list.txt | 2 +-
> tools/perf/Documentation/perf-script-perl.txt | 2 +-
> .../perf/Documentation/perf-script-python.txt | 4 ++--
> tools/power/pm-graph/sleepgraph.py | 4 ++--
> .../x86/amd_pstate_tracer/amd_pstate_trace.py | 4 ++--
> .../intel_pstate_tracer.py | 10 +++++-----
> .../selftests/bpf/get_cgroup_id_user.c | 2 +-
> .../bpf/prog_tests/kprobe_multi_test.c | 2 +-
> .../bpf/prog_tests/task_fd_query_tp.c | 2 +-
> .../bpf/prog_tests/tp_attach_query.c | 2 +-
> .../selftests/bpf/prog_tests/trace_printk.c | 2 +-
> .../selftests/bpf/prog_tests/trace_vprintk.c | 2 +-
> .../selftests/bpf/progs/test_stacktrace_map.c | 2 +-
> .../selftests/bpf/progs/test_tracepoint.c | 2 +-
> tools/testing/selftests/bpf/test_ftrace.sh | 2 +-
> tools/testing/selftests/bpf/test_tunnel.sh | 8 ++++----
> tools/testing/selftests/bpf/trace_helpers.c | 4 ++--
> .../testing/selftests/user_events/dyn_test.c | 2 +-
> .../selftests/user_events/ftrace_test.c | 10 +++++-----
> .../testing/selftests/user_events/perf_test.c | 8 ++++----
> tools/testing/selftests/vm/protection_keys.c | 4 ++--
> tools/tracing/latency/latency-collector.c | 2 +-
> tools/virtio/virtio-trace/README | 2 +-
> tools/virtio/virtio-trace/trace-agent.c | 2 +-
> 48 files changed, 96 insertions(+), 95 deletions(-)
>
> --
> 2.39.1.456.gfc5497dd1b-goog
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-30 19:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-30 18:19 [PATCH 0/9] use canonical ftrace path whenever possible Ross Zwisler
2023-01-30 18:19 ` [PATCH 6/9] selftests: use canonical ftrace path Ross Zwisler
2023-01-30 19:26 ` [PATCH 0/9] use canonical ftrace path whenever possible Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox