torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

net: make sk->sk_rcvtimeo lockless

Browse Source 
Followup of commit 285975dd67 ("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.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250620155536.335520-3-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Eric Dumazet 2025-06-20 15:55:36 +00:00 committed by Jakub Kicinski
parent 3169e36ae1
commit 935b67675a
9 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/smb/server/transport_tcp.c
View File

@ -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) static inline void ksmbd_tcp_rcv_timeout(struct socket *sock, s64 secs)
{ {
lock_sock(sock->sk);
if (secs && secs < MAX_SCHEDULE_TIMEOUT / HZ - 1) if (secs && secs < MAX_SCHEDULE_TIMEOUT / HZ - 1)
sock->sk->sk_rcvtimeo = secs * HZ; WRITE_ONCE(sock->sk->sk_rcvtimeo, secs * HZ);
else else
sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; WRITE_ONCE(sock->sk->sk_rcvtimeo, MAX_SCHEDULE_TIMEOUT);
release_sock(sock->sk);
} }
static inline void ksmbd_tcp_snd_timeout(struct socket *sock, s64 secs) static inline void ksmbd_tcp_snd_timeout(struct socket *sock, s64 secs)

2
include/net/sock.h
View File

@ -2596,7 +2596,7 @@ static inline gfp_t gfp_memcg_charge(void)
static inline long sock_rcvtimeo(const struct sock *sk, bool noblock) 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) static inline long sock_sndtimeo(const struct sock *sk, bool noblock)

10
net/core/sock.c
View File

@ -1289,6 +1289,10 @@ int sk_setsockopt(struct sock *sk, int level, int optname,
case SO_SNDTIMEO_NEW: case SO_SNDTIMEO_NEW:
return sock_set_timeout(&sk->sk_sndtimeo, optval, return sock_set_timeout(&sk->sk_sndtimeo, optval,
optlen, optname == SO_SNDTIMEO_OLD); 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); sockopt_lock_sock(sk);
@ -1444,12 +1448,6 @@ set_sndbuf:
WRITE_ONCE(sk->sk_rcvlowat, val ? : 1); WRITE_ONCE(sk->sk_rcvlowat, val ? : 1);
break; 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: { case SO_ATTACH_FILTER: {
struct sock_fprog fprog; struct sock_fprog fprog;

6
net/llc/af_llc.c
View File

@ -210,7 +210,7 @@ static int llc_ui_release(struct socket *sock)
dprintk("%s: closing local(%02X) remote(%02X)\n", __func__, dprintk("%s: closing local(%02X) remote(%02X)\n", __func__,
llc->laddr.lsap, llc->daddr.lsap); llc->laddr.lsap, llc->daddr.lsap);
if (!llc_send_disc(sk)) 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)) { if (!sock_flag(sk, SOCK_ZAPPED)) {
struct llc_sap *sap = llc->sap; struct llc_sap *sap = llc->sap;
@ -455,7 +455,7 @@ static int llc_ui_shutdown(struct socket *sock, int how)
goto out; goto out;
rc = llc_send_disc(sk); rc = llc_send_disc(sk);
if (!rc) 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 */ /* Wake up anyone sleeping in poll */
sk->sk_state_change(sk); sk->sk_state_change(sk);
out: out:
@ -712,7 +712,7 @@ static int llc_ui_accept(struct socket *sock, struct socket *newsock,
goto out; goto out;
/* wait for a connection to arrive. */ /* wait for a connection to arrive. */
if (skb_queue_empty(&sk->sk_receive_queue)) { 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) if (rc)
goto out; goto out;
} }

2
net/sctp/socket.c
View File

@ -9492,7 +9492,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk,
newsk->sk_sndbuf = sk->sk_sndbuf; newsk->sk_sndbuf = sk->sk_sndbuf;
newsk->sk_rcvbuf = sk->sk_rcvbuf; newsk->sk_rcvbuf = sk->sk_rcvbuf;
newsk->sk_lingertime = sk->sk_lingertime; 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_sndtimeo = READ_ONCE(sk->sk_sndtimeo);
newsk->sk_rxhash = sk->sk_rxhash; newsk->sk_rxhash = sk->sk_rxhash;

2
net/smc/af_smc.c
View File

@ -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 */ /* options we don't get control via setsockopt for */
nsk->sk_type = osk->sk_type; nsk->sk_type = osk->sk_type;
nsk->sk_sndtimeo = READ_ONCE(osk->sk_sndtimeo); 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_mark = READ_ONCE(osk->sk_mark);
nsk->sk_priority = READ_ONCE(osk->sk_priority); nsk->sk_priority = READ_ONCE(osk->sk_priority);
nsk->sk_rcvlowat = osk->sk_rcvlowat; nsk->sk_rcvlowat = osk->sk_rcvlowat;

6
net/smc/smc_clc.c
View File

@ -688,7 +688,7 @@ out:
int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen, int smc_clc_wait_msg(struct smc_sock *smc, void *buf, int buflen,
u8 expected_type, unsigned long timeout) 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 sock *clc_sk = smc->clcsock->sk;
struct smc_clc_msg_hdr *clcm = buf; struct smc_clc_msg_hdr *clcm = buf;
struct msghdr msg = {NULL, 0}; 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) * sizeof(struct smc_clc_msg_hdr)
*/ */
krflags = MSG_PEEK | MSG_WAITALL; 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, iov_iter_kvec(&msg.msg_iter, ITER_DEST, &vec, 1,
sizeof(struct smc_clc_msg_hdr)); sizeof(struct smc_clc_msg_hdr));
len = sock_recvmsg(smc->clcsock, &msg, krflags); 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: out:
clc_sk->sk_rcvtimeo = rcvtimeo; WRITE_ONCE(clc_sk->sk_rcvtimeo, rcvtimeo);
return reason_code; return reason_code;
} }

2
net/strparser/strparser.c
View File

@ -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; struct strparser *strp = (struct strparser *)desc->arg.data;
return __strp_recv(desc, orig_skb, orig_offset, orig_len, 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) static int default_read_sock_done(struct strparser *strp, int err)

2
net/x25/af_x25.c
View File

@ -891,7 +891,7 @@ static int x25_accept(struct socket *sock, struct socket *newsock,
if (sk->sk_state != TCP_LISTEN) if (sk->sk_state != TCP_LISTEN)
goto out2; goto out2;
rc = x25_wait_for_data(sk, sk->sk_rcvtimeo); rc = x25_wait_for_data(sk, READ_ONCE(sk->sk_rcvtimeo));
if (rc) if (rc)
goto out2; goto out2;
skb = skb_dequeue(&sk->sk_receive_queue); skb = skb_dequeue(&sk->sk_receive_queue);