net: lockless sk_sndtimeo and sk_rcvtimeo
Subsystems (9)
cover net: lockless sk_sndtimeo and sk_rcvtimeo
This series completes the task of making sk->sk_sndtimeo and sk->sk_rcvtimeo lockless.
Eric Dumazet (2):
net: make sk->sk_sndtimeo lockless
net: make sk->sk_rcvtimeo lockless
fs/smb/server/transport_tcp.c | 6 ++---- include/net/sock.h | 4 ++-- net/bluetooth/iso.c | 4 ++-- net/bluetooth/l2cap_sock.c | 4 ++-- net/bluetooth/sco.c | 4 ++-- net/core/sock.c | 22 ++++++++-------------- net/llc/af_llc.c | 6 +++--- net/sctp/socket.c | 4 ++-- net/smc/af_smc.c | 6 +++--- net/smc/smc_clc.c | 6 +++--- net/strparser/strparser.c | 2 +- net/x25/af_x25.c | 2 +- 12 files changed, 31 insertions(+), 39 deletions(-)
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
PATCH 1/2 net: make sk->sk_sndtimeo lockless
Followup of commit 285975dd6742 ("net: annotate data-races around sk->sk_{rcv|snd}timeo").
Remove lock_sock()/release_sock() from sock_set_sndtimeo(), and add READ_ONCE()/WRITE_ONCE() where it is needed.
Also SO_SNDTIMEO_OLD and SO_SNDTIMEO_NEW can call sock_set_timeout() without holding the socket lock.
--- include/net/sock.h | 2 +- net/bluetooth/iso.c | 4 ++-- net/bluetooth/l2cap_sock.c | 4 ++-- net/bluetooth/sco.c | 4 ++-- net/core/sock.c | 12 ++++-------- net/sctp/socket.c | 2 +- net/smc/af_smc.c | 4 ++-- 7 files changed, 14 insertions(+), 18 deletions(-)
include/net/sock.h +1 -1
@@ -2595,7 +2595,7 @@ static inline long sock_rcvtimeo(const struct sock *sk, bool noblock)static inline long sock_sndtimeo (const struct sock *sk,bool noblock) { -return noblock ?0 : sk->sk_sndtimeo; +return noblock ?0 :READ_ONCE (sk->sk_sndtimeo); }static inline int sock_rcvlowat (const struct sock *sk,int waitall,int len)
net/bluetooth/iso.c +2 -2
@@ -413,7 +413,7 @@ static int iso_connect_bis(struct sock *sk) sk->sk_state =BT_CONNECT ; }else { sk->sk_state =BT_CONNECT ; -iso_sock_set_timer (sk, sk->sk_sndtimeo); +iso_sock_set_timer (sk,READ_ONCE (sk->sk_sndtimeo)); }release_sock (sk);
@@ -503,7 +503,7 @@ static int iso_connect_cis(struct sock *sk) sk->sk_state =BT_CONNECT ; }else { sk->sk_state =BT_CONNECT ; -iso_sock_set_timer (sk, sk->sk_sndtimeo); +iso_sock_set_timer (sk,READ_ONCE (sk->sk_sndtimeo)); }release_sock (sk);
net/bluetooth/l2cap_sock.c +2 -2
@@ -255,7 +255,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, err =l2cap_chan_connect (chan, la.l2_psm,__le16_to_cpu (la.l2_cid), &la.l2_bdaddr, la.l2_bdaddr_type, - sk->sk_sndtimeo); +READ_ONCE (sk->sk_sndtimeo));if (err)return err;
@@ -1725,7 +1725,7 @@ static long l2cap_sock_get_sndtimeo_cb(struct l2cap_chan *chan) {struct sock *sk = chan->data; -return sk->sk_sndtimeo; +return READ_ONCE (sk->sk_sndtimeo); }static struct pid *l2cap_sock_get_peer_pid_cb (struct l2cap_chan *chan)
net/bluetooth/sco.c +2 -2
@@ -338,7 +338,7 @@ static int sco_connect(struct sock *sk) hcon =hci_connect_sco (hdev, type, &sco_pi (sk)->dst,sco_pi (sk)->setting, &sco_pi (sk)->codec, - sk->sk_sndtimeo); +READ_ONCE (sk->sk_sndtimeo));if (IS_ERR (hcon)) { err =PTR_ERR (hcon); goto unlock;
@@ -367,7 +367,7 @@ static int sco_connect(struct sock *sk) sk->sk_state =BT_CONNECTED ; }else { sk->sk_state =BT_CONNECT ; -sco_sock_set_timer (sk, sk->sk_sndtimeo); +sco_sock_set_timer (sk,READ_ONCE (sk->sk_sndtimeo)); }release_sock (sk);
net/core/sock.c +4 -8
@@ -818,12 +818,10 @@ EXPORT_SYMBOL(sock_set_priority);void sock_set_sndtimeo (struct sock *sk,s64 secs) { -lock_sock (sk);if (secs && secs <MAX_SCHEDULE_TIMEOUT /HZ -1 )WRITE_ONCE (sk->sk_sndtimeo, secs *HZ );else WRITE_ONCE (sk->sk_sndtimeo,MAX_SCHEDULE_TIMEOUT ); -release_sock (sk); }EXPORT_SYMBOL (sock_set_sndtimeo);
@@ -1287,6 +1285,10 @@ int sk_setsockopt(struct sock *sk, int level, int optname,case SO_DEVMEM_DONTNEED :return sock_devmem_dontneed (sk, optval, optlen);#endif +case SO_SNDTIMEO_OLD : +case SO_SNDTIMEO_NEW : +return sock_set_timeout (&sk->sk_sndtimeo, optval, + optlen, optname ==SO_SNDTIMEO_OLD ); }sockopt_lock_sock (sk);
@@ -1448,12 +1450,6 @@ int sk_setsockopt(struct sock *sk, int level, int optname, optlen, optname == SO_RCVTIMEO_OLD);break ; -case SO_SNDTIMEO_OLD : -case SO_SNDTIMEO_NEW : - ret =sock_set_timeout (&sk->sk_sndtimeo, optval, - optlen, optname ==SO_SNDTIMEO_OLD ); -break ; -case SO_ATTACH_FILTER : {struct sock_fprog fprog;
net/sctp/socket.c +1 -1
@@ -9493,7 +9493,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, newsk->sk_rcvbuf = sk->sk_rcvbuf; newsk->sk_lingertime = sk->sk_lingertime; newsk->sk_rcvtimeo = sk->sk_rcvtimeo; - newsk->sk_sndtimeo = sk->sk_sndtimeo; + newsk->sk_sndtimeo =READ_ONCE (sk->sk_sndtimeo); newsk->sk_rxhash = sk->sk_rxhash; newinet =inet_sk (newsk);
net/smc/af_smc.c +2 -2
@@ -486,7 +486,7 @@ static void smc_copy_sock_settings(struct sock *nsk, struct sock *osk, {/* options we don't get control via setsockopt for */ nsk->sk_type = osk->sk_type; - nsk->sk_sndtimeo = osk->sk_sndtimeo; + nsk->sk_sndtimeo =READ_ONCE (osk->sk_sndtimeo); nsk->sk_rcvtimeo = osk->sk_rcvtimeo; nsk->sk_mark =READ_ONCE (osk->sk_mark); nsk->sk_priority =READ_ONCE (osk->sk_priority);
@@ -1585,7 +1585,7 @@ static void smc_connect_work(struct work_struct *work) { struct smc_sock *smc = container_of(work, struct smc_sock, connect_work); -long timeo = smc->sk.sk_sndtimeo; +long timeo =READ_ONCE (smc->sk.sk_sndtimeo);int rc =0 ;if (!timeo)
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
PATCH 2/2 net: make sk->sk_rcvtimeo lockless
In reply to Eric DumazetFollowup of commit 285975dd6742 ("net: annotate data-races around sk->sk_{rcv|snd}timeo").
Remove lock_sock()/release_sock() from ksmbd_tcp_rcv_timeout() and add READ_ONCE()/WRITE_ONCE() where it is needed.
Also SO_RCVTIMEO_OLD and SO_RCVTIMEO_NEW can call sock_set_timeout() without holding the socket lock.
--- fs/smb/server/transport_tcp.c | 6 ++---- include/net/sock.h | 2 +- net/core/sock.c | 10 ++++------ net/llc/af_llc.c | 6 +++--- net/sctp/socket.c | 2 +- net/smc/af_smc.c | 2 +- net/smc/smc_clc.c | 6 +++--- net/strparser/strparser.c | 2 +- net/x25/af_x25.c | 2 +- 9 files changed, 17 insertions(+), 21 deletions(-)
fs/smb/server/transport_tcp.c +2 -4
@@ -58,12 +58,10 @@ static inline void ksmbd_tcp_reuseaddr(struct socket *sock)static inline void ksmbd_tcp_rcv_timeout (struct socket *sock,s64 secs) { -lock_sock (sock->sk);if (secs && secs <MAX_SCHEDULE_TIMEOUT /HZ -1 ) - sock->sk->sk_rcvtimeo = secs *HZ ; +WRITE_ONCE (sock->sk->sk_rcvtimeo, secs *HZ );else - sock->sk->sk_rcvtimeo =MAX_SCHEDULE_TIMEOUT ; -release_sock (sock->sk); +WRITE_ONCE (sock->sk->sk_rcvtimeo,MAX_SCHEDULE_TIMEOUT ); }static inline void ksmbd_tcp_snd_timeout (struct socket *sock,s64 secs)
include/net/sock.h +1 -1
@@ -2590,7 +2590,7 @@ static inline gfp_t gfp_memcg_charge(void)static inline long sock_rcvtimeo (const struct sock *sk,bool noblock) { -return noblock ?0 : sk->sk_rcvtimeo; +return noblock ?0 :READ_ONCE (sk->sk_rcvtimeo); }static inline long sock_sndtimeo (const struct sock *sk,bool noblock)
net/core/sock.c +4 -6
@@ -1289,6 +1289,10 @@ int sk_setsockopt(struct sock *sk, int level, int optname,case SO_SNDTIMEO_NEW :return sock_set_timeout (&sk->sk_sndtimeo, optval, optlen, optname ==SO_SNDTIMEO_OLD ); +case SO_RCVTIMEO_OLD : +case SO_RCVTIMEO_NEW : +return sock_set_timeout (&sk->sk_rcvtimeo, optval, + optlen, optname ==SO_RCVTIMEO_OLD ); }sockopt_lock_sock (sk);
@@ -1444,12 +1448,6 @@ int sk_setsockopt(struct sock *sk, int level, int optname,WRITE_ONCE (sk->sk_rcvlowat, val ? :1 );break ; } -case SO_RCVTIMEO_OLD : -case SO_RCVTIMEO_NEW : - ret =sock_set_timeout (&sk->sk_rcvtimeo, optval, - optlen, optname ==SO_RCVTIMEO_OLD ); -break ; -case SO_ATTACH_FILTER : {struct sock_fprog fprog;
net/llc/af_llc.c +3 -3
@@ -210,7 +210,7 @@ static int llc_ui_release(struct socket *sock)dprintk ("%s: closing local(%02X) remote(%02X)\n" , __func__, llc->laddr.lsap, llc->daddr.lsap);if (!llc_send_disc (sk)) -llc_ui_wait_for_disc (sk, sk->sk_rcvtimeo); +llc_ui_wait_for_disc (sk,READ_ONCE (sk->sk_rcvtimeo));if (!sock_flag (sk,SOCK_ZAPPED )) {struct llc_sap *sap = llc->sap;
@@ -455,7 +455,7 @@ static int llc_ui_shutdown(struct socket *sock, int how) goto out; rc =llc_send_disc (sk);if (!rc) - rc =llc_ui_wait_for_disc (sk, sk->sk_rcvtimeo); + rc =llc_ui_wait_for_disc (sk,READ_ONCE (sk->sk_rcvtimeo));/* Wake up anyone sleeping in poll */ sk->sk_state_change (sk); out:
@@ -712,7 +712,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock, goto out;/* wait for a connection to arrive. */ if (skb_queue_empty (&sk->sk_receive_queue)) { - rc =llc_wait_data (sk, sk->sk_rcvtimeo); + rc =llc_wait_data (sk,READ_ONCE (sk->sk_rcvtimeo));if (rc) goto out; }
net/sctp/socket.c +1 -1
@@ -9492,7 +9492,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, newsk->sk_sndbuf = sk->sk_sndbuf; newsk->sk_rcvbuf = sk->sk_rcvbuf; newsk->sk_lingertime = sk->sk_lingertime; - newsk->sk_rcvtimeo = sk->sk_rcvtimeo; + newsk->sk_rcvtimeo =READ_ONCE (sk->sk_rcvtimeo); newsk->sk_sndtimeo =READ_ONCE (sk->sk_sndtimeo); newsk->sk_rxhash = sk->sk_rxhash;
net/smc/af_smc.c +1 -1
@@ -487,7 +487,7 @@ static void smc_copy_sock_settings(struct sock *nsk, struct sock *osk,/* options we don't get control via setsockopt for */ nsk->sk_type = osk->sk_type; nsk->sk_sndtimeo =READ_ONCE (osk->sk_sndtimeo); - nsk->sk_rcvtimeo = osk->sk_rcvtimeo; + nsk->sk_rcvtimeo =READ_ONCE (osk->sk_rcvtimeo); nsk->sk_mark =READ_ONCE (osk->sk_mark); nsk->sk_priority =READ_ONCE (osk->sk_priority); nsk->sk_rcvlowat = osk->sk_rcvlowat;
net/smc/smc_clc.c +3 -3
@@ -688,7 +688,7 @@ int smc_clc_prfx_match(struct socket *clcsock,int smc_clc_wait_msg (struct smc_sock *smc,void *buf,int buflen,u8 expected_type,unsigned long timeout) { -long rcvtimeo = smc->clcsock->sk->sk_rcvtimeo; +long rcvtimeo =READ_ONCE (smc->clcsock->sk->sk_rcvtimeo);struct sock *clc_sk = smc->clcsock->sk;struct smc_clc_msg_hdr *clcm = buf;struct msghdr msg = {NULL ,0 };
@@ -707,7 +707,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,* sizeof(struct smc_clc_msg_hdr) */ krflags =MSG_PEEK |MSG_WAITALL ; - clc_sk->sk_rcvtimeo = timeout; +WRITE_ONCE (clc_sk->sk_rcvtimeo, timeout);iov_iter_kvec (&msg.msg_iter,ITER_DEST , &vec,1 ,sizeof (struct smc_clc_msg_hdr )); len =sock_recvmsg (smc->clcsock, &msg, krflags);
@@ -795,7 +795,7 @@ int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, } out: - clc_sk->sk_rcvtimeo = rcvtimeo; +WRITE_ONCE (clc_sk->sk_rcvtimeo, rcvtimeo);return reason_code; }
net/strparser/strparser.c +1 -1
@@ -333,7 +333,7 @@ static int strp_recv(read_descriptor_t *desc, struct sk_buff *orig_skb,struct strparser *strp = (struct strparser *)desc->arg.data;return __strp_recv (desc, orig_skb, orig_offset, orig_len, - strp->sk->sk_rcvbuf, strp->sk->sk_rcvtimeo); + strp->sk->sk_rcvbuf,READ_ONCE (strp->sk->sk_rcvtimeo)); }static int default_read_sock_done (struct strparser *strp,int err)
net/x25/af_x25.c +1 -1
@@ -891,7 +891,7 @@ static int x25_accept(struct socket *sock, struct socket *newsock,if (sk->sk_state !=TCP_LISTEN ) goto out2; - rc =x25_wait_for_data (sk, sk->sk_rcvtimeo); + rc =x25_wait_for_data (sk,READ_ONCE (sk->sk_rcvtimeo));if (rc) goto out2; skb =skb_dequeue (&sk->sk_receive_queue);
Signature · 1 line
2.50.0.rc2.701.gf1e915cc24-goog
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Fri, 20 Jun 2025 15:55:34 +0000 you wrote:
This series completes the task of making
sk->sk_sndtimeoandsk->sk_rcvtimeolockless.Eric Dumazet (2):
net: makesk->sk_sndtimeolockless
net: makesk->sk_rcvtimeolockless[...]
Here is the summary with links:
- [net-next,1/2] net: make sk->sk_sndtimeo lockless
https://git.kernel.org/netdev/net-next/c/3169e36ae148 - [net-next,2/2] net: make sk->sk_rcvtimeo lockless https://git.kernel.org/netdev/net-next/c/935b67675a9f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html