diff mbox series

[bpf] bpf, docs: Better scale maintenance of BPF subsystem

Message ID 5bdc73e7f5a087299589944fa074563cdf2c2c1a.1656353995.git.daniel@iogearbox.net (mailing list archive)
State Accepted
Delegated to: BPF
Headers show
Series [bpf] bpf, docs: Better scale maintenance of BPF subsystem | expand

Checks

Context Check Description
netdev/tree_selection success Clearly marked for bpf
netdev/fixes_present success No Fixes tags, but series doesn't touch code
netdev/subject_prefix success Link
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 12 of 12 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch warning WARNING: Misordered MAINTAINERS entry - list file patterns in alphabetic order
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0
bpf/vmtest-bpf-VM_Test-1 success Logs for Kernel LATEST on ubuntu-latest with gcc
bpf/vmtest-bpf-VM_Test-2 success Logs for Kernel LATEST on ubuntu-latest with llvm-15
bpf/vmtest-bpf-PR success PR summary
bpf/vmtest-bpf-VM_Test-3 success Logs for Kernel LATEST on z15 with gcc

Commit Message

Daniel Borkmann June 27, 2022, 6:22 p.m. UTC 
From: Alexei Starovoitov <ast@kernel.org>

The BPF subsystem consists of a large number of pieces. There is not a
single person that understands it all. Yet reviews are crucially important
for the BPF community to provide productive quality feedback to contributors
in a timely manner and therefore to ultimately expand the number of active
developers in the community.

So far, the BPF community had a two-stage review system, that is, a weekly
rotation among 7 developers (Alexei, Daniel, Andrii, Martin, Song, Yonghong,
John) as a first-level review of all inbound patches accompanied by a BPF CI
system which runs the in-tree BPF selftests to check for regressions for
every new patch, and then, a final check by Alexei, Daniel, Andrii to apply
the patches to either bpf or bpf-next trees.

This system worked well for the last ~3.5 years, but clearly reaches its
limits these days as it does not scale enough. Especially, as we also need
to allow enough room for every developer to contribute patches themselves,
integrate with their day to day job, and in particular avoid burnout. We
want to better scale both horizontally and vertically going forward.

On the horizontal scale, we are adding more developers (KP, Stan, Hao, Jiri)
to the overall core reviewer team, thus growing to 11 people in total. The
weekly rotation for the horizontal oncall reviewer is shortened to 1/2 week
(Mo - Wed and Thur - Fri). Instead of just patches, the coverage however
extends also generally to triage and reply to mailing list traffic (e.g. RFCs,
questions, etc).

On the vertical scale, there is clearly a need for deep expertise areas to
assign dedicated maintainer/reviewer teams that are responsible for code
reviews and help with design of individual building blocks. To some degree
we have been doing this implicitly, but the point is to formalize the teams
and commitment.

There is an overlap between areas and boundaries are intentionally grey. These
additional entries provide a guidance on who has to look at the patches. The
patch series which span multiple areas will be looked at by multiple people.
The vertical review with areas of deep expertise are bundled at the same time
with the horizontal side.

This patch cleans up a bit the BPF entries, adds mentioned developers to
the horizontal scale and creates new sub-entries with teams for developers
committing to the above outlined vertical scale.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Martin KaFai Lau <martin.lau@linux.dev>
Acked-by: Song Liu <song@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Mykola Lysenko <mykolal@fb.com>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: KP Singh <kpsingh@kernel.org>
Acked-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Hao Luo <haoluo@google.com>
Acked-by: Quentin Monnet <quentin@isovalent.com>
---
 MAINTAINERS | 108 +++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 90 insertions(+), 18 deletions(-)

Comments

Jakub Kicinski June 27, 2022, 7:26 p.m. UTC | #1 
On Mon, 27 Jun 2022 20:22:55 +0200 Daniel Borkmann wrote:
> -BPF (Safe dynamic programs and tools)
> +BPF [GENERAL] (Safe Dynamic Programs and Tools)
>  M:	Alexei Starovoitov <ast@kernel.org>
>  M:	Daniel Borkmann <daniel@iogearbox.net>
>  M:	Andrii Nakryiko <andrii@kernel.org>
> -R:	Martin KaFai Lau <kafai@fb.com>
> -R:	Song Liu <songliubraving@fb.com>
> +R:	Martin KaFai Lau <martin.lau@linux.dev>
> +R:	Song Liu <song@kernel.org>
>  R:	Yonghong Song <yhs@fb.com>
>  R:	John Fastabend <john.fastabend@gmail.com>
>  R:	KP Singh <kpsingh@kernel.org>
> -L:	netdev@vger.kernel.org
> +R:	Stanislav Fomichev <sdf@google.com>
> +R:	Hao Luo <haoluo@google.com>
> +R:	Jiri Olsa <jolsa@kernel.org>
>  L:	bpf@vger.kernel.org
>  S:	Supported
>  W:	https://bpf.io/

