Skip to content

Commit ef4ab3b

Browse files
torvaldstorvalds
committed
Merge tag 'net-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Pull networking fixes from Paolo Abeni: "Including fixes from bpf, netfilter, can, and bluetooth. Current release - regressions: - bluetooth: fix deadlock on hci_power_on_sync Previous releases - regressions: - sched: act_police: allow 'continue' action offload - eth: usbnet: fix memory leak in error case - eth: ibmvnic: properly dispose of all skbs during a failover Previous releases - always broken: - bpf: - fix insufficient bounds propagation from adjust_scalar_min_max_vals - clear page contiguity bit when unmapping pool - netfilter: nft_set_pipapo: release elements in clone from abort path - mptcp: netlink: issue MP_PRIO signals from userspace PMs - can: - rcar_canfd: fix data transmission failed on R-Car V3U - gs_usb: gs_usb_open/close(): fix memory leak Misc: - add Wenjia as SMC maintainer" * tag 'net-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (57 commits) wireguard: Kconfig: select CRYPTO_CHACHA_S390 crypto: s390 - do not depend on CRYPTO_HW for SIMD implementations wireguard: selftests: use microvm on x86 wireguard: selftests: always call kernel makefile wireguard: selftests: use virt machine on m68k wireguard: selftests: set fake real time in init r8169: fix accessing unset transport header net: rose: fix UAF bug caused by rose_t0timer_expiry usbnet: fix memory leak in error case Revert "tls: rx: move counting TlsDecryptErrors for sync" mptcp: update MIB_RMSUBFLOW in cmd_sf_destroy mptcp: fix local endpoint accounting selftests: mptcp: userspace PM support for MP_PRIO signals mptcp: netlink: issue MP_PRIO signals from userspace PMs mptcp: Acquire the subflow socket lock before modifying MP_PRIO flags mptcp: Avoid acquiring PM lock for subflow priority changes mptcp: fix locking in mptcp_nl_cmd_sf_destroy() net/mlx5e: Fix matchall police parameters validation net/sched: act_police: allow 'continue' action offload net: lan966x: hardcode the number of external ports ...
2 parents 651a853 + 07266d0 commit ef4ab3b

65 files changed

Lines changed: 1089 additions & 524 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/process/maintainer-netdev.rst‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66
netdev FAQ
77
==========
88

9+
tl;dr
10+
-----
11+
12+
- designate your patch to a tree - ``[PATCH net]`` or ``[PATCH net-next]``
13+
- for fixes the ``Fixes:`` tag is required, regardless of the tree
14+
- don't post large series (> 15 patches), break them up
15+
- don't repost your patches within one 24h period
16+
- reverse xmas tree
17+
918
What is netdev?
1019
---------------
1120
It is a mailing list for all network-related Linux stuff. This
@@ -136,6 +145,20 @@ it to the maintainer to figure out what is the most recent and current
136145
version that should be applied. If there is any doubt, the maintainer
137146
will reply and ask what should be done.
138147

148+
How do I divide my work into patches?
149+
-------------------------------------
150+
151+
Put yourself in the shoes of the reviewer. Each patch is read separately
152+
and therefore should constitute a comprehensible step towards your stated
153+
goal.
154+
155+
Avoid sending series longer than 15 patches. Larger series takes longer
156+
to review as reviewers will defer looking at it until they find a large
157+
chunk of time. A small series can be reviewed in a short time, so Maintainers
158+
just do it. As a result, a sequence of smaller series gets merged quicker and
159+
with better review coverage. Re-posting large series also increases the mailing
160+
list traffic.
161+
139162
I made changes to only a few patches in a patch series should I resend only those changed?
140163
------------------------------------------------------------------------------------------
141164
No, please resend the entire patch series and make sure you do number your
@@ -183,6 +206,19 @@ it is requested that you make it look like this::
183206
* another line of text
184207
*/
185208

