* [PATCH v2 2/6] selftests: use canonical ftrace path
2023-02-15 22:33 [PATCH v2 0/6] use canonical ftrace path whenever possible Ross Zwisler
@ 2023-02-15 22:33 ` Ross Zwisler
2023-02-16 20:58 ` Steven Rostedt
2023-02-17 15:40 ` Mukesh Ojha
2023-03-10 8:29 ` [PATCH v2 0/6] use canonical ftrace path whenever possible Michael S. Tsirkin
2023-03-22 2:32 ` Michael S. Tsirkin
2 siblings, 2 replies; 9+ messages in thread
From: Ross Zwisler @ 2023-02-15 22:33 UTC (permalink / raw)
To: linux-kernel
Cc: Ross Zwisler, Shuah Khan, Andrew Morton, linux-kselftest,
linux-mm, linux-trace-kernel, Steven Rostedt
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 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
}
--
2.39.1.637.g21b0678d19-goog
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/6] selftests: use canonical ftrace path
2023-02-15 22:33 ` [PATCH v2 2/6] selftests: use canonical ftrace path Ross Zwisler
@ 2023-02-16 20:58 ` Steven Rostedt
2023-02-17 15:40 ` Mukesh Ojha
1 sibling, 0 replies; 9+ messages in thread
From: Steven Rostedt @ 2023-02-16 20:58 UTC (permalink / raw)
To: Ross Zwisler, Shuah Khan
Cc: linux-kernel, Ross Zwisler, Shuah Khan, Andrew Morton,
linux-kselftest, linux-mm, linux-trace-kernel
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
> }
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2 2/6] selftests: use canonical ftrace path
2023-02-15 22:33 ` [PATCH v2 2/6] selftests: use canonical ftrace path Ross Zwisler
2023-02-16 20:58 ` Steven Rostedt
@ 2023-02-17 15:40 ` Mukesh Ojha
1 sibling, 0 replies; 9+ messages in thread
From: Mukesh Ojha @ 2023-02-17 15:40 UTC (permalink / raw)
To: Ross Zwisler, linux-kernel
Cc: Ross Zwisler, Shuah Khan, Andrew Morton, linux-kselftest,
linux-mm, linux-trace-kernel, Steven Rostedt
On 2/16/2023 4:03 AM, Ross Zwisler 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.
>
> 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
> }
>
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
-Mukesh
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/6] use canonical ftrace path whenever possible
2023-02-15 22:33 [PATCH v2 0/6] use canonical ftrace path whenever possible Ross Zwisler
2023-02-15 22:33 ` [PATCH v2 2/6] selftests: use canonical ftrace path Ross Zwisler
@ 2023-03-10 8:29 ` Michael S. Tsirkin
2023-03-10 19:06 ` Ross Zwisler
2023-03-22 2:32 ` Michael S. Tsirkin
2 siblings, 1 reply; 9+ messages in thread
From: Michael S. Tsirkin @ 2023-03-10 8:29 UTC (permalink / raw)
To: Ross Zwisler
Cc: linux-kernel, Ross Zwisler, Tobin C. Harding, Andrew Morton,
Jason Wang, Masami Hiramatsu, Paolo Bonzini, Shuah Khan,
Tycho Andersen, kvm, linux-hardening, linux-kselftest, linux-mm,
virtualization, linux-trace-kernel, Steven Rostedt
On Wed, Feb 15, 2023 at 03:33:44PM -0700, Ross Zwisler wrote:
> Changes in v2:
> * Dropped patches which were pulled into maintainer trees.
> * Split BPF patches out into another series targeting bpf-next.
> * trace-agent now falls back to debugfs if tracefs isn't present.
> * Added Acked-by from mst@redhat.com to series.
> * Added a typo fixup for the virtio-trace README.
>
> Steven, assuming there are no objections, would you feel comfortable
> taking this series through your tree?
Acked-by: Michael S. Tsirkin <mst@redhat.com>
if you want the virtio patches through my tree after all, let me know.
> ---
> 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 (6):
> tracing: always use canonical ftrace path
> selftests: use canonical ftrace path
> leaking_addresses: also skip canonical ftrace path
> tools/kvm_stat: use canonical ftrace path
> tools/virtio: use canonical ftrace path
> tools/virtio: fix typo in README instructions
>
> include/linux/kernel.h | 2 +-
> include/linux/tracepoint.h | 4 ++--
> 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/user_events/example.c | 4 ++--
> scripts/leaking_addresses.pl | 1 +
> scripts/tracing/draw_functrace.py | 6 +++---
> tools/kvm/kvm_stat/kvm_stat | 2 +-
> tools/lib/api/fs/tracing_path.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 | 4 ++--
> tools/virtio/virtio-trace/trace-agent.c | 12 +++++++----
> 19 files changed, 49 insertions(+), 44 deletions(-)
>
> --
> 2.39.1.637.g21b0678d19-goog
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/6] use canonical ftrace path whenever possible
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
0 siblings, 1 reply; 9+ messages in thread
From: Ross Zwisler @ 2023-03-10 19:06 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Ross Zwisler, linux-kernel, Tobin C. Harding, Andrew Morton,
Jason Wang, Masami Hiramatsu, Paolo Bonzini, Shuah Khan,
Tycho Andersen, kvm, linux-hardening, linux-kselftest, linux-mm,
virtualization, linux-trace-kernel, Steven Rostedt
On Fri, Mar 10, 2023 at 03:29:49AM -0500, Michael S. Tsirkin wrote:
> On Wed, Feb 15, 2023 at 03:33:44PM -0700, Ross Zwisler wrote:
> > Changes in v2:
> > * Dropped patches which were pulled into maintainer trees.
> > * Split BPF patches out into another series targeting bpf-next.
> > * trace-agent now falls back to debugfs if tracefs isn't present.
> > * Added Acked-by from mst@redhat.com to series.
> > * Added a typo fixup for the virtio-trace README.
> >
> > Steven, assuming there are no objections, would you feel comfortable
> > taking this series through your tree?
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>
> if you want the virtio patches through my tree after all, let me know.
Yes, please, that would be great. I'll send out v3 with the few patches that
haven't gotten a response, but I'll drop the virtio patches assuming you've
got them.
Thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/6] use canonical ftrace path whenever possible
2023-03-10 19:06 ` Ross Zwisler
@ 2023-03-10 19:37 ` Steven Rostedt
0 siblings, 0 replies; 9+ messages in thread
From: Steven Rostedt @ 2023-03-10 19:37 UTC (permalink / raw)
To: Ross Zwisler
Cc: Michael S. Tsirkin, Ross Zwisler, linux-kernel, Tobin C. Harding,
Andrew Morton, Jason Wang, Masami Hiramatsu, Paolo Bonzini,
Shuah Khan, Tycho Andersen, kvm, linux-hardening, linux-kselftest,
linux-mm, virtualization, linux-trace-kernel
On Fri, 10 Mar 2023 12:06:58 -0700
Ross Zwisler <zwisler@google.com> wrote:
> On Fri, Mar 10, 2023 at 03:29:49AM -0500, Michael S. Tsirkin wrote:
> > On Wed, Feb 15, 2023 at 03:33:44PM -0700, Ross Zwisler wrote:
> > > Changes in v2:
> > > * Dropped patches which were pulled into maintainer trees.
> > > * Split BPF patches out into another series targeting bpf-next.
> > > * trace-agent now falls back to debugfs if tracefs isn't present.
> > > * Added Acked-by from mst@redhat.com to series.
> > > * Added a typo fixup for the virtio-trace README.
> > >
> > > Steven, assuming there are no objections, would you feel comfortable
> > > taking this series through your tree?
> >
> > Acked-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > if you want the virtio patches through my tree after all, let me know.
>
> Yes, please, that would be great. I'll send out v3 with the few patches that
> haven't gotten a response, but I'll drop the virtio patches assuming you've
> got them.
>
Since the last patch 6/6 is not tracing related, I would prefer it to go
through the virtio tree.
For patches 1-5, please add:
Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Thanks!
-- Steve
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/6] use canonical ftrace path whenever possible
2023-02-15 22:33 [PATCH v2 0/6] use canonical ftrace path whenever possible Ross Zwisler
2023-02-15 22:33 ` [PATCH v2 2/6] selftests: use canonical ftrace path Ross Zwisler
2023-03-10 8:29 ` [PATCH v2 0/6] use canonical ftrace path whenever possible Michael S. Tsirkin
@ 2023-03-22 2:32 ` Michael S. Tsirkin
2023-03-22 16:52 ` Ross Zwisler
2 siblings, 1 reply; 9+ messages in thread
From: Michael S. Tsirkin @ 2023-03-22 2:32 UTC (permalink / raw)
To: Ross Zwisler
Cc: linux-kernel, Ross Zwisler, Tobin C. Harding, Andrew Morton,
Jason Wang, Masami Hiramatsu, Paolo Bonzini, Shuah Khan,
Tycho Andersen, kvm, linux-hardening, linux-kselftest, linux-mm,
virtualization, linux-trace-kernel, Steven Rostedt
On Wed, Feb 15, 2023 at 03:33:44PM -0700, Ross Zwisler wrote:
> Changes in v2:
> * Dropped patches which were pulled into maintainer trees.
> * Split BPF patches out into another series targeting bpf-next.
> * trace-agent now falls back to debugfs if tracefs isn't present.
> * Added Acked-by from mst@redhat.com to series.
> * Added a typo fixup for the virtio-trace README.
>
> Steven, assuming there are no objections, would you feel comfortable
> taking this series through your tree?
for merging up to patch 5 through another tree:
Acked-by: Michael S. Tsirkin <mst@redhat.com>
I'll merge patch 6, no problem.
> ---
> 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 (6):
> tracing: always use canonical ftrace path
> selftests: use canonical ftrace path
> leaking_addresses: also skip canonical ftrace path
> tools/kvm_stat: use canonical ftrace path
> tools/virtio: use canonical ftrace path
> tools/virtio: fix typo in README instructions
>
> include/linux/kernel.h | 2 +-
> include/linux/tracepoint.h | 4 ++--
> 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/user_events/example.c | 4 ++--
> scripts/leaking_addresses.pl | 1 +
> scripts/tracing/draw_functrace.py | 6 +++---
> tools/kvm/kvm_stat/kvm_stat | 2 +-
> tools/lib/api/fs/tracing_path.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 | 4 ++--
> tools/virtio/virtio-trace/trace-agent.c | 12 +++++++----
> 19 files changed, 49 insertions(+), 44 deletions(-)
>
> --
> 2.39.1.637.g21b0678d19-goog
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/6] use canonical ftrace path whenever possible
2023-03-22 2:32 ` Michael S. Tsirkin
@ 2023-03-22 16:52 ` Ross Zwisler
0 siblings, 0 replies; 9+ messages in thread
From: Ross Zwisler @ 2023-03-22 16:52 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Ross Zwisler, linux-kernel, Tobin C. Harding, Andrew Morton,
Jason Wang, Masami Hiramatsu, Paolo Bonzini, Shuah Khan,
Tycho Andersen, kvm, linux-hardening, linux-kselftest, linux-mm,
virtualization, linux-trace-kernel, Steven Rostedt
On Tue, Mar 21, 2023 at 10:32:46PM -0400, Michael S. Tsirkin wrote:
> On Wed, Feb 15, 2023 at 03:33:44PM -0700, Ross Zwisler wrote:
> > Changes in v2:
> > * Dropped patches which were pulled into maintainer trees.
> > * Split BPF patches out into another series targeting bpf-next.
> > * trace-agent now falls back to debugfs if tracefs isn't present.
> > * Added Acked-by from mst@redhat.com to series.
> > * Added a typo fixup for the virtio-trace README.
> >
> > Steven, assuming there are no objections, would you feel comfortable
> > taking this series through your tree?
>
> for merging up to patch 5 through another tree:
>
> Acked-by: Michael S. Tsirkin <mst@redhat.com>
>
> I'll merge patch 6, no problem.
Hey Michael, would you also mind merging patch 5, the other virtio patch?
[PATCH v2 5/6] tools/virtio: use canonical ftrace path
https://lore.kernel.org/all/20230215223350.2658616-6-zwisler@google.com/
I don't think Steven took this one through his tree. Thanks!
^ permalink raw reply [flat|nested] 9+ messages in thread