Can we pause and think a bit about the purpose for this entry? I've been
trying to make people obey get_maintainer.pl but having to CC 11 people
is a asking a lot - especially that this entry regexp-keys on BPF (K:
bpf N: bpf). So any patch that as much as uses the letters "bpf" gets
an enormous CC list.
Alexei Starovoitov June 27, 2022, 7:57 p.m. UTC | #2 
On Mon, Jun 27, 2022 at 12:26 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Mon, 27 Jun 2022 20:22:55 +0200 Daniel Borkmann wrote:
> > -BPF (Safe dynamic programs and tools)
> > +BPF [GENERAL] (Safe Dynamic Programs and Tools)
> >  M:   Alexei Starovoitov <ast@kernel.org>
> >  M:   Daniel Borkmann <daniel@iogearbox.net>
> >  M:   Andrii Nakryiko <andrii@kernel.org>
> > -R:   Martin KaFai Lau <kafai@fb.com>
> > -R:   Song Liu <songliubraving@fb.com>
> > +R:   Martin KaFai Lau <martin.lau@linux.dev>
> > +R:   Song Liu <song@kernel.org>
> >  R:   Yonghong Song <yhs@fb.com>
> >  R:   John Fastabend <john.fastabend@gmail.com>
> >  R:   KP Singh <kpsingh@kernel.org>
> > -L:   netdev@vger.kernel.org
> > +R:   Stanislav Fomichev <sdf@google.com>
> > +R:   Hao Luo <haoluo@google.com>
> > +R:   Jiri Olsa <jolsa@kernel.org>
> >  L:   bpf@vger.kernel.org
> >  S:   Supported
> >  W:   https://bpf.io/
>
> Can we pause and think a bit about the purpose for this entry? I've been
> trying to make people obey get_maintainer.pl but having to CC 11 people
> is a asking a lot - especially that this entry regexp-keys on BPF (K:
> bpf N: bpf). So any patch that as much as uses the letters "bpf" gets
> an enormous CC list.

And that's a good thing.
vger continues to cause trouble and it doesn't sound that the fix is coming.
So having everyone directly cc-ed is the only option we have.
Jakub Kicinski June 27, 2022, 8:30 p.m. UTC | #3 
On Mon, 27 Jun 2022 12:57:21 -0700 Alexei Starovoitov wrote:
> And that's a good thing.

My concern is that folks will rebel against populating the CC list if
they never receive feedback from the CCed. I often have to go and
manually trim the CC list because I don't think Jiri, KP, Yonghong etc.
care about my random TLS patch, or removal of a driver which happens 
to contain the letters "bpf". I was hoping the delegation you're
performing could help with the large Cc list. Would you perhaps
consider moving the K/N regexes to the "Core" entry? It'd lower 
the pain of false positives.

> vger continues to cause trouble and it doesn't sound that the fix is coming.
> So having everyone directly cc-ed is the only option we have.

Yeah, Exhibit A - vger is lagging right now...
I guess the "real fix" is on the vger, trying to massage MAINTAINERS
now is not a great use of time..
Alexei Starovoitov June 27, 2022, 8:38 p.m. UTC | #4 
On Mon, Jun 27, 2022 at 1:30 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Mon, 27 Jun 2022 12:57:21 -0700 Alexei Starovoitov wrote:
> > And that's a good thing.
>
> My concern is that folks will rebel against populating the CC list if
> they never receive feedback from the CCed. I often have to go and
> manually trim the CC list because I don't think Jiri, KP, Yonghong etc.
> care about my random TLS patch, or removal of a driver which happens
> to contain the letters "bpf".