209+
What is "reverse xmas tree"?
210+
----------------------------
211+
212+
Netdev has a convention for ordering local variables in functions.
213+
Order the variable declaration lines longest to shortest, e.g.::
214+
215+
struct scatterlist *sg;
216+
struct sk_buff *skb;
217+
int err, i;
218+
219+
If there are dependencies between the variables preventing the ordering
220+
move the initialization out of line.
221+
186222
I am working in existing code which uses non-standard formatting. Which formatting should I use?
187223
------------------------------------------------------------------------------------------------
188224
Make your code follow the most recent guidelines, so that eventually all code

‎MAINTAINERS‎

Lines changed: 96 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3618,16 +3618,18 @@ S: Maintained
36183618
F: Documentation/devicetree/bindings/iio/accel/bosch,bma400.yaml
36193619
F: drivers/iio/accel/bma400*
36203620

3621-
BPF (Safe dynamic programs and tools)
3621+
BPF [GENERAL] (Safe Dynamic Programs and Tools)
36223622
M: Alexei Starovoitov <ast@kernel.org>
36233623
M: Daniel Borkmann <daniel@iogearbox.net>
36243624
M: Andrii Nakryiko <andrii@kernel.org>
3625-
R: Martin KaFai Lau <kafai@fb.com>
3626-
R: Song Liu <songliubraving@fb.com>
3625+
R: Martin KaFai Lau <martin.lau@linux.dev>
3626+
R: Song Liu <song@kernel.org>
36273627
R: Yonghong Song <yhs@fb.com>
36283628
R: John Fastabend <john.fastabend@gmail.com>
36293629
R: KP Singh <kpsingh@kernel.org>
3630-
L: netdev@vger.kernel.org
3630+
R: Stanislav Fomichev <sdf@google.com>
3631+
R: Hao Luo <haoluo@google.com>
3632+
R: Jiri Olsa <jolsa@kernel.org>
36313633
L: bpf@vger.kernel.org
36323634
S: Supported
36333635
W: https://bpf.io/
@@ -3659,12 +3661,9 @@ F: scripts/pahole-version.sh
36593661
F: tools/bpf/
36603662
F: tools/lib/bpf/
36613663
F: tools/testing/selftests/bpf/
3662-
N: bpf
3663-
K: bpf
36643664

36653665
BPF JIT for ARM
36663666
M: Shubham Bansal <illusionist.neo@gmail.com>
3667-
L: netdev@vger.kernel.org
36683667
L: bpf@vger.kernel.org
36693668
S: Odd Fixes
36703669
F: arch/arm/net/
@@ -3673,46 +3672,40 @@ BPF JIT for ARM64
36733672
M: Daniel Borkmann <daniel@iogearbox.net>
36743673
M: Alexei Starovoitov <ast@kernel.org>
36753674
M: Zi Shen Lim <zlim.lnx@gmail.com>
3676-
L: netdev@vger.kernel.org
36773675
L: bpf@vger.kernel.org
36783676
S: Supported
36793677
F: arch/arm64/net/
36803678

36813679
BPF JIT for MIPS (32-BIT AND 64-BIT)
36823680
M: Johan Almbladh <johan.almbladh@anyfinetworks.com>
36833681
M: Paul Burton <paulburton@kernel.org>
3684-
L: netdev@vger.kernel.org
36853682
L: bpf@vger.kernel.org
36863683
S: Maintained
36873684
F: arch/mips/net/
36883685

36893686
BPF JIT for NFP NICs
36903687
M: Jakub Kicinski <kuba@kernel.org>
3691-
L: netdev@vger.kernel.org
36923688
L: bpf@vger.kernel.org
36933689
S: Odd Fixes
36943690
F: drivers/net/ethernet/netronome/nfp/bpf/
36953691

36963692
BPF JIT for POWERPC (32-BIT AND 64-BIT)
36973693
M: Naveen N. Rao <naveen.n.rao@linux.ibm.com>
36983694
M: Michael Ellerman <mpe@ellerman.id.au>
3699-
L: netdev@vger.kernel.org
37003695
L: bpf@vger.kernel.org
37013696
S: Supported
37023697
F: arch/powerpc/net/
37033698

