From: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>, Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Andi Kleen <ak@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Alexander Antonov <alexander.antonov@linux.intel.com>,
Alexei Budankov <abudankov@huawei.com>,
Riccardo Mancini <rickyman7@gmail.com>
Subject: [PATCH v9 14/24] perf record: Implement compatibility checks
Date: Fri, 2 Jul 2021 15:32:22 +0300 [thread overview]
Message-ID: <48a54ddc4c18532d8cfe0ffa1c1c04185bea5a7b.1625227739.git.alexey.v.bayduraev@linux.intel.com> (raw)
In-Reply-To: <cover.1625227739.git.alexey.v.bayduraev@linux.intel.com>
Implement compatibility checks for other modes and related command line
options: asynchronous (--aio) trace streaming and affinity (--affinity)
modes, pipe mode, AUX area tracing --snapshot and --aux-sample options,
--switch-output, --switch-output-event, --switch-max-files and
--timestamp-filename options. Parallel data streaming is compatible with
Zstd compression (--compression-level) and external control commands
(--control). Cpu mask provided via -C option filters --threads
specification masks.
Acked-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
---
tools/perf/builtin-record.c | 49 ++++++++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 06400fcbfc27..893dab03391f 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -826,6 +826,12 @@ static int record__auxtrace_init(struct record *rec)
{
int err;
+ if ((rec->opts.auxtrace_snapshot_opts || rec->opts.auxtrace_sample_opts)
+ && record__threads_enabled(rec)) {
+ pr_err("AUX area tracing options are not available in parallel streaming mode.\n");
+ return -EINVAL;
+ }
+
if (!rec->itr) {
rec->itr = auxtrace_record__init(rec->evlist, &err);
if (err)
@@ -2241,6 +2247,17 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
return PTR_ERR(session);
}
+ if (record__threads_enabled(rec)) {
+ if (perf_data__is_pipe(&rec->data)) {
+ pr_err("Parallel trace streaming is not available in pipe mode.\n");
+ return -1;
+ }
+ if (rec->opts.full_auxtrace) {
+ pr_err("Parallel trace streaming is not available in AUX area tracing mode.\n");
+ return -1;
+ }
+ }
+
fd = perf_data__fd(data);
rec->session = session;
@@ -3008,12 +3025,22 @@ static int switch_output_setup(struct record *rec)
* --switch-output=signal, as we'll send a SIGUSR2 from the side band
* thread to its parent.
*/
- if (rec->switch_output_event_set)
+ if (rec->switch_output_event_set) {
+ if (record__threads_enabled(rec)) {
+ pr_warning("WARNING: --switch-output-event option is not available in parallel streaming mode.\n");
+ return 0;
+ }
goto do_signal;
+ }
if (!s->set)
return 0;
+ if (record__threads_enabled(rec)) {
+ pr_warning("WARNING: --switch-output option is not available in parallel streaming mode.\n");
+ return 0;
+ }
+
if (!strcmp(s->str, "signal")) {
do_signal:
s->signal = true;
@@ -3311,8 +3338,8 @@ static struct option __record_options[] = {
"Set affinity mask of trace reading thread to NUMA node cpu mask or cpu of processed mmap buffer",
record__parse_affinity),
#ifdef HAVE_ZSTD_SUPPORT
- OPT_CALLBACK_OPTARG('z', "compression-level", &record.opts, &comp_level_default,
- "n", "Compressed records using specified level (default: 1 - fastest compression, 22 - greatest compression)",
+ OPT_CALLBACK_OPTARG('z', "compression-level", &record.opts, &comp_level_default, "n",
+ "Compress records using specified level (default: 1 - fastest compression, 22 - greatest compression)",
record__parse_comp_level),
#endif
OPT_CALLBACK(0, "max-size", &record.output_max_size,
@@ -3753,6 +3780,17 @@ int cmd_record(int argc, const char **argv)
if (rec->opts.kcore || record__threads_enabled(rec))
rec->data.is_dir = true;
+ if (record__threads_enabled(rec)) {
+ if (rec->opts.affinity != PERF_AFFINITY_SYS) {
+ pr_err("--affinity option is mutually exclusive to parallel streaming mode.\n");
+ goto out_opts;
+ }
+ if (record__aio_enabled(rec)) {
+ pr_err("Asynchronous streaming mode (--aio) is mutually exclusive to parallel streaming mode.\n");
+ goto out_opts;
+ }
+ }
+
if (rec->opts.comp_level != 0) {
pr_debug("Compression enabled, disabling build id collection at the end of the session.\n");
rec->no_buildid = true;
@@ -3786,6 +3824,11 @@ int cmd_record(int argc, const char **argv)
}
}
+ if (rec->timestamp_filename && record__threads_enabled(rec)) {
+ rec->timestamp_filename = false;
+ pr_warning("WARNING: --timestamp-filename option is not available in parallel streaming mode.\n");
+ }
+
/*
* Allow aliases to facilitate the lookup of symbols for address
* filters. Refer to auxtrace_parse_filters().
--
2.19.0
next prev parent reply other threads:[~2021-07-02 12:33 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 12:32 [PATCH v9 00/24] Introduce threaded trace streaming for basic perf record operation Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 01/24] perf record: Introduce thread affinity and mmap masks Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 02/24] tools lib: Introduce fdarray clone function Alexey Bayduraev
2021-07-02 18:15 ` Arnaldo Carvalho de Melo
2021-07-02 12:32 ` [PATCH v9 03/24] perf record: Introduce thread specific data array Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 04/24] perf record: Introduce function to propagate control commands Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 05/24] perf record: Introduce thread local variable Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 06/24] perf record: Stop threads in the end of trace streaming Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 07/24] perf record: Start threads in the beginning " Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 08/24] perf record: Introduce data file at mmap buffer object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 09/24] perf record: Introduce bytes written stats to support --max-size option Alexey Bayduraev
2021-07-09 5:38 ` Namhyung Kim
2021-07-02 12:32 ` [PATCH v9 10/24] perf record: Introduce data transferred and compressed stats Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 11/24] perf record: Init data file at mmap buffer object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 12/24] perf record: Introduce --threads command line option Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 13/24] perf record: Extend " Alexey Bayduraev
2021-07-02 12:32 ` Alexey Bayduraev [this message]
2021-07-02 12:32 ` [PATCH v9 15/24] perf report: Output non-zero offset for decompressed records Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 16/24] perf report: Output data file name in raw trace dump Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 17/24] perf session: Move reader structure to the top Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 18/24] perf session: Introduce reader_state in reader object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 19/24] perf session: Introduce reader objects in session object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 20/24] perf session: Introduce decompressor into trace reader object Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 21/24] perf session: Move init into reader__init function Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 22/24] perf session: Move map/unmap into reader__mmap function Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 23/24] perf session: Load single file for analysis Alexey Bayduraev
2021-07-02 12:32 ` [PATCH v9 24/24] perf session: Load data directory files " Alexey Bayduraev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48a54ddc4c18532d8cfe0ffa1c1c04185bea5a7b.1625227739.git.alexey.v.bayduraev@linux.intel.com \
--to=alexey.v.bayduraev@linux.intel.com \
--cc=abudankov@huawei.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.antonov@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rickyman7@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).