On Tue, Oct 24, 2023 at 03:45:54PM -0700, Song Liu wrote: > This set enables allocating bpf trampoline from bpf_prog_pack on x86. The > majority of this work, however, is the refactoring of trampoline code. > This is needed because we need to handle 4 archs and 2 users (trampoline > and struct_ops). > > 1/7 through 6/7 refactors trampoline code. A few helpers are added. > 7/7 finally let bpf trampoline on x86 use bpf_prog_pack. > > Changes in v5: > 1. Adjust size of trampoline ksym. (Jiri) > 2. Use "unsigned int size" arg in image management helpers.(Daniel) > > Changes in v4: > 1. Dropped 1/8 in v3, which is already merged in bpf-next. > 2. Add Reviewed-by from Björn Töpel. > > Changes in v3: > 1. Fix bug in s390. (Thanks to Ilya Leoshkevich). > 2. Fix build error in riscv. (kernel test robot). > > Changes in v2: > 1. Add missing changes in net/bpf/bpf_dummy_struct_ops.c. > 2. Reduce one dry run in arch_prepare_bpf_trampoline. (Xu Kuohai) > 3. Other small fixes. > > Song Liu (7): > bpf: Let bpf_prog_pack_free handle any pointer > bpf: Adjust argument names of arch_prepare_bpf_trampoline() > bpf: Add helpers for trampoline image management > bpf, x86: Adjust arch_prepare_bpf_trampoline return value > bpf: Add arch_bpf_trampoline_size() > bpf: Use arch_bpf_trampoline_size > x86, bpf: Use bpf_prog_pack for bpf trampoline Acked-by: Jiri Olsa <jolsa@xxxxxxxxxx> jirka > > arch/arm64/net/bpf_jit_comp.c | 55 +++++++++----- > arch/riscv/net/bpf_jit_comp64.c | 25 ++++--- > arch/s390/net/bpf_jit_comp.c | 56 +++++++++------ > arch/x86/net/bpf_jit_comp.c | 124 +++++++++++++++++++++++++------- > include/linux/bpf.h | 14 +++- > include/linux/filter.h | 2 +- > kernel/bpf/bpf_struct_ops.c | 19 +++-- > kernel/bpf/core.c | 21 +++--- > kernel/bpf/dispatcher.c | 7 +- > kernel/bpf/trampoline.c | 101 +++++++++++++++++++------- > net/bpf/bpf_dummy_struct_ops.c | 7 +- > 11 files changed, 299 insertions(+), 132 deletions(-) > > -- > 2.34.1