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 0F3A53E3C5C; Tue, 31 Mar 2026 16:31:51 +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=1774974711; cv=none; b=IqiOilKLLmQF6NZfhYIg/IjV3bJDAVVTPlLRVKacJM9tqhk4u00l3pfZAHrWJBXdI7CaMHtNH8jmE6dhxX8nlHv8vd+2u5w5QRqGm6QggfXg0XVwjWv16D8MejkNKPWSNeQWGZFR8ntFzPN8l5VDJqvyvkCuMaDm+s/Na84Si7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774974711; c=relaxed/simple; bh=EK0aqCrqMNxXjbfwnSbeS646kZWIco34/2B6QKSfBqA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z+QCprCNlR5Bz9DVjAFvx+CjY9sP+wakzkwITzVpxreqzRxyhYYWzXVHTu13eoumVOaPeLXFoipsNaNmD5O5FmWJzuAmplhlwNF7zgu1ypPRzCOp4mTJ9KSUV6XXrRI/X87Y01IUyJD5juQBQoTSLUSd2ulDnZ3PfAPToJ7aFcc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XnfE8z3+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XnfE8z3+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98715C19423; Tue, 31 Mar 2026 16:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774974710; bh=EK0aqCrqMNxXjbfwnSbeS646kZWIco34/2B6QKSfBqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XnfE8z3+WKfjohopJYUISozQ2BzNHBot3whZIF/f32J7o9nHwm/tfpDCcgp3zidRw X3Fq4w1uizPOlyOWcl1o8cuJvpd6i9BTyoVC1WqjkqXJZvzUBTbDG+w5mswDScLTyD esQps+yf15j5TNwsIfyZJryslFbkUrx88hUysm4I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Leo Yan , Ian Rogers , Arnaldo Carvalho de Melo , Namhyung Kim , Sasha Levin Subject: [PATCH 6.19 015/342] perf metricgroup: Fix metricgroup__has_metric_or_groups() Date: Tue, 31 Mar 2026 18:17:28 +0200 Message-ID: <20260331161759.468675274@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260331161758.909578033@linuxfoundation.org> References: <20260331161758.909578033@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 8dd1d9a335321d0829aeb85d8e1a897248d0da29 ] Use metricgroup__for_each_metric() rather than pmu_metrics_table__for_each_metric() that combines the default metric table with, a potentially empty, CPUID table. Fixes: cee275edcdb1acfd ("perf metricgroup: Don't early exit if no CPUID table exists") Reviewed-by: Leo Yan Signed-off-by: Ian Rogers Tested-by: Arnaldo Carvalho de Melo Tested-by: Leo Yan Cc: Ian Rogers Signed-off-by: Namhyung Kim Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/metricgroup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index a21f2d4969c5c..45bb94da97b99 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1606,9 +1606,9 @@ bool metricgroup__has_metric_or_groups(const char *pmu, const char *metric_or_gr .metric_or_groups = metric_or_groups, }; - return pmu_metrics_table__for_each_metric(table, - metricgroup__has_metric_or_groups_callback, - &data) + return metricgroup__for_each_metric(table, + metricgroup__has_metric_or_groups_callback, + &data) ? true : false; } -- 2.51.0