From nobody Mon May 11 07:05:59 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 0AEBCC433F5 for ; Tue, 12 Apr 2022 15:48:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357314AbiDLPuv (ORCPT ); Tue, 12 Apr 2022 11:50:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353342AbiDLPuo (ORCPT ); Tue, 12 Apr 2022 11:50:44 -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 3DB645FF3D for ; Tue, 12 Apr 2022 08:48:25 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2d2d45c0df7so161713577b3.1 for ; Tue, 12 Apr 2022 08:48: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=MNOrivzCB1IEcfUHpsPArN3av86pSVn5LI+JFeA009c=; b=Jxfcw41rIapSLBYY08oP79pW5QErfm0BlHMc9JOvIieL951+KQwxEyz9TwCoKjg5ia ti5O1h3vb0jWEPqVVl//CM9xr5kJ5zPlDjSWm+vWxVFjzTQBRAGF5u4FbK2UyoDSDkuj DS0FxeIAgTgE/ydppsuZWDV3puxDGvxQiY00VfHoimJhhNrx1mI7YG88+b0wdKV51Ifr BJznapmMQh2xGpvRKO/1uyO2wjRgvC2awCco39UmxwoZZjOV0NHOTYSqX+EC5Q4Y0vFw /xzhlk8w7udKnct+AFWq56O39PGQTRWntQjSn/cJKZt5HEA0zu7dpJG5iURk+3EDgf8F AoWQ== 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=MNOrivzCB1IEcfUHpsPArN3av86pSVn5LI+JFeA009c=; b=5zmPgriCWqqu4B3LKa7nuVuOICsrynnuica6YhwMSNAko9pitNOmI71aNq+cFwBJWO 9+HYDyLmfLe7XnjjEPwaMiaAte4091G5Ityg79dIRsUgy+ddghpNLIemaApBeYVykclH 1PQk1Z4f1G50X/8sHPXoFKTcJ/ubXRg50iIl6uNtWUxYz9agtKzYAkqXJU+rLApzjdqi r5eNv7OLdya1PK502CopA5qEHZnjKzBlX5SzSiCPrElK146niJvD98CtaBAaYPb9BtxE P0qB8fgLYAL4EQf81QN1FKqOn+sP/lNkh2OZ8osVucBvp3J8iLYFdgf846cKrwZ48dhR OpjQ== X-Gm-Message-State: AOAM531N5SXRqXELupPLyaUSGZJN+jecuFzM9hhQx+JpOzBQFMsVULnW cJ2Tjs4S9O7duNAtV+QXFPvBG1nq08fk X-Google-Smtp-Source: ABdhPJwGRXJ4fhz3KDb9CRYJODouALMvz33H5HzPda/tm0sxnTSEU0EVIgx3og/+Sbbhdq3eUBWkMUmwdzDj X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:5f6f:a698:92a:5d45]) (user=irogers job=sendgmr) by 2002:a81:36cf:0:b0:2e5:2597:a026 with SMTP id d198-20020a8136cf000000b002e52597a026mr30798226ywa.301.1649778504446; Tue, 12 Apr 2022 08:48:24 -0700 (PDT) Date: Tue, 12 Apr 2022 08:48:14 -0700 In-Reply-To: <20220412154817.2728324-1-irogers@google.com> Message-Id: <20220412154817.2728324-2-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 1/4] 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. --- 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 Mon May 11 07:05:59 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 26283C433EF for ; Tue, 12 Apr 2022 15:48:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357342AbiDLPuz (ORCPT ); Tue, 12 Apr 2022 11:50:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357285AbiDLPup (ORCPT ); Tue, 12 Apr 2022 11:50:45 -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 B3A415FF33 for ; Tue, 12 Apr 2022 08:48:27 -0700 (PDT) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-2ebf1d99068so88815507b3.9 for ; Tue, 12 Apr 2022 08:48:27 -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=ao0b9SWr4K1uMMglAI9pQiJY6csgtAAxNiaqGNs4iMk=; b=CVmjJoHRp0cuWN+qWLxSv70lIZwKxS9l1PPkCmKoRyk4/PcDWbhUe1EZdXpxROHbqr MfatMkGlhosHFw9pelGvDgW0GjarZmyGkZqhK3+UkDeqSg0SJgS6koPtg3lZcTS2/3SB fXQfOoAymNNH7cZJhQzhvAlB59XOWl7DoGL4YyFg1jsgmX8U0xgZo78f4EkolbhTx6Wp tUS/VIM6bokV3JxvfJ7+ggcIyItJ1dvyOaZaQZ7sVEIuAIe/N/jC3VlKHCIVhnpeRIK9 aPDwv/CDJG+szBn9xZmqE393Y/uSKwl7SA8to7FSChssTVey1Filxt8iWMyncmk3p91m IWIQ== 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=ao0b9SWr4K1uMMglAI9pQiJY6csgtAAxNiaqGNs4iMk=; b=CCruR01xrx2j9v0KjOdfqNAsKg/uAfWdM2owDZDZv2+RcHbLvjuQrF+Ris/gR76rw+ BkP62IGiMmADk433umnBAHYjisCErsvpSMKS2CMdP2ZVHvDarsYqDCMaTyRQKL1zsBnx niKuaYhL8oP6UN1n9EguyarH35Hv5950PvZquceRUL6oxuZUum9tveVTKODIP1EpHqpb YCF7Epk9ss8bSmORDxa4cAnaoGlBpSy+ZDjmSK/bH0gPkOVIlermAktZncrBVTy2pxUr 3wuRqXZ6sIZVEOb5i6uavGYgjFcopptC8n3rgRiS5ARGTqeWBi18fgKWj28meTLT8kZg dXIg== X-Gm-Message-State: AOAM532VJZfGzjPSL93JWfAN2Egm4hRYpV4lTvM5D7oYclraEeA+mcy/ 1AafYO8TuhjANttKIE8XjIuEWrkofzr3 X-Google-Smtp-Source: ABdhPJxS981/qfGqVamAS7vUL+eulQvFZOOVJXsweJ0Mj0SFfDO4j+3T10ZZbBbE0xQWvNrqtMtTEsf15ari X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:5f6f:a698:92a:5d45]) (user=irogers job=sendgmr) by 2002:a25:3b8b:0:b0:63d:f010:ed04 with SMTP id i133-20020a253b8b000000b0063df010ed04mr24813034yba.591.1649778506887; Tue, 12 Apr 2022 08:48:26 -0700 (PDT) Date: Tue, 12 Apr 2022 08:48:15 -0700 In-Reply-To: <20220412154817.2728324-1-irogers@google.com> Message-Id: <20220412154817.2728324-3-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 2/4] 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. --- 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 | 11 ++++++----- tools/perf/util/symbol.h | 4 ++-- 6 files changed, 16 insertions(+), 11 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..cc4c46563802 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) @@ -1659,7 +1660,7 @@ int dso__load_bfd_symbols(struct dso *dso, const char= *debugfile) #undef bfd_asymbol_section #endif =20 - symbols__fixup_end(&dso->symbols); + symbols__fixup_end(&dso->symbols, dso->kernel !=3D DSO_SPACE__USER); symbols__fixup_duplicate(&dso->symbols); dso->adjust_symbols =3D 1; =20 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 Mon May 11 07:05:59 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 D04DEC433F5 for ; Tue, 12 Apr 2022 15:48:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357354AbiDLPu6 (ORCPT ); Tue, 12 Apr 2022 11:50:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41138 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357284AbiDLPus (ORCPT ); Tue, 12 Apr 2022 11:50:48 -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 75EB75FF33 for ; Tue, 12 Apr 2022 08:48:30 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2ec12272fb2so56698087b3.6 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=77tWtpFk64oIEc12HKEob6OxT3YhqRusvn5QmgD7ZHLpKkIwiHIKFYIQy9l+ZM8MNB KZnkcdD2oUhMgd06teGOagF8c0iCGsFtvIuDOyxONeYnlvsWuOBLv9VbEkFx6ZkeF8oV FPvqQjitZ0KzxhdP4Qw9jg7Ix3kZpWDRu/hmDtBkekwAwEzXv307fbrprRBlDupIVJt8 kZ+Pg77aWOfmq/T6IoX2xz0dUOA7NUvlr7uPT+Vr/xQK8uooNOVYud0a1191NUFOU9em OomiCN0t/WLpC+tT3RNflvvzT424Lsx5WxuFvxC402pYA63FzTWJxalNAKvlYukMQwvv jo/Q== X-Gm-Message-State: AOAM532Hzp16EJkfAt7QU40IBHBgNlnQf7gK4su9jFDSEyUt3XefOvhc ti6Vby1HKLaEHg9amXW1MOY2kcrBPaUx 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=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. --- 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 =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 Mon May 11 07:05:59 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 5D0BBC433FE for ; Tue, 12 Apr 2022 15:48:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357378AbiDLPvB (ORCPT ); Tue, 12 Apr 2022 11:51:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357310AbiDLPuv (ORCPT ); Tue, 12 Apr 2022 11:50:51 -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 44F9560047 for ; Tue, 12 Apr 2022 08:48:33 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-2eb7d137101so161685747b3.12 for ; Tue, 12 Apr 2022 08:48:33 -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=cK/G+RqonStF/h6xatk1gRDJ5hKKNHxh+2wJ+78igxE=; b=EIM0xpglnrgdDge6VWgBXN8lvGL/IrrgKxb8vdaNjShzxCRJlvFBrPzOrFHL5lp+I7 ugxJ9LYMkf/3GQfmoop9DJRQEjENOpNJfNzpxXmYPbZiWVJqpqBsRXdIa5RR1B6TQKWJ YJFpXMWb8qn2tkyio6rJzkXAQp98Uqc6E/PbJB6XFwzeMOX5Up+bWOHCWjdcJl1JfMUF 3XcxNbsZ7xCBuT1vK7ZqYnntZGrY4Rf803wSA4ZHCk2z8RKwhFmxRj6poLOsQ7HchQBi mAv2YzmyYPUdeyA5x4QiTA6n9DQ01xkP3U8h8p/loJfnObWqyPkuG7JiAJQZe8RjcdoK 73vQ== 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=cK/G+RqonStF/h6xatk1gRDJ5hKKNHxh+2wJ+78igxE=; b=z6eT8A9ZjB5ht1vreQRj/GDWTHoTrvZeSZrR6raNX5qvns6sGo6CPMDdV/U8B+FOnd UqtkdxorynEfF1MPQnKqmMd1T5P9168r5ZjsxCsD0R061KpaUvPExI/As1U1yZkcNAdx vN1Pd1dRfHO6w7vKpU6Y25uFdJQjtVjlDii2VmJvOroahc3nPCZyU2cz0yCMtwMk7hhr cR5C9jUVWTDlISr1mr+xbP28Iq4kOBpgcteqTQZPiEP0sgQlU5qUfkIUro4kqZ6O61ac yWuGnMMKWg3m42wMNGXuUE1tMEdJM4+AttEG9DyE5OmrlFkrjb2vIpTvti0wZGuB1M+y he6Q== X-Gm-Message-State: AOAM530aOtSXbB6CYVZnBPWYQj1/deigGeeyhC7DTwFvq4zs8w9F1gXs c5UjFxYARA4kdH1YflEtKYvlHTU2carW X-Google-Smtp-Source: ABdhPJzeeAZlsCG5jbITUmxEHUU6RdnBefMiXkuXksPrPKjHyVQMHFGwRGaloelAD/z0+JPjBhMnEenrZx10 X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:5f6f:a698:92a:5d45]) (user=irogers job=sendgmr) by 2002:a05:6902:1083:b0:63e:5325:d6b0 with SMTP id v3-20020a056902108300b0063e5325d6b0mr18951794ybu.431.1649778512269; Tue, 12 Apr 2022 08:48:32 -0700 (PDT) Date: Tue, 12 Apr 2022 08:48:17 -0700 In-Reply-To: <20220412154817.2728324-1-irogers@google.com> Message-Id: <20220412154817.2728324-5-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 4/4] 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/ --- 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