Commit 015e7b0b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'bpf-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 

Pull bpf updates from Alexei Starovoitov:

 - Convert selftests/bpf/test_tc_edt and test_tc_tunnel from .sh to
   test_progs runner (Alexis Lothoré)

 - Convert selftests/bpf/test_xsk to test_progs runner (Bastien
   Curutchet)

 - Replace bpf memory allocator with kmalloc_nolock() in
   bpf_local_storage (Amery Hung), and in bpf streams and range tree
   (Puranjay Mohan)

 - Introduce support for indirect jumps in BPF verifier and x86 JIT
   (Anton Protopopov) and arm64 JIT (Puranjay Mohan)

 - Remove runqslower bpf tool (Hoyeon Lee)

 - Fix corner cases in the verifier to close several syzbot reports
   (Eduard Zingerman, KaFai Wan)

 - Several improvements in deadlock detection in rqspinlock (Kumar
   Kartikeya Dwivedi)

 - Implement "jmp" mode for BPF trampoline and corresponding
   DYNAMIC_FTRACE_WITH_JMP. It improves "fexit" program type performance
   from 80 M/s to 136 M/s. With Steven's Ack. (Menglong Dong)

 - Add ability to test non-linear skbs in BPF_PROG_TEST_RUN (Paul
   Chaignon)

 - Do not let BPF_PROG_TEST_RUN emit invalid GSO types to stack (Daniel
   Borkmann)

 - Generalize buildid reader into bpf_dynptr (Mykyta Yatsenko)

 - Optimize bpf_map_update_elem() for map-in-map types (Ritesh
   Oedayrajsingh Varma)

 - Introduce overwrite mode for BPF ring buffer (Xu Kuohai)

* tag 'bpf-next-6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (169 commits)
  bpf: optimize bpf_map_update_elem() for map-in-map types
  bpf: make kprobe_multi_link_prog_run always_inline
  selftests/bpf: do not hardcode target rate in test_tc_edt BPF program
  selftests/bpf: remove test_tc_edt.sh
  selftests/bpf: integrate test_tc_edt into test_progs
  selftests/bpf: rename test_tc_edt.bpf.c section to expose program type
  selftests/bpf: Add success stats to rqspinlock stress test
  rqspinlock: Precede non-head waiter queueing with AA check
  rqspinlock: Disable spinning for trylock fallback
  rqspinlock: Use trylock fallback when per-CPU rqnode is busy
  rqspinlock: Perform AA checks immediately
  rqspinlock: Enclose lock/unlock within lock entry acquisitions
  bpf: Remove runqslower tool
  selftests/bpf: Remove usage of lsm/file_alloc_security in selftest
  bpf: Disable file_alloc_security hook
  bpf: check for insn arrays in check_ptr_alignment
  bpf: force BPF_F_RDONLY_PROG on insn array creation
  bpf: Fix exclusive map memory leak
  selftests/bpf: Make CS length configurable for rqspinlock stress test
  selftests/bpf: Add lock wait time stats to rqspinlock stress test
  ...
parents b6d99331 ff34657a

Documentation/bpf/libbpf/program_types.rst

