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 DD15CC433EF for ; Thu, 7 Apr 2022 23:05:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232468AbiDGXHf (ORCPT ); Thu, 7 Apr 2022 19:07:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232494AbiDGXHX (ORCPT ); Thu, 7 Apr 2022 19:07:23 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAEF1EBBB3 for ; Thu, 7 Apr 2022 16:05:22 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2eb8b94ad35so61137497b3.9 for ; Thu, 07 Apr 2022 16:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=WfvJj1m2gyFhMYgsgYi4914wWZZ5tzxnbwOex5ZNN7c=; b=G2lGhIKmig3u+8Ub/UZePe7b5WEYGKMuUAK5QddQmOTd95nRvbGk6CftAlO2mjIBqj fPSTJsBbSAHeP0HU+7B2e4hekgOS6WUOmus9G4U8A5BKCccxPMQavp6ueLLXnIqrpp9W k48zTkXZ7RDlkF66BC95dDcZ2Wi7Ya8X7ZEoLGq9dis2TED2GK/4KTYERmB/4bka3Vpt A+GyNY9K5bb9rV/hMtmX6Li0uXHQiX6LBymKd2xC9/6FiRxau7bU9mnhkwPdullG+1P0 dnWNY0jWwl30VGEcSl3GzMVqsXYFzxW8rMiHlaWLZA3zi9RAXZ6VLuyDmmBR/YH9wwkp OSgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=WfvJj1m2gyFhMYgsgYi4914wWZZ5tzxnbwOex5ZNN7c=; b=6zcMuxefD3kDz+4WcY2A3dCdWlmrpPPPWTH5eYZ6G7k8zq4oPJf28l57RDetZ+FmtG 7tLZvCF+84u4QwpR4WjckYG3juhvGL1+5ttf2WSeDNst9A4E1w4b284EaMZBeHydAzuh C35IsSSxovhqyl6uA6A5/cFOX6HgJI/wIC92m3GBzn0hTmzJnLOSgQrwvsYatqSOPjeb 20f90LmdItfwDdEWYrT15+m329QlJa6H1vxqfxQ57yPffzpAwONam3JGrk8TCU2lA4CC erCr3eOW1s8OI2wUmINSmPnp2LYHCN0qrrpcI996opneq/iblY2hTC7IUFQUWJYifEl3 7nUg== X-Gm-Message-State: AOAM532qisZN/MlBcWQ/fNcTfWuFPEqSxw3iR2dsfEfg1rNKVfXX1U3e Sfukj2bvO4D0t+0nsjD0NKwpBh1JnaxS X-Google-Smtp-Source: ABdhPJzHPc5JHRaajp14gJSR1JqmyinEoG5M4+QbCs6ofW0PQZulXHx6/8KCUTfl6DQ+O36TSTdCFPTtU9uk X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:560:aa27:649e:a07d]) (user=irogers job=sendgmr) by 2002:a25:8483:0:b0:63d:9504:8a14 with SMTP id v3-20020a258483000000b0063d95048a14mr11903156ybk.183.1649372721877; Thu, 07 Apr 2022 16:05:21 -0700 (PDT) Date: Thu, 7 Apr 2022 16:05:02 -0700 In-Reply-To: <20220407230503.1265036-1-irogers@google.com> Message-Id: <20220407230503.1265036-5-irogers@google.com> Mime-Version: 1.0 References: <20220407230503.1265036-1-irogers@google.com> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-goog Subject: [PATCH 4/5] perf symbol: By default only fix zero length symbols From: Ian Rogers To: John Garry , Will Deacon , Mathieu Poirier , Leo Yan , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , James Clark , Alexandre Truong , German Gomez , Ian Rogers , Dave Marchevsky , Song Liu , Ravi Bangoria , Li Huafei , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , William Cohen , Riccardo Mancini , Masami Hiramatsu , Thomas Richter , Lexi Shao , Remi Bernon , Michael Petlan , Denis Nikitin , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephane Eranian Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For architectures without a specific end fixup (ie not arm64, powerpc, s390) only fix up the end of zero length symbols. This reverts the behavior introduced by: https://lore.kernel.org/lkml/20220317135536.805-1-mpetlan@redhat.com/ where non-zero length symbols were expanded to the start of the current symbol. Signed-off-by: Ian Rogers --- tools/perf/util/symbol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 087cdf2a58c9..59c562316d75 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -104,7 +104,8 @@ static int prefix_underscores_count(const char *str) void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c, bool is_kernel __maybe_unused) { - if (p->end == p->start || p->end != c->start) + /* If the previous symbol is zero length, make its end the start of the current symbol. */ + if (p->end == p->start) p->end = c->start; } -- 2.35.1.1178.g4f1659d476-goog