From: Masahiro Yamada <masahiroy@kernel.org>
To: Ard Biesheuvel <ardb+git@google.com>
Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel <ardb@kernel.org>,
Arnd Bergmann <arnd@arndb.de>,
Martin KaFai Lau <martin.lau@linux.dev>,
linux-arch@vger.kernel.org, linux-kbuild@vger.kernel.org,
bpf@vger.kernel.org, Andrii Nakryiko <andrii@kernel.org>,
Jiri Olsa <olsajiri@gmail.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Kees Cook <keescook@chromium.org>
Subject: Re: [PATCH v4 1/3] kallsyms: Avoid weak references for kallsyms symbols
Date: Tue, 23 Apr 2024 22:44:26 +0900 [thread overview]
Message-ID: <CAK7LNAQi33YR35QZi3gX8Gfe-J3mfuEB5GWjmfT7W07mjmgKYw@mail.gmail.com> (raw)
In-Reply-To: <20240415162041.2491523-6-ardb+git@google.com>
On Tue, Apr 16, 2024 at 1:20 AM Ard Biesheuvel <ardb+git@google.com> wrote:
>
> From: Ard Biesheuvel <ardb@kernel.org>
>
> kallsyms is a directory of all the symbols in the vmlinux binary, and so
> creating it is somewhat of a chicken-and-egg problem, as its non-zero
> size affects the layout of the binary, and therefore the values of the
> symbols.
>
> For this reason, the kernel is linked more than once, and the first pass
> does not include any kallsyms data at all. For the linker to accept
> this, the symbol declarations describing the kallsyms metadata are
> emitted as having weak linkage, so they can remain unsatisfied. During
> the subsequent passes, the weak references are satisfied by the kallsyms
> metadata that was constructed based on information gathered from the
> preceding passes.
>
> Weak references lead to somewhat worse codegen, because taking their
> address may need to produce NULL (if the reference was unsatisfied), and
> this is not usually supported by RIP or PC relative symbol references.
>
> Given that these references are ultimately always satisfied in the final
> link, let's drop the weak annotation, and instead, provide fallback
> definitions in the linker script that are only emitted if an unsatisfied
> reference exists.
>
> While at it, drop the FRV specific annotation that these symbols reside
> in .rodata - FRV is long gone.
>
> Tested-by: Nick Desaulniers <ndesaulniers@google.com> # Boot
> Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> Acked-by: Arnd Bergmann <arnd@arndb.de>
> Link: https://lkml.kernel.org/r/20230504174320.3930345-1-ardb%40kernel.org
> Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
> ---
I dropped v5, and picked up this one.
Thanks.
> include/asm-generic/vmlinux.lds.h | 19 +++++++++++++
> kernel/kallsyms.c | 6 ----
> kernel/kallsyms_internal.h | 30 ++++++++------------
> 3 files changed, 31 insertions(+), 24 deletions(-)
>
> diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
> index f7749d0f2562..e8449be62058 100644
> --- a/include/asm-generic/vmlinux.lds.h
> +++ b/include/asm-generic/vmlinux.lds.h
> @@ -448,11 +448,30 @@
> #endif
> #endif
>
> +/*
> + * Some symbol definitions will not exist yet during the first pass of the
> + * link, but are guaranteed to exist in the final link. Provide preliminary
> + * definitions that will be superseded in the final link to avoid having to
> + * rely on weak external linkage, which requires a GOT when used in position
> + * independent code.
> + */
> +#define PRELIMINARY_SYMBOL_DEFINITIONS \
> + PROVIDE(kallsyms_addresses = .); \
> + PROVIDE(kallsyms_offsets = .); \
> + PROVIDE(kallsyms_names = .); \
> + PROVIDE(kallsyms_num_syms = .); \
> + PROVIDE(kallsyms_relative_base = .); \
> + PROVIDE(kallsyms_token_table = .); \
> + PROVIDE(kallsyms_token_index = .); \
> + PROVIDE(kallsyms_markers = .); \
> + PROVIDE(kallsyms_seqs_of_names = .);
> +
> /*
> * Read only Data
> */
> #define RO_DATA(align) \
> . = ALIGN((align)); \
> + PRELIMINARY_SYMBOL_DEFINITIONS \
> .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
> __start_rodata = .; \
> *(.rodata) *(.rodata.*) \
> diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
> index 18edd57b5fe8..22ea19a36e6e 100644
> --- a/kernel/kallsyms.c
> +++ b/kernel/kallsyms.c
> @@ -325,12 +325,6 @@ static unsigned long get_symbol_pos(unsigned long addr,
> unsigned long symbol_start = 0, symbol_end = 0;
> unsigned long i, low, high, mid;
>
> - /* This kernel should never had been booted. */
> - if (!IS_ENABLED(CONFIG_KALLSYMS_BASE_RELATIVE))
> - BUG_ON(!kallsyms_addresses);
> - else
> - BUG_ON(!kallsyms_offsets);
> -
> /* Do a binary search on the sorted kallsyms_addresses array. */
> low = 0;
> high = kallsyms_num_syms;
> diff --git a/kernel/kallsyms_internal.h b/kernel/kallsyms_internal.h
> index 27fabdcc40f5..85480274fc8f 100644
> --- a/kernel/kallsyms_internal.h
> +++ b/kernel/kallsyms_internal.h
> @@ -5,27 +5,21 @@
> #include <linux/types.h>
>
> /*
> - * These will be re-linked against their real values
> - * during the second link stage.
> + * These will be re-linked against their real values during the second link
> + * stage. Preliminary values must be provided in the linker script using the
> + * PROVIDE() directive so that the first link stage can complete successfully.
> */
> -extern const unsigned long kallsyms_addresses[] __weak;
> -extern const int kallsyms_offsets[] __weak;
> -extern const u8 kallsyms_names[] __weak;
> +extern const unsigned long kallsyms_addresses[];
> +extern const int kallsyms_offsets[];
> +extern const u8 kallsyms_names[];
>
> -/*
> - * Tell the compiler that the count isn't in the small data section if the arch
> - * has one (eg: FRV).
> - */
> -extern const unsigned int kallsyms_num_syms
> -__section(".rodata") __attribute__((weak));
> -
> -extern const unsigned long kallsyms_relative_base
> -__section(".rodata") __attribute__((weak));
> +extern const unsigned int kallsyms_num_syms;
> +extern const unsigned long kallsyms_relative_base;
>
> -extern const char kallsyms_token_table[] __weak;
> -extern const u16 kallsyms_token_index[] __weak;
> +extern const char kallsyms_token_table[];
> +extern const u16 kallsyms_token_index[];
>
> -extern const unsigned int kallsyms_markers[] __weak;
> -extern const u8 kallsyms_seqs_of_names[] __weak;
> +extern const unsigned int kallsyms_markers[];
> +extern const u8 kallsyms_seqs_of_names[];
>
> #endif // LINUX_KALLSYMS_INTERNAL_H_
> --
> 2.44.0.683.g7961c838ac-goog
>
>
--
Best Regards
Masahiro Yamada
next prev parent reply other threads:[~2024-04-23 13:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-15 16:20 [PATCH v4 0/3] kbuild: Avoid weak external linkage where possible Ard Biesheuvel
2024-04-15 16:20 ` [PATCH v4 1/3] kallsyms: Avoid weak references for kallsyms symbols Ard Biesheuvel
2024-04-23 13:44 ` Masahiro Yamada [this message]
2024-04-15 16:20 ` [PATCH v4 2/3] vmlinux: Avoid weak reference to notes section Ard Biesheuvel
2024-04-20 13:42 ` Masahiro Yamada
2024-04-15 16:20 ` [PATCH v4 3/3] btf: Avoid weak external references Ard Biesheuvel
2024-04-16 14:40 ` [PATCH v4 0/3] kbuild: Avoid weak external linkage where possible patchwork-bot+netdevbpf
2024-04-19 7:57 ` Ard Biesheuvel
2024-04-20 12:31 ` Masahiro Yamada
2024-04-20 12:35 ` Ard Biesheuvel
2024-04-20 13:41 ` Masahiro Yamada
2024-04-20 13:56 ` Ard Biesheuvel
2024-04-20 13:59 ` Ard Biesheuvel
2024-04-20 14:05 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK7LNAQi33YR35QZi3gX8Gfe-J3mfuEB5GWjmfT7W07mjmgKYw@mail.gmail.com \
--to=masahiroy@kernel.org \
--cc=andrii@kernel.org \
--cc=ardb+git@google.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=bpf@vger.kernel.org \
--cc=keescook@chromium.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=ndesaulniers@google.com \
--cc=olsajiri@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).