[v7,bpf-next,0/7] Allocate bpf trampoline on bpf_prog_pack

Message

Song Liu Dec. 6, 2023, 10:40 p.m. UTC

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 v7:
1. Use kvmalloc for rw_image in x86/arch_prepare_bpf_trampoline. (Alexei)
2. Add comment to explain why we cannot use kvmalloc in
   x86/arch_bpf_trampoline_size. (Alexei)

Changes in v6:
1. Rebase.
2. Add Acked-by and Tested-by from Jiri Olsa and Björn Töpel.

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

 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     | 130 +++++++++++++++++++++++++-------
 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, 305 insertions(+), 132 deletions(-)

--
2.34.1

Comments

[e-mail] Dec. 7, 2023, 1:40 a.m. UTC | #1

Hello:

This series was applied to bpf/bpf-next.git (master)
by Alexei Starovoitov <[e-mail]>:

On Wed,  6 Dec 2023 14:40:47 -0800 you 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.
> 
> [...]

Here is the summary with links:
  - [v7,bpf-next,1/7] bpf: Let bpf_prog_pack_free handle any pointer
    https://git.kernel.org/bpf/bpf-next/c/f08a1c658257
  - [v7,bpf-next,2/7] bpf: Adjust argument names of arch_prepare_bpf_trampoline()
    https://git.kernel.org/bpf/bpf-next/c/7a3d9a159b17
  - [v7,bpf-next,3/7] bpf: Add helpers for trampoline image management
    https://git.kernel.org/bpf/bpf-next/c/82583daa2efc
  - [v7,bpf-next,4/7] bpf, x86: Adjust arch_prepare_bpf_trampoline return value
    https://git.kernel.org/bpf/bpf-next/c/38b8b58ae776
  - [v7,bpf-next,5/7] bpf: Add arch_bpf_trampoline_size()
    https://git.kernel.org/bpf/bpf-next/c/96d1b7c081c0
  - [v7,bpf-next,6/7] bpf: Use arch_bpf_trampoline_size
    https://git.kernel.org/bpf/bpf-next/c/26ef208c209a
  - [v7,bpf-next,7/7] x86, bpf: Use bpf_prog_pack for bpf trampoline
    https://git.kernel.org/bpf/bpf-next/c/3ba026fca878

You are awesome, thank you!