Skip to content

Eric Dumazet netdev 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest10 patches 1 replyIn review 9 of 10 applied
  2. v110 patches 3 repliesSuperseded

Patches in v2 9 of 10 applied

#Subject and filesSizeRepliesApplied
1/10net: annotate races around sk->sk_bound_dev_ifinclude/net/ip.h include/net/sock.h net/ipv6/datagram.c +1 more+13 -110 repliesApplied
2/10sctp: read sk->sk_bound_dev_if once in sctp_rcv()net/sctp/input.c+3 -11 replyApplied
3/10tcp: sk->sk_bound_dev_if once in inet_request_bound_dev_if()include/net/inet_sock.h+3 -20 repliesApplied
4/10net: core: add READ_ONCE/WRITE_ONCE annotations for sk->sk_bound_dev_ifnet/core/sock.c+7 -40 repliesApplied
5/10dccp: use READ_ONCE() to read sk->sk_bound_dev_ifnet/dccp/ipv4.c net/dccp/ipv6.c+3 -30 repliesApplied
6/10inet: add READ_ONCE(sk->sk_bound_dev_if) in inet_csk_bind_conflict()net/ipv4/inet_connection_sock.c+8 -40 repliesApplied
7/10net_sched: em_meta: add READ_ONCE() in var_sk_bound_if()net/sched/em_meta.c+5 -20 repliesApplied
8/10l2tp: use add READ_ONCE() to fetch sk->sk_bound_dev_ifnet/l2tp/l2tp_ip.c net/l2tp/l2tp_ip6.c+8 -40 repliesApplied
9/10ipv6: add READ_ONCE(sk->sk_bound_dev_if) in INET6_MATCH()include/net/inet6_hashtables.h net/ipv4/inet_hashtables.c net/ipv6/inet6_hashtables.c +1 more+24 -140 replies
10/10inet: rename INET_MATCH()include/net/inet_hashtables.h net/ipv4/inet_hashtables.c net/ipv4/udp.c+6 -60 repliesApplied

Reviews trailers per patch

1 of 10 patches has a Reviewed-by or Acked-by.

PatchMarcelo Ricardo Leitner
1/10
2/10A-b
3/10
4/10
5/10
6/10
7/10
8/10
9/10
10/10

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 net-next 00/10]

From: Eric Dumazet <[email protected]>

net: add annotations for sk->sk_bound_dev_if

While writes on sk->sk_bound_dev_if are protected by socket lock, we have many lockless reads all over the places.

This is based on syzbot report found in the first patch changelog.

v2: inline ipv6 function only defined if IS_ENABLED(CONFIG_IPV6) (kernel bots)
Change the INET6_MATCH() to inet6_match(), this is no longer a macro. Change INET_MATCH() to inet_match() (Olivier Hartkopp & Jakub Kicinski)

Eric Dumazet (10):
net: annotate races around sk->sk_bound_dev_if
sctp: read sk->sk_bound_dev_if once in sctp_rcv()
tcp: sk->sk_bound_dev_if once in inet_request_bound_dev_if()
net: core: add READ_ONCE/WRITE_ONCE annotations for

    sk->sk_bound_dev_if

dccp: use READ_ONCE() to read sk->sk_bound_dev_if
inet: add READ_ONCE(sk->sk_bound_dev_if) in inet_csk_bind_conflict()
net_sched: em_meta: add READ_ONCE() in var_sk_bound_if()
l2tp: use add READ_ONCE() to fetch sk->sk_bound_dev_if
ipv6: add READ_ONCE(sk->sk_bound_dev_if) in INET6_MATCH()
inet: rename INET_MATCH()

 include/net/inet6_hashtables.h  | 28 +++++++++++++++++++---------
 include/net/inet_hashtables.h   |  2 +-
 include/net/inet_sock.h         |  5 +++--
 include/net/ip.h                |  2 +-
 include/net/sock.h              |  5 +++--
 net/core/sock.c                 | 11 +++++++----
 net/dccp/ipv4.c                 |  2 +-
 net/dccp/ipv6.c                 |  4 ++--
 net/ipv4/inet_connection_sock.c | 12 ++++++++----
 net/ipv4/inet_hashtables.c      | 10 +++++-----
 net/ipv4/udp.c                  |  2 +-
 net/ipv6/datagram.c             |  6 +++---
 net/ipv6/inet6_hashtables.c     |  6 +++---
 net/ipv6/udp.c                  | 13 +++++++------
 net/l2tp/l2tp_ip.c              |  4 +++-
 net/l2tp/l2tp_ip6.c             |  8 +++++---
 net/sched/em_meta.c             |  7 +++++--
 net/sctp/input.c                |  4 +++-
 18 files changed, 80 insertions(+), 51 deletions(-)
Signature · 1 line
2.36.0.550.gb090851708-goog