but they might! Trimming the cc list doesn't help anything.
We used to trim cc list only because of silly vger anti-spam
feature which is dropping emails with long cc.
Since vger is broken anyway we should be increasing cc where we can.

> I was hoping the delegation you're
> performing could help with the large Cc list. Would you perhaps
> consider moving the K/N regexes to the "Core" entry? It'd lower
> the pain of false positives.

sure. but I'd rather address the misconception that
long cc list is somehow bad. It's good!

>
> > vger continues to cause trouble and it doesn't sound that the fix is coming.
> > So having everyone directly cc-ed is the only option we have.
>
> Yeah, Exhibit A - vger is lagging right now...
> I guess the "real fix" is on the vger, trying to massage MAINTAINERS
> now is not a great use of time..

The real fix is to move away from vger and adjust get_maintainer
script to be smarter when the mailer can do its job.
MAINTAINERS file should list everyone who performs code reviews
and maintains the code.
Daniel Borkmann June 28, 2022, 8:59 a.m. UTC | #5 
On 6/27/22 10:38 PM, Alexei Starovoitov wrote:
> On Mon, Jun 27, 2022 at 1:30 PM Jakub Kicinski <kuba@kernel.org> wrote:
[...]
>>> vger continues to cause trouble and it doesn't sound that the fix is coming.
>>> So having everyone directly cc-ed is the only option we have.
>>
>> Yeah, Exhibit A - vger is lagging right now...
>> I guess the "real fix" is on the vger, trying to massage MAINTAINERS
>> now is not a great use of time..
> 
> The real fix is to move away from vger and adjust get_maintainer
> script to be smarter when the mailer can do its job.
> MAINTAINERS file should list everyone who performs code reviews
> and maintains the code.

Agree to all above. I think to address Jakub's concern, we could adapt
this regex similarly as we have in XDP and move this as a remainder to
a misc/noise section, like below:

diff --git a/MAINTAINERS b/MAINTAINERS
index dbf978014e8a..b5a1960c8339 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3657,8 +3657,6 @@ 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 <illusionist.neo@gmail.com>
@@ -3850,6 +3848,11 @@ L:       bpf@vger.kernel.org
  S:     Maintained
  F:     tools/testing/selftests/bpf/

+BPF [MISC]
+L:     bpf@vger.kernel.org
+S:     Odd Fixes
+K:     (?:\b|_)bpf(?:\b|_)
+
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:     Michael Chan <michael.chan@broadcom.com>
  L:     netdev@vger.kernel.org

If there are no objections, I can fold this in..

Thanks,
Daniel
Alexei Starovoitov June 28, 2022, 4:46 p.m. UTC | #6 
On Tue, Jun 28, 2022 at 10:59:02AM +0200, Daniel Borkmann wrote:
> On 6/27/22 10:38 PM, Alexei Starovoitov wrote:
> > On Mon, Jun 27, 2022 at 1:30 PM Jakub Kicinski <kuba@kernel.org> wrote:
> [...]
> > > > vger continues to cause trouble and it doesn't sound that the fix is coming.
> > > > So having everyone directly cc-ed is the only option we have.
> > > 
> > > Yeah, Exhibit A - vger is lagging right now...
> > > I guess the "real fix" is on the vger, trying to massage MAINTAINERS
> > > now is not a great use of time..
> > 
> > The real fix is to move away from vger and adjust get_maintainer
> > script to be smarter when the mailer can do its job.
> > MAINTAINERS file should list everyone who performs code reviews
> > and maintains the code.
> 
> Agree to all above. I think to address Jakub's concern, we could adapt
> this regex similarly as we have in XDP and move this as a remainder to
> a misc/noise section, like below:
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index dbf978014e8a..b5a1960c8339 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3657,8 +3657,6 @@ 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 <illusionist.neo@gmail.com>
> @@ -3850,6 +3848,11 @@ L:       bpf@vger.kernel.org
>  S:     Maintained
>  F:     tools/testing/selftests/bpf/
> 
> +BPF [MISC]
> +L:     bpf@vger.kernel.org
> +S:     Odd Fixes
> +K:     (?:\b|_)bpf(?:\b|_)
> +

Good idea!

>  BROADCOM B44 10/100 ETHERNET DRIVER
>  M:     Michael Chan <michael.chan@broadcom.com>
>  L:     netdev@vger.kernel.org
> 
> If there are no objections, I can fold this in..

