From patchwork Thu Dec 14 14:46:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 178761 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8596198dys; Thu, 14 Dec 2023 06:46:56 -0800 (PST) X-Google-Smtp-Source: AGHT+IES2niFyC+w3xyMyC1TuX2Vu00/FMSg3FvPJKLpJHDRM6xAfeJumklJ4xYbsUqEQY9vAdLx X-Received: by 2002:a17:902:d50d:b0:1d0:bfb7:6700 with SMTP id b13-20020a170902d50d00b001d0bfb76700mr14156484plg.58.1702565216196; Thu, 14 Dec 2023 06:46:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702565216; cv=none; d=google.com; s=arc-20160816; b=fl3hAWAjCq8Fs4aBQSLae3Dp3taWhZK+SR1RXEWd0nnRCcCKnN2V4cEtaTUAJ6Llxj jhkcC3LjTDpevb7QTm5Lf3jW77/RYACwdz0Ghws58pxugp6J2Khe6f2JdwmWrV/W/10k oXp1lxAqx4Dfm2OfGwZfeVb6RNfoLEmnq2aNU6DsPZSQUvPUFelmjRg/HHEFRn83YDIY XMGGx6yx8yPdHLKGFtuNAFGt1Xr4US0k1yentiSsudKWRFz9orc/NVkokHcaFSTsLvTU fAZ0M+Yi7mlWhTlJf6/D1hFMYAPBvW7/mZDau4fNcPmFBO/Sho2cnD3p4gQ2Ap5WTYol /0TA== 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=A+dYUycQTqn95/2ThEtH5euwXSRtqbqRYzU2a6xyMvWPiSGkgozll/h4q4o/vDypMw msjMYozk4yer/gWlUDMpzNwsijN0++RB9FUlqV0/hipSkt+SurDYB1K5lowEXVk61hIN 3Iv5mR6B6kdsNlwiUdUEHV0FazW7jc6DzD1dLqs6Mt8mhH51EI99dUc0VSDe4yZ6+QHP BTrhC+mdyy8jrOItwmGpALfSXu3OQgO5WDS90bKHonUjAuKJ+jA6Pqrof6gIlgcZWj1h u/XdbLf9Wq+Pus6AgtDWhkXiH0I7iZM1r9iW4FIIE0PgQuIt/P0YeAwWFuQ16qX4sNj/ CaPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="OTFX2+/k"; 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 y24-20020a634b18000000b005c6b4e190absi11033030pga.502.2023.12.14.06.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 06:46:56 -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="OTFX2+/k"; 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 DD242801B396; Thu, 14 Dec 2023 06:46:52 -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 S230105AbjLNOqo (ORCPT + 99 others); Thu, 14 Dec 2023 09:46:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbjLNOqm (ORCPT ); Thu, 14 Dec 2023 09:46:42 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9415F11D; Thu, 14 Dec 2023 06:46:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702565209; x=1734101209; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=yNDl1AIWfRrLV+Gwxh9D4+zILF9whC0/B0msILdny9c=; b=OTFX2+/kwNA7oLgae0X1dxrrhj+m8T4ihA04GYgpa2RoXpRK4jdMZBlq QYnwWZcd4cXiILjpUxtGe5al5z6704UKZ12D2nZL6so62yeVKol871F0Y 5hao1C3UWWb3MKyQjMGaBrfqoQUs7n1hK2Aid7JMZlWzoGfbpjDGfTA9F ywg15vvVWhvsfRx42V+WglYrrGGA2POa2iiW7aQpaM81MYyB67Hdzhbny PG2SPDY6q0pPWYkZtyF23qmIdRW6H74LvXLKh58ODKXASNmBUdZNORKZo 7cnf1NWrKt70FvUk2noLLTbkbhH0aileoMXB5bRIT+eBGn5udSq8KXiZy A==; X-IronPort-AV: E=McAfee;i="6600,9927,10924"; a="16676490" X-IronPort-AV: E=Sophos;i="6.04,275,1695711600"; d="scan'208";a="16676490" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2023 06:46:46 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,275,1695711600"; d="scan'208";a="22434527" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orviesa001.jf.intel.com with ESMTP; 14 Dec 2023 06:46:45 -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 V4 1/2] perf top: Use evsel's cpus to replace user_requested_cpus Date: Thu, 14 Dec 2023 06:46:11 -0800 Message-Id: <20231214144612.1092028-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]); Thu, 14 Dec 2023 06:46:53 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785269023884690723 X-GMAIL-MSGID: 1785269023884690723 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 Thu Dec 14 14:46:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liang, Kan" X-Patchwork-Id: 178762 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp8596738dys; Thu, 14 Dec 2023 06:47:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IHG1TKzgvi8CPTIUEbT5hXu8A1Q8OLKs77RL6GXpJypWiwgtOMB4caeuBQMV/NU+0qFoOTx X-Received: by 2002:a05:6e02:20c2:b0:35f:780a:218b with SMTP id 2-20020a056e0220c200b0035f780a218bmr2587861ilq.120.1702565275260; Thu, 14 Dec 2023 06:47:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702565275; cv=none; d=google.com; s=arc-20160816; b=xm5rBKOcM/d+xzwmAWJJUzHiZfsoVZMOTA16fbyyqU0oDuANICAtNawxUmOQG5WXd2 S7ZKVp/hPwDhRQF+iD7qgXMTTvo/ShTBufpWBd3iSYr3yl581m1rF7UDABHjijWBAlvh f2doERQGiRT3ZqoAqUV5KRtO7OM8oDvxcZPmjLFR1GWNQ7M3pXUC3niOJnKmHlQh2aSc fb20pZmbwLyn7Y3sBt9TLcgwWDa1267fCpx2ZbIjAO7ZLi5YlZf14oTjLOBAcwo9zgRt 4ekd6qsYm/j2Ko8f/9qAnoScarsA/7faQ622BNrfIQcbkmZTqp8Z3BwLeWwKw1j1cUDZ kODA== 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=D00D1xYlVaQVQCbghSZkgmUNmFAlwI9SawCKOupTkhA=; fh=V97FFFi5RmpdUikarEoLTJWoOplAC1MpM9MGOX1xMoI=; b=GvsxAlFr2Ezwkr12WHrd6v2JYxawHomtxgZjnJSU4HoCgFiro/tsfJYCUB7MFpvAh9 s2bXzXcc7eD9dEXYVWT8hhjX/bArUxYOIXAST8kZhOd/VMKDm63TsDTKDLKy2KiseY6P o0KurOEWGtci9vwzHBWfmDDL4INP6BGk2SMO/ARNE2vN9UTzIhFxXwtjE6t9PGbZeeac Ve3dMwN/ZOFUrB93NmQvfqObJpmAhZTZoPJKBphyYXAWL2743XCkw03hc6TozUKOX45O LRxVjiU9VSFM1YhvUAP/Fa+EZ67I/kkDm6VNue34dOaSw8wmALoJ3cyggAISMPCBY1dN kiUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PLelfZiR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id bk5-20020a056a02028500b005c680fbab19si11770951pgb.513.2023.12.14.06.47.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Dec 2023 06:47:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=PLelfZiR; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 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 howler.vger.email (Postfix) with ESMTP id 3200780A1E35; Thu, 14 Dec 2023 06:47:14 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230012AbjLNOqq (ORCPT + 99 others); Thu, 14 Dec 2023 09:46:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230088AbjLNOqn (ORCPT ); Thu, 14 Dec 2023 09:46:43 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF24C127; Thu, 14 Dec 2023 06:46: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=1702565210; x=1734101210; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=W+QcQYPBRRILXjXpljiq/9qSGzmY+l3Ffaxs/VbS0Pw=; b=PLelfZiRhENXQ7Ea5Ms4qAVqT33bUMhOuLQqra7gW/FJHwN8RNQowZu1 k6fN0vP8h/6O1IJy7pNeBW3FgATi5FKofpAM2kTRiFNe64NTjaZ+mm7sj qOF+MoKhoKZS0tlTcIKIx9gUQcNbylTNuWEfTJ7rQLuWrs5B8XROwFY4H kTbOrGBEJfIcyAzWGQqgDkESx4byK+SF2z7T4520M8fC0F39d+c7JYFoy k1NKFbXsEq14MbWib/Yx92g66P4i1xQHJMps077XrNFI0FHS0fSIJ006/ G8kk/mqo6JCkQywiK2tpbD9LHgyt1ChRpwDzksZyGU1jUPe3smSNpM7x2 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10924"; a="16676498" X-IronPort-AV: E=Sophos;i="6.04,275,1695711600"; d="scan'208";a="16676498" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2023 06:46:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.04,275,1695711600"; d="scan'208";a="22434530" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orviesa001.jf.intel.com with ESMTP; 14 Dec 2023 06:46:45 -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 V4 2/2] perf top: Uniform the event name for the hybrid machine Date: Thu, 14 Dec 2023 06:46:12 -0800 Message-Id: <20231214144612.1092028-2-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231214144612.1092028-1-kan.liang@linux.intel.com> References: <20231214144612.1092028-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 howler.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 (howler.vger.email [0.0.0.0]); Thu, 14 Dec 2023 06:47:14 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785269086000808737 X-GMAIL-MSGID: 1785269086000808737 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 evlist__uniquify_name() will be invoked by both record and top. Move it to util/evlist.c With the patch $perf top Available samples 148 cpu_atom/cycles:P/ 1K cpu_core/cycles:P/ Reviewed-by: Ian Rogers Signed-off-by: Kan Liang Signed-off-by: Arnaldo Carvalho de Melo --- Changes since V3: - rename the function to evlist__uniquify_name() and move it to util/evlist.c. (Namhyung) - Add Reviewed-by from Ian (The change is just a rename and relocation. I think the tag still stands. Please let me know if there are other opinions.) tools/perf/builtin-record.c | 28 +--------------------------- tools/perf/builtin-top.c | 1 + tools/perf/util/evlist.c | 25 +++++++++++++++++++++++++ tools/perf/util/evlist.h | 1 + 4 files changed, 28 insertions(+), 27 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index dcf288a4fb9a..3a7e7484995d 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); + evlist__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..cd64ae44ccbd 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) } } + evlist__uniquify_name(top->evlist); ret = perf_top__start_counters(top); if (ret) return ret; diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index e36da58522ef..fda411ab41e7 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -2518,3 +2518,28 @@ void evlist__warn_user_requested_cpus(struct evlist *evlist, const char *cpu_lis } perf_cpu_map__put(user_requested_cpus); } + +void evlist__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/evlist.h b/tools/perf/util/evlist.h index 98e7ddb2bd30..cb91dc9117a2 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -442,5 +442,6 @@ struct evsel *evlist__find_evsel(struct evlist *evlist, int idx); int evlist__scnprintf_evsels(struct evlist *evlist, size_t size, char *bf); void evlist__check_mem_load_aux(struct evlist *evlist); void evlist__warn_user_requested_cpus(struct evlist *evlist, const char *cpu_list); +void evlist__uniquify_name(struct evlist *evlist); #endif /* __PERF_EVLIST_H */