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 8DB44C77B60 for ; Sat, 29 Apr 2023 05:37:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347176AbjD2Fhf (ORCPT ); Sat, 29 Apr 2023 01:37:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347247AbjD2Fhc (ORCPT ); Sat, 29 Apr 2023 01:37:32 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E39A9272A for ; Fri, 28 Apr 2023 22:36:51 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-b9a6f15287eso16034004276.1 for ; Fri, 28 Apr 2023 22:36:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682746609; x=1685338609; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=plp8jNunI45YXnTgcIa90XW8dmc+0uDhLWyMSPKR7UY=; b=6dAThpLFujNNO34yULX2NxehJBIaeK+GrJQgFMoks9CoK3rdn4qprX+nogfmh1TkTJ oyKEXCVB5rS51WTG2HoudMX5p6Au7/MNn0Wi55rGQSvuDpU3DHj9UCObE6dGyOr0asYf SN0sZxdP3qsVXhCstwmMFviegP5hunTZdM4utVs8owV8T02dxk6J/0UxP3xNh4XQit9o Gse/5ujs833RS+GjtnfRHvjnXHqR+KG5Uhm2f9Qcwo5cqCarofkX4SFeVp1EM51uH65A Rwh5ajupqgNQiptffJoV+y8uLjshG/imqgXIvZRa7Kz5qFuPP5RYL44WA7ckBmeBx62E 3OhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682746609; x=1685338609; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=plp8jNunI45YXnTgcIa90XW8dmc+0uDhLWyMSPKR7UY=; b=gqrt27J4V4ZT1njhmviY3U13yP7gRJqok/oaUCrnJhCzwNy32hyjojoSz7pQb5beBA W124gHJLGL9RurrB3kG3rjtLTuF65ZnlXSXf1qWQxpk4lVAZwbQocKHOAGZ4BYmFk528 uBqrok3ehQnLoGu9qvQejOZNI3LThthPXWwSOyHOWikvdBWwjBgCtrPtI4d5K3rD9ko0 hvRght3JJhZeUcyLus90/EeW07SW1gAoIU1n4xy3lZiD7cePWiuo9dKMe6GnXxP/Z97X tnZa+WbWS5+/B40pbwlOibIOCg7uFaKb/lUHDCMiYZmRNjzNhPx4RzLSo1DTQYtBH7lD pElA== X-Gm-Message-State: AC+VfDzwsruh9BuXQrrB5lbbWranK3MeWnj/kEsQg1A+hVZ1mDM3FHoz LrHu/g8GzrTRTOhK5vIcW6Hs8PqOSwWF X-Google-Smtp-Source: ACHHUZ5NkJ+eWbRvlTe45zKIH9rMlZ9mfr7e4F2J/u0+NfsamZdvPBGACWToFTUgYSyCjwHpz5ryuTG+ZW2O X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:c563:7e28:fb7c:bce3]) (user=irogers job=sendgmr) by 2002:a05:690c:2f82:b0:54f:e2ca:3085 with SMTP id ew2-20020a05690c2f8200b0054fe2ca3085mr7506556ywb.1.1682746609688; Fri, 28 Apr 2023 22:36:49 -0700 (PDT) Date: Fri, 28 Apr 2023 22:34:31 -0700 In-Reply-To: <20230429053506.1962559-1-irogers@google.com> Message-Id: <20230429053506.1962559-12-irogers@google.com> Mime-Version: 1.0 References: <20230429053506.1962559-1-irogers@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Subject: [PATCH v3 11/46] perf stat: Avoid segv on counter->name From: Ian Rogers To: Arnaldo Carvalho de Melo , Kan Liang , Ahmad Yasin , Peter Zijlstra , Ingo Molnar , Stephane Eranian , Andi Kleen , Perry Taylor , Samantha Alt , Caleb Biggers , Weilin Wang , Edward Baker , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Adrian Hunter , Florian Fischer , Rob Herring , Zhengjun Xing , John Garry , Kajol Jain , Sumanth Korikkar , Thomas Richter , Tiezhu Yang , Ravi Bangoria , Leo Yan , Yang Jihong , James Clark , Suzuki Poulouse , Kang Minchul , Athira Rajeev , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Switch to use evsel__name that doesn't return NULL for hardware and similar events. Reviewed-by: Kan Liang Signed-off-by: Ian Rogers --- tools/perf/util/stat-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index d87fb5328543..bf5a6c14dfcd 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -747,7 +747,7 @@ static void uniquify_event_name(struct evsel *counter) int ret = 0; if (counter->uniquified_name || counter->use_config_name || - !counter->pmu_name || !strncmp(counter->name, counter->pmu_name, + !counter->pmu_name || !strncmp(evsel__name(counter), counter->pmu_name, strlen(counter->pmu_name))) return; -- 2.40.1.495.gc816e09b53d-goog