Merge https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2022-07-02

We've added 7 non-merge commits during the last 14 day(s) which contain
a total of 6 files changed, 193 insertions(+), 86 deletions(-).

The main changes are:

1) Fix clearing of page contiguity when unmapping XSK pool, from Ivan Malov.

2) Two verifier fixes around bounds data propagation, from Daniel Borkmann.

3) Fix fprobe sample module's parameter descriptions, from Masami Hiramatsu.

4) General BPF maintainer entry revamp to better scale patch reviews.

* https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf:
  bpf, selftests: Add verifier test case for jmp32's jeq/jne
  bpf, selftests: Add verifier test case for imm=0,umin=0,umax=1 scalar
  bpf: Fix insufficient bounds propagation from adjust_scalar_min_max_vals
  bpf: Fix incorrect verifier simulation around jmp32's jeq/jne
  xsk: Clear page contiguity bit when unmapping pool
  bpf, docs: Better scale maintenance of BPF subsystem
  fprobe, samples: Add module parameter descriptions
====================

Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>

Author: kuba-moo

MAINTAINERS

@@ -3617,16 +3617,18 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
 F:	drivers/iio/accel/bma400*
 
-BPF (Safe dynamic programs and tools)
+BPF [GENERAL] (Safe Dynamic Programs and Tools)
 M:	Alexei Starovoitov <[email protected]>
 M:	Daniel Borkmann <[email protected]>
 M:	Andrii Nakryiko <[email protected]>
-R:	Martin KaFai Lau <[email protected]>
-R:	Song Liu <[email protected]>
+R:	Martin KaFai Lau <[email protected]>
+R:	Song Liu <[email protected]>
 R:	Yonghong Song <[email protected]>
 R:	John Fastabend <[email protected]>
 R:	KP Singh <[email protected]>
-L:	[email protected]
+R:	Stanislav Fomichev <[email protected]>
+R:	Hao Luo <[email protected]>
+R:	Jiri Olsa <[email protected]>
 L:	[email protected]
 S:	Supported
 W:	https://bpf.io/
@@ -3658,12 +3660,9 @@ F:	scripts/pahole-version.sh
 F:	tools/bpf/
 F:	tools/lib/bpf/
 F:	tools/testing/selftests/bpf/
-N:	bpf
-K:	bpf
 
 BPF JIT for ARM
 M:	Shubham Bansal <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	arch/arm/net/
@@ -3672,46 +3671,40 @@ BPF JIT for ARM64
 M:	Daniel Borkmann <[email protected]>
 M:	Alexei Starovoitov <[email protected]>
 M:	Zi Shen Lim <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/arm64/net/
 
 BPF JIT for MIPS (32-BIT AND 64-BIT)
 M:	Johan Almbladh <[email protected]>
 M:	Paul Burton <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	arch/mips/net/
 
 BPF JIT for NFP NICs
 M:	Jakub Kicinski <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	drivers/net/ethernet/netronome/nfp/bpf/
 
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:	Naveen N. Rao <[email protected]>
 M:	Michael Ellerman <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/powerpc/net/
 
 BPF JIT for RISC-V (32-bit)
 M:	Luke Nelson <[email protected]>
 M:	Xi Wang <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	arch/riscv/net/
 X:	arch/riscv/net/bpf_jit_comp64.c
 
 BPF JIT for RISC-V (64-bit)
 M:	Björn Töpel <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Maintained
 F:	arch/riscv/net/
@@ -3721,36 +3714,80 @@ BPF JIT for S390
 M:	Ilya Leoshkevich <[email protected]>
 M:	Heiko Carstens <[email protected]>
 M:	Vasily Gorbik <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/s390/net/
 X:	arch/s390/net/pnet.c
 
 BPF JIT for SPARC (32-BIT AND 64-BIT)
 M:	David S. Miller <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	arch/sparc/net/
 
 BPF JIT for X86 32-BIT
 M:	Wang YanQing <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Odd Fixes
 F:	arch/x86/net/bpf_jit_comp32.c
 
 BPF JIT for X86 64-BIT
 M:	Alexei Starovoitov <[email protected]>
 M:	Daniel Borkmann <[email protected]>
-L:	[email protected]
 L:	[email protected]
 S:	Supported
 F:	arch/x86/net/
 X:	arch/x86/net/bpf_jit_comp32.c
 
-BPF LSM (Security Audit and Enforcement using BPF)
+BPF [CORE]
+M:	Alexei Starovoitov <[email protected]>
+M:	Daniel Borkmann <[email protected]>
+R:	John Fastabend <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/verifier.c
+F:	kernel/bpf/tnum.c
+F:	kernel/bpf/core.c
+F:	kernel/bpf/syscall.c
+F:	kernel/bpf/dispatcher.c
+F:	kernel/bpf/trampoline.c
+F:	include/linux/bpf*
+F:	include/linux/filter.h
+
+BPF [BTF]
+M:	Martin KaFai Lau <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/btf.c
+F:	include/linux/btf*
+
+BPF [TRACING]
+M:	Song Liu <[email protected]>
+R:	Jiri Olsa <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/trace/bpf_trace.c
+F:	kernel/bpf/stackmap.c
+
+BPF [NETWORKING] (tc BPF, sock_addr)
+M:	Martin KaFai Lau <[email protected]>
+M:	Daniel Borkmann <[email protected]>
+R:	John Fastabend <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	net/core/filter.c
+F:	net/sched/act_bpf.c
+F:	net/sched/cls_bpf.c
+
+BPF [NETWORKING] (struct_ops, reuseport)
+M:	Martin KaFai Lau <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/bpf_struct*
+
+BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
 M:	KP Singh <[email protected]>
 R:	Florent Revest <[email protected]>
 R:	Brendan Jackman <[email protected]>
@@ -3761,7 +3798,27 @@ F:	include/linux/bpf_lsm.h
 F:	kernel/bpf/bpf_lsm.c
 F:	security/bpf/
 
-BPF L7 FRAMEWORK
+BPF [STORAGE & CGROUPS]
+M:	Martin KaFai Lau <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/cgroup.c
+F:	kernel/bpf/*storage.c
+F:	kernel/bpf/bpf_lru*
+
+BPF [RINGBUF]
+M:	Andrii Nakryiko <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/ringbuf.c
+
+BPF [ITERATOR]
+M:	Yonghong Song <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	kernel/bpf/*iter.c
+
+BPF [L7 FRAMEWORK] (sockmap)
 M:	John Fastabend <[email protected]>
 M:	Jakub Sitnicki <[email protected]>
 L:	[email protected]
@@ -3774,13 +3831,31 @@ F:	net/ipv4/tcp_bpf.c
 F:	net/ipv4/udp_bpf.c
 F:	net/unix/unix_bpf.c
 
-BPFTOOL
+BPF [LIBRARY] (libbpf)
+M:	Andrii Nakryiko <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	tools/lib/bpf/
+
+BPF [TOOLING] (bpftool)
 M:	Quentin Monnet <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	kernel/bpf/disasm.*
 F:	tools/bpf/bpftool/
 
+BPF [SELFTESTS] (Test Runners & Infrastructure)
+M:	Andrii Nakryiko <[email protected]>
+R:	Mykola Lysenko <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	tools/testing/selftests/bpf/
+
+BPF [MISC]
+L:	[email protected]
+S:	Odd Fixes
+K:	(?:\b|_)bpf(?:\b|_)
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:	Michael Chan <[email protected]>
 L:	[email protected]