sgtm
Daniel Borkmann June 28, 2022, 4:56 p.m. UTC | #7 
On 6/28/22 6:46 PM, Alexei Starovoitov wrote:
> On Tue, Jun 28, 2022 at 10:59:02AM +0200, Daniel Borkmann wrote:
>> On 6/27/22 10:38 PM, Alexei Starovoitov wrote:
>>> On Mon, Jun 27, 2022 at 1:30 PM Jakub Kicinski <kuba@kernel.org> wrote:
[...]
>> +BPF [MISC]
>> +L:     bpf@vger.kernel.org
>> +S:     Odd Fixes
>> +K:     (?:\b|_)bpf(?:\b|_)
>> +
> 
> Good idea!
> 
>>   BROADCOM B44 10/100 ETHERNET DRIVER
>>   M:     Michael Chan <michael.chan@broadcom.com>
>>   L:     netdev@vger.kernel.org
>>
>> If there are no objections, I can fold this in..
> 
> sgtm

Ok, done now & pushed out.

Thanks,
Daniel
Jakub Kicinski June 28, 2022, 4:57 p.m. UTC | #8 
On Tue, 28 Jun 2022 10:59:02 +0200 Daniel Borkmann wrote:
> +BPF [MISC]
> +L:     bpf@vger.kernel.org
> +S:     Odd Fixes
> +K:     (?:\b|_)bpf(?:\b|_)
> +
>   BROADCOM B44 10/100 ETHERNET DRIVER
>   M:     Michael Chan <michael.chan@broadcom.com>
>   L:     netdev@vger.kernel.org
> 
> If there are no objections, I can fold this in..
diff mbox series

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index 15a2341936ea..dbf978014e8a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3614,16 +3614,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 <ast@kernel.org>
 M:	Daniel Borkmann <daniel@iogearbox.net>
 M:	Andrii Nakryiko <andrii@kernel.org>
-R:	Martin KaFai Lau <kafai@fb.com>
-R:	Song Liu <songliubraving@fb.com>
+R:	Martin KaFai Lau <martin.lau@linux.dev>
+R:	Song Liu <song@kernel.org>
 R:	Yonghong Song <yhs@fb.com>
 R:	John Fastabend <john.fastabend@gmail.com>
 R:	KP Singh <kpsingh@kernel.org>
-L:	netdev@vger.kernel.org
+R:	Stanislav Fomichev <sdf@google.com>
+R:	Hao Luo <haoluo@google.com>
+R:	Jiri Olsa <jolsa@kernel.org>
 L:	bpf@vger.kernel.org
 S:	Supported
 W:	https://bpf.io/
@@ -3660,7 +3662,6 @@  K:	bpf
 
 BPF JIT for ARM
 M:	Shubham Bansal <illusionist.neo@gmail.com>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Odd Fixes
 F:	arch/arm/net/
@@ -3669,7 +3670,6 @@  BPF JIT for ARM64
 M:	Daniel Borkmann <daniel@iogearbox.net>
 M:	Alexei Starovoitov <ast@kernel.org>
 M:	Zi Shen Lim <zlim.lnx@gmail.com>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Supported
 F:	arch/arm64/net/
@@ -3677,14 +3677,12 @@  F:	arch/arm64/net/
 BPF JIT for MIPS (32-BIT AND 64-BIT)
 M:	Johan Almbladh <johan.almbladh@anyfinetworks.com>
 M:	Paul Burton <paulburton@kernel.org>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Maintained
 F:	arch/mips/net/
 
 BPF JIT for NFP NICs
 M:	Jakub Kicinski <kuba@kernel.org>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Odd Fixes
 F:	drivers/net/ethernet/netronome/nfp/bpf/
@@ -3692,7 +3690,6 @@  F:	drivers/net/ethernet/netronome/nfp/bpf/
 BPF JIT for POWERPC (32-BIT AND 64-BIT)
 M:	Naveen N. Rao <naveen.n.rao@linux.ibm.com>
 M:	Michael Ellerman <mpe@ellerman.id.au>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Supported
 F:	arch/powerpc/net/
@@ -3700,7 +3697,6 @@  F:	arch/powerpc/net/
 BPF JIT for RISC-V (32-bit)
 M:	Luke Nelson <luke.r.nels@gmail.com>
 M:	Xi Wang <xi.wang@gmail.com>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Maintained
 F:	arch/riscv/net/
