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 X-Spam-Level: X-Spam-Status: No, score=-28.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB6FDC07E9A for ; Wed, 14 Jul 2021 18:21:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95EE9613C5 for ; Wed, 14 Jul 2021 18:21:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229738AbhGNSYt (ORCPT ); Wed, 14 Jul 2021 14:24:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240038AbhGNSXu (ORCPT ); Wed, 14 Jul 2021 14:23:50 -0400 Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A5C6C061764 for ; Wed, 14 Jul 2021 11:20:58 -0700 (PDT) Received: by mail-lf1-x132.google.com with SMTP id y42so5212708lfa.3 for ; Wed, 14 Jul 2021 11:20:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YIyhhFVB7lAJhhYlHC8Aypf2fwXB60EEf6/ds0a06qs=; b=WjWBbDP+tcAoBdyhzpem1Lt+enhBtxIdl7M/LZz7pvw2fcnfLkxB9LPDvEnrEoF1d7 cN7vgiiYCkEXNbXuCy8FBQx+2pKOOHn8AUC2EyBSHQD1NnfdhyiW8CQNXiExKTPcfWh5 HHek690m5HL4ZA6zm3mVcPfE3SwmsNv2kAgTEb2QQ8PszDqWMmFrSzSNrigP9XtUcSRA huzgAwiB3oced8ka9MN9OPRc2k8ZBQvS/jcroEw+iI0hJAd6d9S+6F3eaw7fDlQC1//i AVFxM4Us8XoLCmwsvE5u8YxooJy5tSa40XWL6dn57LJ/g0HJtaLFUZejCGKjq/Ebzyz5 mijg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YIyhhFVB7lAJhhYlHC8Aypf2fwXB60EEf6/ds0a06qs=; b=tUmUmTcbEK9SR5ADUQyQssfPqNvpTjg67wn2KVEZLm6o3fe1u4+K9newHglH7AFbhe L4IJHCoAOPVJPmJR8eKAuRwxmaoTV35sTHAOdEGgFKJjJukfXuUKfDiYP0FA2RLGavd6 XaqsfNmNkWBVr5nnE8Sz0vvBWNjTQxk/AHIBfltE00/OdCPFHQSXVhWKJ13sgEKXSrky VGp20qx2j75DkBhqmkRlSH+1+TS+G+mB8vesM+kb2/ZwFym8tDHYhN5wsz2KSlnbRuhy Yy/nbcRnck0tSmpVTNoI0x2qqje2y0Ns8y/IzPRh5MohHGL7Xp+B83fdqMutIBy4Ahfk +3Zg== X-Gm-Message-State: AOAM530ajAttl9/zWNiF9mAuXKslsq5Wohzsi3DGRcOgiUrdFSnmjoQV Iy8fyTreZrdfxumDdJAEsauEtbz6LWtKtkb6qCf2pMISmn13RQ== X-Google-Smtp-Source: ABdhPJxnH4NvQGYqbyk8YkNhDQI/yZpwt8HCAd8tHuT3h7Tmoj24r5uK2DyIdsNuBU+BZee+ngnFx20Yy8qqdce7lNY= X-Received: by 2002:a19:4916:: with SMTP id w22mr9201976lfa.374.1626286856158; Wed, 14 Jul 2021 11:20:56 -0700 (PDT) MIME-Version: 1.0 References: <20210704202756.29107-1-ojeda@kernel.org> <20210704202756.29107-3-ojeda@kernel.org> In-Reply-To: <20210704202756.29107-3-ojeda@kernel.org> From: Nick Desaulniers Date: Wed, 14 Jul 2021 11:20:44 -0700 Message-ID: Subject: Re: [PATCH 02/17] kallsyms: increase maximum kernel symbol length to 512 To: ojeda@kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , rust-for-linux@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Alex Gaynor , Geoffrey Thomas , Finn Behrens , Adam Bratschi-Kaye , Wedson Almeida Filho Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: rust-for-linux@vger.kernel.org On Sun, Jul 4, 2021 at 1:28 PM wrote: > > From: Miguel Ojeda > > Rust symbols can become quite long due to namespacing introduced > by modules, types, traits, generics, etc. For instance, for: > > pub mod my_module { > pub struct MyType; > pub struct MyGenericType(T); > > pub trait MyTrait { > fn my_method() -> u32; > } > > impl MyTrait for MyGenericType { > fn my_method() -> u32 { > 42 > } > } > } > > generates a symbol of length 96 when using the upcoming v0 mangling scheme: > > _RNvXNtCshGpAVYOtgW1_7example9my_moduleINtB2_13MyGenericTypeNtB2_6MyTypeENtB2_7MyTrait9my_method For C++ demangling, we have c++filt. A quick search turned up: https://github.com/luser/rustfilt but if the v0 mangling scheme is upcoming, I doubt a repo that hasn't been updated supports an upcoming scheme. Is there a more official equivalent? Do we demangle rust symbols when printing a trace from a warn/panic? That would be nice. > > At the moment, Rust symbols may reach up to 300 in length. > Setting 512 as the maximum seems like a reasonable choice to > keep some headroom. > > Co-developed-by: Alex Gaynor > Signed-off-by: Alex Gaynor > Co-developed-by: Geoffrey Thomas > Signed-off-by: Geoffrey Thomas > Co-developed-by: Finn Behrens > Signed-off-by: Finn Behrens > Co-developed-by: Adam Bratschi-Kaye > Signed-off-by: Adam Bratschi-Kaye > Co-developed-by: Wedson Almeida Filho > Signed-off-by: Wedson Almeida Filho > Signed-off-by: Miguel Ojeda > --- > include/linux/kallsyms.h | 2 +- > kernel/livepatch/core.c | 4 ++-- > scripts/kallsyms.c | 2 +- > tools/include/linux/kallsyms.h | 2 +- > tools/include/linux/lockdep.h | 2 +- > tools/lib/perf/include/perf/event.h | 2 +- > tools/lib/symbol/kallsyms.h | 2 +- > 7 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h > index 465060acc98..5cdc6903abc 100644 > --- a/include/linux/kallsyms.h > +++ b/include/linux/kallsyms.h > @@ -14,7 +14,7 @@ > > #include > > -#define KSYM_NAME_LEN 128 > +#define KSYM_NAME_LEN 512 > #define KSYM_SYMBOL_LEN (sizeof("%s+%#lx/%#lx [%s]") + (KSYM_NAME_LEN - 1) + \ > 2*(BITS_PER_LONG*3/10) + (MODULE_NAME_LEN - 1) + 1) > > diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c > index 335d988bd81..73874e5edfd 100644 > --- a/kernel/livepatch/core.c > +++ b/kernel/livepatch/core.c > @@ -213,7 +213,7 @@ static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab, > * we use the smallest/strictest upper bound possible (56, based on > * the current definition of MODULE_NAME_LEN) to prevent overflows. > */ > - BUILD_BUG_ON(MODULE_NAME_LEN < 56 || KSYM_NAME_LEN != 128); > + BUILD_BUG_ON(MODULE_NAME_LEN < 56 || KSYM_NAME_LEN != 512); > > relas = (Elf_Rela *) relasec->sh_addr; > /* For each rela in this klp relocation section */ > @@ -227,7 +227,7 @@ static int klp_resolve_symbols(Elf64_Shdr *sechdrs, const char *strtab, > > /* Format: .klp.sym.sym_objname.sym_name,sympos */ > cnt = sscanf(strtab + sym->st_name, > - ".klp.sym.%55[^.].%127[^,],%lu", > + ".klp.sym.%55[^.].%511[^,],%lu", > sym_objname, sym_name, &sympos); > if (cnt != 3) { > pr_err("symbol %s has an incorrectly formatted name\n", > diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c > index bcdabee13aa..9bab5f55ade 100644 > --- a/scripts/kallsyms.c > +++ b/scripts/kallsyms.c > @@ -27,7 +27,7 @@ > > #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0])) > > -#define KSYM_NAME_LEN 128 > +#define KSYM_NAME_LEN 512 > > struct sym_entry { > unsigned long long addr; > diff --git a/tools/include/linux/kallsyms.h b/tools/include/linux/kallsyms.h > index efb6c3f5f2a..5a37ccbec54 100644 > --- a/tools/include/linux/kallsyms.h > +++ b/tools/include/linux/kallsyms.h > @@ -6,7 +6,7 @@ > #include > #include > > -#define KSYM_NAME_LEN 128 > +#define KSYM_NAME_LEN 512 > > struct module; > > diff --git a/tools/include/linux/lockdep.h b/tools/include/linux/lockdep.h > index e56997288f2..d9c163f3ab2 100644 > --- a/tools/include/linux/lockdep.h > +++ b/tools/include/linux/lockdep.h > @@ -47,7 +47,7 @@ static inline int debug_locks_off(void) > > #define task_pid_nr(tsk) ((tsk)->pid) > > -#define KSYM_NAME_LEN 128 > +#define KSYM_NAME_LEN 512 > #define printk(...) dprintf(STDOUT_FILENO, __VA_ARGS__) > #define pr_err(format, ...) fprintf (stderr, format, ## __VA_ARGS__) > #define pr_warn pr_err > diff --git a/tools/lib/perf/include/perf/event.h b/tools/lib/perf/include/perf/event.h > index 4d0c02ba3f7..095d60144a7 100644 > --- a/tools/lib/perf/include/perf/event.h > +++ b/tools/lib/perf/include/perf/event.h > @@ -95,7 +95,7 @@ struct perf_record_throttle { > }; > > #ifndef KSYM_NAME_LEN > -#define KSYM_NAME_LEN 256 > +#define KSYM_NAME_LEN 512 > #endif > > struct perf_record_ksymbol { > diff --git a/tools/lib/symbol/kallsyms.h b/tools/lib/symbol/kallsyms.h > index 72ab9870454..542f9b059c3 100644 > --- a/tools/lib/symbol/kallsyms.h > +++ b/tools/lib/symbol/kallsyms.h > @@ -7,7 +7,7 @@ > #include > > #ifndef KSYM_NAME_LEN > -#define KSYM_NAME_LEN 256 > +#define KSYM_NAME_LEN 512 > #endif > > static inline u8 kallsyms2elf_binding(char type) > -- > 2.32.0 > -- Thanks, ~Nick Desaulniers