2023-06-06 18:33:03

by Pierre-Clément Tosi

Subject: [PATCH] scripts/mksysmap: Ignore __pi_ local arm64 symbols

Similarly to "__kvm_nvhe_", filter out any local symbol that was
prefixed with "__pi_" (generated when CONFIG_RANDOMIZE_BASE=y) when
compiling System.map and in kallsyms.

Signed-off-by: Pierre-Clément Tosi <[email protected]>
---
scripts/mksysmap | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/scripts/mksysmap b/scripts/mksysmap
index cb3b1fff3eee..a7de0f637cc7 100755
--- a/scripts/mksysmap
+++ b/scripts/mksysmap
@@ -40,6 +40,10 @@ ${NM} -n ${1} | sed >${2} -e "
# arm64 EFI stub namespace
/ __efistub_/d

+# arm64 local symbols in PIE namespace
+/ __pi_\\$/d
+/ __pi_\.L/d
+
# arm64 local symbols in non-VHE KVM namespace
/ __kvm_nvhe_\$/d
/ __kvm_nvhe_\.L/d
--
2.41.0.rc0.172.g3f132b7071-goog


--
Pierre

2023-06-07 08:58:47

by Ard Biesheuvel

Subject: Re: [PATCH] scripts/mksysmap: Ignore __pi_ local arm64 symbols

On Tue, 6 Jun 2023 at 20:19, Pierre-Clément Tosi <[email protected]> wrote:
>
> Similarly to "__kvm_nvhe_", filter out any local symbol that was
> prefixed with "__pi_" (generated when CONFIG_RANDOMIZE_BASE=y) when
> compiling System.map and in kallsyms.
>
> Signed-off-by: Pierre-Clément Tosi <[email protected]>

Acked-by: Ard Biesheuvel <[email protected]>

> ---
> scripts/mksysmap | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/mksysmap b/scripts/mksysmap
> index cb3b1fff3eee..a7de0f637cc7 100755
> --- a/scripts/mksysmap
> +++ b/scripts/mksysmap
> @@ -40,6 +40,10 @@ ${NM} -n ${1} | sed >${2} -e "
> # arm64 EFI stub namespace
> / __efistub_/d
>
> +# arm64 local symbols in PIE namespace
> +/ __pi_\\$/d
> +/ __pi_\.L/d
> +
> # arm64 local symbols in non-VHE KVM namespace
> / __kvm_nvhe_\$/d
> / __kvm_nvhe_\.L/d
> --
> 2.41.0.rc0.172.g3f132b7071-goog
>
>
> --
> Pierre

2023-06-07 12:48:34

by Masahiro Yamada

Subject: Re: [PATCH] scripts/mksysmap: Ignore __pi_ local arm64 symbols

On Wed, Jun 7, 2023 at 3:19 AM Pierre-Clément Tosi <[email protected]> wrote:
>
> Similarly to "__kvm_nvhe_", filter out any local symbol that was
> prefixed with "__pi_" (generated when CONFIG_RANDOMIZE_BASE=y) when
> compiling System.map and in kallsyms.
>
> Signed-off-by: Pierre-Clément Tosi <[email protected]>
> ---


Applied to linux-kbuild. Thanks.



> scripts/mksysmap | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/scripts/mksysmap b/scripts/mksysmap
> index cb3b1fff3eee..a7de0f637cc7 100755
> --- a/scripts/mksysmap
> +++ b/scripts/mksysmap
> @@ -40,6 +40,10 @@ ${NM} -n ${1} | sed >${2} -e "
> # arm64 EFI stub namespace
> / __efistub_/d
>
> +# arm64 local symbols in PIE namespace
> +/ __pi_\\$/d
> +/ __pi_\.L/d
> +
> # arm64 local symbols in non-VHE KVM namespace
> / __kvm_nvhe_\$/d
> / __kvm_nvhe_\.L/d
> --
> 2.41.0.rc0.172.g3f132b7071-goog
>
>
> --
> Pierre



--
Best Regards
Masahiro Yamada