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 227031D546 for ; Wed, 4 Oct 2023 18:10:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65246C433C8; Wed, 4 Oct 2023 18:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1696443012; bh=2nr6hw1t/kAGiTdEmk2oWVusqtPeuDrJdErtN+GXjjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=okimJ2MiYdHytQAe9HoQcOGiyriow6qeCI1wMJL/c5Ubqw0qtJUqo5tpLhLzae6YI qel46SPHfl4B339fxpx/3fPsE6jRWy+HGSOJSHwxS2yilmErtWdiO4zoj1nK/u/NMk SnZ1bvSB5+zQVDyTsdD/NBuvwmu05+o072lbqFYg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Arnaldo Carvalho de Melo , Alexander Shishkin , Andi Kleen , Caleb Biggers , Florian Fischer , Ian Rogers , Ingo Molnar , James Clark , Jiri Olsa , John Garry , Kan Liang , Kshipra Bopardikar , Mark Rutland , Miaoqian Lin , Namhyung Kim , Perry Taylor , Peter Zijlstra , Stephane Eranian , Thomas Richter , Xing Zhengjun , Sasha Levin Subject: [PATCH 5.15 151/183] perf metric: Return early if no CPU PMU table exists Date: Wed, 4 Oct 2023 19:56:22 +0200 Message-ID: <20231004175210.345761271@linuxfoundation.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231004175203.943277832@linuxfoundation.org> References: <20231004175203.943277832@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 3f5df3ac646e21a79a421ae4037c4ef0632bcaa9 ] Previous behavior is to segfault if there is no CPU PMU table and a metric is sought. To reproduce compile with NO_JEVENTS=1 then request a metric, for example, "perf stat -M IPC true". Committer testing: Before: $ make -k NO_JEVENTS=1 BUILD_BPF_SKEL=1 O=/tmp/build/perf-urgent -C tools/perf install-bin $ perf stat -M IPC true Segmentation fault (core dumped) $ After: $ perf stat -M IPC true Usage: perf stat [] [] -M, --metrics monitor specified metrics or metric groups (separated by ,) $ Fixes: 00facc760903be66 ("perf jevents: Switch build to use jevents.py") Signed-off-by: Ian Rogers Tested-by: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Andi Kleen Cc: Caleb Biggers Cc: Florian Fischer Cc: Ian Rogers Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: John Garry Cc: Kan Liang Cc: Kshipra Bopardikar Cc: Mark Rutland Cc: Miaoqian Lin Cc: Namhyung Kim Cc: Perry Taylor Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Richter Cc: Xing Zhengjun Link: https://lore.kernel.org/r/20220830164846.401143-3-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/metricgroup.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index 29b747ac31c12..ee6c5582681bd 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1258,6 +1258,9 @@ int metricgroup__parse_groups(const struct option *opt, struct evlist *perf_evlist = *(struct evlist **)opt->value; struct pmu_events_map *map = pmu_events_map__find(); + if (!table) + return -EINVAL; + return parse_groups(perf_evlist, str, metric_no_group, metric_no_merge, NULL, metric_events, map); } -- 2.40.1