From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87E4714A60F for ; Thu, 1 Aug 2024 21:30:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722547823; cv=none; b=PsrC/+ZpZyTCT+6FyNLvTDy0oFOckCQ0Ke/D2Mho1+DtQqVjTvitmS0k6g/uQd8VLMAz9HTs843qup4yEBWKHsf0wAXsoe93FpHiM3HfmMnqnouhqNhMuYjAFQqcm1EyF7NcC7utVf7NMsh67YrcX6nzNZMQjgwUb0mJM5t14Uk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722547823; c=relaxed/simple; bh=e2vWWZzTZKFuJ6KmNJeMAY78DGHeIbYrzs3oXi10T9M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Pmlip/zUgK18CKzgcaZOFtOQNh5HA3ysaSBrF5uQOir1ljKk/K022y59eD2rF6nPdFNFOBCcZrLhWAqdYzQgCOOqGhj165UdEhQB7QV0luWqoHr7a3U+DR/bUoqrKh9ZuAlc9z5O+H6bVDpvQrNzoN0SPMlcuk0lW9yvBJNZL1U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=mrglvme/; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="mrglvme/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1722547822; x=1754083822; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=e2vWWZzTZKFuJ6KmNJeMAY78DGHeIbYrzs3oXi10T9M=; b=mrglvme/H/8m1tOmiakQOG+0ii3GrnBHQsUuhyCVKY3zJDH04B6672wd v7f8rWUQr0txnzAdjnP8A1GpbA57AbcPd51Lv4miMIiu0gu124nvgjb5J P22FmBusA+oBnxUJo9OdQ/8px6BFmLyiC6iq/Sv1sBej1Dw1V4rjHpYux Omgj361toGqtAChroEaDCTW53gpb/jD4nlorA9OYkmhVxYMgdSAVmi2wS n0evY7cOvqib2ijiG4DpflwMYiVYQ7oramivrO1X2JfgBHEBfqu11wWSv gH5iUREnKtYbr6eZmMKrH7MdjZesqRbWUrviMoTCupB7WEnmFa3kGgG4I w==; X-CSE-ConnectionGUID: v7WQY5X3THWfkrRCLhHFQw== X-CSE-MsgGUID: Ar53r3AIRuamd9Z5nXTkwQ== X-IronPort-AV: E=McAfee;i="6700,10204,11151"; a="24309530" X-IronPort-AV: E=Sophos;i="6.09,255,1716274800"; d="scan'208";a="24309530" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2024 14:28:55 -0700 X-CSE-ConnectionGUID: a6A2m0qYRxS+d5byiTBlcQ== X-CSE-MsgGUID: 0p/ABXYEQHGlk0jzKtwVZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,255,1716274800"; d="scan'208";a="55414349" Received: from tassilo.jf.intel.com ([10.54.38.190]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Aug 2024 14:28:55 -0700 From: Andi Kleen To: linux-perf-users@vger.kernel.org Cc: namhyung@kernel.org, Andi Kleen Subject: [PATCH v8 3/4] perf script: Fix perf script -F +metric Date: Thu, 1 Aug 2024 14:28:43 -0700 Message-ID: <20240801212844.677895-3-ak@linux.intel.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801212844.677895-1-ak@linux.intel.com> References: <20240801212844.677895-1-ak@linux.intel.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit This fixes a regression with perf script -F +metric originally caused by : commit 37cc8ad77cf81f3ffd226856c367b0e15333a738 Author: Ian Rogers Date: Sun Feb 19 01:28:46 2023 -0800 perf metric: Directly use counts rather than saved_value In the perf script environment the evsel wouldn't allocate an aggr values array, which led to a -1 reference because the metric evaluation would try to reference NULL - 1 (for aggr_idx) Give the perf script evsels a single CPU aggr setup. That's enough because the groups are always contiguous, so no need to store more than one CPU's worth of values. Before % perf record -e '{cycles,instructions}:S' perf bench mem memcpy % perf script -F +metric Segmentation fault (core dumped) After: % perf record -e '{cycles,instructions}:S' perf bench mem memcpy ... [ perf record: Woken up 1 times to write data ] [ perf record: Captured and wrote 0.028 MB perf.data (90 samples) ] % perf script -F +metric perf-exec 1847557 264658.180789: 3009 cycles: ffffffff990a579a native_write_msr+0xa ([kernel.kallsyms]) perf-exec 1847557 264658.180789: 382 instructions: ffffffff990a579a native_write_msr+0xa ([kernel.kallsyms]) perf-exec 1847557 264658.180789: metric: 0.13 insn per cycle ... Fixes: 37cc8ad77cf8 ("perf metric: Directly use counts rather ...") Signed-off-by: Andi Kleen ---- v2: Reformat code v3: Work around bogus warning v4: Set up aggr map only for metrics case to keep perf stat record working v5: Broken version v6: Only set up limited aggregation mode with -F +metric. Add conflict checks with perf stat record files. v7: Remove some unnecessary conflict checks. Fix buffer overflow. Minor cleanups. v8: Add check for leader sampling. Update some comments. --- tools/perf/builtin-script.c | 50 +++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index c16224b1fef3..04378615b2ad 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -335,7 +335,6 @@ struct evsel_script { FILE *fp; u64 samples; /* For metric output */ - u64 val; int gnum; }; @@ -2127,18 +2126,30 @@ static void perf_sample__fprint_metric(struct perf_script *script, }; struct evsel *ev2; u64 val; + static int printed; if (!evsel->stats) evlist__alloc_stats(&stat_config, script->session->evlist, /*alloc_raw=*/false); if (evsel_script(leader)->gnum++ == 0) perf_stat__reset_shadow_stats(); - val = sample->period * evsel->scale; - evsel_script(evsel)->val = val; + val = sample->period; + if (!(evsel->core.attr.sample_type & PERF_SAMPLE_READ)) { + if (!printed) + fprintf(stderr, "perf script: -F metric requires {}:S for groups leader sampling\n"); + printed = 1; + return; + } + /* + * Always use the first entry as storage because the leader sampling + * groups are contiguous and there's no need to handle multiple indexes + * for anything. + */ + evsel->stats->aggr[0].counts.val = val; if (evsel_script(leader)->gnum == leader->core.nr_members) { for_each_group_member (ev2, leader) { perf_stat__print_shadow_stats(&stat_config, ev2, - evsel_script(ev2)->val, - sample->cpu, + evsel->stats->aggr[0].counts.val, + 0, &ctx, NULL); } @@ -2325,6 +2336,20 @@ static void process_event(struct perf_script *script, fflush(fp); } +static void check_metric_conflict(void) +{ + int i; + /* + * Avoid conflict with the aggregation mode used for the metric printing. + */ + for (i = 0; i < OUTPUT_TYPE_MAX; i++) { + if (output[i].fields & PERF_OUTPUT_METRIC) { + fprintf(stderr, "perf stat record files are not supported with -F metric\n"); + exit(1); + } + } +} + static struct scripting_ops *scripting_ops; static void __process_stat(struct evsel *counter, u64 tstamp) @@ -2334,6 +2359,8 @@ static void __process_stat(struct evsel *counter, u64 tstamp) struct perf_cpu cpu; static int header_printed; + check_metric_conflict(); + if (!header_printed) { printf("%3s %8s %15s %15s %15s %15s %s\n", "CPU", "THREAD", "VAL", "ENA", "RUN", "TIME", "EVENT"); @@ -3725,6 +3752,8 @@ static int process_stat_config_event(struct perf_session *session __maybe_unused { perf_event__read_stat_config(&stat_config, &event->stat_config); + check_metric_conflict(); + /* * Aggregation modes are not used since post-processing scripts are * supposed to take care of such requirements @@ -4088,6 +4117,17 @@ int cmd_script(int argc, const char **argv) argc = parse_options_subcommand(argc, argv, options, script_subcommands, script_usage, PARSE_OPT_STOP_AT_NON_OPTION); + for (i = 0; i < OUTPUT_TYPE_MAX; i++) { + if (output[i].fields & PERF_OUTPUT_METRIC) { + stat_config.aggr_map = cpu_aggr_map__empty_new(1); + err = -ENOMEM; + if (!stat_config.aggr_map) + goto out; + err = 0; + stat_config.aggr_map->nr = 1; + break; + } + } if (symbol_conf.guestmount || symbol_conf.default_guest_vmlinux_name || -- 2.45.2