+18 −0
Original line number Diff line number Diff line
@@ -100,10 +100,26 @@ described in more detail in the footnotes. 
|                                           |                                        | ``uretprobe.s+`` [#uprobe]_      | Yes       |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``usdt+`` [#usdt]_               |           |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``usdt.s+`` [#usdt]_             | Yes       |

+                                           +----------------------------------------+----------------------------------+-----------+

|                                           | ``BPF_TRACE_KPROBE_MULTI``             | ``kprobe.multi+`` [#kpmulti]_    |           |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``kretprobe.multi+`` [#kpmulti]_ |           |

+                                           +----------------------------------------+----------------------------------+-----------+

|                                           | ``BPF_TRACE_KPROBE_SESSION``           | ``kprobe.session+`` [#kpmulti]_  |           |

+                                           +----------------------------------------+----------------------------------+-----------+

|                                           | ``BPF_TRACE_UPROBE_MULTI``             | ``uprobe.multi+`` [#upmul]_      |           |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``uprobe.multi.s+`` [#upmul]_    | Yes       |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``uretprobe.multi+`` [#upmul]_   |           |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``uretprobe.multi.s+`` [#upmul]_ | Yes       |

+                                           +----------------------------------------+----------------------------------+-----------+

|                                           | ``BPF_TRACE_UPROBE_SESSION``           | ``uprobe.session+`` [#upmul]_    |           |

+                                           +                                        +----------------------------------+-----------+

|                                           |                                        | ``uprobe.session.s+`` [#upmul]_  | Yes       |

+-------------------------------------------+----------------------------------------+----------------------------------+-----------+

| ``BPF_PROG_TYPE_LIRC_MODE2``              | ``BPF_LIRC_MODE2``                     | ``lirc_mode2``                   |           |

+-------------------------------------------+----------------------------------------+----------------------------------+-----------+
@@ -219,6 +235,8 @@ described in more detail in the footnotes. 
             non-negative integer.

.. [#ksyscall] The ``ksyscall`` attach format is ``ksyscall/<syscall>``.

.. [#uprobe] The ``uprobe`` attach format is ``uprobe[.s]/<path>:<function>[+<offset>]``.

.. [#upmul] The ``uprobe.multi`` attach format is ``uprobe.multi[.s]/<path>:<function-pattern>``

            where ``function-pattern`` supports ``*`` and ``?`` wildcards.

.. [#usdt] The ``usdt`` attach format is ``usdt/<path>:<provider>:<name>``.

.. [#kpmulti] The ``kprobe.multi`` attach format is ``kprobe.multi/<pattern>`` where ``pattern``

              supports ``*`` and ``?`` wildcards. Valid characters for pattern are

Documentation/bpf/map_array.rst

+3 −2
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ of constant size. The size of the array is defined in ``max_entries`` at 
creation time. All array elements are pre-allocated and zero initialized when

created. ``BPF_MAP_TYPE_PERCPU_ARRAY`` uses a different memory region for each

CPU whereas ``BPF_MAP_TYPE_ARRAY`` uses the same memory region. The value

stored can be of any size, however, all array elements are aligned to 8

bytes.

stored can be of any size for ``BPF_MAP_TYPE_ARRAY`` and not more than

``PCPU_MIN_UNIT_SIZE`` (32 kB) for ``BPF_MAP_TYPE_PERCPU_ARRAY``. All

array elements are aligned to 8 bytes.



Since kernel 5.5, memory mapping may be enabled for ``BPF_MAP_TYPE_ARRAY`` by

setting the flag ``BPF_F_MMAPABLE``. The map definition is page-aligned and

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4654,6 +4654,7 @@ F: Documentation/userspace-api/ebpf/ 
F:	arch/*/net/*

F:	include/linux/bpf*

F:	include/linux/btf*

F:	include/linux/buildid.h

F:	include/linux/filter.h

F:	include/trace/events/xdp.h

F:	include/uapi/linux/bpf*

arch/arm64/net/bpf_jit_comp.c

+18 −7
Original line number Diff line number Diff line
@@ -1452,6 +1452,10 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, 
		emit(A64_ASR(is64, dst, dst, imm), ctx);

		break;



	/* JUMP reg */

	case BPF_JMP | BPF_JA | BPF_X:

		emit(A64_BR(dst), ctx);

		break;

	/* JUMP off */

	case BPF_JMP | BPF_JA:

	case BPF_JMP32 | BPF_JA:
@@ -2231,6 +2235,13 @@ struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog) 
		for (i = 0; i <= prog->len; i++)

			ctx.offset[i] *= AARCH64_INSN_SIZE;

		bpf_prog_fill_jited_linfo(prog, ctx.offset + 1);

		/*

		 * The bpf_prog_update_insn_ptrs function expects offsets to

		 * point to the first byte of the jitted instruction (unlike

		 * the bpf_prog_fill_jited_linfo above, which, for historical

		 * reasons, expects to point to the next instruction)

		 */

		bpf_prog_update_insn_ptrs(prog, ctx.offset, ctx.ro_image);

out_off:

		if (!ro_header && priv_stack_ptr) {

			free_percpu(priv_stack_ptr);
@@ -2923,8 +2934,9 @@ static int gen_branch_or_nop(enum aarch64_insn_branch_type type, void *ip, 
 * The dummy_tramp is used to prevent another CPU from jumping to unknown

 * locations during the patching process, making the patching process easier.

 */

int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type,

		       void *old_addr, void *new_addr)

int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,

		       enum bpf_text_poke_type new_t, void *old_addr,

		       void *new_addr)

{

	int ret;

	u32 old_insn;
@@ -2968,14 +2980,13 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type, 
		    !poking_bpf_entry))

		return -EINVAL;



	if (poke_type == BPF_MOD_CALL)

		branch_type = AARCH64_INSN_BRANCH_LINK;

	else

		branch_type = AARCH64_INSN_BRANCH_NOLINK;



	branch_type = old_t == BPF_MOD_CALL ? AARCH64_INSN_BRANCH_LINK :

					      AARCH64_INSN_BRANCH_NOLINK;

	if (gen_branch_or_nop(branch_type, ip, old_addr, plt, &old_insn) < 0)

		return -EFAULT;



	branch_type = new_t == BPF_MOD_CALL ? AARCH64_INSN_BRANCH_LINK :

					      AARCH64_INSN_BRANCH_NOLINK;

	if (gen_branch_or_nop(branch_type, ip, new_addr, plt, &new_insn) < 0)

		return -EFAULT;

arch/loongarch/net/bpf_jit.c

+6 −3
Original line number Diff line number Diff line
@@ -1284,11 +1284,12 @@ void *bpf_arch_text_copy(void *dst, void *src, size_t len) 
	return ret ? ERR_PTR(-EINVAL) : dst;

}



int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type,

		       void *old_addr, void *new_addr)

int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type old_t,

		       enum bpf_text_poke_type new_t, void *old_addr,

		       void *new_addr)

{

	int ret;

	bool is_call = (poke_type == BPF_MOD_CALL);

	bool is_call;

	u32 old_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};

	u32 new_insns[LOONGARCH_LONG_JUMP_NINSNS] = {[0 ... 4] = INSN_NOP};
@@ -1298,6 +1299,7 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type, 
	if (!is_bpf_text_address((unsigned long)ip))

		return -ENOTSUPP;



	is_call = old_t == BPF_MOD_CALL;

	ret = emit_jump_or_nops(old_addr, ip, old_insns, is_call);

	if (ret)

		return ret;
@@ -1305,6 +1307,7 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type poke_type, 
	if (memcmp(ip, old_insns, LOONGARCH_LONG_JUMP_NBYTES))

		return -EFAULT;



	is_call = new_t == BPF_MOD_CALL;

	ret = emit_jump_or_nops(new_addr, ip, new_insns, is_call);

	if (ret)

		return ret;