From patchwork Wed Dec 13 21:36:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 178311 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8108557dys; Wed, 13 Dec 2023 13:37:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNjRuPI4oFNa376qQYGevo7mCkwSfhnPtwEUH6H/wS1GKqlgCi8p2irnuFlYfbdTX1GRxn X-Received: by 2002:a17:90a:be0f:b0:286:6cc1:2cbc with SMTP id a15-20020a17090abe0f00b002866cc12cbcmr4201775pjs.70.1702503423753; Wed, 13 Dec 2023 13:37:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702503423; cv=none; d=google.com; s=arc-20160816; b=EODUt61mry3GfAxViVbR6sDGD3iubad1x/6ulQZRQoyaoO7eUiZ91558ae6aF5Bu+3 1CZqGxQkTmh1mY/99rKrVKS3tLMPTXKwyWPNCNr2NVY8+JjYL+cswEWYassNwvxRjgHc eTgqk7/E/B43hiKSnUNGL1u0APCo09xMUzYUmGbpQb0F6vV/UFx/vvcQdH+wJb5e//5B Pfyth5EmjF0LwbUnHK245843qM/wqMdCnOQ9N0D3NCO4wNJX+1Iqacr2wL6WDS7ALpBI D8gHwkm+TXc1KASQFAYdhYzOPs81Lzz7Hd0gM2+jp5UZ+VomgMrqdqrNF07PU8QaEXqb quUw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=GxdaydlV2w8uFrzLyNbldk+hmhHXRcRUFEb/Xk2YyXQ=; fh=V97FFFi5RmpdUikarEoLTJWoOplAC1MpM9MGOX1xMoI=; b=ts/EIiyXJjKza0mOv8qOVpGiA/VqAlUyolFczkgq1JObMf1Xj8Ev06u++NYShRrH46 bb7Wit2PgaWCSuxWRBBJWksyEIKXezZtwWp2MotfYKYb21gFTP7i7AE1GqatxqAxKLLq M1JfK6ixwCLDKSWf1MtWVHPu16WBwRIHSYUqSTiIF2Gy2Ak7mJWem+AirD1md+vcgJhE wPfSnEZ2gfgNSdyWVPZ0wuXk3ryT72wvCUtFVjyMaqODlLfFJnMKQuW7sJ6w7ckPBfBw YEUmUjQY7yT106qMTiT7FjimPkMcgld8lydsfQKwmH+kRHH5TyWpBj6sfL49CgBBEj5d irbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="P/qX9FKS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id e13-20020a170902d38d00b001ce663d7930si10128793pld.47.2023.12.13.13.36.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:37:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="P/qX9FKS"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 2799D8037AAA; Wed, 13 Dec 2023 13:36:53 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230039AbjLMVgo (ORCPT + 99 others); Wed, 13 Dec 2023 16:36:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229772AbjLMVgn (ORCPT ); Wed, 13 Dec 2023 16:36:43 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 767ABCF; Wed, 13 Dec 2023 13:36:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702503409; x=1734039409; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yNDl1AIWfRrLV+Gwxh9D4+zILF9whC0/B0msILdny9c=; b=P/qX9FKSHydigFvmMc9fC/02HTUcmj8NPwylgjv5d6yfCvLjDOWlWSL5 QTtr/W2140XGB3t/vspItEgyCDKpS5kpMc40C5D39a15pa8jmV7aDX984 skPhaL3bfgxucF+fGLzgxG9nlNhAwcDy2lTbQQ96WYTxHTo9EUdW4gBmp 5xRTJkdSmrdodB+jaxfQsk7KQ0gbvM9gWeIh6eWaXYYENOp6KgUDkhBdi p9ib0n9jlFmiMU0Se1Y4ksUo5tBm3GLk3O+tS/uafxrGR05z+AIdGffBo ikk3PMSPJU87Sd9GvH6lSDNB8Lu6XNeQzRfe2qFG0mVu427w/PSQYvDHv Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="8426580" X-IronPort-AV: E=Sophos;i="6.04,273,1695711600"; d="scan'208";a="8426580" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 13:36:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="723811714" X-IronPort-AV: E=Sophos;i="6.04,273,1695711600"; d="scan'208";a="723811714" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga003.jf.intel.com with ESMTP; 13 Dec 2023 13:36:48 -0800 From: kan.liang@linux.intel.com To: acme@kernel.org, irogers@google.com Cc: namhyung@kernel.org, mark.rutland@arm.com, maz@kernel.org, marcan@marcan.st, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Kan Liang Subject: [PATCH V3 1/2] perf top: Use evsel's cpus to replace user_requested_cpus Date: Wed, 13 Dec 2023 13:36:32 -0800 Message-Id: <20231213213633.1088026-1-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Dec 2023 13:36:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785106234015225929 X-GMAIL-MSGID: 1785204230007395128 From: Kan Liang perf top errors out on a hybrid machine $perf top Error: The cycles:P event is not supported. The perf top expects that the "cycles" is collected on all CPUs in the system. But for hybrid there is no single "cycles" event which can cover all CPUs. Perf has to split it into two cycles events, e.g., cpu_core/cycles/ and cpu_atom/cycles/. Each event has its own CPU mask. If a event is opened on the unsupported CPU. The open fails. That's the reason of the above error out. Perf should only open the cycles event on the corresponding CPU. The commit ef91871c960e ("perf evlist: Propagate user CPU maps intersecting core PMU maps") intersect the requested CPU map with the CPU map of the PMU. Use the evsel's cpus to replace user_requested_cpus. The evlist's threads are also propagated to the evsel's threads in __perf_evlist__propagate_maps(). For a system-wide event, perf appends a dummy event and assign it to the evsel's threads. For a per-thread event, the evlist's thread_map is assigned to the evsel's threads. The same as the other tools, e.g., perf record, using the evsel's threads when opening an event. Reported-by: Arnaldo Carvalho de Melo Closes: https://lore.kernel.org/linux-perf-users/ZXNnDrGKXbEELMXV@kernel.org/ Reviewed-by: Ian Rogers Signed-off-by: Kan Liang --- No changes since V2 tools/perf/builtin-top.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index ea8c7eca5eee..cce9350177e2 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1027,8 +1027,8 @@ static int perf_top__start_counters(struct perf_top *top) evlist__for_each_entry(evlist, counter) { try_again: - if (evsel__open(counter, top->evlist->core.user_requested_cpus, - top->evlist->core.threads) < 0) { + if (evsel__open(counter, counter->core.cpus, + counter->core.threads) < 0) { /* * Specially handle overwrite fall back. From patchwork Wed Dec 13 21:36:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 178312 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8108615dys; Wed, 13 Dec 2023 13:37:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9vRi8QLf48kzNSpJZ+jqZOLbdG1F/tkxiCiqENwmvAQLoRaf3MR6RIWksH7aRSz7T2Ewf X-Received: by 2002:a05:6a20:a107:b0:18f:e2c9:9751 with SMTP id q7-20020a056a20a10700b0018fe2c99751mr12716819pzk.19.1702503433794; Wed, 13 Dec 2023 13:37:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702503433; cv=none; d=google.com; s=arc-20160816; b=q+bGySb/SGgaCG8krKoxMq9LHmGgtBjk0s5FSY4ITKpHVHEk3YmXWQ36XP9WBbmj8r VIR0Jz9CLZP6lmt1G/Mqu1RwAIxptM+p1z1gebHtWIb8zSKJjj7EqUeOoacwZMf2mguB TGG29iBR3lBnznUxgzboydC3wHdHyyYL5mAr3WusNyOoUf9cxL+AdnLUgo6Fr4TnmgIu PWTiKaLeanFqXTm+bxsfY/Zod8ynv/i0El69C5yuTgzVSM/cTFgESAODJk3qeRCSuj+O GiQWMBSAVawtkF58wz7oObaSmjd/tNt5KRwuZEX/57UujqV5493xtgp4+/9AMtYwvzzP d4YQ== 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 :dkim-signature; bh=zfGaQEnVr1eZ0j76XvG3j36FJsCI0k8hj1DJ5w2cgso=; fh=V97FFFi5RmpdUikarEoLTJWoOplAC1MpM9MGOX1xMoI=; b=vL6To16rsln/CZWi7V8xeYhpPt+aCcCMaw/Tk+qpc3qRhvTZnINTfRnGcvdwmcICLm hOA4zgoKAcluOj47q8n0IqetVHLzzYlcfFc7anmjcLzuD4BLCCRZAFT9paSykbS/Mgnb 1jQdy48CnjZzgj8gvaULrAt3FWBj5AKZh/KrfJ8zEltxNcAi468jWnmD29Vx5qdNMIhB 90Ay2msEQ3JxamrZLZVxQyTY3MTVMaiwftInHCwgCHDO0V4X99Egm0u7GqFctqwRf/ZF MVgO6RcUhytdnow/FcVIs1JArH6lMdG9RYSEb1pW+sKqDjIWgbWfomRPl0dLYHYI9nt4 q98Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Hsr2moDP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id m8-20020a056a00080800b006d0d83a11b9si1215071pfk.282.2023.12.13.13.37.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 13:37:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Hsr2moDP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id DEF5A8037AB0; Wed, 13 Dec 2023 13:37:10 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233841AbjLMVgp (ORCPT + 99 others); Wed, 13 Dec 2023 16:36:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230001AbjLMVgo (ORCPT ); Wed, 13 Dec 2023 16:36:44 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70D2FD0; Wed, 13 Dec 2023 13:36:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702503410; x=1734039410; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wuxih5kxzunVAuhYR0tbSjKsKpQAlm8S+2cJPq2Ei9E=; b=Hsr2moDPObkKKOJKfYyH/9HYa7pazQd9OC7VcJQcLMLXG/Bk6wuUDove 2JARuiR7SU3a7o/j0Dk9foIFH4gFddSdQFHsEobxnmwHiZ8Aq0JYXpDeo 5mf98i+8cCugsmDfcUXVkJQiawh4IgwD+Lek7rWGXFDuhQfJ7iI8AGWWK V+EfB/dDCt+CVurnu+vDNRZEqWvYEkmIC7a9rY4fa3ZVpeioRXYrEv7jJ cHcD+mXBx9I1AE0XtJuqbI3mp15MxZIBCk9S88F6LXRLoohgz9AlB+SZb iEZ1TOFY8GOcdIfaHTG6e0Kl8r+n2iFOcbAZdaeLyA+czQ3vEKxoGPUtc w==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="8426585" X-IronPort-AV: E=Sophos;i="6.04,273,1695711600"; d="scan'208";a="8426585" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 13:36:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="723811718" X-IronPort-AV: E=Sophos;i="6.04,273,1695711600"; d="scan'208";a="723811718" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga003.jf.intel.com with ESMTP; 13 Dec 2023 13:36:48 -0800 From: kan.liang@linux.intel.com To: acme@kernel.org, irogers@google.com Cc: namhyung@kernel.org, mark.rutland@arm.com, maz@kernel.org, marcan@marcan.st, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Kan Liang Subject: [PATCH V3 2/2] perf top: Uniform the event name for the hybrid machine Date: Wed, 13 Dec 2023 13:36:33 -0800 Message-Id: <20231213213633.1088026-2-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231213213633.1088026-1-kan.liang@linux.intel.com> References: <20231213213633.1088026-1-kan.liang@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Dec 2023 13:37:11 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785204240723795306 X-GMAIL-MSGID: 1785204240723795306 From: Kan Liang It's hard to distinguish the default cycles events among hybrid PMUs. For example, $perf top Available samples 385 cycles:P 903 cycles:P The other tool, e.g., perf record, uniforms the event name and adds the hybrid PMU name before opening the event. So the events can be easily distinguished. Apply the same methodology for the perf top as well. The record__uniquify_name() will be invoked by both record and top. Move it to util/record.c With the patch $perf top Available samples 148 cpu_atom/cycles:P/ 1K cpu_core/cycles:P/ Signed-off-by: Kan Liang Reviewed-by: Ian Rogers --- New patch to address the display concern https://lore.kernel.org/lkml/e9383607-1e43-4c1a-9512-29f27784d035@linux.intel.com/ tools/perf/builtin-record.c | 28 +--------------------------- tools/perf/builtin-top.c | 1 + tools/perf/util/record.c | 25 +++++++++++++++++++++++++ tools/perf/util/record.h | 2 ++ 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index dcf288a4fb9a..a096422a4a14 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2216,32 +2216,6 @@ static void hit_auxtrace_snapshot_trigger(struct record *rec) } } -static void record__uniquify_name(struct record *rec) -{ - struct evsel *pos; - struct evlist *evlist = rec->evlist; - char *new_name; - int ret; - - if (perf_pmus__num_core_pmus() == 1) - return; - - evlist__for_each_entry(evlist, pos) { - if (!evsel__is_hybrid(pos)) - continue; - - if (strchr(pos->name, '/')) - continue; - - ret = asprintf(&new_name, "%s/%s/", - pos->pmu_name, pos->name); - if (ret) { - free(pos->name); - pos->name = new_name; - } - } -} - static int record__terminate_thread(struct record_thread *thread_data) { int err; @@ -2475,7 +2449,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) if (data->is_pipe && rec->evlist->core.nr_entries == 1) rec->opts.sample_id = true; - record__uniquify_name(rec); + record__uniquify_name(rec->evlist); /* Debug message used by test scripts */ pr_debug3("perf record opening and mmapping events\n"); diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index cce9350177e2..4e8296654280 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1299,6 +1299,7 @@ static int __cmd_top(struct perf_top *top) } } + record__uniquify_name(top->evlist); ret = perf_top__start_counters(top); if (ret) return ret; diff --git a/tools/perf/util/record.c b/tools/perf/util/record.c index 9eb5c6a08999..5b4be3c72cbc 100644 --- a/tools/perf/util/record.c +++ b/tools/perf/util/record.c @@ -289,3 +289,28 @@ int record__parse_freq(const struct option *opt, const char *str, int unset __ma opts->user_freq = freq; return 0; } + +void record__uniquify_name(struct evlist *evlist) +{ + struct evsel *pos; + char *new_name; + int ret; + + if (perf_pmus__num_core_pmus() == 1) + return; + + evlist__for_each_entry(evlist, pos) { + if (!evsel__is_hybrid(pos)) + continue; + + if (strchr(pos->name, '/')) + continue; + + ret = asprintf(&new_name, "%s/%s/", + pos->pmu_name, pos->name); + if (ret) { + free(pos->name); + pos->name = new_name; + } + } +} diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h index a6566134e09e..9b520ab784bc 100644 --- a/tools/perf/util/record.h +++ b/tools/perf/util/record.h @@ -8,6 +8,7 @@ #include #include #include "util/target.h" +#include "util/evlist.h" struct option; @@ -85,6 +86,7 @@ extern const char * const *record_usage; extern struct option *record_options; int record__parse_freq(const struct option *opt, const char *str, int unset); +void record__uniquify_name(struct evlist *evlist); static inline bool record_opts__no_switch_events(const struct record_opts *opts) {