From patchwork Mon Dec 4 18:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13478904 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 DFDA3C10DC1 for ; Mon, 4 Dec 2023 18:24:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Mime-Version:Message-Id :Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=Rg5+DBrV7RanhFhFU/NborpNcsEGpijjTh7yvr8QTp4=; b=CWM12sjKlFC3gG CQtd/VT1fmvtC0KblanIvTBjy6KM8u48+nJfZD5XRzVLRWbKkV4lXaDHU+nsA6rz5+WoMhgYjeANt mHr9fuFSaCOBt7+gdBWk6+4ilz7ij3JPCbjXSpZIpc4S7FDUN3aqwE1RAktT7hzJtzHkiQuREWSMG Uf3Uyt2Oq6F8oNCUbbKd3d2S22y9Oi/k35BGnny6jie7326071vNCpaszyFkP9T1kETCqB/rw9IGX YGRjeXSZMQ2MzAe7j1WVwP8CeUgYvIh3ZWcNi88PleM1Dz7NRJGJLIyzNCBToGfmlbA9pVBdCBAlq IEnucicZeiOw8F3uLbRw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rADbf-005I1q-28; Mon, 04 Dec 2023 18:23:47 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rADbW-005Hrx-2B for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2023 18:23:40 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-db5463707f9so4428702276.0 for ; Mon, 04 Dec 2023 10:23:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701714215; x=1702319015; darn=lists.infradead.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=SZ0pxQHPPtXifBYnQK2oqRhP2CZVwJXTHj6rC9GaE3c=; b=EtEbrWQ9RO/tFWb9QoizcVf6GqGApkeQWSsg4dMcs/x23jNYO6Otuq0yT/A/50AvCF lqF5lQjljEhg7YvGxqNVUbT19RP9Jz/lL+4MqSMY/Q2Cg7e+OMlGtfsoEj6cduVMUMQm QanuALfJI9rDpt9HQB6oZV3R4hHVhytPm1JNeZ4h01Zt+9CJuuhAsiK5nrshb8BJYJl7 qGGCFr9d48o5U5Qi5Zkx8FD7FgeFmCQJ29B16aZG9iEBmbtHwKDYTaEdDf/lVrf87EGz vxAdaBejFj538jpxZt1/mrGOvsEOA7PGCLIiW+IDDR147plt1qkleo85ZzKpOUd7Nukr +suQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701714215; x=1702319015; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=SZ0pxQHPPtXifBYnQK2oqRhP2CZVwJXTHj6rC9GaE3c=; b=o6IzDcy5pXcYyFA2y5LysjDCq5XUxWo5ntknXgxFVZzBSpL7Z2mlNOdv+hD6ylxy16 Hjo1TUcCn+VwMcNKYKS4u4KExhWGE5GS6K8i7OWYGbii5BgadirIq9w41pjYmfMxJWjB FBCGILrm8g4fefviVqK6mJOQ0EoLDISUtaeiH0QmGLKbDl3OKAA/11jWOdpJO1ilkPzA quukVqBFMLILis3fy/jNYv0E6hI959jpf064wEgo4EpZCdVspxDMQh8PtQoefJWw3kqx 9tnpd4FS/QspVMnDCKmHJlarQmdAZWTGEWxpSLiUqfbEFlGNmWSnkIBOZisdFVDdVj+1 bHmw== X-Gm-Message-State: AOJu0YxY3z2hmkTtuJ3YFg6jH4JnjHPEgRT6owWJA8eQvaJm3vP3MBM+ uqacGTKWEDOaIMm4DRZPvf2YtM+uy3tk X-Google-Smtp-Source: AGHT+IEi0XJiqlbzPFe4i2AZZ6mCBKtqb89HyDPZeG0sLxj598uJOhxVo9IAsT589yyTX39eoBGSOL+OWZ5d X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b241:d804:967e:c827]) (user=irogers job=sendgmr) by 2002:a25:cace:0:b0:db5:4692:3aae with SMTP id a197-20020a25cace000000b00db546923aaemr331621ybg.4.1701714215509; Mon, 04 Dec 2023 10:23:35 -0800 (PST) Date: Mon, 4 Dec 2023 10:23:29 -0800 Message-Id: <20231204182330.654255-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Subject: [PATCH v1 1/2] perf metrics: Avoid segv if default metricgroup isn't set From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Ilkka Koskinen , Kan Liang , Kajol Jain , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231204_102338_739060_311F3A23 X-CRM114-Status: GOOD ( 14.49 ) 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 metric is default by having "Default" within its groups. The default metricgroup name needn't be set and this can result in segv in default_metricgroup_cmp and perf_stat__print_shadow_stats_metricgroup that assume it has a value when there is a Default metric group. To avoid the segv initialize the value to "". Fixes: 1c0e47956a8e ("perf metrics: Sort the Default metricgroup") Signed-off-by: Ian Rogers --- tools/perf/util/metricgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 0484736d9fe4..ca3e0404f187 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -225,7 +225,7 @@ static struct metric *metric__new(const struct pmu_metric *pm, m->pmu = pm->pmu ?: "cpu"; m->metric_name = pm->metric_name; - m->default_metricgroup_name = pm->default_metricgroup_name; + m->default_metricgroup_name = pm->default_metricgroup_name ?: ""; m->modifier = NULL; if (modifier) { m->modifier = strdup(modifier); From patchwork Mon Dec 4 18:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 13478906 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 036F8C4167B for ; Mon, 4 Dec 2023 18:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V5AtCPfdmqqgOCi+0ZtFAB1l9/UmJeTk+E/JFoREHUk=; b=jLPjkzUPExPapP VnLAT+5J6ds3iNeEtnZnKxiEOGb7/2iIGTblgf8kxm97XDOVTKfgM7uR6Yst0bPRKZTBhPQoGS88N jxZQ0ZPgl8yVQcztZPM+TkTJhlqxTSn83+inmUqOSXufGaF7ZimuxemR/JuhqsT06z2qXp+BWpsMw BlDfmu1u7S6gVQTO30juTXl0QH8fQGV1nR2//GvI1WvCktYPgwCF2SR3+SUZFPDS/FBSEhQ+qqw/R cWFk78mNlOuGKKMasyrqFiuwsPSEnJtj/gdSmz+VQspvzs4eGNNzjWt8mQmgC2lvd83SBbYS8dFDT wYxDxxBG7jhsSZdtaBDQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rADbg-005I2c-26; Mon, 04 Dec 2023 18:23:48 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rADbX-005Hsw-0Q for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2023 18:23:42 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-db548f8dae4so3114865276.3 for ; Mon, 04 Dec 2023 10:23:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701714217; x=1702319017; darn=lists.infradead.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=X7oIwN0gwgnh0JH2uoSPjyFXY7LBES97cup/kWuAMDc=; b=wZm4cjU4sujJY/3ortuKvXvnrremSDiYR6NbvWFvSwJbYBKITzzfTYflnLslGjHsBB VGZM0wOTUcrfWf9kG9dW7qTmb+0IZ/XQWZaxtk+Dn5WsiRXSsa4w5sqL/FZ/K1LfJoNA pqAthZXrz15gRvFj/6X1WGmpM2lg1WZPXxpG7yisYoTc4DFbcIDwgij/3dhgNIai3X7q 5/5P9l/bwpURaRM9QfcHsl/+49/C+Hk6sySgQ1EvfnygfFu+dlsFewTyhP16B1JtEMQl QM7387JPilasN6wH1BCBWKAWFUyDk7W0F7/TpetTZoeLMfps7dAQJAaMVUqlsoAn0pSt oU8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701714217; x=1702319017; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=X7oIwN0gwgnh0JH2uoSPjyFXY7LBES97cup/kWuAMDc=; b=wq2DvjnhmGnX7zZmRBESBp0OluR8HS2yTZ+HU31aR+47OiCp2kPFCBZPHCfBql3iPc 2uoAxtOltT4zcFW3IDJeiOjkJxTOOntdq+H5q9I+rWwzi60PkolBZ1QLZn8zG/lBZdi+ 9gZ98mEZ/P2mDMb9REYPAKIT2KFeuesfGMW9uK0fBiGFM5NfHZjNcoaEybauCr6dgoYN h7OiZMj6nxsihye98rqUU/2uZhM+TqWkjq0Cdp3LF8HPKlh4cJMk2U1S17japuuDfrH1 EJLAebhKJ4MEZGHquiCB2E684lKy4ZNnq3ps2BUuuf0bEKCBLJKm5oNN+J4BOd90g7eN UGMA== X-Gm-Message-State: AOJu0YzJCYHG0VRZFWVUFW1UhjyBZwgrDKthMORwiVtD+xUBh8wnP/8q TXOznnd361FBvWhF6pgzP5m2hxliyMRc X-Google-Smtp-Source: AGHT+IHOBK+GAxccPQiMkDdDXauTrztmqup3Xwe1oIP3fGM+SQUEpNnshkLn78GxvBotlA0CjlE9r9x7oN0t X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:b241:d804:967e:c827]) (user=irogers job=sendgmr) by 2002:a25:d4cc:0:b0:db9:772b:1020 with SMTP id m195-20020a25d4cc000000b00db9772b1020mr44975ybf.5.1701714217695; Mon, 04 Dec 2023 10:23:37 -0800 (PST) Date: Mon, 4 Dec 2023 10:23:30 -0800 In-Reply-To: <20231204182330.654255-1-irogers@google.com> Message-Id: <20231204182330.654255-2-irogers@google.com> Mime-Version: 1.0 References: <20231204182330.654255-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.rc2.451.g8631bc7472-goog Subject: [PATCH v1 2/2] perf vendor events arm64: Fix default AmpereOne metrics From: Ian Rogers To: John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Ilkka Koskinen , Kan Liang , Kajol Jain , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231204_102339_225896_C371D214 X-CRM114-Status: GOOD ( 10.93 ) 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 Add default metric group name for TopdownL1 metrics. Fixes: 59faeaf80d02 ("perf vendor events arm64: Fix for AmpereOne metrics") Signed-off-by: Ian Rogers --- tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json b/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json index e2848a9d4848..afcdad58ef89 100644 --- a/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json +++ b/tools/perf/pmu-events/arch/arm64/ampere/ampereone/metrics.json @@ -231,6 +231,7 @@ "MetricName": "slots_lost_misspeculation_fraction", "MetricExpr": "100 * ((OP_SPEC - OP_RETIRED) / (CPU_CYCLES * #slots))", "BriefDescription": "Fraction of slots lost due to misspeculation", + "DefaultMetricgroupName": "TopdownL1", "MetricGroup": "Default;TopdownL1", "ScaleUnit": "1percent of slots" }, @@ -238,6 +239,7 @@ "MetricName": "retired_fraction", "MetricExpr": "100 * (OP_RETIRED / (CPU_CYCLES * #slots))", "BriefDescription": "Fraction of slots retiring, useful work", + "DefaultMetricgroupName": "TopdownL1", "MetricGroup": "Default;TopdownL1", "ScaleUnit": "1percent of slots" },