Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp3375638pxy; Tue, 4 May 2021 00:08:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzGNEyhaKI6V9zpUtewRx1VKFkukzDMUkrzswwKMKFP6bI6os3iLAOTiV/ZUERqovKgctmk X-Received: by 2002:a63:86c7:: with SMTP id x190mr22424021pgd.194.1620112123493; Tue, 04 May 2021 00:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620112123; cv=none; d=google.com; s=arc-20160816; b=i4T2RAGypVYSKOoJMtAzImCq1SUAqGqEBEOzm+P9/cCXzLkYdnuFteaxrZmwprHUpf MQzRkFEie8+92U3zyNeqQXo9iy4SO94LJw0zW38bww69LfQLCx/3m/eT9TVjmVoyuPJT lV7ndpEtYxoBmp5/jyheZZYJnqJZwbafcmxfDQ8tUKDgHu6JMgIoLi7wcyH2ckxbMwxf AMrqP8fIiU/7hAmyoyBpMM3xwVua42AzZ/kQsZBCMmLAwmerBUQwrQn8O3xyEmjepnDP StWmomdw9FVuTZLtd3xmKkns8Nr4Pfmmp6S8bn8UV1Tp1XXAmVhjWycVr19a2WOLY5/x lgew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=uRZDTe3m6VoQSCf9guGu9oIrZUg60tkYazgtcTcargI=; b=wQdYmtPi5AzjAN4qFp2QLI/vhNhBMOjpB/m8eu5puhEAl6/2+1Ckh73hScWnfdRDlP RjO3dqqMNnSlUjaW1OQjzzvJ4cKHQPNMBM6g5YQYh0hQODDf94hvU3fqd7rnSAbbu1EP JkGy6GyDHQL/FiPg8LfOQ5XzK9DvL82z2zOOzNfFmEqnwwGG2RNArkzsQHLu6YUhQ4uv KvkKlA9Bp9kRtcvO/oMJfOpPMWqTegthIXLHKVmqf2kpQJgUnbPKW7e16WWHzgF+GTJN 43II2d2dwag+PaYPPSSyDXo48fp4IeTf85wxbM7PbNWHGaQMkwUuqa0P4CpJTaMHUic5 tj/w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o3si2598540pgc.591.2021.05.04.00.08.31; Tue, 04 May 2021 00:08:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230015AbhEDHHx (ORCPT + 99 others); Tue, 4 May 2021 03:07:53 -0400 Received: from mga14.intel.com ([192.55.52.115]:4397 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230095AbhEDHHd (ORCPT ); Tue, 4 May 2021 03:07:33 -0400 IronPort-SDR: pnlTf2IvUhelj7Ro6fhNIgUwPqUg8badUJ1KV6kcu3bL/TxTbJ5icKSHUQg4fiZakiXhWKXnLF jcxODssJzQ7A== X-IronPort-AV: E=McAfee;i="6200,9189,9973"; a="197534562" X-IronPort-AV: E=Sophos;i="5.82,271,1613462400"; d="scan'208";a="197534562" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2021 00:06:00 -0700 IronPort-SDR: h3qz6w7vHuu7JjW3opSY440syrV+TmnS0jaLg/CcYx9hz9lbr5lGtMfi9v5xqh28Z1snl+LhsB e7CEqmk+pR+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,271,1613462400"; d="scan'208";a="450895619" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by fmsmga004.fm.intel.com with ESMTP; 04 May 2021 00:05:53 -0700 From: Alexey Bayduraev To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , linux-kernel , Andi Kleen , Adrian Hunter , Alexander Antonov , Alexei Budankov Subject: [PATCH v5 11/20] perf record: document parallel data streaming mode Date: Tue, 4 May 2021 10:04:46 +0300 Message-Id: X-Mailer: git-send-email 2.19.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Document --threads option syntax and parallel data streaming modes in Documentation/perf-record.txt. 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. Signed-off-by: Alexey Bayduraev --- tools/perf/Documentation/perf-record.txt | 30 +++++++++++++++ tools/perf/builtin-record.c | 49 ++++++++++++++++++++++-- 2 files changed, 76 insertions(+), 3 deletions(-) diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index d71bac847936..2046b28d9822 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt @@ -695,6 +695,36 @@ measurements: wait -n ${perf_pid} exit $? +--threads=:: +Write collected trace data into several data files using parallel threads. + value can be user defined list of masks. Masks separated by colon +define cpus to be monitored by a thread and affinity mask of that thread +is separated by slash: + + /:/:... + +For example user specification like the following: + + 0,2-4/2-4:1,5-7/5-7 + +specifies parallel threads layout that consists of two threads, +the first thread monitors cpus 0 and 2-4 with the affinity mask 2-4, +the second monitors cpus 1 and 5-7 with the affinity mask 5-7. + + value can also be a string meaning predefined parallel threads +layout: + + cpu - create new data streaming thread for every monitored cpu + core - create new thread to monitor cpus grouped by a core + socket - create new thread to monitor cpus grouped by a socket + numa - create new threed to monitor cpus grouped by a numa domain + +Predefined layouts can be used on systems with large number of cpus in +order not to spawn multiple per-cpu streaming threads but still avoid LOST +events in data directory files. Option specified with no or empty value +defaults to cpu layout. Masks defined or provided by the option value are +filtered through the mask provided by -C option. + include::intel-hybrid.txt[] SEE ALSO diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index e5ea1334cc7d..4d676a1be139 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -800,6 +800,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) @@ -2145,6 +2151,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; @@ -2903,12 +2920,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; @@ -3193,8 +3220,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, @@ -3610,6 +3637,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; @@ -3643,6 +3681,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