From patchwork Tue Apr 12 15:48:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 12810905 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47CD9C433F5 for ; Tue, 12 Apr 2022 15:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=whBlEbOO6mAdl11yN7BoSwS65n54xKcrjq/8Y/By/zw=; b=ZH+GeHg7mwenF1hMKYMI27Lwcn ANLW0vu8ENP76DhDBcNoCrmBh/ijBpMXNQhSj5cCUDIIa8KfdRNb8Jh49QVXHvN/f4zoS+o/8TQDq zNwoOH9Iiz2addzZI5WPPVpNdgx0A6/3EMGZoe1J2P54wCoyYoaxYueeKjYt9afPaYWrFwIHLpp/d ErSrzv/sXHVPkil582L3GCsjF7QNGPmbbs4hKEaBlkHxdUtWXPXNKpMrb71XROuMBnGGmYZR5v6Ox meXYR8bR2oHyUxAfBH0qtcd9kogf/r2tmUyqATD8suh+PA9eIOhpA0U6tFJ6SGyGocBv8EViJ+Pg+ FBfLJBQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1neIlI-00F047-Kn; Tue, 12 Apr 2022 15:49:00 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1neIkp-00Ezry-A9 for linux-arm-kernel@lists.infradead.org; Tue, 12 Apr 2022 15:48:32 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id a16-20020a258050000000b0064197c6f42bso2514316ybn.0 for ; Tue, 12 Apr 2022 08:48:30 -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=E5czj/bC3S4sZ4UgMamyfD/R4emkovjRTfasylw11c8=; b=cIEupEYkE1f7xIXa2QLCg5rVnIl2Lz0s+h2BNFFK/IKWT1xdZBnxzlPGbY8NrHbiBi CifyeqIG97Q9JLG7HFVEpxLnuis4pgAYYgt4vPNiPOw3oyQi5pvnKR4WF0N1+RapQc7C 1YgfVLcYqVJ2AFOViG/nTZw7hnRjbTuOTUJVQbHVSge2h4ToRaeVA80vB+ZACxvwKMaP FseJzDRxTY3fiFCjtS6yoIbqqAiXEXcs7g75idPELZEccNDk+CupnS1DbWr4YoPYt4NN JmM3Tymk5OwMMP9D8/iq2DHuxg0Tx7htHYTcWdvD+6+Hdfz2G7iKua1LlXp60K97B/YT oT2w== 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=E5czj/bC3S4sZ4UgMamyfD/R4emkovjRTfasylw11c8=; b=RfD4+50R0vD+apngU9kCevWgh1TEXhGX74gK6rQvv52y0TIFEuysFwp9JOiOD17HSB d2KWYqmt8rMueL8aDdVOHsZZtZqMZAt5p3UjaMLTZIemxiJI/BFZrXR6ihMds7lfzRE+ +Wze1Ks0dA+/9dAjaVoVh8+ZikX5scv7HQZr/l4c/hzZGxA1TqOhPhO9CiDXqisI7fLT E9OC7RpKTpB88wmmiPKOrWOOH9usp5qxfEdSyBmG8ENp+haIKiGu735l0UxnRHJKKLyX hMU4YFG5HHqwnef4YotL1bV6Z/HO/RkKstdob1ON9yY1O2gd7YWLWGsNomtDM9sSM6Wx ZeSA== X-Gm-Message-State: AOAM531OnLQfFcIehe3Q+aDiWDOIDPipcRy47dFhTRNVxiZ2tXqe1CbO qeNNy3riishSms+9qW3NU+90g4NierKC X-Google-Smtp-Source: ABdhPJxebRmsFHLeMUzDv29itwFXatOp3qc2ILe77MVoqCifZVtWoVoLfD2g59Q8gGAkSynYd6HQJ7+oTyhB X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:5f6f:a698:92a:5d45]) (user=irogers job=sendgmr) by 2002:a25:688d:0:b0:641:2721:798 with SMTP id d135-20020a25688d000000b0064127210798mr11414226ybc.35.1649778509700; Tue, 12 Apr 2022 08:48:29 -0700 (PDT) Date: Tue, 12 Apr 2022 08:48:16 -0700 In-Reply-To: <20220412154817.2728324-1-irogers@google.com> Message-Id: <20220412154817.2728324-4-irogers@google.com> Mime-Version: 1.0 References: <20220412154817.2728324-1-irogers@google.com> X-Mailer: git-send-email 2.35.1.1178.g4f1659d476-goog Subject: [PATCH v2 3/4] 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_Li=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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220412_084831_386397_6EAA6ABD X-CRM114-Status: GOOD ( 14.46 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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. --- 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 cc4c46563802..62163b45cf3f 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; }