From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EC6BC77B75 for ; Mon, 15 May 2023 22:45:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343552AbjEOWpi (ORCPT ); Mon, 15 May 2023 18:45:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343549AbjEOWph (ORCPT ); Mon, 15 May 2023 18:45:37 -0400 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6659ADC4E for ; Mon, 15 May 2023 15:45:35 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-559fb850e08so216183187b3.3 for ; Mon, 15 May 2023 15:45:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684190734; x=1686782734; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=/L8bXT+0geh2otdU6iNl7MVNZkb5RxXc7Qeizh0qbl8=; b=ql0+WwRTH43ALwDQodzd0Zact93wOmtEipG5MitJpFVTS6r9eSDl5D0u5Ruo+95xdh 5slEGVpdR3PZRG0tS3bQ0s5cvGpX/pp6YVRco9+ZxAPIE2QGJ00v35rQDcWldNz0Yip8 AS6qMFuV+57KOf2SuL43ATXmhCRO69PEh+CGNB2xposgaAuoX7/sd9LRg5cYZtfWMuCU sZGdmcC8FC0JuaFC43uove9mK7YXhZJAgTj+6CE3JL03PRUSNkc6lrJlubATFZTXlV9L sNhR9PCjX7PLwaoHiZvSCpZbUHBatdzaNBUtn2JipXqsxCeOH1FpoehE2aQhHJCARQSP AOSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684190734; x=1686782734; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=/L8bXT+0geh2otdU6iNl7MVNZkb5RxXc7Qeizh0qbl8=; b=jg+QVXXa/KZ2O6krTA37UJCCW6nqpcQfkNhXijCsp2mYQ4EF1BVWBNsHrVNjnY9i3l 07vxVuotSE7IrocmusR31EWd/QIJhhqPu9rB2e2Z6cLZ70DaL2AroMNo+0BJxHguddco JJ8V1oi87msNQ5TMagoAhCHSmPWuCCGkWpiFDtIrmkHgAsQp4sD1spOz+QIDbF63DE6m 1t9If8ZRM/04npaPjfkifNN/zUhwnnCS5k0KWK9T/b0lfm5lf2k1pjak7qKylFrK5G2M /1hK8n3FO6ymJtdengX4fZ0g6WeqoWSktq6n7L3EHdz/dIt8WCy3N94GXtmGkfJa7y8o E7gg== X-Gm-Message-State: AC+VfDzOBUC6olfuY9rGDrFCVrsG3+T/+WU/LdhPRQROvuamdt7k4cHV Uy+vmKeVhXNUPydwzouPGhQPUoFGtyCO X-Google-Smtp-Source: ACHHUZ5d2r+rfNcjfPvN8YeFUzhzCaEaysmKzJ6JUdPGlOSxkjs+f2+90E56eB1SX6H5aj7WU/7hPQlADpHm X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:638e:7eff:a1d9:3b2b]) (user=irogers job=sendgmr) by 2002:a81:4513:0:b0:55d:f929:418f with SMTP id s19-20020a814513000000b0055df929418fmr15952511ywa.1.1684190734487; Mon, 15 May 2023 15:45:34 -0700 (PDT) Date: Mon, 15 May 2023 15:45:30 -0700 Message-Id: <20230515224530.671331-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog Subject: [PATCH v1] perf metrics: Avoid segv with --topdown From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Kajol Jain , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, Kan Liang Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Some metrics may not have a metric_group which can result in segvs with "perf stat --topdown". Add a condition for the no metric_group case. Fixes: 1647cd5b8802 ("perf stat: Implement --topdown using json metrics") Reported-by: Kan Liang 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 4e7d41d285b4..5e9c657dd3f7 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -1672,7 +1672,7 @@ static int metricgroup__topdown_max_level_callback(const struct pmu_metric *pm, { unsigned int *max_level = data; unsigned int level; - const char *p = strstr(pm->metric_group, "TopdownL"); + const char *p = strstr(pm->metric_group ?: "", "TopdownL"); if (!p || p[8] == '\0') return 0; -- 2.40.1.606.ga4b1b128d6-goog