@@ -3708,7 +3704,6 @@  X:	arch/riscv/net/bpf_jit_comp64.c
 
 BPF JIT for RISC-V (64-bit)
 M:	Björn Töpel <bjorn@kernel.org>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Maintained
 F:	arch/riscv/net/
@@ -3718,7 +3713,6 @@  BPF JIT for S390
 M:	Ilya Leoshkevich <iii@linux.ibm.com>
 M:	Heiko Carstens <hca@linux.ibm.com>
 M:	Vasily Gorbik <gor@linux.ibm.com>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Supported
 F:	arch/s390/net/
@@ -3726,14 +3720,12 @@  X:	arch/s390/net/pnet.c
 
 BPF JIT for SPARC (32-BIT AND 64-BIT)
 M:	David S. Miller <davem@davemloft.net>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Odd Fixes
 F:	arch/sparc/net/
 
 BPF JIT for X86 32-BIT
 M:	Wang YanQing <udknight@gmail.com>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 S:	Odd Fixes
 F:	arch/x86/net/bpf_jit_comp32.c
@@ -3741,13 +3733,60 @@  F:	arch/x86/net/bpf_jit_comp32.c
 BPF JIT for X86 64-BIT
 M:	Alexei Starovoitov <ast@kernel.org>
 M:	Daniel Borkmann <daniel@iogearbox.net>
-L:	netdev@vger.kernel.org
 L:	bpf@vger.kernel.org
 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 <ast@kernel.org>
+M:	Daniel Borkmann <daniel@iogearbox.net>
+R:	John Fastabend <john.fastabend@gmail.com>
+L:	bpf@vger.kernel.org
+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 <martin.lau@linux.dev>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	kernel/bpf/btf.c
+F:	include/linux/btf*
+
+BPF [TRACING]
+M:	Song Liu <song@kernel.org>
+R:	Jiri Olsa <jolsa@kernel.org>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	kernel/trace/bpf_trace.c
+F:	kernel/bpf/stackmap.c
+
+BPF [NETWORKING] (tc BPF, sock_addr)
+M:	Martin KaFai Lau <martin.lau@linux.dev>
+M:	Daniel Borkmann <daniel@iogearbox.net>
+R:	John Fastabend <john.fastabend@gmail.com>
+L:	bpf@vger.kernel.org
+L:	netdev@vger.kernel.org
+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 <martin.lau@linux.dev>
+L:	bpf@vger.kernel.org
+L:	netdev@vger.kernel.org
+S:	Maintained
+F:	kernel/bpf/bpf_struct*
+
+BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
 M:	KP Singh <kpsingh@kernel.org>
 R:	Florent Revest <revest@chromium.org>
 R:	Brendan Jackman <jackmanb@chromium.org>
@@ -3758,7 +3797,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 <martin.lau@linux.dev>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	kernel/bpf/cgroup.c
+F:	kernel/bpf/*storage.c
+F:	kernel/bpf/bpf_lru*
+
+BPF [RINGBUF]
+M:	Andrii Nakryiko <andrii@kernel.org>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	kernel/bpf/ringbuf.c
+
+BPF [ITERATOR]
+M:	Yonghong Song <yhs@fb.com>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	kernel/bpf/*iter.c
+
+BPF [L7 FRAMEWORK] (sockmap)
 M:	John Fastabend <john.fastabend@gmail.com>
 M:	Jakub Sitnicki <jakub@cloudflare.com>
 L:	netdev@vger.kernel.org
@@ -3771,13 +3830,26 @@  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 <andrii@kernel.org>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	tools/lib/bpf/
+
+BPF [TOOLING] (bpftool)
 M:	Quentin Monnet <quentin@isovalent.com>
 L:	bpf@vger.kernel.org
 S:	Maintained
 F:	kernel/bpf/disasm.*
 F:	tools/bpf/bpftool/
 
+BPF [SELFTESTS] (Test Runners & Infrastructure)
+M:	Andrii Nakryiko <andrii@kernel.org>
+R:	Mykola Lysenko <mykolal@fb.com>
+L:	bpf@vger.kernel.org
+S:	Maintained
+F:	tools/testing/selftests/bpf/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:	Michael Chan <michael.chan@broadcom.com>
 L:	netdev@vger.kernel.org