From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC296367F54; Mon, 9 Mar 2026 07:40:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773042038; cv=none; b=kfC9nQ3dG3+eyvoGaM6lIozG5MXt2+tnWWBL50y5ZTqfVZX4UlKLA9GsIfLw4cn8V3um9/YnZQ2QaW4GS+hg6zdxnrdNGMQOojCl18GMv1QPaEejtSC2qFBazC0FixZrcDYzMnURURmLaqxvEu//GJkcDDCRpc5MLzYZRR1hC3k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773042038; c=relaxed/simple; bh=6pOk5r+eqecGW4XpT/Sws6aXRvaHzw35eCS5cUcWYEE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=fg/ozdvYPkWEBFAtBAbIWUNqanXKGuy84eIn7231xfDPqItb4K+lFhsGfVM7JLM++zLhSjpBif+y6a0uvHErrm+gpPpyt+8bLSlKJMANS9KtzjLM087vjD5u97Ban8F5lUnKw+3JV/KCi9EDIBdxZZhcCPQCYla9phea9TCP8qQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QLNInrlS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QLNInrlS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED73CC4CEF7; Mon, 9 Mar 2026 07:40:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773042038; bh=6pOk5r+eqecGW4XpT/Sws6aXRvaHzw35eCS5cUcWYEE=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=QLNInrlSnpMI98akMZlmdEsa7iOQGty4F0+F1FQhzyGT8UnPYQaH+ZcvsjxsHyjMo VUqRB2/ovpF4r1lDdxt30cfZIAQfZ5kmJkNfdmAjUK4hMf73ydztvthFZJur4rJ4xl gptiZ7iqcM0XshPIM8cymhRkx5Gg//B2ggKsKME/w6KkLFHIpOdyUIX4dRaxGGgOmc MhPLanLhY+zEBSC2Lqeix5UA+pOIjuWRuy6/VdRirwbNTAONIP9ywMyvBTDiLWIXXL R3lzCHYpJYOoDEgEaEcwqdD9fEztvQRA/k/G6sD9kFjVo+eaws2mCkvc9AJxN7fTgm HdYwLi9RhuWUA== Message-ID: <072e2a07-5c6f-47b5-9695-0a3ffe854ac8@kernel.org> Date: Mon, 9 Mar 2026 08:40:33 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 6.19 027/844] perf metricgroup: Don't early exit if no CPUID table exists To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , Leo Yan , Adrian Hunter , Alexander Shishkin , Ingo Molnar , James Clark , Jiri Olsa , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo References: <20260228173244.1509663-1-sashal@kernel.org> <20260228173244.1509663-28-sashal@kernel.org> Content-Language: en-US From: Jiri Slaby Autocrypt: addr=jirislaby@kernel.org; keydata= xsFNBE6S54YBEACzzjLwDUbU5elY4GTg/NdotjA0jyyJtYI86wdKraekbNE0bC4zV+ryvH4j rrcDwGs6tFVrAHvdHeIdI07s1iIx5R/ndcHwt4fvI8CL5PzPmn5J+h0WERR5rFprRh6axhOk rSD5CwQl19fm4AJCS6A9GJtOoiLpWn2/IbogPc71jQVrupZYYx51rAaHZ0D2KYK/uhfc6neJ i0WqPlbtIlIrpvWxckucNu6ZwXjFY0f3qIRg3Vqh5QxPkojGsq9tXVFVLEkSVz6FoqCHrUTx wr+aw6qqQVgvT/McQtsI0S66uIkQjzPUrgAEtWUv76rM4ekqL9stHyvTGw0Fjsualwb0Gwdx ReTZzMgheAyoy/umIOKrSEpWouVoBt5FFSZUyjuDdlPPYyPav+hpI6ggmCTld3u2hyiHji2H cDpcLM2LMhlHBipu80s9anNeZhCANDhbC5E+NZmuwgzHBcan8WC7xsPXPaiZSIm7TKaVoOcL 9tE5aN3jQmIlrT7ZUX52Ff/hSdx/JKDP3YMNtt4B0cH6ejIjtqTd+Ge8sSttsnNM0CQUkXps w98jwz+Lxw/bKMr3NSnnFpUZaxwji3BC9vYyxKMAwNelBCHEgS/OAa3EJoTfuYOK6wT6nadm YqYjwYbZE5V/SwzMbpWu7Jwlvuwyfo5mh7w5iMfnZE+vHFwp/wARAQABzSFKaXJpIFNsYWJ5 IDxqaXJpc2xhYnlAa2VybmVsLm9yZz7CwXcEEwEIACEFAlW3RUwCGwMFCwkIBwIGFQgJCgsC BBYCAwECHgECF4AACgkQvSWxBAa0cEnVTg//TQpdIAr8Tn0VAeUjdVIH9XCFw+cPSU+zMSCH eCZoA/N6gitEcnvHoFVVM7b3hK2HgoFUNbmYC0RdcSc80pOF5gCnACSP9XWHGWzeKCARRcQR 4s5YD8I4VV5hqXcKo2DFAtIOVbHDW+0okOzcecdasCakUTr7s2fXz97uuoc2gIBB7bmHUGAH XQXHvdnCLjDjR+eJN+zrtbqZKYSfj89s/ZHn5Slug6w8qOPT1sVNGG+eWPlc5s7XYhT9z66E l5C0rG35JE4PhC+tl7BaE5IwjJlBMHf/cMJxNHAYoQ1hWQCKOfMDQ6bsEr++kGUCbHkrEFwD UVA72iLnnnlZCMevwE4hc0zVhseWhPc/KMYObU1sDGqaCesRLkE3tiE7X2cikmj/qH0CoMWe gjnwnQ2qVJcaPSzJ4QITvchEQ+tbuVAyvn9H+9MkdT7b7b2OaqYsUP8rn/2k1Td5zknUz7iF oJ0Z9wPTl6tDfF8phaMIPISYrhceVOIoL+rWfaikhBulZTIT5ihieY9nQOw6vhOfWkYvv0Dl o4GRnb2ybPQpfEs7WtetOsUgiUbfljTgILFw3CsPW8JESOGQc0Pv8ieznIighqPPFz9g+zSu Ss/rpcsqag5n9rQp/H3WW5zKUpeYcKGaPDp/vSUovMcjp8USIhzBBrmI7UWAtuedG9prjqfO wU0ETpLnhgEQAM+cDWLL+Wvc9cLhA2OXZ/gMmu7NbYKjfth1UyOuBd5emIO+d4RfFM02XFTI t4MxwhAryhsKQQcA4iQNldkbyeviYrPKWjLTjRXT5cD2lpWzr+Jx7mX7InV5JOz1Qq+P+nJW YIBjUKhI03ux89p58CYil24Zpyn2F5cX7U+inY8lJIBwLPBnc9Z0An/DVnUOD+0wIcYVnZAK DiIXODkGqTg3fhZwbbi+KAhtHPFM2fGw2VTUf62IHzV+eBSnamzPOBc1XsJYKRo3FHNeLuS8 f4wUe7bWb9O66PPFK/RkeqNX6akkFBf9VfrZ1rTEKAyJ2uqf1EI1olYnENk4+00IBa+BavGQ 8UW9dGW3nbPrfuOV5UUvbnsSQwj67pSdrBQqilr5N/5H9z7VCDQ0dhuJNtvDSlTf2iUFBqgk 3smln31PUYiVPrMP0V4ja0i9qtO/TB01rTfTyXTRtqz53qO5dGsYiliJO5aUmh8swVpotgK4 /57h3zGsaXO9PGgnnAdqeKVITaFTLY1ISg+Ptb4KoliiOjrBMmQUSJVtkUXMrCMCeuPDGHo7 39Xc75lcHlGuM3yEB//htKjyprbLeLf1y4xPyTeeF5zg/0ztRZNKZicgEmxyUNBHHnBKHQxz 1j+mzH0HjZZtXjGu2KLJ18G07q0fpz2ZPk2D53Ww39VNI/J9ABEBAAHCwV8EGAECAAkFAk6S 54YCGwwACgkQvSWxBAa0cEk3tRAAgO+DFpbyIa4RlnfpcW17AfnpZi9VR5+zr496n2jH/1ld wRO/S+QNSA8qdABqMb9WI4BNaoANgcg0AS429Mq0taaWKkAjkkGAT7mD1Q5PiLr06Y/+Kzdr 90eUVneqM2TUQQbK+Kh7JwmGVrRGNqQrDk+gRNvKnGwFNeTkTKtJ0P8jYd7P1gZb9Fwj9YLx jhn/sVIhNmEBLBoI7PL+9fbILqJPHgAwW35rpnq4f/EYTykbk1sa13Tav6btJ+4QOgbcezWI wZ5w/JVfEJW9JXp3BFAVzRQ5nVrrLDAJZ8Y5ioWcm99JtSIIxXxt9FJaGc1Bgsi5K/+dyTKL wLMJgiBzbVx8G+fCJJ9YtlNOPWhbKPlrQ8+AY52Aagi9WNhe6XfJdh5g6ptiOILm330mkR4g W6nEgZVyIyTq3ekOuruftWL99qpP5zi+eNrMmLRQx9iecDNgFr342R9bTDlb1TLuRb+/tJ98 f/bIWIr0cqQmqQ33FgRhrG1+Xml6UXyJ2jExmlO8JljuOGeXYh6ZkIEyzqzffzBLXZCujlYQ DFXpyMNVJ2ZwPmX2mWEoYuaBU0JN7wM+/zWgOf2zRwhEuD3A2cO2PxoiIfyUEfB9SSmffaK/ S4xXoB6wvGENZ85Hg37C7WDNdaAt6Xh2uQIly5grkgvWppkNy4ZHxE+jeNsU7tg= In-Reply-To: <20260228173244.1509663-28-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 28. 02. 26, 18:19, Sasha Levin wrote: > From: Ian Rogers > > [ Upstream commit cee275edcdb1acfdc8270f80e96f30750b633220 ] This breaks (userspace) perf: $ ./perf stat -a -d -p 1 sleep 5 PID/TID switch overriding SYSTEM Error: No supported events found. Any ideas? > The failure to find a table of metrics with a CPUID shouldn't early > exit as the metric code will now also consider the default table. > > When searching for a metric or metric group, > pmu_metrics_table__for_each_metric() considers all tables and so the > caller doesn't need to switch the table to do this. > > Fixes: c7adeb0974f18da4 ("perf jevents: Add set of common metrics based on default ones") > Reviewed-by: Leo Yan > Signed-off-by: Ian Rogers > Tested-by: Leo Yan > Cc: Adrian Hunter > Cc: Alexander Shishkin > Cc: Ian Rogers > Cc: Ingo Molnar > Cc: James Clark > Cc: Jiri Olsa > Cc: Namhyung Kim > Cc: Peter Zijlstra > Signed-off-by: Arnaldo Carvalho de Melo > Signed-off-by: Sasha Levin > --- > tools/perf/util/metricgroup.c | 18 +++++------------- > 1 file changed, 5 insertions(+), 13 deletions(-) > > diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c > index 25c75fdbfc525..a21f2d4969c5c 100644 > --- a/tools/perf/util/metricgroup.c > +++ b/tools/perf/util/metricgroup.c > @@ -1563,8 +1563,6 @@ int metricgroup__parse_groups(struct evlist *perf_evlist, > { > const struct pmu_metrics_table *table = pmu_metrics_table__find(); > > - if (!table) > - return -EINVAL; > if (hardware_aware_grouping) > pr_debug("Use hardware aware grouping instead of traditional metric grouping method\n"); > > @@ -1602,22 +1600,16 @@ static int metricgroup__has_metric_or_groups_callback(const struct pmu_metric *p > > bool metricgroup__has_metric_or_groups(const char *pmu, const char *metric_or_groups) > { > - const struct pmu_metrics_table *tables[2] = { > - pmu_metrics_table__find(), > - pmu_metrics_table__default(), > - }; > + const struct pmu_metrics_table *table = pmu_metrics_table__find(); > struct metricgroup__has_metric_data data = { > .pmu = pmu, > .metric_or_groups = metric_or_groups, > }; > > - for (size_t i = 0; i < ARRAY_SIZE(tables); i++) { > - if (pmu_metrics_table__for_each_metric(tables[i], > - metricgroup__has_metric_or_groups_callback, > - &data)) > - return true; > - } > - return false; > + return pmu_metrics_table__for_each_metric(table, > + metricgroup__has_metric_or_groups_callback, > + &data) > + ? true : false; > } > > static int metricgroup__topdown_max_level_callback(const struct pmu_metric *pm, -- js suse labs