Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230606181936.bw62oyqswo7jomra@google.com>
In-Reply-To: <20230606181936.bw62oyqswo7jomra@google.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Wed, 7 Jun 2023 10:49:33 +0200
Message-ID: <CAMj1kXHqXTdm-zdeY7vUxEycQ8zymRSQYZsgOKvi77gC5=nL-A@mail.gmail.com>
Subject: Re: [PATCH] scripts/mksysmap: Ignore __pi_ local arm64 symbols
To:     =?UTF-8?Q?Pierre=2DCl=C3=A9ment_Tosi?= <ptosi@google.com>
Cc:     linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
        Masahiro Yamada <masahiroy@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, 6 Jun 2023 at 20:19, Pierre-Cl=C3=A9ment Tosi <ptosi@google.com> wr=
ote:
>
> Similarly to "__kvm_nvhe_", filter out any local symbol that was
> prefixed with "__pi_" (generated when CONFIG_RANDOMIZE_BASE=3Dy) when
> compiling System.map and in kallsyms.
>
> Signed-off-by: Pierre-Cl=C3=A9ment Tosi <ptosi@google.com>

Acked-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  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