Re: [PATCH bpf-next v13 3/3] arm64/cfi,bpf: Support kCFI + BPF on arm64

[Alexei Starovoitov]

On Tue, Jul 22, 2025 at 1:54 PM Sami Tolvanen <samitolvanen@xxxxxxxxxx> wrote:
>
> From: Puranjay Mohan <puranjay12@xxxxxxxxx>
>
> Currently, bpf_dispatcher_*_func() is marked with `__nocfi` therefore
> calling BPF programs from this interface doesn't cause CFI warnings.
>
> When BPF programs are called directly from C: from BPF helpers or
> struct_ops, CFI warnings are generated.
>
> Implement proper CFI prologues for the BPF programs and callbacks and
> drop __nocfi for arm64. Fix the trampoline generation code to emit kCFI
> prologue when a struct_ops trampoline is being prepared.
>
> Signed-off-by: Puranjay Mohan <puranjay12@xxxxxxxxx>
> Co-developed-by: Maxwell Bland <mbland@xxxxxxxxxxxx>
> Signed-off-by: Maxwell Bland <mbland@xxxxxxxxxxxx>
> Co-developed-by: Sami Tolvanen <samitolvanen@xxxxxxxxxx>
> Signed-off-by: Sami Tolvanen <samitolvanen@xxxxxxxxxx>
> Tested-by: Dao Huang <huangdao1@xxxxxxxx>
> Acked-by: Will Deacon <will@xxxxxxxxxx>
> ---
>  arch/arm64/include/asm/cfi.h  |  7 +++++++
>  arch/arm64/net/bpf_jit_comp.c | 30 +++++++++++++++++++++++++++---

Unfortunately there is a conflict. Please respin.

--
pw-bot: cr