37043699
BPF JIT for RISC-V (32-bit)
37053700
M: Luke Nelson <luke.r.nels@gmail.com>
37063701
M: Xi Wang <xi.wang@gmail.com>
3707-
L: netdev@vger.kernel.org
37083702
L: bpf@vger.kernel.org
37093703
S: Maintained
37103704
F: arch/riscv/net/
37113705
X: arch/riscv/net/bpf_jit_comp64.c
37123706

37133707
BPF JIT for RISC-V (64-bit)
37143708
M: Björn Töpel <bjorn@kernel.org>
3715-
L: netdev@vger.kernel.org
37163709
L: bpf@vger.kernel.org
37173710
S: Maintained
37183711
F: arch/riscv/net/
@@ -3722,36 +3715,80 @@ BPF JIT for S390
37223715
M: Ilya Leoshkevich <iii@linux.ibm.com>
37233716
M: Heiko Carstens <hca@linux.ibm.com>
37243717
M: Vasily Gorbik <gor@linux.ibm.com>
3725-
L: netdev@vger.kernel.org
37263718
L: bpf@vger.kernel.org
37273719
S: Supported
37283720
F: arch/s390/net/
37293721
X: arch/s390/net/pnet.c
37303722

37313723
BPF JIT for SPARC (32-BIT AND 64-BIT)
37323724
M: David S. Miller <davem@davemloft.net>
3733-
L: netdev@vger.kernel.org
37343725
L: bpf@vger.kernel.org
37353726
S: Odd Fixes
37363727
F: arch/sparc/net/
37373728

37383729
BPF JIT for X86 32-BIT
37393730
M: Wang YanQing <udknight@gmail.com>
3740-
L: netdev@vger.kernel.org
37413731
L: bpf@vger.kernel.org
37423732
S: Odd Fixes
37433733
F: arch/x86/net/bpf_jit_comp32.c
37443734

37453735
BPF JIT for X86 64-BIT
37463736
M: Alexei Starovoitov <ast@kernel.org>
37473737
M: Daniel Borkmann <daniel@iogearbox.net>
3748-
L: netdev@vger.kernel.org
37493738
L: bpf@vger.kernel.org
37503739
S: Supported
37513740
F: arch/x86/net/
37523741
X: arch/x86/net/bpf_jit_comp32.c
37533742

3754-
BPF LSM (Security Audit and Enforcement using BPF)
3743+
BPF [CORE]
3744+
M: Alexei Starovoitov <ast@kernel.org>
3745+
M: Daniel Borkmann <daniel@iogearbox.net>
3746+
R: John Fastabend <john.fastabend@gmail.com>
3747+
L: bpf@vger.kernel.org
3748+
S: Maintained
3749+
F: kernel/bpf/verifier.c
3750+
F: kernel/bpf/tnum.c
3751+
F: kernel/bpf/core.c
3752+
F: kernel/bpf/syscall.c
3753+
F: kernel/bpf/dispatcher.c
3754+
F: kernel/bpf/trampoline.c
3755+
F: include/linux/bpf*
3756+
F: include/linux/filter.h
3757+
3758+
BPF [BTF]
3759+
M: Martin KaFai Lau <martin.lau@linux.dev>
3760+
L: bpf@vger.kernel.org
3761+
S: Maintained
3762+
F: kernel/bpf/btf.c
3763+
F: include/linux/btf*
3764+
3765+
BPF [TRACING]
3766+
M: Song Liu <song@kernel.org>
3767+
R: Jiri Olsa <jolsa@kernel.org>
3768+
L: bpf@vger.kernel.org
3769+
S: Maintained
3770+
F: kernel/trace/bpf_trace.c
3771+
F: kernel/bpf/stackmap.c
3772+
3773+
BPF [NETWORKING] (tc BPF, sock_addr)
3774+
M: Martin KaFai Lau <martin.lau@linux.dev>
3775+
M: Daniel Borkmann <daniel@iogearbox.net>
3776+
R: John Fastabend <john.fastabend@gmail.com>
3777+
L: bpf@vger.kernel.org
3778+
L: netdev@vger.kernel.org
3779+
S: Maintained
3780+
F: net/core/filter.c
3781+
F: net/sched/act_bpf.c
3782+
F: net/sched/cls_bpf.c
3783+
3784+
BPF [NETWORKING] (struct_ops, reuseport)
3785+
M: Martin KaFai Lau <martin.lau@linux.dev>
3786+
L: bpf@vger.kernel.org
3787+
L: netdev@vger.kernel.org
3788+
S: Maintained
3789+
F: kernel/bpf/bpf_struct*
3790+
3791+
BPF [SECURITY & LSM] (Security Audit and Enforcement using BPF)
37553792
M: KP Singh <kpsingh@kernel.org>
37563793
R: Florent Revest <revest@chromium.org>
37573794
R: Brendan Jackman <jackmanb@chromium.org>
@@ -3762,7 +3799,27 @@ F: include/linux/bpf_lsm.h
37623799
F: kernel/bpf/bpf_lsm.c
37633800
F: security/bpf/
37643801

