| Message ID | 20220513185550.844558-1-eric.dumazet@gmail.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | [v2,net-next,01/10] net: annotate races around sk->sk_bound_dev_if | expand |
Hello: This series was applied to netdev/net-next.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 13 May 2022 11:55:40 -0700 you wrote: > From: Eric Dumazet <edumazet@google.com> > > 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. > > [...] Here is the summary with links: - [v2,net-next,01/10] net: annotate races around sk->sk_bound_dev_if https://git.kernel.org/netdev/net-next/c/4c971d2f3548 - [v2,net-next,02/10] sctp: read sk->sk_bound_dev_if once in sctp_rcv() https://git.kernel.org/netdev/net-next/c/a20ea298071f - [v2,net-next,03/10] tcp: sk->sk_bound_dev_if once in inet_request_bound_dev_if() https://git.kernel.org/netdev/net-next/c/fdb5fd7f736e - [v2,net-next,04/10] net: core: add READ_ONCE/WRITE_ONCE annotations for sk->sk_bound_dev_if https://git.kernel.org/netdev/net-next/c/e5fccaa1eb7f - [v2,net-next,05/10] dccp: use READ_ONCE() to read sk->sk_bound_dev_if https://git.kernel.org/netdev/net-next/c/36f7cec4f3af - [v2,net-next,06/10] inet: add READ_ONCE(sk->sk_bound_dev_if) in inet_csk_bind_conflict() https://git.kernel.org/netdev/net-next/c/d2c135619cb8 - [v2,net-next,07/10] net_sched: em_meta: add READ_ONCE() in var_sk_bound_if() https://git.kernel.org/netdev/net-next/c/70f87de9fa0d - [v2,net-next,08/10] l2tp: use add READ_ONCE() to fetch sk->sk_bound_dev_if https://git.kernel.org/netdev/net-next/c/ff0094030f14 - [v2,net-next,09/10] ipv6: add READ_ONCE(sk->sk_bound_dev_if) in INET6_MATCH() (no matching commit) - [v2,net-next,10/10] inet: rename INET_MATCH() https://git.kernel.org/netdev/net-next/c/eda090c31fe9 You are awesome, thank you!
From: Eric Dumazet <edumazet@google.com> 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(-)