Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   John Garry <john.g.garry@oracle.com>
To:     acme@kernel.org, irogers@google.com, namhyung@kernel.org,
        jolsa@kernel.org
Cc:     linux-arm-kernel@lists.infradead.org,
        linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
        renyu.zj@linux.alibaba.com, shangxiaojing@huawei.com,
        zhangshaokun@hisilicon.com, qiangqing.zhang@nxp.com,
        kjain@linux.ibm.com, kan.liang@linux.intel.com,
        John Garry <john.g.garry@oracle.com>
Subject: [PATCH RFC 1/9] perf metrics: Delete metricgroup_add_iter_data.table
Date:   Wed, 28 Jun 2023 10:29:41 +0000
Message-Id: <20230628102949.2598096-2-john.g.garry@oracle.com>
In-Reply-To: <20230628102949.2598096-1-john.g.garry@oracle.com>
References: <20230628102949.2598096-1-john.g.garry@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HY0PuDNePb08X/ZOufmc5Pt8tnN64xytqQN1DyUqZIbPIw91XS8AudEm7LZv?=
 =?us-ascii?Q?oVUjPpGty0s7Wc2hb7b49bhtN4eoCQK5i2dqX2sGvroj96ZtOViEX1BwVCB1?=
 =?us-ascii?Q?rcnVA0m/SPQ57i6Big1hQkmSvLsYHpE5gCn3zhhv8PLMFSi/VBj+AP79NVrZ?=
 =?us-ascii?Q?leEYcP+8Vq1G9rGwdaXDKi0agQO78wFoqgJNStkHrVl15RuhvSjSXvW3mCZi?=
 =?us-ascii?Q?U1Xyv62rPVs7vhR/FuPcLlONE8t8gstj6NiV5mxA99PDNzl1pV2f+A8E073J?=
 =?us-ascii?Q?GjBc61g4oAYVeHFfV1Aebvghjx0/DVYmYz0Kuklq+NRGwb5+uX0rtV6bbPkW?=
 =?us-ascii?Q?+6wtcYLVcY/jkbyk3l29QT3GAtuT/A4qaXTQxn1IiDP/slOmkRN9GWRMNLNY?=
 =?us-ascii?Q?rzF84mM92zrh0wBNndWLKYt7SjjFd/hUtVg52fan0qX9mz2CF2/RvUqHaLfu?=
 =?us-ascii?Q?6BI8FJYxom1qPueD8KVAL8U7eMM1NIyE31GOGToOkLTElFhQ9rPjykYZwWCF?=
 =?us-ascii?Q?fStFX7Bj2z/ayk1vChVqcbzaxlsJiiOFVhxMGAlawFnV2G6E5VSuuR7sHT5T?=
 =?us-ascii?Q?tXiqizgfnT1Tjtf03Upkd7EMX5E9P2jOY1XolWcKmqaPjU2UkFuwcJQD2oRV?=
 =?us-ascii?Q?idLl046FX5XVNZpKgKiQg6OrqmI4PFfZymHlqZkHPxwoAPKHYCectUIapS/D?=
 =?us-ascii?Q?jdAErBlNtasGl886XCRDc/fVOOC6Fdv3efOTFvo6JbFRBC5USJ82lXbAjB4O?=
 =?us-ascii?Q?twOCmxxQyghCv6AHP4DX3sSzxhnwuI6XHtW7P2CFNh//zbI9qEUXRJFYZQyB?=
 =?us-ascii?Q?k2OlxRLZVVgwLxiGTmg60CwQJC33ivVP8CjKyvEJJAf1kZyJJvx+noC3+xaq?=
 =?us-ascii?Q?pw9hLxsr69kqg9gl/DkGqxsutTOduvoE7RvCQ8AV6+IZGNDw9swgC8ALb5eY?=
 =?us-ascii?Q?JTDNF+FZksfz4PCsCdGbYWeUy5wxzBwsEujBy+GlkTcx4jkupj3kEgYgPv3C?=
 =?us-ascii?Q?1g1Rcm9P9JXFTUn0IsH+XvuYh1XpHuVkG9hTuio1OVdqTX1aumJ6WquOLlna?=
 =?us-ascii?Q?Aqre7rkDnr4LEKBMv7z4mX+K4hp/scdLfFo/mzfGYI+hf7Wtm6+Ff42KKb8N?=
 =?us-ascii?Q?UixIXs7d/fZf9zq1pueMoRrOySmF+qUM5/0gv/9pMKn09ZbVKckIW9xL6Knj?=
 =?us-ascii?Q?j0g6sySlnjWZhDJlUtKufSUosTA+1Hxl4nNxiktbE6+SaguloqeLrrmR8tHC?=
 =?us-ascii?Q?dop8DU6kyV8rj7roqYY/47Q9d+F5KQay2KKKwUwAqC/3nry7z/GFWIYs9CBy?=
 =?us-ascii?Q?hFYlCbIegf0LHDev8nYH273CNtKbfdbaq+jgp4fi8GL0kM5po14+4O24narG?=
 =?us-ascii?Q?HNlFs7Dy5pv+YmjaL36Pe1DmYOcVLZqToj5khg/BkeiwmXYPyGkJDDNXqSge?=
 =?us-ascii?Q?18NsF9c++ia6pXRmX7+T4BQIVCtGAggGg1/JF8vAZhtVL/SdNgnr+SbV0PSO?=
 =?us-ascii?Q?2UmUBFTi3PjmykngZ7jb3fRgkvVqwWEiZOnfEhc924Hi9E6gzVdwpmK60c8p?=
 =?us-ascii?Q?AbNutuGxNRzj2m3oAtvYNNTQmfmDj+p8pqG3WZltoM+sC6KnR8pBCGYewUiR?=
 =?us-ascii?Q?CQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?us-ascii?Q?K4gq6sGswh7mtwLc+wLsro0lB51gr+g3AmA7Hlu9t3XmTaHqcd/addEyA5Hr?=
 =?us-ascii?Q?mW+0fhFqgNnB9CrHQAQVFXBEKRoeb6/4o9zLyRIZTns2hNUKYFfLZpWhTvJY?=
 =?us-ascii?Q?PIKQ55pMzWYxHmk60aTqh3GDSKdhzwtW0Sfx8oeBoSjoLy96bFWM7ZGO8b7/?=
 =?us-ascii?Q?2L7JZb0HKShsX+rW3EyGYFs0t1Ctg50b9rhbg16gq81VHvoSHRXEVS8c1RtR?=
 =?us-ascii?Q?xzEI5pag6PEmGNkaFeQgJqJXcNip17JdRgNRYeRdUKsi26jefCHRsvpizQTW?=
 =?us-ascii?Q?RLhh5503mvClTwz7ggEN1HiDeCgBMpZllgXEsmFxrhTCigapVseUhWL6FSqE?=
 =?us-ascii?Q?bWXOtHqrDsNFUZC7X63C8jfs42wBKjK4/N3nhTUpAdcouk7AOszn/7wQjBJU?=
 =?us-ascii?Q?3sCM/uPVkbFbz6Fnnxa+b75oGMevcS0PIkdkclacNlXnuZUpzzxhOqIxStS1?=
 =?us-ascii?Q?x4HCN0Sh6r8g1Z+V6R6Bv9368IBlFyDUXgHmXtU2gLPJpolkziVzDJWsUEcK?=
 =?us-ascii?Q?tSw1VnoRP+oLP8rT1OjxJozKCgfRH5xrnffhNV3GxMdILIAsfowi0BwD9bXE?=
 =?us-ascii?Q?nZ0aQ0anZqlQF6VhbNUqw6jOZf+urpnqqOx2mZ+bSQWHeczGTZWAs5Y6vZAR?=
 =?us-ascii?Q?77NXtXKMp7oS6o+STZyqgqYe4ecgjkPn8FBJublmtDTUrElL+bCQH6ShGJxV?=
 =?us-ascii?Q?FKlNLX/WfsuPnjWIdfy0T4RXEqSsOCDCKJEWzj6qakemTmhXCLqw2U5YjWom?=
 =?us-ascii?Q?b6Kh5nOop8iB8ceMFRkgetvkiHa6aUSSK5cZAjv38d6svEbtnv9prC1k4/ip?=
 =?us-ascii?Q?qwNfhV8Hz/AdrV6MgUH1qUs41UwjwMhIKRD0FX9SOrjNWxXOYkujV7FTnVqc?=
 =?us-ascii?Q?WCKsgSeTkmBtGjpATzJFDcbwdWyh2jkCMmS3xyyEnb0Acd5xkzltLXsTNqxa?=
 =?us-ascii?Q?fgpO7vX9qF5DuTg21CbFlWgKWBNZObNL32l7+JnWRC4NxI+aOW1w5c24eEYF?=
 =?us-ascii?Q?e3Isjw6r6Nsl/kmFAKOC13OvtxWXyO3yvHydP2ZA4O/wfr+1QbB8Iw4OIgYV?=
 =?us-ascii?Q?/vjSNpIPa5yAtNH3VCbj+ITua81ibQ=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7aed91fd-f1f0-402a-2146-08db77c2a74a
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2023 10:30:11.8257
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: rxp/8UHY8/BbWKhJj6Pjxkt/1wWH0NN3EcDEBsONomj2CDaPQh+DU+tDyoZ2eAIDvdWa5Sla+jKXsfh1VY5F9A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4715
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-06-28_06,2023-06-27_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 adultscore=0 bulkscore=0
 suspectscore=0 mlxscore=0 phishscore=0 malwarescore=0 mlxlogscore=999
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2306280092
X-Proofpoint-ORIG-GUID: nWAHPee0XKvOZcxCXFabLcwtA3-pIKBj
X-Proofpoint-GUID: nWAHPee0XKvOZcxCXFabLcwtA3-pIKBj
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Member metricgroup_add_iter_data.table is only used in
metricgroup__add_metric_sys_event_iter() as the @table arg to the
add_metric() call there.

