From patchwork Sat Jul 6 15:20:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13725870 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9931FC3814E for ; Sat, 6 Jul 2024 15:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9czsepkVPrqj1Zii9kLRJmlexhguZk9R4LkdiHYKdZE=; b=ruZ+Dke6eIu/22ZAYsMpJeBmDV hMo2EiGFzR1f1FVonNXHaeBqjCWRXAt+y0D3EHgGeX+PTzSaegq5vhXmyd1pTe0aZmnBgnuCFeFs0 AuW7R0AlbBXy02lyZxVT7XHYuyhlu9u3Hs06CNAt7uTdL1mxSM2mlvudYYV70XGzF0ySOMGNSxEby ot1n02gqCorgWfzkYFceM/uEz8rPZWWIZmJBOLvbZo//CTojU+aa69FmYGP4Jc0xfMPCln/wXZ1/t zDAJaxq31M2w3Uxx6efzEkT4zHMnqTlWywy98VbMHHYSpdR4cDTKC1lpkTueUdjsaNOheA2MhAh0Q mPJKh0sA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQ7EE-00000000No2-2sQ5; Sat, 06 Jul 2024 15:21:34 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQ7Dn-00000000NhY-0bJe for linux-arm-kernel@lists.infradead.org; Sat, 06 Jul 2024 15:21:09 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 19A881477; Sat, 6 Jul 2024 08:21:31 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id CF8AA3F762; Sat, 6 Jul 2024 08:21:03 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Ian Rogers , Namhyung Kim , James Clark , John Garry , Will Deacon , Adrian Hunter , Jiri Olsa , "Liang, Kan" , Suzuki K Poulose , Mike Leach , Kajol Jain , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , James Clark Subject: [PATCH v2 1/2] perf arm-spe: Support multiple Arm SPE PMUs Date: Sat, 6 Jul 2024 16:20:34 +0100 Message-Id: <20240706152035.86983-2-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240706152035.86983-1-leo.yan@arm.com> References: <20240706152035.86983-1-leo.yan@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240706_082107_264984_6BC824C8 X-CRM114-Status: GOOD ( 11.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A platform can have more than one Arm SPE PMU. For example, a system with multiple clusters may have each cluster enabled with its own Arm SPE instance. In such case, the PMU devices will be named 'arm_spe_0', 'arm_spe_1', and so on. Currently, the tool only supports 'arm_spe_0'. This commit extends support to multiple Arm SPE PMUs by detecting the substring 'arm_spe_'. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/arch/arm/util/pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c index 8b7cb68ba1a8..b762f6395d16 100644 --- a/tools/perf/arch/arm/util/pmu.c +++ b/tools/perf/arch/arm/util/pmu.c @@ -27,7 +27,7 @@ void perf_pmu__arch_init(struct perf_pmu *pmu __maybe_unused) pmu->selectable = true; pmu->is_uncore = false; pmu->perf_event_attr_init_default = arm_spe_pmu_default_config; - if (!strcmp(pmu->name, "arm_spe_0")) + if (strstarts(pmu->name, "arm_spe_")) pmu->mem_events = perf_mem_events_arm; } else if (strstarts(pmu->name, HISI_PTT_PMU_NAME)) { pmu->selectable = true; From patchwork Sat Jul 6 15:20:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13725892 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8D94DC3814E for ; Sat, 6 Jul 2024 15:21:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0Jt4CfIFkGrw5uLmAplUUW6S3e1xO8QcdFcMk7Rka3c=; b=hyyilQgO8zfJAZ9tlbD3LQtHMp FDixdl/A3qYPu8+tBgHiQ0cAeGyXBHNaHxYvdhlQmhhd3G4yyLvqJE72XVADcNpyYl6pOLqX9u/BW FiPHvZ5LmmN2SOIpOqqwPY6sq6xZdQsPw4+M/uL2G9jRnTcgrBB7uqsHWwelU8BBJfKW98y1rncfE dMDXe9sGbBRlww5GfpTlUDpeRmcGuSH1X9AEC/regE2r1tdGPufIDAcGsKe3FYKYjdcnFpB58I9Qf UX4EGmVcdFC4ZwiKV2Hcu/hvGv1g6iKOhGpAoHrwWZzMxgbYsje0pjlIoUnmbDMpsnn5oKnooRtI9 v6fnN/Xg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQ7EQ-00000000NtO-2wlj; Sat, 06 Jul 2024 15:21:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sQ7Dp-00000000NiK-1CQJ for linux-arm-kernel@lists.infradead.org; Sat, 06 Jul 2024 15:21:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 70B881596; Sat, 6 Jul 2024 08:21:33 -0700 (PDT) Received: from e132581.cambridge.arm.com (e132581.arm.com [10.2.76.71]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3BC623F762; Sat, 6 Jul 2024 08:21:06 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Ian Rogers , Namhyung Kim , James Clark , John Garry , Will Deacon , Adrian Hunter , Jiri Olsa , "Liang, Kan" , Suzuki K Poulose , Mike Leach , Kajol Jain , coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Leo Yan , James Clark Subject: [PATCH v2 2/2] perf mem: Warn if memory events are not supported on all CPUs Date: Sat, 6 Jul 2024 16:20:35 +0100 Message-Id: <20240706152035.86983-3-leo.yan@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240706152035.86983-1-leo.yan@arm.com> References: <20240706152035.86983-1-leo.yan@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240706_082109_435626_3DD07AF4 X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org It is possible that memory events are not supported on all CPUs. Prints a warning by dumping the enabled CPU maps in this case. Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/util/mem-events.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 6dda47bb774f..8aff2ca8bbd5 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -8,6 +8,7 @@ #include #include #include +#include "cpumap.h" #include "map_symbol.h" #include "mem-events.h" #include "mem-info.h" @@ -242,6 +243,7 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr) int i = *argv_nr; const char *s; char *copy; + struct perf_cpu_map *cpu_map = NULL; while ((pmu = perf_pmus__scan_mem(pmu)) != NULL) { for (int j = 0; j < PERF_MEM_EVENTS__MAX; j++) { @@ -266,7 +268,19 @@ int perf_mem_events__record_args(const char **rec_argv, int *argv_nr) rec_argv[i++] = "-e"; rec_argv[i++] = copy; + + cpu_map = perf_cpu_map__merge(cpu_map, pmu->cpus); + } + } + + if (cpu_map) { + if (!perf_cpu_map__equal(cpu_map, cpu_map__online())) { + char buf[200]; + + cpu_map__snprint(cpu_map, buf, sizeof(buf)); + pr_warning("Memory events are enabled on a subset of CPUs: %s\n", buf); } + perf_cpu_map__put(cpu_map); } *argv_nr = i;