[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <aCeJcsJnbi7jfVdK@x1>
Date: Fri, 16 May 2025 15:52:34 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: Thomas Richter <tmricht@...ux.ibm.com>
Cc: linux390-list@...maker.boeblingen.de.ibm.com, sumanthk@...ux.ibm.com,
hca@...ux.ibm.com, agordeev@...ux.ibm.com, gor@...ux.ibm.com,
Alexander Egorenkov <egorenar@...ux.ibm.com>,
linux-perf-users@...r.kernel.org,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] perf ftrace: Use process/session specific trace settings
On Fri, May 16, 2025 at 03:10:23PM +0200, Thomas Richter wrote:
> Executing perf ftrace commands ftrace, profile and latency
> leave tracing disabled as can seen in this output:
You forgot to CC lkml and linux-perf-users mailing list, I'm doing it
now, noticed when b4 didn't manage to find it.
Thanks for working on this! From a quick glance it looks great, I'm
testing it now.
- Arnaldo
> # echo 1 > /sys/kernel/debug/tracing/tracing_on
> # cat /sys/kernel/debug/tracing/tracing_on
> 1
> # perf ftrace trace --graph-opts depth=5 sleep 0.1 > /dev/null
> # cat /sys/kernel/debug/tracing/tracing_on
> 0
> #
>
> The tracing_on file is not restored to its value before the command.
> Fix this behavior and restore the trace setting to what
> is was before the invocation of the command.
> On Fedora 41 and 42 tracing is turned on by default.
>
> This patch use the .../tracing/instances/XXX subdirectory feature.
> Each perf ftrace invocation creates its own session/process
> specific subdirectory and does not change the global state
> in the .../tracing directory itself.
>
> Signed-off-by: Thomas Richter <tmricht@...ux.ibm.com>
> Suggested-by: Arnaldo Carvalho de Melo <acme@...nel.org>
> Reported-by: Alexander Egorenkov <egorenar@...ux.ibm.com>
> ---
> tools/perf/builtin-ftrace.c | 79 ++++++++++++++++++++++++++++++++++---
> 1 file changed, 73 insertions(+), 6 deletions(-)
>
> diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
> index 7caa18d5ffc3..f523039c585f 100644
> --- a/tools/perf/builtin-ftrace.c
> +++ b/tools/perf/builtin-ftrace.c
> @@ -38,6 +38,8 @@
> #include "util/units.h"
> #include "util/parse-sublevel-options.h"
>
> +#include <sys/stat.h>
> +
> #define DEFAULT_TRACER "function_graph"
>
> static volatile sig_atomic_t workload_exec_errno;
> @@ -45,6 +47,8 @@ static volatile sig_atomic_t done;
>
> static struct stats latency_stats; /* for tracepoints */
>
> +static char tracing_instance[PATH_MAX]; /* Trace instance directory */
> +
> static void sig_handler(int sig __maybe_unused)
> {
> done = true;
> @@ -100,6 +104,34 @@ static bool is_ftrace_supported(void)
> return supported;
> }
>
> +/*
> + * Wrapper to test if a file in directory .../tracing/instances/XXX
> + * exists. If so return the .../tracing/instances/XXX file for use.
> + * Otherwise the file exists only in directory .../tracing and
> + * is applicable to all instances, for example file available_filter_functions.
> + * Return that file name in this case.
> + *
> + * This functions works similar to get_tracing_file() and expects its caller
> + * to free the returned file name.
> + *
> + * The global variable tracing_instance is set in init_tracing_instance()
> + * called a the beginning to a process specific tracing subdirectory.
> + */
> +static char *get_tracing_instance_file(const char *name)
> +{
> + char *file;
> +
> + if (asprintf(&file, "%s/%s", tracing_instance, name) < 0)
> + return NULL;
> +
> + if (!access(file, F_OK))
> + return file;
> +
> + put_tracing_file(file);
> + file = get_tracing_file(name);
> + return file;
> +}
> +
> static int __write_tracing_file(const char *name, const char *val, bool append)
> {
> char *file;
> @@ -109,7 +141,7 @@ static int __write_tracing_file(const char *name, const char *val, bool append)
> char errbuf[512];
> char *val_copy;
>
> - file = get_tracing_file(name);
> + file = get_tracing_instance_file(name);
> if (!file) {
> pr_debug("cannot get tracing file: %s\n", name);
> return -1;
> @@ -167,7 +199,7 @@ static int read_tracing_file_to_stdout(const char *name)
> int fd;
> int ret = -1;
>
> - file = get_tracing_file(name);
> + file = get_tracing_instance_file(name);
> if (!file) {
> pr_debug("cannot get tracing file: %s\n", name);
> return -1;
> @@ -209,7 +241,7 @@ static int read_tracing_file_by_line(const char *name,
> char *file;
> FILE *fp;
>
> - file = get_tracing_file(name);
> + file = get_tracing_instance_file(name);
> if (!file) {
> pr_debug("cannot get tracing file: %s\n", name);
> return -1;
> @@ -299,6 +331,36 @@ static int reset_tracing_files(struct perf_ftrace *ftrace __maybe_unused)
> return 0;
> }
>
> +/* Remove .../tracing/instances/XXX subdirectory created with
> + * init_tracing_instance().
> + */
> +static void exit_tracing_instance(void)
> +{
> + rmdir(tracing_instance);
> +}
> +
> +/* Create subdirectory within .../tracing/instances/XXX to have session
> + * or process specific setup. To delete this setup, simply remove the
> + * subdirectory.
> + */
> +static int init_tracing_instance(void)
> +{
> + char dirname[] = "instances/perf-ftrace-XXXXXX";
> + char *path;
> +
> + path = get_tracing_file(dirname);
> + if (!path)
> + return -1;
> + strcpy(tracing_instance, path);
> + put_tracing_file(path);
> + path = mkdtemp(tracing_instance);
> + if (!path) {
> + pr_err("failed to create tracing/instances directory\n");
> + return -1;
> + }
> + return 0;
> +}
> +
> static int set_tracing_pid(struct perf_ftrace *ftrace)
> {
> int i;
> @@ -648,7 +710,7 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace)
>
> setup_pager();
>
> - trace_file = get_tracing_file("trace_pipe");
> + trace_file = get_tracing_instance_file("trace_pipe");
> if (!trace_file) {
> pr_err("failed to open trace_pipe\n");
> goto out_reset;
> @@ -942,7 +1004,7 @@ static int prepare_func_latency(struct perf_ftrace *ftrace)
> return -1;
> }
>
> - trace_file = get_tracing_file("trace_pipe");
> + trace_file = get_tracing_instance_file("trace_pipe");
> if (!trace_file) {
> pr_err("failed to open trace_pipe\n");
> return -1;
> @@ -1323,7 +1385,7 @@ static int __cmd_profile(struct perf_ftrace *ftrace)
>
> setup_pager();
>
> - trace_file = get_tracing_file("trace_pipe");
> + trace_file = get_tracing_instance_file("trace_pipe");
> if (!trace_file) {
> pr_err("failed to open trace_pipe\n");
> goto out_reset;
> @@ -1740,6 +1802,9 @@ int cmd_ftrace(int argc, const char **argv)
> if (!argc && target__none(&ftrace.target))
> ftrace.target.system_wide = true;
>
> + if (init_tracing_instance())
> + goto out_delete_filters;
> +
> switch (subcmd) {
> case PERF_FTRACE_TRACE:
> cmd_func = __cmd_ftrace;
> @@ -1839,5 +1904,7 @@ int cmd_ftrace(int argc, const char **argv)
> delete_filter_func(&ftrace.graph_funcs);
> delete_filter_func(&ftrace.nograph_funcs);
>
> + exit_tracing_instance();
> +
> return ret;
> }
> --
> 2.49.0
Powered by blists - more mailing lists