Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp1013361pxb; Tue, 17 Aug 2021 01:27:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzNwt649WJXTAj+TpHY/xyabD8SlxLrMIqu+gn/6I9s0/UQkyMXj+MIhblan9BuMP1uATnV X-Received: by 2002:aa7:d388:: with SMTP id x8mr2926629edq.254.1629188828052; Tue, 17 Aug 2021 01:27:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629188828; cv=none; d=google.com; s=arc-20160816; b=s1b07vxMgtGnohJiUASlxaEikKleMCFGuoyBlqYHgI8nR2dBeuJcxsK9RBKRN73xCS OEJwn8aq2IWGrghVbMdKVbhSuFvfFZOQEmUUMML8HP4UjMYqyrHi/ykZUezNNFCnNdn3 bWDMleVw3lzrIetBO+GJIj8ey69kzwAZBRgdp8uGluA6koi/Ams1RvCfvpmZUon1Rmcm gKQoOEmeSipmTVDF+6RGMA5qBA8GJFrXCZcCPTUYrBCwk/FuZTxkW35BRR2zPtZD0o1t 307FOYH8rIUpzcrk2qZDxtPdKWh4menEEwBSAK2zA1G4VjKtSu5Q1we5PBGhgZiOxkpv zLiQ== 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; bh=2VagYPGFrqmEdpxig46sahHrGdM+8IMRfNv7y2aAcWk=; b=bNIsJp4Kx90NFQTbVP/Dj0f/gCuyv/9XVuS/1fwCSrslBIh08dSV1LbGrnwwvo9c98 12pjWGb2Yf2NvzYWv5wwlR/liKCn2BVJJIOvHKoJNAkKD1RkNTuhKNsBN6cG4HtqLYK1 3bkjvERdyd3jaJ95ZVi0RBDNc/jYEvrs70va/qfImVarBx8ANWO9B3q71pRxVHLk2uTC AACI+NY4OUlxIVeLOa+Gb71/0PKPm7pYpMR2c9ga/vK/5YDFMBXJni/nBUYeyWSEnjmC chCcGCNsmYfcveTNxynNohOqgdlUZh91PzqaYDu4jGRcIqwnsHKsFn4L62aTkXLllhZP fmmg== 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 lv10si1617612ejb.316.2021.08.17.01.26.43; Tue, 17 Aug 2021 01:27:08 -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 S239377AbhHQIZN (ORCPT + 99 others); Tue, 17 Aug 2021 04:25:13 -0400 Received: from mga04.intel.com ([192.55.52.120]:18130 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239167AbhHQIYt (ORCPT ); Tue, 17 Aug 2021 04:24:49 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10078"; a="214171922" X-IronPort-AV: E=Sophos;i="5.84,328,1620716400"; d="scan'208";a="214171922" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2021 01:24:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,328,1620716400"; d="scan'208";a="471080364" Received: from nntpat99-84.inn.intel.com ([10.125.99.84]) by orsmga008.jf.intel.com with ESMTP; 17 Aug 2021 01:24:13 -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 , Riccardo Mancini Subject: [PATCH v11 14/24] perf record: Implement compatibility checks Date: Tue, 17 Aug 2021 11:23:17 +0300 Message-Id: <12c2d60cb76580b61adb56a76c9c98cd728121b2.1629186429.git.alexey.v.bayduraev@linux.intel.com> 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 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 Reviewed-by: Riccardo Mancini Tested-by: Riccardo Mancini Signed-off-by: Alexey Bayduraev --- 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 8d93b4fe52f4..63f50f12011f 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) @@ -2213,6 +2219,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; @@ -2980,12 +2997,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; @@ -3283,8 +3310,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, @@ -3725,6 +3752,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; @@ -3758,6 +3796,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