Received-SPF: pass (google.com: domain of linux-kernel+bounces-211978-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Precedence: bulk
MIME-Version: 1.0
References: <illfkwuxwq3adca2h4shibz2xub62kku3g2wte4sqp7xj7cwkb@ckn3qg7zxjuv> <c6fsgv7bjt2d2ejz2uuin2g475fkvpyenp32wehdqlcf6ihqgx@5gicsaw4u37f>
In-Reply-To: <c6fsgv7bjt2d2ejz2uuin2g475fkvpyenp32wehdqlcf6ihqgx@5gicsaw4u37f>
From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
Date: Wed, 12 Jun 2024 10:07:09 -0700
Message-ID: <CAADnVQK6Vh-pv_ewS0RjBBfL5KUsMXpdMNFvv5F0OPWzABEsAw@mail.gmail.com>
Subject: Re: [PATCH bpf-next v6 3/3] arm64/cfi,bpf: Use DEFINE_CFI_TYPE in arm64
To: Maxwell Bland <mbland@motorola.com>
Cc: "open list:BPF [GENERAL] (Safe Dynamic Programs and Tools)" <bpf@vger.kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, 
	Will Deacon <will@kernel.org>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, 
	Andrii Nakryiko <andrii@kernel.org>, Martin KaFai Lau <martin.lau@linux.dev>, 
	Eduard Zingerman <eddyz87@gmail.com>, Song Liu <song@kernel.org>, 
	Yonghong Song <yonghong.song@linux.dev>, John Fastabend <john.fastabend@gmail.com>, 
	KP Singh <kpsingh@kernel.org>, Stanislav Fomichev <sdf@google.com>, Hao Luo <haoluo@google.com>, 
	Jiri Olsa <jolsa@kernel.org>, Zi Shen Lim <zlim.lnx@gmail.com>, 
	Mark Rutland <mark.rutland@arm.com>, Suzuki K Poulose <suzuki.poulose@arm.com>, 
	Mark Brown <broonie@kernel.org>, 
	linux-arm-kernel <linux-arm-kernel@lists.infradead.org>, 
	open list <linux-kernel@vger.kernel.org>, Josh Poimboeuf <jpoimboe@kernel.org>, 
	Puranjay Mohan <puranjay12@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Wed, Jun 12, 2024 at 8:32=E2=80=AFAM Maxwell Bland <mbland@motorola.com>=
 wrote:
>
> Corrects Puranjay Mohan's commit to adopt Mark Rutland's
> suggestion of using a C CFI type macro in kCFI+BPF.
>
> Signed-off-by: Maxwell Bland <mbland@motorola.com>
> ---
>  arch/arm64/kernel/alternative.c | 46 ++++-----------------------------
>  1 file changed, 5 insertions(+), 41 deletions(-)
>
> diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternat=
ive.c
> index 1715da7df137..d7a58eca7665 100644
> --- a/arch/arm64/kernel/alternative.c
> +++ b/arch/arm64/kernel/alternative.c
> @@ -8,6 +8,7 @@
>
>  #define pr_fmt(fmt) "alternatives: " fmt
>
> +#include <linux/cfi_types.h>
>  #include <linux/init.h>
>  #include <linux/cpu.h>
>  #include <linux/elf.h>
> @@ -302,53 +303,16 @@ EXPORT_SYMBOL(alt_cb_patch_nops);
>
>  #ifdef CONFIG_CFI_CLANG
>  struct bpf_insn;
> -
>  /* Must match bpf_func_t / DEFINE_BPF_PROG_RUN() */
>  extern unsigned int __bpf_prog_runX(const void *ctx,
>                                     const struct bpf_insn *insn);
> -
> -/*
> - * Force a reference to the external symbol so the compiler generates
> - * __kcfi_typid.
> - */
> -__ADDRESSABLE(__bpf_prog_runX);
> -
> -/* u32 __ro_after_init cfi_bpf_hash =3D __kcfi_typeid___bpf_prog_runX; *=
/
> -asm (
> -"      .pushsection    .data..ro_after_init,\"aw\",@progbits   \n"
> -"      .type   cfi_bpf_hash,@object                            \n"
> -"      .globl  cfi_bpf_hash                                    \n"
> -"      .p2align        2, 0x0                                  \n"
> -"cfi_bpf_hash:                                                 \n"
> -"      .word   __kcfi_typeid___bpf_prog_runX                   \n"
> -"      .size   cfi_bpf_hash, 4                                 \n"
> -"      .popsection                                             \n"
> -);
> -
> +DEFINE_CFI_TYPE(cfi_bpf_hash, __bpf_prog_runX);
>  /* Must match bpf_callback_t */
>  extern u64 __bpf_callback_fn(u64, u64, u64, u64, u64);
> -
> -__ADDRESSABLE(__bpf_callback_fn);
> -
> -/* u32 __ro_after_init cfi_bpf_subprog_hash =3D __kcfi_typeid___bpf_call=
back_fn; */
> -asm (
> -"      .pushsection    .data..ro_after_init,\"aw\",@progbits   \n"
> -"      .type   cfi_bpf_subprog_hash,@object                    \n"
> -"      .globl  cfi_bpf_subprog_hash                            \n"
> -"      .p2align        2, 0x0                                  \n"
> -"cfi_bpf_subprog_hash:                                         \n"
> -"      .word   __kcfi_typeid___bpf_callback_fn                 \n"
> -"      .size   cfi_bpf_subprog_hash, 4                         \n"
> -"      .popsection                                             \n"
> -);
> -
> +DEFINE_CFI_TYPE(cfi_bpf_subprog_hash, __bpf_callback_fn);
>  u32 cfi_get_func_hash(void *func)
>  {
> -       u32 hash;
> -
> -       if (get_kernel_nofault(hash, func - cfi_get_offset()))
> -               return 0;
> -
> -       return hash;
> +       u32 *hashp =3D func - cfi_get_offset();
> +       return READ_ONCE(*hashp);

Please avoid the code churn.
Just squash it into the previous patch.

pw-bot: cr