However we only use the @table arg in add_metric() for resolving metrics,
which is currently not relevant to sys event metrics. As such, don't
bother passing this @table arg and use iter table instead, which is more
sane.

Signed-off-by: John Garry <john.g.garry@oracle.com>
---
 tools/perf/util/metricgroup.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index a6a5ed44a679..4389ccd29fe7 100644
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -798,7 +798,6 @@ struct metricgroup_add_iter_data {
 	bool system_wide;
 	struct metric *root_metric;
 	const struct visited_metric *visited;
-	const struct pmu_metrics_table *table;
 };
 
 static bool metricgroup__find_metric(const char *pmu,
@@ -1112,7 +1111,7 @@ static int add_metric(struct list_head *metric_list,
 }
 
 static int metricgroup__add_metric_sys_event_iter(const struct pmu_metric *pm,
-					const struct pmu_metrics_table *table __maybe_unused,
+					const struct pmu_metrics_table *table,
 					void *data)
 {
 	struct metricgroup_add_iter_data *d = data;
@@ -1123,7 +1122,7 @@ static int metricgroup__add_metric_sys_event_iter(const struct pmu_metric *pm,
 
 	ret = add_metric(d->metric_list, pm, d->modifier, d->metric_no_group,
 			 d->metric_no_threshold, d->user_requested_cpu_list,
-			 d->system_wide, d->root_metric, d->visited, d->table);
+			 d->system_wide, d->root_metric, d->visited, table);
 	if (ret)
 		goto out;
 
@@ -1275,7 +1274,6 @@ static int metricgroup__add_metric(const char *pmu, const char *metric_name, con
 				.system_wide = system_wide,
 				.has_match = &has_match,
 				.ret = &ret,
-				.table = table,
 			},
 		};
 
-- 
2.35.3