Changes v7 => v8: 1. Rebase and fix conflicts. 2. Lock text_mutex for text_poke_copy. (Daniel) Changes v6 => v7: 1. Redesign the interface between generic and arch logic, based on feedback from Alexei and Ilya. 2. Split 6/7 of v6 to 7/9 and 8/9 in v7, for cleaner logic. 3. Add bpf_arch_text_copy in 6/9. Changes v5 => v6: 1. Make jit_hole_buffer 128 byte long. Only fill the first and last 128 bytes of header with INT3. (Alexei) 2. Use kvmalloc for temporary buffer. (Alexei) 3. Rename tmp_header/tmp_image => rw_header/rw_image. Remove tmp_image from x64_jit_data. (Alexei) 4. Change fall back round_up_to in bpf_jit_binary_alloc_pack() from BPF_PROG_MAX_PACK_PROG_SIZE to PAGE_SIZE. Changes v4 => v5: 1. Do not use atomic64 for bpf_jit_current. (Alexei) Changes v3 => v4: 1. Rename text_poke_jit() => text_poke_copy(). (Peter) 2. Change comment style. (Peter) Changes v2 => v3: 1. Fix tailcall. Changes v1 => v2: 1. Use text_poke instead of writing through linear mapping. (Peter) 2. Avoid making changes to non-x86_64 code. Most BPF programs are small, but they consume a page each. For systems with busy traffic and many BPF programs, this could also add significant pressure to instruction TLB. This set tries to solve this problem with customized allocator that pack multiple programs into a huge page. Patches 1-6 prepare the work. Patch 7 contains key logic of bpf_prog_pack allocator. Patch 8 contains bpf_jit_binary_pack_alloc logic on top of bpf_prog_pack allocator. Patch 9 uses this allocator in x86_64 jit. Song Liu (9): x86/Kconfig: select HAVE_ARCH_HUGE_VMALLOC with HAVE_ARCH_HUGE_VMAP bpf: use bytes instead of pages for bpf_jit_[charge|uncharge]_modmem bpf: use size instead of pages in bpf_binary_header bpf: use prog->jited_len in bpf_prog_ksym_set_addr() x86/alternative: introduce text_poke_copy bpf: introduce bpf_arch_text_copy bpf: introduce bpf_prog_pack allocator bpf: introduce bpf_jit_binary_pack_[alloc|finalize|free] bpf, x86_64: use bpf_jit_binary_pack_alloc arch/x86/Kconfig | 1 + arch/x86/include/asm/text-patching.h | 1 + arch/x86/kernel/alternative.c | 34 ++++ arch/x86/net/bpf_jit_comp.c | 65 ++++--- include/linux/bpf.h | 7 +- include/linux/filter.h | 27 +-- kernel/bpf/core.c | 269 +++++++++++++++++++++++++-- kernel/bpf/trampoline.c | 6 +- 8 files changed, 348 insertions(+), 62 deletions(-) -- 2.30.2