3765-
BPF L7 FRAMEWORK
3802+
BPF [STORAGE & CGROUPS]
3803+
M: Martin KaFai Lau <martin.lau@linux.dev>
3804+
L: bpf@vger.kernel.org
3805+
S: Maintained
3806+
F: kernel/bpf/cgroup.c
3807+
F: kernel/bpf/*storage.c
3808+
F: kernel/bpf/bpf_lru*
3809+
3810+
BPF [RINGBUF]
3811+
M: Andrii Nakryiko <andrii@kernel.org>
3812+
L: bpf@vger.kernel.org
3813+
S: Maintained
3814+
F: kernel/bpf/ringbuf.c
3815+
3816+
BPF [ITERATOR]
3817+
M: Yonghong Song <yhs@fb.com>
3818+
L: bpf@vger.kernel.org
3819+
S: Maintained
3820+
F: kernel/bpf/*iter.c
3821+
3822+
BPF [L7 FRAMEWORK] (sockmap)
37663823
M: John Fastabend <john.fastabend@gmail.com>
37673824
M: Jakub Sitnicki <jakub@cloudflare.com>
37683825
L: netdev@vger.kernel.org
@@ -3775,13 +3832,31 @@ F: net/ipv4/tcp_bpf.c
37753832
F: net/ipv4/udp_bpf.c
37763833
F: net/unix/unix_bpf.c
37773834

3778-
BPFTOOL
3835+
BPF [LIBRARY] (libbpf)
3836+
M: Andrii Nakryiko <andrii@kernel.org>
3837+
L: bpf@vger.kernel.org
3838+
S: Maintained
3839+
F: tools/lib/bpf/
3840+
3841+
BPF [TOOLING] (bpftool)
37793842
M: Quentin Monnet <quentin@isovalent.com>
37803843
L: bpf@vger.kernel.org
37813844
S: Maintained
37823845
F: kernel/bpf/disasm.*
37833846
F: tools/bpf/bpftool/
37843847

3848+
BPF [SELFTESTS] (Test Runners & Infrastructure)
3849+
M: Andrii Nakryiko <andrii@kernel.org>
3850+
R: Mykola Lysenko <mykolal@fb.com>
3851+
L: bpf@vger.kernel.org
3852+
S: Maintained
3853+
F: tools/testing/selftests/bpf/
3854+
3855+
BPF [MISC]
3856+
L: bpf@vger.kernel.org
3857+
S: Odd Fixes
3858+
K: (?:\b|_)bpf(?:\b|_)
3859+
37853860
BROADCOM B44 10/100 ETHERNET DRIVER
37863861
M: Michael Chan <michael.chan@broadcom.com>
37873862
L: netdev@vger.kernel.org
@@ -18109,6 +18184,7 @@ F: drivers/misc/sgi-xp/
1810918184

1811018185
SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
1811118186
M: Karsten Graul <kgraul@linux.ibm.com>
18187+
M: Wenjia Zhang <wenjia@linux.ibm.com>
1811218188
L: linux-s390@vger.kernel.org
1811318189
S: Supported
1811418190
W: http://www.ibm.com/developerworks/linux/linux390/

0 commit comments

Comments
 (0)