perf tools: Enable AUX area tracing snapshots using a FIFO
Adrian Hunter
reviewerv2 cover perf tools: Enable AUX area tracing snapshots using a FIFO
Hi
Here are V2 patches to enable AUX area tracing snapshots using a FIFO. Presently SIGUSR2 can be used but the advantage of the FIFO is that access is governed by access to the FIFO. Refer to the example in patch 5.
The first 4 patches are preparation, including patch 4 which enhances the --control option to accept file names.
Patch 5 adds snapshot control command.
The final patch updates Intel PT documentation.
Changes in V2:
Use fifo: prefix in --control option
Adrian Hunter (6):
perf tools: Consolidate --control option parsing into one function perf tools: Handle read errors from ctl_fd
perf tools: Use AsciiDoc formatting for --control option documentation perf tools: Add FIFO file names as alternative options to --control perf record: Add 'snapshot' control command
perf intel-pt: Document snapshot control command
tools/perf/Documentation/perf-intel-pt.txt | 23 ++++++- tools/perf/Documentation/perf-record.txt | 56 ++++++++--------- tools/perf/Documentation/perf-stat.txt | 48 ++++++++------- tools/perf/builtin-record.c | 74 +++++++++++++---------- tools/perf/builtin-stat.c | 35 +++++------ tools/perf/util/evlist.c | 96 +++++++++++++++++++++++++++--- tools/perf/util/evlist.h | 6 +- tools/perf/util/record.h | 1 + tools/perf/util/stat.h | 1 + 9 files changed, 227 insertions(+), 113 deletions(-)
Regards
Adrian
Adrian Hunter
reviewerPATCH v2 1/6 perf tools: Consolidate --control option parsing into one function
Consolidate --control option parsing into one function, in preparation for adding FIFO file name options.
--- tools/perf/builtin-record.c | 22 ++-------------------- tools/perf/builtin-stat.c | 22 ++-------------------- tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++ tools/perf/util/evlist.h | 1 + 4 files changed, 29 insertions(+), 40 deletions(-)
tools/perf/builtin-record.c +2 -20
@@ -2234,27 +2234,9 @@ static int parse_control_option(const struct option *opt, const char *str, int unset __maybe_unused) { - char *comma = NULL, *endptr = NULL; -struct record_opts *config = (struct record_opts *)opt->value; - -if (strncmp (str,"fd:" ,3 )) -return -EINVAL ; - - config->ctl_fd =strtoul (&str[3 ], &endptr,0 ); -if (endptr == &str[3 ]) -return -EINVAL ; - - comma =strchr (str,',' ); -if (comma) { -if (endptr != comma) -return -EINVAL ; - - config->ctl_fd_ack =strtoul (comma +1 , &endptr,0 ); -if (endptr == comma +1 || *endptr !='\0' ) -return -EINVAL ; - } +struct record_opts *opts = opt->value; -return 0 ; +return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack); }static void switch_output_size_warn (struct record *rec)
tools/perf/builtin-stat.c +2 -20
@@ -1045,27 +1045,9 @@ static int parse_control_option(const struct option *opt, const char *str, int unset __maybe_unused) { - char *comma = NULL, *endptr = NULL; -struct perf_stat_config *config = (struct perf_stat_config *)opt->value; +struct perf_stat_config *config = opt->value; -if (strncmp (str,"fd:" ,3 )) -return -EINVAL ; - - config->ctl_fd =strtoul (&str[3 ], &endptr,0 ); -if (endptr == &str[3 ]) -return -EINVAL ; - - comma =strchr (str,',' ); -if (comma) { -if (endptr != comma) -return -EINVAL ; - - config->ctl_fd_ack =strtoul (comma +1 , &endptr,0 ); -if (endptr == comma +1 || *endptr !='\0' ) -return -EINVAL ; - } - -return 0 ; +return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack); }static struct option stat_options[] = {
tools/perf/util/evlist.c +24 -0
@@ -1727,6 +1727,30 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,return leader; } +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack) +{ +char *comma =NULL , *endptr =NULL ; + +if (strncmp (str,"fd:" ,3 )) +return -EINVAL ; + + *ctl_fd =strtoul (&str[3 ], &endptr,0 ); +if (endptr == &str[3 ]) +return -EINVAL ; + + comma =strchr (str,',' ); +if (comma) { +if (endptr != comma) +return -EINVAL ; + + *ctl_fd_ack =strtoul (comma +1 , &endptr,0 ); +if (endptr == comma +1 || *endptr !='\0' ) +return -EINVAL ; + } + +return 0 ; +} +int evlist__initialize_ctlfd (struct evlist *evlist,int fd,int ack) {if (fd ==-1 ) {
tools/perf/util/evlist.h +1 -0
@@ -373,6 +373,7 @@ enum evlist_ctl_cmd { EVLIST_CTL_CMD_ACK }; +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);
Signature · 1 line
2.17.1
Re: [PATCH V2 1/6] perf tools: Consolidate --control option parsing into one function
Quoted 10 lines · Adrian Hunter
Consolidate --control option parsing into one function, in preparation for adding FIFO file name options.
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/builtin-record.c | 22 ++-------------------- tools/perf/builtin-stat.c | 22 ++-------------------- tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++ tools/perf/util/evlist.h | 1 + 4 files changed, 29 insertions(+), 40 deletions(-)
Regards,
Alexei
Re: [PATCH V2 1/6] perf tools: Consolidate --control option parsing into one function
Em Wed, Sep 02, 2020 at 07:06:51PM +0300, Alexey Budankov escreveu:
Quoted 13 lines · Adrian Hunter
Quoted 10 lines
Consolidate --control option parsing into one function, in preparation for adding FIFO file name options.
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/builtin-record.c | 22 ++-------------------- tools/perf/builtin-stat.c | 22 ++-------------------- tools/perf/util/evlist.c | 24 ++++++++++++++++++++++++ tools/perf/util/evlist.h | 1 + 4 files changed, 29 insertions(+), 40 deletions(-)
Quoted 1 line
Acked-by Alexei Budankov <[email protected]>
Thanks, applied.
- Arnaldo
Adrian Hunter
reviewerPATCH v2 2/6 perf tools: Handle read errors from ctl_fd
In reply to Adrian HunterHandle read errors from ctl_fd such as EINTR, EAGAIN and EWOULDBLOCK.
--- tools/perf/util/evlist.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
tools/perf/util/evlist.c +11 -5
@@ -1802,6 +1802,7 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd,char c;size_t bytes_read =0 ; + *cmd =EVLIST_CTL_CMD_UNSUPPORTED ;memset (cmd_data,0 , data_size); data_size--;
@@ -1813,17 +1814,22 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, cmd_data[bytes_read++] = c;if (bytes_read == data_size)break ; - }else { -if (err ==-1 ) +continue ; + }else if (err ==-1 ) { +if (errno ==EINTR ) +continue ; +if (errno ==EAGAIN || errno ==EWOULDBLOCK ) + err =0 ; +else pr_err ("Failed to read from ctlfd %d: %m\n" , evlist->ctl_fd.fd); -break ; } +break ; }while (1 );pr_debug ("Message from ctl_fd: \"%s%s\"\n" , cmd_data, bytes_read == data_size ?"" : c =='\n' ?"\\n" :"\\0" ); -if (err >0 ) { +if (bytes_read >0 ) {if (!strncmp (cmd_data,EVLIST_CTL_CMD_ENABLE_TAG , (sizeof (EVLIST_CTL_CMD_ENABLE_TAG )-1 ))) { *cmd =EVLIST_CTL_CMD_ENABLE ;
@@ -1833,7 +1839,7 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, } } -return err; +return bytes_read ? (int )bytes_read : err; }static int evlist__ctlfd_ack (struct evlist *evlist)
Signature · 1 line
2.17.1
Re: [PATCH V2 2/6] perf tools: Handle read errors from ctl_fd
Quoted 6 lines · Adrian Hunter
Handle read errors from
ctl_fdsuch as EINTR, EAGAIN and EWOULDBLOCK.Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/util/evlist.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
Regards,
Alexei
Re: [PATCH V2 2/6] perf tools: Handle read errors from ctl_fd
Em Wed, Sep 02, 2020 at 07:11:14PM +0300, Alexey Budankov escreveu:
Quoted 10 lines · Adrian Hunter
Quoted 6 lines
Handle read errors from
ctl_fdsuch as EINTR, EAGAIN and EWOULDBLOCK.Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/util/evlist.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)Acked-by Alexei Budankov <[email protected]>
Thanks, applied.
- Arnaldo
Adrian Hunter
reviewerPATCH v2 3/6 perf tools: Use AsciiDoc formatting for --control option documentation
In reply to Adrian HunterThe --control option does not display well in man pages unless AsciiDoc formatting is used.
--- tools/perf/Documentation/perf-record.txt | 46 ++++++++++++------------ tools/perf/Documentation/perf-stat.txt | 46 ++++++++++++------------ 2 files changed, 46 insertions(+), 46 deletions(-)
tools/perf/Documentation/perf-record.txt +23 -23
@@ -627,43 +627,43 @@ option. The -e option and this one can be mixed and matched. Events can be grouped using the {} notation. endif::HAVE_LIBPFM[] ---control fd:ctl-fd[,ack-fd] +--control=fd:ctl-fd[,ack-fd]:: Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor to synchronize with the controlling process. Example of bash shell script to enable and disable events during measurements: -#!/bin/bash + #!/bin/bash -ctl_dir=/tmp/ + ctl_dir=/tmp/ -ctl_fifo=${ctl_dir}perf_ctl.fifo -test -p ${ctl_fifo} && unlink ${ctl_fifo} -mkfifo ${ctl_fifo} -exec {ctl_fd}<>${ctl_fifo} + ctl_fifo=${ctl_dir}perf_ctl.fifo + test -p ${ctl_fifo} && unlink ${ctl_fifo} + mkfifo ${ctl_fifo} + exec {ctl_fd}<>${ctl_fifo} -ctl_ack_fifo=${ctl_dir}perf_ctl_ack.fifo -test -p ${ctl_ack_fifo} && unlink ${ctl_ack_fifo} -mkfifo ${ctl_ack_fifo} -exec {ctl_fd_ack}<>${ctl_ack_fifo} + ctl_ack_fifo=${ctl_dir}perf_ctl_ack.fifo + test -p ${ctl_ack_fifo} && unlink ${ctl_ack_fifo} + mkfifo ${ctl_ack_fifo} + exec {ctl_fd_ack}<>${ctl_ack_fifo} -perf record -D -1 -e cpu-cycles -a \ - --control fd:${ctl_fd},${ctl_fd_ack} \ - -- sleep 30 & -perf_pid=$! + perf record -D -1 -e cpu-cycles -a \ + --control fd:${ctl_fd},${ctl_fd_ack} \ + -- sleep 30 & + perf_pid=$! -sleep 5 && echo 'enable' >&${ctl_fd} && read -u ${ctl_fd_ack} e1 && echo "enabled(${e1})" -sleep 10 && echo 'disable' >&${ctl_fd} && read -u ${ctl_fd_ack} d1 && echo "disabled(${d1})" + sleep 5 && echo 'enable' >&${ctl_fd} && read -u ${ctl_fd_ack} e1 && echo "enabled(${e1})" + sleep 10 && echo 'disable' >&${ctl_fd} && read -u ${ctl_fd_ack} d1 && echo "disabled(${d1})" -exec {ctl_fd_ack}>&- -unlink ${ctl_ack_fifo} + exec {ctl_fd_ack}>&- + unlink ${ctl_ack_fifo} -exec {ctl_fd}>&- -unlink ${ctl_fifo} + exec {ctl_fd}>&- + unlink ${ctl_fifo} -wait -n ${perf_pid} -exit $? + wait -n ${perf_pid} + exit $? SEE ALSO
tools/perf/Documentation/perf-stat.txt +23 -23
66 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH V2 3/6] perf tools: Use AsciiDoc formatting for --control option documentation
Quoted 8 lines · Adrian Hunter
The --control option does not display well in man pages unless AsciiDoc formatting is used.
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/Documentation/perf-record.txt | 46 ++++++++++++------------ tools/perf/Documentation/perf-stat.txt | 46 ++++++++++++------------ 2 files changed, 46 insertions(+), 46 deletions(-)
Thanks Adrian for all the formating corrections.
Regards,
Alexei
Re: [PATCH V2 3/6] perf tools: Use AsciiDoc formatting for --control option documentation
Em Wed, Sep 02, 2020 at 07:12:43PM +0300, Alexey Budankov escreveu:
Quoted 11 lines · Adrian Hunter
Quoted 8 lines
The --control option does not display well in man pages unless AsciiDoc formatting is used.
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/Documentation/perf-record.txt | 46 ++++++++++++------------ tools/perf/Documentation/perf-stat.txt | 46 ++++++++++++------------ 2 files changed, 46 insertions(+), 46 deletions(-)
Quoted 3 lines
Thanks Adrian for all the formating corrections.
Acked-by Alexei Budankov <[email protected]>
Thanks, applied.
- Arnaldo
Adrian Hunter
reviewerPATCH v2 4/6 perf tools: Add FIFO file names as alternative options to --control
In reply to Adrian HunterEnable the --control option to accept file names as an alternative to file descriptors.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 6808 $ perf record --control fifo:perf.control,perf.ack -- sleep 300 & [2] 6810 $ echo disable > perf.control $ Events disabled ack
$ echo enable > perf.control $ Events enabled ack
$ echo disable > perf.control $ Events disabled ack
$ kill %2 [ perf record: Woken up 4 times to write data ] $ [ perf record: Captured and wrote 0.018 MB perf.data (7 samples) ]
[1]- Done cat perf.ack [2]+ Terminated perf record --control fifo:perf.control,perf.ack -- sleep 300
$
--- tools/perf/Documentation/perf-record.txt | 2 + tools/perf/Documentation/perf-stat.txt | 2 + tools/perf/builtin-record.c | 34 +++++++++++---- tools/perf/builtin-stat.c | 18 ++++++-- tools/perf/util/evlist.c | 53 +++++++++++++++++++++++- tools/perf/util/evlist.h | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/stat.h | 1 + 8 files changed, 99 insertions(+), 14 deletions(-)
tools/perf/Documentation/perf-record.txt +2 -0
@@ -627,7 +627,9 @@ option. The -e option and this one can be mixed and matched. Events can be grouped using the {} notation. endif::HAVE_LIBPFM[] +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor
tools/perf/Documentation/perf-stat.txt +2 -0
@@ -176,7 +176,9 @@ with it. --append may be used here. Examples: 3>results perf stat --log-fd 3 -- $cmd 3>>results perf stat --log-fd 3 --append -- $cmd +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor
tools/perf/builtin-record.c +26 -8
@@ -2236,7 +2236,17 @@ static int parse_control_option(const struct option *opt, {struct record_opts *opts = opt->value; -return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack); +return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close); +} + +static void close_control_option (struct record_opts *opts) +{ +if (opts->ctl_fd_close) { + opts->ctl_fd_close = false; +close (opts->ctl_fd); +if (opts->ctl_fd_ack >=0 ) +close (opts->ctl_fd_ack); + } }static void switch_output_size_warn (struct record *rec)
@@ -2578,9 +2588,10 @@ static struct option __record_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };
@@ -2653,12 +2664,14 @@ int cmd_record(int argc, const char **argv) !perf_can_record_switch_events()) {ui__error ("kernel does not support recording context switch events\n" );parse_options_usage (record_usage, record_options,"switch-events" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (switch_output_setup (rec)) {parse_options_usage (record_usage, record_options,"switch-output" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (rec->switch_output.time) {
@@ -2669,8 +2682,10 @@ int cmd_record(int argc, const char **argv)if (rec->switch_output.num_files) { rec->switch_output.filenames =calloc (sizeof (char *), rec->switch_output.num_files); -if (!rec->switch_output.filenames) -return -EINVAL ; +if (!rec->switch_output.filenames) { + err = -EINVAL ; + goto out_opts; + } }/*
@@ -2686,7 +2701,8 @@ int cmd_record(int argc, const char **argv) rec->affinity_mask.bits =bitmap_alloc (rec->affinity_mask.nbits);if (!rec->affinity_mask.bits) {pr_err ("Failed to allocate thread mask for %zd cpus\n" , rec->affinity_mask.nbits); -return -ENOMEM ; + err = -ENOMEM ; + goto out_opts; }pr_debug2 ("thread mask[%zd]: empty\n" , rec->affinity_mask.nbits); }
@@ -2817,6 +2833,8 @@ int cmd_record(int argc, const char **argv)evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr); +out_opts: +close_control_option (&rec->opts);return err; }
tools/perf/builtin-stat.c +15 -3
@@ -1047,7 +1047,17 @@ static int parse_control_option(const struct option *opt, {struct perf_stat_config *config = opt->value; -return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack); +return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); +} + +static void close_control_option (struct perf_stat_config *config) +{ +if (config->ctl_fd_close) { + config->ctl_fd_close = false; +close (config->ctl_fd); +if (config->ctl_fd_ack >=0 ) +close (config->ctl_fd_ack); + } }static struct option stat_options[] = {
@@ -1151,9 +1161,10 @@ static struct option stat_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };
@@ -2396,6 +2407,7 @@ int cmd_stat(int argc, const char **argv)metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config); +close_control_option (&stat_config);return status; }
tools/perf/util/evlist.c +51 -2
63 lines not on this page · raw message
tools/perf/util/evlist.h +1 -1
@@ -373,7 +373,7 @@ enum evlist_ctl_cmd { EVLIST_CTL_CMD_ACK }; -int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack); +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);
tools/perf/util/record.h +1 -0
@@ -73,6 +73,7 @@ struct record_opts {unsigned int nr_threads_synthesize;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };extern const char *const *record_usage;
tools/perf/util/stat.h +1 -0
@@ -135,6 +135,7 @@ struct perf_stat_config {struct rblist metric_events;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };void perf_stat__set_big_num (int set);
Signature · 1 line
2.17.1
Re: [PATCH V2 4/6] perf tools: Add FIFO file names as alternative options to --control
On Tue, Sep 01, 2020 at 12:37:56PM +0300, Adrian Hunter wrote:
SNIP
Quoted 22 lines
tools/perf/util/evlist.c +22
-0+ fd =open (s,O_RDWR |O_NONBLOCK |O_CLOEXEC ); +if (fd <0 ) { +pr_err ("Failed to open '%s'\n" , s); + ret = -errno; + goto out_free; + } + *ctl_fd = fd; + *ctl_fd_close = true; + +if (p && *++p) { +/* O_RDWR | O_NONBLOCK means the other end need not be open */ + fd =open (p,O_RDWR |O_NONBLOCK |O_CLOEXEC ); +if (fd <0 ) { +pr_err ("Failed to open '%s'\n" , p); + ret = -errno; + goto out_free; + } + *ctl_fd_ack = fd; + } + +out_free: +free (s);
tools/perf/util/evlist.c struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, · line 1784
Quoted 10 lines
tools/perf/util/evlist.c +5
-1+return ret; +} + +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close) {char *comma =NULL , *endptr =NULL ;if (strncmp (str,"fd:" ,3 )) -return -EINVAL ; +return evlist__parse_control_names (str, ctl_fd, ctl_fd_ack, ctl_fd_close);
could you please proactively set *ctl_fd_close = false in here, so it's obvious.. also evlist__parse_control_fifo might be better name, other that that it all looks great
we were recently asked to prvide faster intel_pt snapshot control and we were thinking of putting input_pt support to libperf, but your change might just fix this
for the patchset:
Alexey, could you please check on this?
thanks,
jirka
Quoted 3 lines
tools/perf/util/evlist.c +0
-0*ctl_fd =strtoul (&str[3 ], &endptr,0 );if (endptr == &str[3 ])
SNIP
Adrian Hunter
reviewerPATCH v3 4/6 perf tools: Add FIFO file names as alternative options to --control
Enable the --control option to accept file names as an alternative to file descriptors.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 6808 $ perf record --control fifo:perf.control,perf.ack -- sleep 300 & [2] 6810 $ echo disable > perf.control $ Events disabled ack
$ echo enable > perf.control $ Events enabled ack
$ echo disable > perf.control $ Events disabled ack
$ kill %2 [ perf record: Woken up 4 times to write data ] $ [ perf record: Captured and wrote 0.018 MB perf.data (7 samples) ]
[1]- Done cat perf.ack [2]+ Terminated perf record --control fifo:perf.control,perf.ack -- sleep 300
$
---
Changes in V3:
Rename evlist__parse_control_names to evlist__parse_control_fifo Explicitly initialize *ctl_fd_close = false
tools/perf/Documentation/perf-record.txt | 2 + tools/perf/Documentation/perf-stat.txt | 2 + tools/perf/builtin-record.c | 34 +++++++++++---- tools/perf/builtin-stat.c | 18 ++++++-- tools/perf/util/evlist.c | 55 +++++++++++++++++++++++- tools/perf/util/evlist.h | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/stat.h | 1 + 8 files changed, 101 insertions(+), 14 deletions(-)
tools/perf/Documentation/perf-record.txt +2 -0
@@ -627,7 +627,9 @@ option. The -e option and this one can be mixed and matched. Events can be grouped using the {} notation. endif::HAVE_LIBPFM[] +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor
tools/perf/Documentation/perf-stat.txt +2 -0
@@ -176,7 +176,9 @@ with it. --append may be used here. Examples: 3>results perf stat --log-fd 3 -- $cmd 3>>results perf stat --log-fd 3 --append -- $cmd +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor
tools/perf/builtin-record.c +26 -8
@@ -2236,7 +2236,17 @@ static int parse_control_option(const struct option *opt, {struct record_opts *opts = opt->value; -return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack); +return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close); +} + +static void close_control_option (struct record_opts *opts) +{ +if (opts->ctl_fd_close) { + opts->ctl_fd_close = false; +close (opts->ctl_fd); +if (opts->ctl_fd_ack >=0 ) +close (opts->ctl_fd_ack); + } }static void switch_output_size_warn (struct record *rec)
@@ -2578,9 +2588,10 @@ static struct option __record_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };
@@ -2653,12 +2664,14 @@ int cmd_record(int argc, const char **argv) !perf_can_record_switch_events()) {ui__error ("kernel does not support recording context switch events\n" );parse_options_usage (record_usage, record_options,"switch-events" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (switch_output_setup (rec)) {parse_options_usage (record_usage, record_options,"switch-output" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (rec->switch_output.time) {
@@ -2669,8 +2682,10 @@ int cmd_record(int argc, const char **argv)if (rec->switch_output.num_files) { rec->switch_output.filenames =calloc (sizeof (char *), rec->switch_output.num_files); -if (!rec->switch_output.filenames) -return -EINVAL ; +if (!rec->switch_output.filenames) { + err = -EINVAL ; + goto out_opts; + } }/*
@@ -2686,7 +2701,8 @@ int cmd_record(int argc, const char **argv) rec->affinity_mask.bits =bitmap_alloc (rec->affinity_mask.nbits);if (!rec->affinity_mask.bits) {pr_err ("Failed to allocate thread mask for %zd cpus\n" , rec->affinity_mask.nbits); -return -ENOMEM ; + err = -ENOMEM ; + goto out_opts; }pr_debug2 ("thread mask[%zd]: empty\n" , rec->affinity_mask.nbits); }
@@ -2817,6 +2833,8 @@ int cmd_record(int argc, const char **argv)evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr); +out_opts: +close_control_option (&rec->opts);return err; }
tools/perf/builtin-stat.c +15 -3
@@ -1047,7 +1047,17 @@ static int parse_control_option(const struct option *opt, {struct perf_stat_config *config = opt->value; -return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack); +return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); +} + +static void close_control_option (struct perf_stat_config *config) +{ +if (config->ctl_fd_close) { + config->ctl_fd_close = false; +close (config->ctl_fd); +if (config->ctl_fd_ack >=0 ) +close (config->ctl_fd_ack); + } }static struct option stat_options[] = {
@@ -1151,9 +1161,10 @@ static struct option stat_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };
@@ -2396,6 +2407,7 @@ int cmd_stat(int argc, const char **argv)metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config); +close_control_option (&stat_config);return status; }
tools/perf/util/evlist.c +53 -2
65 lines not on this page · raw message
tools/perf/util/evlist.h +1 -1
@@ -373,7 +373,7 @@ enum evlist_ctl_cmd { EVLIST_CTL_CMD_ACK }; -int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack); +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);
tools/perf/util/record.h +1 -0
@@ -73,6 +73,7 @@ struct record_opts {unsigned int nr_threads_synthesize;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };extern const char *const *record_usage;
tools/perf/util/stat.h +1 -0
@@ -135,6 +135,7 @@ struct perf_stat_config {struct rblist metric_events;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };void perf_stat__set_big_num (int set);
Signature · 1 line
2.17.1
Re: [PATCH V3 4/6] perf tools: Add FIFO file names as alternative options to --control
Quoted 85 lines · Adrian Hunter
Enable the --control option to accept file names as an alternative to file descriptors.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 6808 $ perf record --control fifo:perf.control,perf.ack -- sleep 300 & [2] 6810 $ echo disable > perf.control $ Events disabled ack$ echo enable > perf.control $ Events enabled ack$ echo disable > perf.control $ Events disabled ack$ kill %2 [ perf record: Woken up 4 times to write data ] $ [ perf record: Captured and wrote 0.018 MB perf.data (7 samples) ][1]- Done cat perf.ack [2]+ Terminated perf record --control fifo:perf.control,perf.ack -- sleep 300$
Signed-off-by Adrian Hunter <[email protected]>Acked-by Jiri Olsa <[email protected]>---
Changes in V3:
Rename
evlist__parse_control_namestoevlist__parse_control_fifoExplicitly initialize*ctl_fd_close= falsetools/perf/Documentation/perf-record.txt | 2 + tools/perf/Documentation/perf-stat.txt | 2 + tools/perf/builtin-record.c | 34 +++++++++++---- tools/perf/builtin-stat.c | 18 ++++++-- tools/perf/util/evlist.c | 55 +++++++++++++++++++++++- tools/perf/util/evlist.h | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/stat.h | 1 + 8 files changed, 101 insertions(+), 14 deletions(-)tools/perf/Documentation/perf-record.txt +2
-0@@ -627,7 +627,9 @@ option. The -e option and this one can be mixed and matched. Events can be grouped using the {} notation. endif::HAVE_LIBPFM[] +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptortools/perf/Documentation/perf-stat.txt +2
-0@@ -176,7 +176,9 @@ with it. --append may be used here. Examples: 3>results perf stat --log-fd 3 -- $cmd 3>>results perf stat --log-fd 3 --append -- $cmd +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptortools/perf/builtin-record.c +0
-0
tools/perf/builtin-record.c static int parse_control_option(const struct option *opt, · line 2242
Quoted 8 lines
tools/perf/builtin-record.c +4
-1@@ -2236,7 +2236,17 @@ static int parse_control_option(const struct option *opt, {struct record_opts *opts = opt->value; -return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack); +return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close); +} + +static void close_control_option (struct record_opts *opts)
This function above and the same one for stat mode below look duplicating. It could possibly be combined.
Regards,
Alexei
Quoted 224 lines
tools/perf/builtin-record.c +22
-7+{ +if (opts->ctl_fd_close) { + opts->ctl_fd_close = false; +close (opts->ctl_fd); +if (opts->ctl_fd_ack >=0 ) +close (opts->ctl_fd_ack); + } }static void switch_output_size_warn (struct record *rec)@@ -2578,9 +2588,10 @@ static struct option __record_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };@@ -2653,12 +2664,14 @@ int cmd_record(int argc, const char **argv) !perf_can_record_switch_events()) {ui__error ("kernel does not support recording context switch events\n" );parse_options_usage (record_usage, record_options,"switch-events" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (switch_output_setup (rec)) {parse_options_usage (record_usage, record_options,"switch-output" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (rec->switch_output.time) {@@ -2669,8 +2682,10 @@ int cmd_record(int argc, const char **argv)if (rec->switch_output.num_files) { rec->switch_output.filenames =calloc (sizeof (char *), rec->switch_output.num_files); -if (!rec->switch_output.filenames) -return -EINVAL ; +if (!rec->switch_output.filenames) { + err = -EINVAL ; + goto out_opts; + } }/* @@ -2686,7 +2701,8 @@ int cmd_record(int argc, const char **argv) rec->affinity_mask.bits =bitmap_alloc (rec->affinity_mask.nbits);if (!rec->affinity_mask.bits) {pr_err ("Failed to allocate thread mask for %zd cpus\n" , rec->affinity_mask.nbits); -return -ENOMEM ; + err = -ENOMEM ; + goto out_opts; }pr_debug2 ("thread mask[%zd]: empty\n" , rec->affinity_mask.nbits); }@@ -2817,6 +2833,8 @@ int cmd_record(int argc, const char **argv)evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr); +out_opts: +close_control_option (&rec->opts);return err; }tools/perf/builtin-stat.c +15
-3@@ -1047,7 +1047,17 @@ static int parse_control_option(const struct option *opt, {struct perf_stat_config *config = opt->value; -return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack); +return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); +} + +static void close_control_option (struct perf_stat_config *config) +{ +if (config->ctl_fd_close) { + config->ctl_fd_close = false; +close (config->ctl_fd); +if (config->ctl_fd_ack >=0 ) +close (config->ctl_fd_ack); + } }static struct option stat_options[] = {@@ -1151,9 +1161,10 @@ static struct option stat_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };@@ -2396,6 +2407,7 @@ int cmd_stat(int argc, const char **argv)metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config); +close_control_option (&stat_config);return status; }tools/perf/util/evlist.c +53
-2@@ -1727,12 +1727,63 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,return leader; } -int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack) +static int evlist__parse_control_fifo (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close) +{ +char *s, *p; +int ret =0 , fd; + +if (strncmp (str,"fifo:" ,5 )) +return -EINVAL ; + + str +=5 ; +if (!*str || *str ==',' ) +return -EINVAL ; + + s =strdup (str); +if (!s) +return -ENOMEM ; + + p =strchr (s,',' ); +if (p) + *p ='\0' ; + +/* +* O_RDWR avoids POLLHUPs which is necessary to allow the other +* end of a FIFO to be repeatedly opened and closed. +*/ + fd =open (s,O_RDWR |O_NONBLOCK |O_CLOEXEC ); +if (fd <0 ) { +pr_err ("Failed to open '%s'\n" , s); + ret = -errno; + goto out_free; + } + *ctl_fd = fd; + *ctl_fd_close = true; + +if (p && *++p) { +/* O_RDWR | O_NONBLOCK means the other end need not be open */ + fd =open (p,O_RDWR |O_NONBLOCK |O_CLOEXEC ); +if (fd <0 ) { +pr_err ("Failed to open '%s'\n" , p); + ret = -errno; + goto out_free; + } + *ctl_fd_ack = fd; + } + +out_free: +free (s); +return ret; +} + +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close) {char *comma =NULL , *endptr =NULL ; + *ctl_fd_close = false; +if (strncmp (str,"fd:" ,3 )) -return -EINVAL ; +return evlist__parse_control_fifo (str, ctl_fd, ctl_fd_ack, ctl_fd_close); *ctl_fd =strtoul (&str[3 ], &endptr,0 );if (endptr == &str[3 ])tools/perf/util/evlist.h +1
-1@@ -373,7 +373,7 @@ enum evlist_ctl_cmd { EVLIST_CTL_CMD_ACK }; -int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack); +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);tools/perf/util/record.h +1
-0@@ -73,6 +73,7 @@ struct record_opts {unsigned int nr_threads_synthesize;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };extern const char *const *record_usage;tools/perf/util/stat.h +1
-0@@ -135,6 +135,7 @@ struct perf_stat_config {struct rblist metric_events;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };void perf_stat__set_big_num (int set);
Adrian Hunter
reviewerRe: [PATCH V3 4/6] perf tools: Add FIFO file names as alternative options to --control
Quoted 90 lines · Alexey Budankov
Quoted 88 lines · Adrian Hunter
Enable the --control option to accept file names as an alternative to file descriptors.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 6808 $ perf record --control fifo:perf.control,perf.ack -- sleep 300 & [2] 6810 $ echo disable > perf.control $ Events disabled ack$ echo enable > perf.control $ Events enabled ack$ echo disable > perf.control $ Events disabled ack$ kill %2 [ perf record: Woken up 4 times to write data ] $ [ perf record: Captured and wrote 0.018 MB perf.data (7 samples) ][1]- Done cat perf.ack [2]+ Terminated perf record --control fifo:perf.control,perf.ack -- sleep 300$
Signed-off-by Adrian Hunter <[email protected]>Acked-by Jiri Olsa <[email protected]>---
Changes in V3:
Rename
evlist__parse_control_namestoevlist__parse_control_fifoExplicitly initialize*ctl_fd_close= falsetools/perf/Documentation/perf-record.txt | 2 + tools/perf/Documentation/perf-stat.txt | 2 + tools/perf/builtin-record.c | 34 +++++++++++---- tools/perf/builtin-stat.c | 18 ++++++-- tools/perf/util/evlist.c | 55 +++++++++++++++++++++++- tools/perf/util/evlist.h | 2 +- tools/perf/util/record.h | 1 + tools/perf/util/stat.h | 1 + 8 files changed, 101 insertions(+), 14 deletions(-)tools/perf/Documentation/perf-record.txt +2
-0@@ -627,7 +627,9 @@ option. The -e option and this one can be mixed and matched. Events can be grouped using the {} notation. endif::HAVE_LIBPFM[] +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptortools/perf/Documentation/perf-stat.txt +2
-0@@ -176,7 +176,9 @@ with it. --append may be used here. Examples: 3>results perf stat --log-fd 3 -- $cmd 3>>results perf stat --log-fd 3 --append -- $cmd +--control=fifo:ctl-fifo[,ack-fifo]:: --control=fd:ctl-fd[,ack-fd]:: +ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events). Measurements can be started with events disabled using --delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptortools/perf/builtin-record.c +0
-0@@ -2236,7 +2236,17 @@ static int parse_control_option(const struct option *opt, {struct record_opts *opts = opt->value;
Quoted 8 lines
tools/perf/builtin-record.c static int parse_control_option(const struct option *opt, · line 2242
Quoted 5 lines
tools/perf/builtin-record.c +4
-1-return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack); +return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close); +} + +static void close_control_option (struct record_opts *opts)This function above and the same one for stat mode below look duplicating. It could possibly be combined.
Good idea. I will send a separate patch for that though.
Quoted 230 lines
Acked-by Alexei Budankov <[email protected]>Regards,
AlexeiQuoted 224 lines
tools/perf/builtin-record.c +22
-7+{ +if (opts->ctl_fd_close) { + opts->ctl_fd_close = false; +close (opts->ctl_fd); +if (opts->ctl_fd_ack >=0 ) +close (opts->ctl_fd_ack); + } }static void switch_output_size_warn (struct record *rec)@@ -2578,9 +2588,10 @@ static struct option __record_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };@@ -2653,12 +2664,14 @@ int cmd_record(int argc, const char **argv) !perf_can_record_switch_events()) {ui__error ("kernel does not support recording context switch events\n" );parse_options_usage (record_usage, record_options,"switch-events" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (switch_output_setup (rec)) {parse_options_usage (record_usage, record_options,"switch-output" ,0 ); -return -EINVAL ; + err = -EINVAL ; + goto out_opts; }if (rec->switch_output.time) {@@ -2669,8 +2682,10 @@ int cmd_record(int argc, const char **argv)if (rec->switch_output.num_files) { rec->switch_output.filenames =calloc (sizeof (char *), rec->switch_output.num_files); -if (!rec->switch_output.filenames) -return -EINVAL ; +if (!rec->switch_output.filenames) { + err = -EINVAL ; + goto out_opts; + } }/* @@ -2686,7 +2701,8 @@ int cmd_record(int argc, const char **argv) rec->affinity_mask.bits =bitmap_alloc (rec->affinity_mask.nbits);if (!rec->affinity_mask.bits) {pr_err ("Failed to allocate thread mask for %zd cpus\n" , rec->affinity_mask.nbits); -return -ENOMEM ; + err = -ENOMEM ; + goto out_opts; }pr_debug2 ("thread mask[%zd]: empty\n" , rec->affinity_mask.nbits); }@@ -2817,6 +2833,8 @@ int cmd_record(int argc, const char **argv)evlist__delete (rec->evlist);symbol__exit ();auxtrace_record__free (rec->itr); +out_opts: +close_control_option (&rec->opts);return err; }tools/perf/builtin-stat.c +15
-3@@ -1047,7 +1047,17 @@ static int parse_control_option(const struct option *opt, {struct perf_stat_config *config = opt->value; -return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack); +return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); +} + +static void close_control_option (struct perf_stat_config *config) +{ +if (config->ctl_fd_close) { + config->ctl_fd_close = false; +close (config->ctl_fd); +if (config->ctl_fd_ack >=0 ) +close (config->ctl_fd_ack); + } }static struct option stat_options[] = {@@ -1151,9 +1161,10 @@ static struct option stat_options[] = { "libpfm4 event selector. use 'perf list' to list available events", parse_libpfm_events_option),#endif -OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd]" , +OPT_CALLBACK (0 ,"control" , &stat_config,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" ,"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" -"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor." , +"\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" +"\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option), OPT_END() };@@ -2396,6 +2407,7 @@ int cmd_stat(int argc, const char **argv)metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config); +close_control_option (&stat_config);return status; }tools/perf/util/evlist.c +53
-2@@ -1727,12 +1727,63 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,return leader; } -int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack) +static int evlist__parse_control_fifo (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close) +{ +char *s, *p; +int ret =0 , fd; + +if (strncmp (str,"fifo:" ,5 )) +return -EINVAL ; + + str +=5 ; +if (!*str || *str ==',' ) +return -EINVAL ; + + s =strdup (str); +if (!s) +return -ENOMEM ; + + p =strchr (s,',' ); +if (p) + *p ='\0' ; + +/* +* O_RDWR avoids POLLHUPs which is necessary to allow the other +* end of a FIFO to be repeatedly opened and closed. +*/ + fd =open (s,O_RDWR |O_NONBLOCK |O_CLOEXEC ); +if (fd <0 ) { +pr_err ("Failed to open '%s'\n" , s); + ret = -errno; + goto out_free; + } + *ctl_fd = fd; + *ctl_fd_close = true; + +if (p && *++p) { +/* O_RDWR | O_NONBLOCK means the other end need not be open */ + fd =open (p,O_RDWR |O_NONBLOCK |O_CLOEXEC ); +if (fd <0 ) { +pr_err ("Failed to open '%s'\n" , p); + ret = -errno; + goto out_free; + } + *ctl_fd_ack = fd; + } + +out_free: +free (s); +return ret; +} + +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close) {char *comma =NULL , *endptr =NULL ; + *ctl_fd_close = false; +if (strncmp (str,"fd:" ,3 )) -return -EINVAL ; +return evlist__parse_control_fifo (str, ctl_fd, ctl_fd_ack, ctl_fd_close); *ctl_fd =strtoul (&str[3 ], &endptr,0 );if (endptr == &str[3 ])tools/perf/util/evlist.h +1
-1@@ -373,7 +373,7 @@ enum evlist_ctl_cmd { EVLIST_CTL_CMD_ACK }; -int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack); +int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);tools/perf/util/record.h +1
-0@@ -73,6 +73,7 @@ struct record_opts {unsigned int nr_threads_synthesize;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };extern const char *const *record_usage;tools/perf/util/stat.h +1
-0@@ -135,6 +135,7 @@ struct perf_stat_config {struct rblist metric_events;int ctl_fd;int ctl_fd_ack; +bool ctl_fd_close; };void perf_stat__set_big_num (int set);
Adrian Hunter
reviewerPATCH 1/1 perf tools: Consolidate close_control_option()'s into one function
Consolidate control option fifo closing into one function.
---
This patch is on top of patch:
"perf tools: Add FIFO file names as alternative options to --control"
tools/perf/builtin-record.c | 12 +----------- tools/perf/builtin-stat.c | 12 +----------- tools/perf/util/evlist.c | 10 ++++++++++ tools/perf/util/evlist.h | 1 + 4 files changed, 13 insertions(+), 22 deletions(-)
tools/perf/builtin-record.c +1 -11
@@ -2253,16 +2253,6 @@ static int parse_control_option(const struct option *opt,return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close); } -static void close_control_option (struct record_opts *opts) -{ -if (opts->ctl_fd_close) { - opts->ctl_fd_close = false; -close (opts->ctl_fd); -if (opts->ctl_fd_ack >=0 ) -close (opts->ctl_fd_ack); - } -} -static void switch_output_size_warn (struct record *rec) {u64 wakeup_size =evlist__mmap_size (rec->opts.mmap_pages);
@@ -2849,7 +2839,7 @@ int cmd_record(int argc, const char **argv)symbol__exit ();auxtrace_record__free (rec->itr); out_opts: -close_control_option (&rec->opts); +evlist__close_control (rec->opts.ctl_fd, rec->opts.ctl_fd_ack, &rec->opts.ctl_fd_close);return err; }
tools/perf/builtin-stat.c +1 -11
@@ -1051,16 +1051,6 @@ static int parse_control_option(const struct option *opt,return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); } -static void close_control_option (struct perf_stat_config *config) -{ -if (config->ctl_fd_close) { - config->ctl_fd_close = false; -close (config->ctl_fd); -if (config->ctl_fd_ack >=0 ) -close (config->ctl_fd_ack); - } -} -static struct option stat_options[] = {OPT_BOOLEAN ('T' ,"transaction" , &transaction_run,"hardware transaction statistics" ),
@@ -2408,7 +2398,7 @@ int cmd_stat(int argc, const char **argv)metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config); -close_control_option (&stat_config); +evlist__close_control (stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_config.ctl_fd_close);return status; }
tools/perf/util/evlist.c +10 -0
@@ -1802,6 +1802,16 @@ int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *creturn 0 ; } +void evlist__close_control (int ctl_fd,int ctl_fd_ack,bool *ctl_fd_close) +{ +if (*ctl_fd_close) { + *ctl_fd_close = false; +close (ctl_fd); +if (ctl_fd_ack >=0 ) +close (ctl_fd_ack); + } +} +int evlist__initialize_ctlfd (struct evlist *evlist,int fd,int ack) {if (fd ==-1 ) {
tools/perf/util/evlist.h +1 -0
@@ -376,6 +376,7 @@ enum evlist_ctl_cmd { };int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close); +void evlist__close_control (int ctl_fd,int ctl_fd_ack,bool *ctl_fd_close);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);
Signature · 1 line
2.17.1
Arnaldo Carvalho de Melo
maintainerRe: [PATCH] perf tools: Consolidate close_control_option()'s into one function
Em Thu, Sep 03, 2020 at 03:29:37PM +0300, Adrian Hunter escreveu:
Quoted 4 lines
Consolidate control option fifo closing into one function.
Signed-off-by Adrian Hunter <[email protected]>---
Applied and added this:
Thanks,
- Arnaldo
Quoted 107 lines
This patch is on top of patch:
"perf tools: Add FIFO file names as alternative options to --control"tools/perf/builtin-record.c | 12 +----------- tools/perf/builtin-stat.c | 12 +----------- tools/perf/util/evlist.c | 10 ++++++++++ tools/perf/util/evlist.h | 1 + 4 files changed, 13 insertions(+), 22 deletions(-)tools/perf/builtin-record.c +1
-11@@ -2253,16 +2253,6 @@ static int parse_control_option(const struct option *opt,return evlist__parse_control (str, &opts->ctl_fd, &opts->ctl_fd_ack, &opts->ctl_fd_close); } -static void close_control_option (struct record_opts *opts) -{ -if (opts->ctl_fd_close) { - opts->ctl_fd_close = false; -close (opts->ctl_fd); -if (opts->ctl_fd_ack >=0 ) -close (opts->ctl_fd_ack); - } -} -static void switch_output_size_warn (struct record *rec) {u64 wakeup_size =evlist__mmap_size (rec->opts.mmap_pages);@@ -2849,7 +2839,7 @@ int cmd_record(int argc, const char **argv)symbol__exit ();auxtrace_record__free (rec->itr); out_opts: -close_control_option (&rec->opts); +evlist__close_control (rec->opts.ctl_fd, rec->opts.ctl_fd_ack, &rec->opts.ctl_fd_close);return err; }tools/perf/builtin-stat.c +1
-11@@ -1051,16 +1051,6 @@ static int parse_control_option(const struct option *opt,return evlist__parse_control (str, &config->ctl_fd, &config->ctl_fd_ack, &config->ctl_fd_close); } -static void close_control_option (struct perf_stat_config *config) -{ -if (config->ctl_fd_close) { - config->ctl_fd_close = false; -close (config->ctl_fd); -if (config->ctl_fd_ack >=0 ) -close (config->ctl_fd_ack); - } -} -static struct option stat_options[] = {OPT_BOOLEAN ('T' ,"transaction" , &transaction_run,"hardware transaction statistics" ),@@ -2408,7 +2398,7 @@ int cmd_stat(int argc, const char **argv)metricgroup__rblist_exit (&stat_config.metric_events);runtime_stat_delete (&stat_config); -close_control_option (&stat_config); +evlist__close_control (stat_config.ctl_fd, stat_config.ctl_fd_ack, &stat_config.ctl_fd_close);return status; }tools/perf/util/evlist.c +10
-0@@ -1802,6 +1802,16 @@ int evlist__parse_control(const char *str, int *ctl_fd, int *ctl_fd_ack, bool *creturn 0 ; } +void evlist__close_control (int ctl_fd,int ctl_fd_ack,bool *ctl_fd_close) +{ +if (*ctl_fd_close) { + *ctl_fd_close = false; +close (ctl_fd); +if (ctl_fd_ack >=0 ) +close (ctl_fd_ack); + } +} +int evlist__initialize_ctlfd (struct evlist *evlist,int fd,int ack) {if (fd ==-1 ) {tools/perf/util/evlist.h +1
-0@@ -376,6 +376,7 @@ enum evlist_ctl_cmd { };int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close); +void evlist__close_control (int ctl_fd,int ctl_fd_ack,bool *ctl_fd_close);int evlist__initialize_ctlfd (struct evlist *evlist,int ctl_fd,int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerRe: [PATCH V3 4/6] perf tools: Add FIFO file names as alternative options to --control
In reply to Alexey BudankovEm Wed, Sep 02, 2020 at 08:03:08PM +0300, Alexey Budankov escreveu:
Quoted 29 lines · Adrian Hunter
Quoted 27 lines
Enable the --control option to accept file names as an alternative to file descriptors.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 6808 $ perf record --control fifo:perf.control,perf.ack -- sleep 300 & [2] 6810 $ echo disable > perf.control $ Events disabled ack$ echo enable > perf.control $ Events enabled ack$ echo disable > perf.control $ Events disabled ack$ kill %2 [ perf record: Woken up 4 times to write data ] $ [ perf record: Captured and wrote 0.018 MB perf.data (7 samples) ]
Quoted 6 lines
Quoted 6 lines
[1]- Done cat perf.ack [2]+ Terminated perf record --control fifo:perf.control,perf.ack -- sleep 300$
Signed-off-by Adrian Hunter <[email protected]>Acked-by Jiri Olsa <[email protected]>
Its great when things come with the exact sequence of commands to test, the output, etc, keep it that way, please.
Thanks, tested, applied,
- Arnaldo
Adrian Hunter
reviewerPATCH v2 5/6 perf record: Add 'snapshot' control command
In reply to Adrian HunterAdd 'snapshot' control command to create an AUX area tracing snapshot the same as if sending SIGUSR2. The advantage of the FIFO is that access is governed by access to the FIFO.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 15235 $ sudo ~/bin/perf record --control fifo:perf.control,perf.ack -S -e intel_pt//u -- sleep 60 & [2] 15243 $ ps -e | grep perf 15244 pts/1 00:00:00 perf $ kill -USR2 15244 bash: kill: (15244) - Operation not permitted $ echo snapshot > perf.control ack
--- tools/perf/Documentation/perf-record.txt | 8 ++++---- tools/perf/builtin-record.c | 24 +++++++++++++++++------- tools/perf/builtin-stat.c | 1 + tools/perf/util/evlist.c | 11 +++++++++-- tools/perf/util/evlist.h | 5 ++++- 5 files changed, 35 insertions(+), 14 deletions(-)
tools/perf/Documentation/perf-record.txt +4 -4
@@ -631,10 +631,10 @@ endif::HAVE_LIBPFM[] --control=fd:ctl-fd[,ack-fd]:: ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, -'disable': disable events). Measurements can be started with events disabled using ---delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor -to synchronize with the controlling process. Example of bash shell script to enable and -disable events during measurements: +'disable': disable events, 'snapshot': AUX area tracing snapshot). Measurements can be +started with events disabled using --delay=-1 option. Optionally send control command +completion ('ack\n') to ack-fd descriptor to synchronize with the controlling process. +Example of bash shell script to enable and disable events during measurements: #!/bin/bash
tools/perf/builtin-record.c +17 -7
@@ -1593,6 +1593,16 @@ static int record__init_clock(struct record *rec)return 0 ; } +static void hit_auxtrace_snapshot_trigger (struct record *rec) +{ +if (trigger_is_ready (&auxtrace_snapshot_trigger)) { +trigger_hit (&auxtrace_snapshot_trigger); + auxtrace_record__snapshot_started =1 ; +if (auxtrace_record__snapshot_start (rec->itr)) +trigger_error (&auxtrace_snapshot_trigger); + } +} +static int __cmd_record (struct record *rec,int argc,const char **argv) {int err;
@@ -1937,6 +1947,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)case EVLIST_CTL_CMD_DISABLE :pr_info (EVLIST_DISABLED_MSG );break ; +case EVLIST_CTL_CMD_SNAPSHOT : +hit_auxtrace_snapshot_trigger (rec); +evlist__ctlfd_ack (rec->evlist); +break ;case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :
@@ -2589,7 +2603,8 @@ static struct option __record_options[] = { parse_libpfm_events_option), #endifOPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" , -"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" +"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events,\n" +"\t\t\t 'snapshot': AUX area tracing snapshot).\n" "\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" "\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option),
@@ -2842,12 +2857,7 @@ static void snapshot_sig_handler(int sig __maybe_unused) {struct record *rec = &record; -if (trigger_is_ready (&auxtrace_snapshot_trigger)) { -trigger_hit (&auxtrace_snapshot_trigger); - auxtrace_record__snapshot_started =1 ; -if (auxtrace_record__snapshot_start (record.itr)) -trigger_error (&auxtrace_snapshot_trigger); - } +hit_auxtrace_snapshot_trigger (rec);if (switch_output_signal (rec))trigger_hit (&switch_output_trigger);
tools/perf/builtin-stat.c +1 -0
@@ -578,6 +578,7 @@ static void process_evlist(struct evlist *evlist, unsigned int interval)process_interval ();pr_info (EVLIST_DISABLED_MSG );break ; +case EVLIST_CTL_CMD_SNAPSHOT :case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :
tools/perf/util/evlist.c +9 -2
@@ -1885,13 +1885,17 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, }else if (!strncmp (cmd_data,EVLIST_CTL_CMD_DISABLE_TAG , (sizeof (EVLIST_CTL_CMD_DISABLE_TAG )-1 ))) { *cmd =EVLIST_CTL_CMD_DISABLE ; + }else if (!strncmp (cmd_data,EVLIST_CTL_CMD_SNAPSHOT_TAG , + (sizeof (EVLIST_CTL_CMD_SNAPSHOT_TAG )-1 ))) { + *cmd =EVLIST_CTL_CMD_SNAPSHOT ; +pr_debug ("is snapshot\n" ); } }return bytes_read ? (int )bytes_read : err; } -static int evlist__ctlfd_ack (struct evlist *evlist) +int evlist__ctlfd_ack (struct evlist *evlist) {int err;
@@ -1927,13 +1931,16 @@ int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd)case EVLIST_CTL_CMD_DISABLE :evlist__disable (evlist);break ; +case EVLIST_CTL_CMD_SNAPSHOT : +break ;case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :pr_debug ("ctlfd: unsupported %d\n" , *cmd);break ; } -if (!(*cmd ==EVLIST_CTL_CMD_ACK || *cmd ==EVLIST_CTL_CMD_UNSUPPORTED )) +if (!(*cmd ==EVLIST_CTL_CMD_ACK || *cmd ==EVLIST_CTL_CMD_UNSUPPORTED || + *cmd ==EVLIST_CTL_CMD_SNAPSHOT ))evlist__ctlfd_ack (evlist); } }
tools/perf/util/evlist.h +4 -1
@@ -363,6 +363,7 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,#define EVLIST_CTL_CMD_ENABLE_TAG "enable"#define EVLIST_CTL_CMD_DISABLE_TAG "disable"#define EVLIST_CTL_CMD_ACK_TAG "ack\n" +#define EVLIST_CTL_CMD_SNAPSHOT_TAG "snapshot"#define EVLIST_CTL_CMD_MAX_LEN 64
@@ -370,7 +371,8 @@ enum evlist_ctl_cmd {EVLIST_CTL_CMD_UNSUPPORTED =0 ,EVLIST_CTL_CMD_ENABLE ,EVLIST_CTL_CMD_DISABLE , - EVLIST_CTL_CMD_ACK +EVLIST_CTL_CMD_ACK , + EVLIST_CTL_CMD_SNAPSHOT, };int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);
@@ -378,6 +380,7 @@ int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);int evlist__ctlfd_process (struct evlist *evlist,enum evlist_ctl_cmd *cmd); +int evlist__ctlfd_ack (struct evlist *evlist);#define EVLIST_ENABLED_MSG "Events enabled\n"#define EVLIST_DISABLED_MSG "Events disabled\n"
Signature · 1 line
2.17.1
Re: [PATCH V2 5/6] perf record: Add 'snapshot' control command
Quoted 69 lines · Adrian Hunter
Add 'snapshot' control command to create an AUX area tracing snapshot the same as if sending SIGUSR2. The advantage of the FIFO is that access is governed by access to the FIFO.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 15235 $ sudo ~/bin/perf record --control fifo:perf.control,perf.ack -S -e intel_pt//u -- sleep 60 & [2] 15243 $ ps -e | grep perf 15244 pts/1 00:00:00 perf $ kill -USR2 15244 bash: kill: (15244) - Operation not permitted $ echo snapshot > perf.control ackSigned-off-by Adrian Hunter <[email protected]>--- tools/perf/Documentation/perf-record.txt | 8 ++++---- tools/perf/builtin-record.c | 24 +++++++++++++++++------- tools/perf/builtin-stat.c | 1 + tools/perf/util/evlist.c | 11 +++++++++-- tools/perf/util/evlist.h | 5 ++++- 5 files changed, 35 insertions(+), 14 deletions(-)tools/perf/Documentation/perf-record.txt +4
-4@@ -631,10 +631,10 @@ endif::HAVE_LIBPFM[] --control=fd:ctl-fd[,ack-fd]:: ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, -'disable': disable events). Measurements can be started with events disabled using ---delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor -to synchronize with the controlling process. Example of bash shell script to enable and -disable events during measurements: +'disable': disable events, 'snapshot': AUX area tracing snapshot). Measurements can be +started with events disabled using --delay=-1 option. Optionally send control command +completion ('ack\n') to ack-fd descriptor to synchronize with the controlling process. +Example of bash shell script to enable and disable events during measurements: #!/bin/bashtools/perf/builtin-record.c +10
-0@@ -1593,6 +1593,16 @@ static int record__init_clock(struct record *rec)return 0 ; } +static void hit_auxtrace_snapshot_trigger (struct record *rec) +{ +if (trigger_is_ready (&auxtrace_snapshot_trigger)) { +trigger_hit (&auxtrace_snapshot_trigger); + auxtrace_record__snapshot_started =1 ; +if (auxtrace_record__snapshot_start (rec->itr)) +trigger_error (&auxtrace_snapshot_trigger); + } +} +static int __cmd_record (struct record *rec,int argc,const char **argv) {int err;
tools/perf/builtin-record.c static int __cmd_record(struct record *rec, int argc, const char **argv) · line 1951
Quoted 5 lines
tools/perf/builtin-record.c +2
-0@@ -1937,6 +1947,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)case EVLIST_CTL_CMD_DISABLE :pr_info (EVLIST_DISABLED_MSG );break ; +case EVLIST_CTL_CMD_SNAPSHOT : +hit_auxtrace_snapshot_trigger (rec);
Could possibly print a messages to console that snapshot taking has started, similar to enabling and disabling of events.
Regards,
Alexei
Quoted 113 lines
tools/perf/builtin-record.c +5
-7+evlist__ctlfd_ack (rec->evlist); +break ;case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :@@ -2589,7 +2603,8 @@ static struct option __record_options[] = { parse_libpfm_events_option), #endifOPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" , -"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" +"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events,\n" +"\t\t\t 'snapshot': AUX area tracing snapshot).\n" "\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" "\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option),@@ -2842,12 +2857,7 @@ static void snapshot_sig_handler(int sig __maybe_unused) {struct record *rec = &record; -if (trigger_is_ready (&auxtrace_snapshot_trigger)) { -trigger_hit (&auxtrace_snapshot_trigger); - auxtrace_record__snapshot_started =1 ; -if (auxtrace_record__snapshot_start (record.itr)) -trigger_error (&auxtrace_snapshot_trigger); - } +hit_auxtrace_snapshot_trigger (rec);if (switch_output_signal (rec))trigger_hit (&switch_output_trigger);tools/perf/builtin-stat.c +1
-0@@ -578,6 +578,7 @@ static void process_evlist(struct evlist *evlist, unsigned int interval)process_interval ();pr_info (EVLIST_DISABLED_MSG );break ; +case EVLIST_CTL_CMD_SNAPSHOT :case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :tools/perf/util/evlist.c +9
-2@@ -1885,13 +1885,17 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, }else if (!strncmp (cmd_data,EVLIST_CTL_CMD_DISABLE_TAG , (sizeof (EVLIST_CTL_CMD_DISABLE_TAG )-1 ))) { *cmd =EVLIST_CTL_CMD_DISABLE ; + }else if (!strncmp (cmd_data,EVLIST_CTL_CMD_SNAPSHOT_TAG , + (sizeof (EVLIST_CTL_CMD_SNAPSHOT_TAG )-1 ))) { + *cmd =EVLIST_CTL_CMD_SNAPSHOT ; +pr_debug ("is snapshot\n" ); } }return bytes_read ? (int )bytes_read : err; } -static int evlist__ctlfd_ack (struct evlist *evlist) +int evlist__ctlfd_ack (struct evlist *evlist) {int err;@@ -1927,13 +1931,16 @@ int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd)case EVLIST_CTL_CMD_DISABLE :evlist__disable (evlist);break ; +case EVLIST_CTL_CMD_SNAPSHOT : +break ;case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :pr_debug ("ctlfd: unsupported %d\n" , *cmd);break ; } -if (!(*cmd ==EVLIST_CTL_CMD_ACK || *cmd ==EVLIST_CTL_CMD_UNSUPPORTED )) +if (!(*cmd ==EVLIST_CTL_CMD_ACK || *cmd ==EVLIST_CTL_CMD_UNSUPPORTED || + *cmd ==EVLIST_CTL_CMD_SNAPSHOT ))evlist__ctlfd_ack (evlist); } }tools/perf/util/evlist.h +4
-1@@ -363,6 +363,7 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,#define EVLIST_CTL_CMD_ENABLE_TAG "enable"#define EVLIST_CTL_CMD_DISABLE_TAG "disable"#define EVLIST_CTL_CMD_ACK_TAG "ack\n" +#define EVLIST_CTL_CMD_SNAPSHOT_TAG "snapshot"#define EVLIST_CTL_CMD_MAX_LEN 64@@ -370,7 +371,8 @@ enum evlist_ctl_cmd {EVLIST_CTL_CMD_UNSUPPORTED =0 ,EVLIST_CTL_CMD_ENABLE ,EVLIST_CTL_CMD_DISABLE , - EVLIST_CTL_CMD_ACK +EVLIST_CTL_CMD_ACK , + EVLIST_CTL_CMD_SNAPSHOT, };int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);@@ -378,6 +380,7 @@ int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);int evlist__ctlfd_process (struct evlist *evlist,enum evlist_ctl_cmd *cmd); +int evlist__ctlfd_ack (struct evlist *evlist);#define EVLIST_ENABLED_MSG "Events enabled\n"#define EVLIST_DISABLED_MSG "Events disabled\n"
Adrian Hunter
reviewerRe: [PATCH V2 5/6] perf record: Add 'snapshot' control command
Quoted 71 lines · Alexey Budankov
Quoted 69 lines · Adrian Hunter
Add 'snapshot' control command to create an AUX area tracing snapshot the same as if sending SIGUSR2. The advantage of the FIFO is that access is governed by access to the FIFO.
Example:
$ mkfifo perf.control $ mkfifo perf.ack $ cat perf.ack & [1] 15235 $ sudo ~/bin/perf record --control fifo:perf.control,perf.ack -S -e intel_pt//u -- sleep 60 & [2] 15243 $ ps -e | grep perf 15244 pts/1 00:00:00 perf $ kill -USR2 15244 bash: kill: (15244) - Operation not permitted $ echo snapshot > perf.control ackSigned-off-by Adrian Hunter <[email protected]>--- tools/perf/Documentation/perf-record.txt | 8 ++++---- tools/perf/builtin-record.c | 24 +++++++++++++++++------- tools/perf/builtin-stat.c | 1 + tools/perf/util/evlist.c | 11 +++++++++-- tools/perf/util/evlist.h | 5 ++++- 5 files changed, 35 insertions(+), 14 deletions(-)tools/perf/Documentation/perf-record.txt +4
-4@@ -631,10 +631,10 @@ endif::HAVE_LIBPFM[] --control=fd:ctl-fd[,ack-fd]:: ctl-fifo / ack-fifo are opened and used as ctl-fd / ack-fd as follows. Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, -'disable': disable events). Measurements can be started with events disabled using ---delay=-1 option. Optionally send control command completion ('ack\n') to ack-fd descriptor -to synchronize with the controlling process. Example of bash shell script to enable and -disable events during measurements: +'disable': disable events, 'snapshot': AUX area tracing snapshot). Measurements can be +started with events disabled using --delay=-1 option. Optionally send control command +completion ('ack\n') to ack-fd descriptor to synchronize with the controlling process. +Example of bash shell script to enable and disable events during measurements: #!/bin/bashtools/perf/builtin-record.c +10
-0@@ -1593,6 +1593,16 @@ static int record__init_clock(struct record *rec)return 0 ; } +static void hit_auxtrace_snapshot_trigger (struct record *rec) +{ +if (trigger_is_ready (&auxtrace_snapshot_trigger)) { +trigger_hit (&auxtrace_snapshot_trigger); + auxtrace_record__snapshot_started =1 ; +if (auxtrace_record__snapshot_start (rec->itr)) +trigger_error (&auxtrace_snapshot_trigger); + } +} +static int __cmd_record (struct record *rec,int argc,const char **argv) {int err;@@ -1937,6 +1947,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
Quoted 8 lines
tools/perf/builtin-record.c static int __cmd_record(struct record *rec, int argc, const char **argv) · line 1951
Quoted 5 lines
tools/perf/builtin-record.c +2
-0case EVLIST_CTL_CMD_DISABLE :pr_info (EVLIST_DISABLED_MSG );break ; +case EVLIST_CTL_CMD_SNAPSHOT : +hit_auxtrace_snapshot_trigger (rec);Could possibly print a messages to console that snapshot taking has started, similar to enabling and disabling of events.
There is a an existing debug print for snapshots, and the ack fifo of course. So I am going to leave that for now.
Quoted 119 lines
Acked-by Alexei Budankov <[email protected]>Regards,
AlexeiQuoted 113 lines
tools/perf/builtin-record.c +5
-7+evlist__ctlfd_ack (rec->evlist); +break ;case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :@@ -2589,7 +2603,8 @@ static struct option __record_options[] = { parse_libpfm_events_option), #endifOPT_CALLBACK (0 ,"control" , &record.opts,"fd:ctl-fd[,ack-fd] or fifo:ctl-fifo[,ack-fifo]" , -"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events).\n" +"Listen on ctl-fd descriptor for command to control measurement ('enable': enable events, 'disable': disable events,\n" +"\t\t\t 'snapshot': AUX area tracing snapshot).\n" "\t\t\t Optionally send control command completion ('ack\\n') to ack-fd descriptor.\n" "\t\t\t Alternatively, ctl-fifo / ack-fifo will be opened and used as ctl-fd / ack-fd." , parse_control_option),@@ -2842,12 +2857,7 @@ static void snapshot_sig_handler(int sig __maybe_unused) {struct record *rec = &record; -if (trigger_is_ready (&auxtrace_snapshot_trigger)) { -trigger_hit (&auxtrace_snapshot_trigger); - auxtrace_record__snapshot_started =1 ; -if (auxtrace_record__snapshot_start (record.itr)) -trigger_error (&auxtrace_snapshot_trigger); - } +hit_auxtrace_snapshot_trigger (rec);if (switch_output_signal (rec))trigger_hit (&switch_output_trigger);tools/perf/builtin-stat.c +1
-0@@ -578,6 +578,7 @@ static void process_evlist(struct evlist *evlist, unsigned int interval)process_interval ();pr_info (EVLIST_DISABLED_MSG );break ; +case EVLIST_CTL_CMD_SNAPSHOT :case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :tools/perf/util/evlist.c +9
-2@@ -1885,13 +1885,17 @@ static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, }else if (!strncmp (cmd_data,EVLIST_CTL_CMD_DISABLE_TAG , (sizeof (EVLIST_CTL_CMD_DISABLE_TAG )-1 ))) { *cmd =EVLIST_CTL_CMD_DISABLE ; + }else if (!strncmp (cmd_data,EVLIST_CTL_CMD_SNAPSHOT_TAG , + (sizeof (EVLIST_CTL_CMD_SNAPSHOT_TAG )-1 ))) { + *cmd =EVLIST_CTL_CMD_SNAPSHOT ; +pr_debug ("is snapshot\n" ); } }return bytes_read ? (int )bytes_read : err; } -static int evlist__ctlfd_ack (struct evlist *evlist) +int evlist__ctlfd_ack (struct evlist *evlist) {int err;@@ -1927,13 +1931,16 @@ int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd)case EVLIST_CTL_CMD_DISABLE :evlist__disable (evlist);break ; +case EVLIST_CTL_CMD_SNAPSHOT : +break ;case EVLIST_CTL_CMD_ACK :case EVLIST_CTL_CMD_UNSUPPORTED :default :pr_debug ("ctlfd: unsupported %d\n" , *cmd);break ; } -if (!(*cmd ==EVLIST_CTL_CMD_ACK || *cmd ==EVLIST_CTL_CMD_UNSUPPORTED )) +if (!(*cmd ==EVLIST_CTL_CMD_ACK || *cmd ==EVLIST_CTL_CMD_UNSUPPORTED || + *cmd ==EVLIST_CTL_CMD_SNAPSHOT ))evlist__ctlfd_ack (evlist); } }tools/perf/util/evlist.h +4
-1@@ -363,6 +363,7 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,#define EVLIST_CTL_CMD_ENABLE_TAG "enable"#define EVLIST_CTL_CMD_DISABLE_TAG "disable"#define EVLIST_CTL_CMD_ACK_TAG "ack\n" +#define EVLIST_CTL_CMD_SNAPSHOT_TAG "snapshot"#define EVLIST_CTL_CMD_MAX_LEN 64@@ -370,7 +371,8 @@ enum evlist_ctl_cmd {EVLIST_CTL_CMD_UNSUPPORTED =0 ,EVLIST_CTL_CMD_ENABLE ,EVLIST_CTL_CMD_DISABLE , - EVLIST_CTL_CMD_ACK +EVLIST_CTL_CMD_ACK , + EVLIST_CTL_CMD_SNAPSHOT, };int evlist__parse_control (const char *str,int *ctl_fd,int *ctl_fd_ack,bool *ctl_fd_close);@@ -378,6 +380,7 @@ int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack);int evlist__finalize_ctlfd (struct evlist *evlist);bool evlist__ctlfd_initialized (struct evlist *evlist);int evlist__ctlfd_process (struct evlist *evlist,enum evlist_ctl_cmd *cmd); +int evlist__ctlfd_ack (struct evlist *evlist);#define EVLIST_ENABLED_MSG "Events enabled\n"#define EVLIST_DISABLED_MSG "Events disabled\n"
Adrian Hunter
reviewerPATCH v2 6/6 perf intel-pt: Document snapshot control command
In reply to Adrian HunterThe documentation descibes snapshot mode. Update it to include the new snapshot control command.
--- tools/perf/Documentation/perf-intel-pt.txt | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
tools/perf/Documentation/perf-intel-pt.txt +20 -3
@@ -558,7 +558,7 @@ The mmap size and auxtrace mmap size are displayed if the -vv option is used e.g Intel PT modes of operation ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Intel PT can be used in 2 modes: +Intel PT can be used in 3 modes: full-trace mode sample mode snapshot mode
@@ -571,7 +571,8 @@ Sample mode attaches a Intel PT sample to other events e.g. perf record --aux-sample -e intel_pt//u -e branch-misses:u -Snapshot mode captures the available data when a signal is sent e.g. +Snapshot mode captures the available data when a signal is sent or "snapshot" +control command is issued. e.g. using a signal perf record -v -e intel_pt//u -S ./loopy 1000000000 & [1] 11435
@@ -582,7 +583,23 @@ Note that the signal sent is SIGUSR2. Note that "Recording AUX area tracing snapshot" is displayed because the -v option is used. -The 2 modes cannot be used together. +The advantage of using "snapshot" control command is that the access is +controlled by access to a FIFO e.g. + + $ mkfifo perf.control + $ mkfifo perf.ack + $ cat perf.ack & + [1] 15235 + $ sudo ~/bin/perf record --control fifo:perf.control,perf.ack -S -e intel_pt//u -- sleep 60 & + [2] 15243 + $ ps -e | grep perf + 15244 pts/1 00:00:00 perf + $ kill -USR2 15244 + bash: kill: (15244) - Operation not permitted + $ echo snapshot > perf.control + ack + +The 3 Intel PT modes of operation cannot be used together. Buffer handling
Signature · 1 line
2.17.1
Re: [PATCH V2 6/6] perf intel-pt: Document snapshot control command
Quoted 7 lines · Adrian Hunter
The documentation descibes snapshot mode. Update it to include the new snapshot control command.
Signed-off-by Adrian Hunter <[email protected]>--- tools/perf/Documentation/perf-intel-pt.txt | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)
Regards,
Alexei