From nobody Thu May 14 07:08:43 2026 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 CE858C433FE for ; Thu, 7 Apr 2022 23:05:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232490AbiDGXHV (ORCPT ); Thu, 7 Apr 2022 19:07:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36058 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232429AbiDGXHQ (ORCPT ); Thu, 7 Apr 2022 19:07:16 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FE65BCB57 for ; Thu, 7 Apr 2022 16:05:15 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id h16-20020a056902009000b00628a70584b2so5293390ybs.6 for ; Thu, 07 Apr 2022 16:05:15 -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=tors/41JgQKyqvse+O7pu0FFz6GUUhE6Y3Idh3XFdO4=; b=VtpRPUeczstXHdV+zd2nTPGF6b/Tshh2qvyDNkCw3zgF3eb0ZPJZGb1X5aCh9Zaj51 ICqxxGu+bkOPrCcWpGJJTTOKpvrPE2Jy5xFSl3otZMHsLZfHoFMa5UwNMjaY1DfWaaP1 n7NAb651jlHirzvPUNVopB+Tan6HzXfzjcDbDT8I0TCJ4DExvHVXfxU8+BVu+3TNBncP nnWg44VKdxqLINhxqbuhPBbPl6F/KpHCxEo4BhaCalVZGHo15rfrzSlHzazPfsnHACaR Y925KpqG5uQcq+P/3MpWcU6CcgRGzSEKfNUeGTBW802evTkhoAcw1Q1Z2843XMItpK1A 6RzA== 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=tors/41JgQKyqvse+O7pu0FFz6GUUhE6Y3Idh3XFdO4=; b=QBvrx7GTnSK6aWMnRHFqADLBq44nAGwxEGMBvJkY62TxmifwGk5njQyhRHyI3N77v0 ioyAOKmYg3Y2t/M/cKWZrz4eNrOYupFGz9DNoNXx2juW9OEsPVBfRVyB+fcvcd5vn9wE ebLqmnSwg+uz5vfwq385XQVxrKFQkJnQgfM8t70KmKz7k0zRtds0Zn21b9CWUBRXCGz0 J9k4cz9Y2OmgKMgGJ5sDtJlzcFofaFFF+1NlNMm9j5WRFKQmbkbwd2iUIeiQkyb/aGqj SdwZ+DMN9UgdvqU/g36yyGRr7GqQHkgo1PiIKq8RKnokzZ/oj+R/n5wr+hKV6fzOSWVT +1Iw== X-Gm-Message-State: AOAM532eNGADNkZuMjKfM6cOI4+Q9VBeAKDQmzIj/zkoEYKEP3ZoQc6N KysBltaWPYywBr99tlTXPMFeSuq7bLno X-Google-Smtp-Source: ABdhPJyH022FsTnDX21QaHconZXhJnn/KzbIMrLAOb8OT7uonKFUv72/UXwSrles6plotzyo7qhEGeurC/8L X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:560:aa27:649e:a07d]) (user=irogers job=sendgmr) by 2002:a25:e70c:0:b0:63e:e00b:ecd5 with SMTP id e12-20020a25e70c000000b0063ee00becd5mr1602174ybh.547.1649372714390; Thu, 07 Apr 2022 16:05:14 -0700 (PDT) Date: Thu, 7 Apr 2022 16:04:59 -0700 In-Reply-To: <20220407230503.1265036-1-irogers@google.com> Message-Id: <20220407230503.1265036-2-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 1/5] perf annotate: Drop objdump stderr 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" If objdump writes to stderr it can block waiting for it to be read. As perf doesn't read stderr then progress stops with perf waiting for stdout output. Signed-off-by: Ian Rogers --- tools/perf/util/annotate.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index e4c641b240df..82cc396ef516 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -2047,6 +2047,7 @@ static int symbol__disassemble(struct symbol *sym, st= ruct annotate_args *args) objdump_process.argv =3D objdump_argv; objdump_process.out =3D -1; objdump_process.err =3D -1; + objdump_process.no_stderr =3D 1; if (start_command(&objdump_process)) { pr_err("Failure starting to run %s\n", command); err =3D -1; --=20 2.35.1.1178.g4f1659d476-goog From nobody Thu May 14 07:08:43 2026 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 ADAE7C433F5 for ; Thu, 7 Apr 2022 23:05:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232523AbiDGXHb (ORCPT ); Thu, 7 Apr 2022 19:07:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232463AbiDGXHT (ORCPT ); Thu, 7 Apr 2022 19:07:19 -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 91546DA6F8 for ; Thu, 7 Apr 2022 16:05:17 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2e61c5a0eb7so60233027b3.22 for ; Thu, 07 Apr 2022 16:05:17 -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=Xuahj0daJES831OYl0Fkgb0vM1zVKd68GzYFqhf9BfQ=; b=PCx5eSsv7v0+PzFFN0c8bH9dab4pORvVPuQqmn3xB8c+/kojL5tIPi1xKduPAAJx/X J1Rapz27A01ixG1Ww4arEC4Gm6FbmtQ5j+++F76q4pnZu371efhghIE5ojZQmbJKwyzD XH7KVhKbIF8HaSHQKcAULmtF8JzxdQmFr12xyZQDKcAT6v2sf+xJdasSZBOGrpPVSNbl BtllOmbDFVN0OlfpjiCILvK8m+vSh5N52b4fOYX/54tRkQlhXYnlggd+dEef1Y7uKple OGyNWHK1PY2AQAUVo5YCDFM4JckuDGnzgWM7DylByHMRwUEtopheDSlH7/VXo3qzLw7k SGlg== 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=Xuahj0daJES831OYl0Fkgb0vM1zVKd68GzYFqhf9BfQ=; b=5OxGKACaze0x8toYC0dHKpR9S7lAO38aLPjegCsu8L2f6yE1+pB++aBwv4db8SzftM QTLCkIgjgqa2KAbZb1JGcSVVyVykbwgAL+KZVSE8WWxss92bDaaJMbd1rCW39GxYedQe yVbcAM2mArimXcsKO2ZdcNWD6QuSkN17xNe7dic46WDNraEkzWHTe1j80E1Vm18eYvJP hxLf1MGE7e6QHjtHB3ujk3Bk8v8tpq66TAoy8gFfWDuKBUS0Yp0ITEOHm7pYW2mQloHL vWaj/89anT51gu+w/1wobpinXfcU5qBUqdGQwqnFUzEO2gV0hSAaEPBN9KVLcmIv+aQj +7Fg== X-Gm-Message-State: AOAM530DG8O4n/Lsf8x9RjjiHY8FnIdYc88H2F4kdNChjWel5f5RLc7e t4Wq3tDUO2FO4AoFJ0nOm+cI4Z6636IP X-Google-Smtp-Source: ABdhPJw3MtR/8U6P+0OZrpAACVCj/fTCBkATcW2PyD/L2Y0Pf7n4jyr+fEe1BhjcG1AtDHHo12kIwXZlYS27 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:560:aa27:649e:a07d]) (user=irogers job=sendgmr) by 2002:a25:f305:0:b0:63e:76f4:4643 with SMTP id c5-20020a25f305000000b0063e76f44643mr2596405ybs.580.1649372716693; Thu, 07 Apr 2022 16:05:16 -0700 (PDT) Date: Thu, 7 Apr 2022 16:05:00 -0700 In-Reply-To: <20220407230503.1265036-1-irogers@google.com> Message-Id: <20220407230503.1265036-3-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 2/5] perf symbols: Always do architecture specific fixups 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The change: https://lore.kernel.org/lkml/20220317135536.805-1-mpetlan@redhat.com/ modified the condition for architecture specific fixups motivated by a PowerPC case. So that architectures can independently modify their condition, move the if into the called architecture symbols__fixup_end function and always call it. Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/machine.c | 14 ++++++++------ tools/perf/arch/powerpc/util/machine.c | 14 ++++++++------ tools/perf/arch/s390/util/machine.c | 14 ++++++++------ tools/perf/util/symbol.c | 6 +++--- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/tools/perf/arch/arm64/util/machine.c b/tools/perf/arch/arm64/u= til/machine.c index d2ce31e28cd7..1cc33b323c3f 100644 --- a/tools/perf/arch/arm64/util/machine.c +++ b/tools/perf/arch/arm64/util/machine.c @@ -20,13 +20,15 @@ =20 void arch__symbols__fixup_end(struct symbol *p, struct symbol *c) { - if ((strchr(p->name, '[') && strchr(c->name, '[') =3D=3D NULL) || + if (p->end =3D=3D p->start || p->end !=3D c->start) { + if ((strchr(p->name, '[') && strchr(c->name, '[') =3D=3D NULL) || (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '['))) - /* Limit range of last symbol in module and kernel */ - p->end +=3D SYMBOL_LIMIT; - else - p->end =3D c->start; - pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + /* Limit range of last symbol in module and kernel */ + p->end +=3D SYMBOL_LIMIT; + else + p->end =3D c->start; + pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + } } =20 void arch__add_leaf_frame_record_opts(struct record_opts *opts) diff --git a/tools/perf/arch/powerpc/util/machine.c b/tools/perf/arch/power= pc/util/machine.c index e652a1aa8132..88a8abf98a57 100644 --- a/tools/perf/arch/powerpc/util/machine.c +++ b/tools/perf/arch/powerpc/util/machine.c @@ -16,10 +16,12 @@ =20 void arch__symbols__fixup_end(struct symbol *p, struct symbol *c) { - if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) - /* Limit the range of last kernel symbol */ - p->end +=3D page_size; - else - p->end =3D c->start; - pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + if (p->end =3D=3D p->start || p->end !=3D c->start) { + if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) + /* Limit the range of last kernel symbol */ + p->end +=3D page_size; + else + p->end =3D c->start; + pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + } } diff --git a/tools/perf/arch/s390/util/machine.c b/tools/perf/arch/s390/uti= l/machine.c index 7644a4f6d4a4..0b750738ec68 100644 --- a/tools/perf/arch/s390/util/machine.c +++ b/tools/perf/arch/s390/util/machine.c @@ -44,10 +44,12 @@ int arch__fix_module_text_start(u64 *start, u64 *size, = const char *name) */ void arch__symbols__fixup_end(struct symbol *p, struct symbol *c) { - if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) - /* Last kernel symbol mapped to end of page */ - p->end =3D roundup(p->end, page_size); - else - p->end =3D c->start; - pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + if (p->end =3D=3D p->start || p->end !=3D c->start) { + if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) + /* Last kernel symbol mapped to end of page */ + p->end =3D roundup(p->end, page_size); + else + p->end =3D c->start; + pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + } } diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index dea0fc495185..394ad493c343 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -103,7 +103,8 @@ static int prefix_underscores_count(const char *str) =20 void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c) { - p->end =3D c->start; + if (p->end =3D=3D p->start || p->end !=3D c->start) + p->end =3D c->start; } =20 const char * __weak arch__normalize_symbol_name(const char *name) @@ -231,8 +232,7 @@ void symbols__fixup_end(struct rb_root_cached *symbols) prev =3D curr; curr =3D rb_entry(nd, struct symbol, rb_node); =20 - if (prev->end =3D=3D prev->start || prev->end !=3D curr->start) - arch__symbols__fixup_end(prev, curr); + arch__symbols__fixup_end(prev, curr); } =20 /* Last entry */ --=20 2.35.1.1178.g4f1659d476-goog From nobody Thu May 14 07:08:43 2026 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 01520C433F5 for ; Thu, 7 Apr 2022 23:05:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232502AbiDGXHY (ORCPT ); Thu, 7 Apr 2022 19:07:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232489AbiDGXHV (ORCPT ); Thu, 7 Apr 2022 19:07:21 -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 26115EBAC7 for ; Thu, 7 Apr 2022 16:05:20 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2eb689106e3so60227007b3.16 for ; Thu, 07 Apr 2022 16:05:20 -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=cgF/pihI368V1FzITLW8N4wweJzsyz+om7JJReNSZ+4=; b=CJH8ftCXfs8lgiSmEvudTtaUdZe73HrhwI3Rm82nLUQbHZZD5KC8Wkiur+6D0xVcCZ mDkWDry/JEXw8XvS1ZFYniUquKCmjtKiXrJz0ReaV1r7HO/dq8JdMQGbmQQRDS6rdgDE GIcr7NhbwnxkDtGPp95BRQ2qKbyrpLBr9BsBrcFZ1BWbDcufruKIZqJGVttMFCaJslx5 TpJmhGy50f+Ejx/Bt5saLeT6GzSCoDnkNgzBevgt4KJsinPd6C54nwf8XKMQhCz6iUMe U2J7zrXwKNK42rXr31UInQkhsCMw7CbfrsXWjMki2yiY62a/dV0RgKRB3N7SfzDRr0fE tLBQ== 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=cgF/pihI368V1FzITLW8N4wweJzsyz+om7JJReNSZ+4=; b=wD/5WMRyJmUGEQGGBy6pQjaCtYnhSyC1R9eQclKDS/3bbjR6+pC9Crp4pWqGXqe5ZZ cbNtmFu18DUPl3S/5sEY7uF3BYQ3e9s2+2EoL0XeAQYySsuyToEz1YOgblCR5RrVtBBK Cw85/d/ErUFdbRqsy0chi0Afim7Ki5d4UBUTp9tX8dOHsh0RI/RP4vdrFXiVsR2wHIw0 WEWH/Ie9WZm8XbXsZKeeKKTilwAb0K3xrJU84S3lvtG+1G0fomJ+/pgvbzBZZKumFtNr FEBHkwxpLwVL8pskhPJZoiH+jJedgxe90mCcX7ymCpetAAf5JTCDX7YOoyoO5bFXZidx l1Og== X-Gm-Message-State: AOAM532r5OOgHbrpu92ew626rLptPI6TAEaFf739qxAkasufbzqM0qTe vuRz8TBNH0xss7V3i7EYS+hpW3pb1ZoH X-Google-Smtp-Source: ABdhPJywzI8+vrcC1is9V+TFv8P9n+XT9Rg9h/gTvBLj628PYmkwX7hEAqXLXvDbPHGUQhWGYR+FwWBprC0v X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:560:aa27:649e:a07d]) (user=irogers job=sendgmr) by 2002:a5b:982:0:b0:63e:7d7e:e2f2 with SMTP id c2-20020a5b0982000000b0063e7d7ee2f2mr2100238ybq.549.1649372719358; Thu, 07 Apr 2022 16:05:19 -0700 (PDT) Date: Thu, 7 Apr 2022 16:05:01 -0700 In-Reply-To: <20220407230503.1265036-1-irogers@google.com> Message-Id: <20220407230503.1265036-4-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 3/5] perf symbols: Add is_kernel argument to fixup end 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Kernel fixups may be special so add a flag to quickly detect if they are necessary. Signed-off-by: Ian Rogers Reported-by: kernel test robot --- tools/perf/arch/arm64/util/machine.c | 3 ++- tools/perf/arch/powerpc/util/machine.c | 4 +++- tools/perf/arch/s390/util/machine.c | 3 ++- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 9 +++++---- tools/perf/util/symbol.h | 4 ++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tools/perf/arch/arm64/util/machine.c b/tools/perf/arch/arm64/u= til/machine.c index 1cc33b323c3f..54fb41de9931 100644 --- a/tools/perf/arch/arm64/util/machine.c +++ b/tools/perf/arch/arm64/util/machine.c @@ -18,7 +18,8 @@ =20 #define SYMBOL_LIMIT (1 << 12) /* 4K */ =20 -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c) +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, + bool is_kernel __maybe_unused) { if (p->end =3D=3D p->start || p->end !=3D c->start) { if ((strchr(p->name, '[') && strchr(c->name, '[') =3D=3D NULL) || diff --git a/tools/perf/arch/powerpc/util/machine.c b/tools/perf/arch/power= pc/util/machine.c index 88a8abf98a57..a732601f951e 100644 --- a/tools/perf/arch/powerpc/util/machine.c +++ b/tools/perf/arch/powerpc/util/machine.c @@ -14,7 +14,9 @@ * Therefore do not fill this gap and do not assign it to the kernel dso m= ap. */ =20 -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c) +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, + bool is_kernel __maybe_unused) +) { if (p->end =3D=3D p->start || p->end !=3D c->start) { if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) diff --git a/tools/perf/arch/s390/util/machine.c b/tools/perf/arch/s390/uti= l/machine.c index 0b750738ec68..8622a1b78748 100644 --- a/tools/perf/arch/s390/util/machine.c +++ b/tools/perf/arch/s390/util/machine.c @@ -42,7 +42,8 @@ int arch__fix_module_text_start(u64 *start, u64 *size, co= nst char *name) * and beginning of first module's text segment is very big. * Therefore do not fill this gap and do not assign it to the kernel dso m= ap. */ -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c) +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, + bool is_kernel __maybe_unused) { if (p->end =3D=3D p->start || p->end !=3D c->start) { if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 31cd59a2b66e..6598a5d9f223 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1290,7 +1290,7 @@ dso__load_sym_internal(struct dso *dso, struct map *m= ap, struct symsrc *syms_ss, * For misannotated, zeroed, ASM function sizes. */ if (nr > 0) { - symbols__fixup_end(&dso->symbols); + symbols__fixup_end(&dso->symbols, dso->kernel !=3D DSO_SPACE__USER); symbols__fixup_duplicate(&dso->symbols); if (kmap) { /* diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index 394ad493c343..087cdf2a58c9 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -101,7 +101,8 @@ static int prefix_underscores_count(const char *str) return tail - str; } =20 -void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c) +void __weak arch__symbols__fixup_end(struct symbol *p, struct symbol *c, + bool is_kernel __maybe_unused) { if (p->end =3D=3D p->start || p->end !=3D c->start) p->end =3D c->start; @@ -218,7 +219,7 @@ void symbols__fixup_duplicate(struct rb_root_cached *sy= mbols) } } =20 -void symbols__fixup_end(struct rb_root_cached *symbols) +void symbols__fixup_end(struct rb_root_cached *symbols, bool is_kernel) { struct rb_node *nd, *prevnd =3D rb_first_cached(symbols); struct symbol *curr, *prev; @@ -232,7 +233,7 @@ void symbols__fixup_end(struct rb_root_cached *symbols) prev =3D curr; curr =3D rb_entry(nd, struct symbol, rb_node); =20 - arch__symbols__fixup_end(prev, curr); + arch__symbols__fixup_end(prev, curr, is_kernel); } =20 /* Last entry */ @@ -1467,7 +1468,7 @@ int __dso__load_kallsyms(struct dso *dso, const char = *filename, if (kallsyms__delta(kmap, filename, &delta)) return -1; =20 - symbols__fixup_end(&dso->symbols); + symbols__fixup_end(&dso->symbols, /*is_kernel=3D*/true); symbols__fixup_duplicate(&dso->symbols); =20 if (dso->kernel =3D=3D DSO_SPACE__KERNEL_GUEST) diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index fbf866d82dcc..8428f24e67df 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -203,7 +203,7 @@ void __symbols__insert(struct rb_root_cached *symbols, = struct symbol *sym, bool kernel); void symbols__insert(struct rb_root_cached *symbols, struct symbol *sym); void symbols__fixup_duplicate(struct rb_root_cached *symbols); -void symbols__fixup_end(struct rb_root_cached *symbols); +void symbols__fixup_end(struct rb_root_cached *symbols, bool is_kernel); void maps__fixup_end(struct maps *maps); =20 typedef int (*mapfn_t)(u64 start, u64 len, u64 pgoff, void *data); @@ -241,7 +241,7 @@ const char *arch__normalize_symbol_name(const char *nam= e); #define SYMBOL_A 0 #define SYMBOL_B 1 =20 -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c); +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, bool is_= kernel); int arch__compare_symbol_names(const char *namea, const char *nameb); int arch__compare_symbol_names_n(const char *namea, const char *nameb, unsigned int n); --=20 2.35.1.1178.g4f1659d476-goog From nobody Thu May 14 07:08:43 2026 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D=3D p->start || p->end !=3D c->start) + /* If the previous symbol is zero length, make its end the start of the c= urrent symbol. */ + if (p->end =3D=3D p->start) p->end =3D c->start; } =20 --=20 2.35.1.1178.g4f1659d476-goog From nobody Thu May 14 07:08:43 2026 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 51DC2C433F5 for ; Thu, 7 Apr 2022 23:05:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232516AbiDGXHj (ORCPT ); Thu, 7 Apr 2022 19:07:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232503AbiDGXH1 (ORCPT ); Thu, 7 Apr 2022 19:07:27 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C0F2F94CA for ; Thu, 7 Apr 2022 16:05:25 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id x9-20020a5b0809000000b00631d9edfb96so5263137ybp.22 for ; Thu, 07 Apr 2022 16:05:25 -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=BlnS9L2b1HywEaYijfWcFOwOQSJE9EtkTs1ukixmBPw=; b=ZoLWREi9IpzQjcNCRfvCg0QXxxgq/g/dr8q8lw6hiFwbYUfHDU1oOZdHzFe2C0x/Wj +G6TEXOTNFkXW2gltwODOW5zukJ6c3lNHMPBcvQp5GI18h87PtXgxM98avfGpH8OyZ5u nzT1o4ojmpF6V/vD2FRe+PGmy0ImyLDV3ZUqcR6ZYZaSKgCLKh4p5yqqe4XuvwTZxhV1 wKnssK5d/ODNrMayMxzcqVNtNCahdn67ngyBl7U3zRKpGFBBKd8ViX3vlJtwMuf7SlpI f+UB8KrczQtgb/Md34bcUsQs03hgQY4AgrDM31NMENxStRmUWp+7sf0pLroD9Ku6pL1D dq8w== 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=BlnS9L2b1HywEaYijfWcFOwOQSJE9EtkTs1ukixmBPw=; b=6HkS9mGEkBCnR2M49kck9DKcpnlR+jInpZI13vHdiAAH04BtuRM3kjvK7clLctWza3 a0FuoUorc8JrWY35e/c6NK+egTG0RiUNs1HASf2O6rtI7z0wBuRYI0mDNknj+r6KOwq+ Sk0xhPk7+H0Idc32rJ2ctZmQ/OZAXVzhbD1svhaM/KfYhZldF18SU/s2LME1PjWhjGIw Pa5yED/pLRqNncxH0ZxUmHIWpX0Gy5BkZ1T/qxn1bOm70BqpIHH33McrwjXcyzxQQTLD Y2j8iRJPsyrKYzY3NXo0KjS/TpZA15FhSnAa/PFWZ8APWT8oSG+iMwX+lBS4JcNJrOcY 9vZw== X-Gm-Message-State: AOAM532CBE+FX3wUu4anULqdXqk2XNhqKOGoSZBcPvQH5rARAdAV5QhC HecQROmjEc44e0kKG8MZZGIS2hD1KPY0 X-Google-Smtp-Source: ABdhPJwO6aQe2goGLlpoTWwXzoYnXPSLIf1haTI2XYvRcrDVlYdlMfH8R5T02DhVCFDBY/64pzF+0lrd295k X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:560:aa27:649e:a07d]) (user=irogers job=sendgmr) by 2002:a05:6902:392:b0:633:621f:166f with SMTP id f18-20020a056902039200b00633621f166fmr12458396ybs.166.1649372724286; Thu, 07 Apr 2022 16:05:24 -0700 (PDT) Date: Thu, 7 Apr 2022 16:05:03 -0700 In-Reply-To: <20220407230503.1265036-1-irogers@google.com> Message-Id: <20220407230503.1265036-6-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 5/5] perf symbols: More specific architecture end fixing 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make the conditions used for symbol fixup closer to the comments. The logic aims to combine the current conditions as last modified in: https://lore.kernel.org/lkml/20220317135536.805-1-mpetlan@redhat.com/ Signed-off-by: Ian Rogers --- tools/perf/arch/arm64/util/machine.c | 19 ++++++++++--------- tools/perf/arch/powerpc/util/machine.c | 18 +++++++++--------- tools/perf/arch/s390/util/machine.c | 17 +++++++++-------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/tools/perf/arch/arm64/util/machine.c b/tools/perf/arch/arm64/u= til/machine.c index 54fb41de9931..f258c1ebac03 100644 --- a/tools/perf/arch/arm64/util/machine.c +++ b/tools/perf/arch/arm64/util/machine.c @@ -18,16 +18,17 @@ =20 #define SYMBOL_LIMIT (1 << 12) /* 4K */ =20 -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, - bool is_kernel __maybe_unused) +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, bool is_= kernel) { - if (p->end =3D=3D p->start || p->end !=3D c->start) { - if ((strchr(p->name, '[') && strchr(c->name, '[') =3D=3D NULL) || - (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '['))) - /* Limit range of last symbol in module and kernel */ - p->end +=3D SYMBOL_LIMIT; - else - p->end =3D c->start; + if (is_kernel && (p->end =3D=3D p->start || p->end !=3D c->start) && + ((strchr(p->name, '[') && strchr(c->name, '[') =3D=3D NULL) || + (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')))) { + /* Limit range of last symbol in module and kernel */ + p->end +=3D SYMBOL_LIMIT; + pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + } else if (p->end =3D=3D p->start) { + /* Expand empty symbols. */ + p->end =3D c->start; pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); } } diff --git a/tools/perf/arch/powerpc/util/machine.c b/tools/perf/arch/power= pc/util/machine.c index a732601f951e..689a48040b64 100644 --- a/tools/perf/arch/powerpc/util/machine.c +++ b/tools/perf/arch/powerpc/util/machine.c @@ -14,16 +14,16 @@ * Therefore do not fill this gap and do not assign it to the kernel dso m= ap. */ =20 -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, - bool is_kernel __maybe_unused) +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, bool is_= kernel) ) { - if (p->end =3D=3D p->start || p->end !=3D c->start) { - if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) - /* Limit the range of last kernel symbol */ - p->end +=3D page_size; - else - p->end =3D c->start; - pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + if (is_kernel && (p->end =3D=3D p->start || p->end !=3D c->start) && + strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) { + /* Limit the range of last kernel symbol */ + p->end +=3D page_size; + } else if (p->end =3D=3D p->start) { + /* Expand empty symbols. */ + p->end =3D c->start; } + pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); } diff --git a/tools/perf/arch/s390/util/machine.c b/tools/perf/arch/s390/uti= l/machine.c index 8622a1b78748..790d98a39c83 100644 --- a/tools/perf/arch/s390/util/machine.c +++ b/tools/perf/arch/s390/util/machine.c @@ -42,15 +42,16 @@ int arch__fix_module_text_start(u64 *start, u64 *size, = const char *name) * and beginning of first module's text segment is very big. * Therefore do not fill this gap and do not assign it to the kernel dso m= ap. */ -void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, - bool is_kernel __maybe_unused) +void arch__symbols__fixup_end(struct symbol *p, struct symbol *c, bool is_= kernel) { - if (p->end =3D=3D p->start || p->end !=3D c->start) { - if (strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) - /* Last kernel symbol mapped to end of page */ - p->end =3D roundup(p->end, page_size); - else - p->end =3D c->start; + if (is_kernel && (p->end =3D=3D p->start || p->end !=3D c->start) && + strchr(p->name, '[') =3D=3D NULL && strchr(c->name, '[')) { + /* Last kernel symbol mapped to end of page */ + p->end =3D roundup(p->end, page_size); + pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); + } else if (p->end =3D=3D p->start) { + /* Expand empty symbols. */ + p->end =3D c->start; pr_debug4("%s sym:%s end:%#" PRIx64 "\n", __func__, p->name, p->end); } } --=20 2.35.1.1178.g4f1659d476-goog