Skip to content

Commit 3f926af

Browse files
edumazetdavem330
authored andcommitted
net: use skb_queue_empty_lockless() in busy poll contexts
Busy polling usually runs without locks. Let's use skb_queue_empty_lockless() instead of skb_queue_empty() Also uses READ_ONCE() in __skb_try_recv_datagram() to address a similar potential problem. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 3ef7cf5 commit 3f926af

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

drivers/crypto/chelsio/chtls/chtls_io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ int chtls_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
17021702
return peekmsg(sk, msg, len, nonblock, flags);
17031703

17041704
if (sk_can_busy_loop(sk) &&
1705-
skb_queue_empty(&sk->sk_receive_queue) &&
1705+
skb_queue_empty_lockless(&sk->sk_receive_queue) &&
17061706
sk->sk_state == TCP_ESTABLISHED)
17071707
sk_busy_loop(sk, nonblock);
17081708

drivers/nvme/host/tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2219,7 +2219,7 @@ static int nvme_tcp_poll(struct blk_mq_hw_ctx *hctx)
22192219
struct nvme_tcp_queue *queue = hctx->driver_data;
22202220
struct sock *sk = queue->sock->sk;
22212221

2222-
if (sk_can_busy_loop(sk) && skb_queue_empty(&sk->sk_receive_queue))
2222+
if (sk_can_busy_loop(sk) && skb_queue_empty_lockless(&sk->sk_receive_queue))
22232223
sk_busy_loop(sk, true);
22242224
nvme_tcp_try_recv(queue);
22252225
return queue->nr_cqe;

net/core/datagram.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ struct sk_buff *__skb_try_recv_datagram(struct sock *sk, unsigned int flags,
278278
break;
279279

280280
sk_busy_loop(sk, flags & MSG_DONTWAIT);
281-
} while (sk->sk_receive_queue.prev != *last);
281+
} while (READ_ONCE(sk->sk_receive_queue.prev) != *last);
282282

283283
error = -EAGAIN;
284284

net/core/sock.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3600,7 +3600,7 @@ bool sk_busy_loop_end(void *p, unsigned long start_time)
36003600
{
36013601
struct sock *sk = p;
36023602

3603-
return !skb_queue_empty(&sk->sk_receive_queue) ||
3603+
return !skb_queue_empty_lockless(&sk->sk_receive_queue) ||
36043604
sk_busy_loop_timeout(sk, start_time);
36053605
}
36063606
EXPORT_SYMBOL(sk_busy_loop_end);

net/ipv4/tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1964,7 +1964,7 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock,
19641964
if (unlikely(flags & MSG_ERRQUEUE))
19651965
return inet_recv_error(sk, msg, len, addr_len);
19661966

1967-
if (sk_can_busy_loop(sk) && skb_queue_empty(&sk->sk_receive_queue) &&
1967+
if (sk_can_busy_loop(sk) && skb_queue_empty_lockless(&sk->sk_receive_queue) &&
19681968
(sk->sk_state == TCP_ESTABLISHED))
19691969
sk_busy_loop(sk, nonblock);
19701970

net/sctp/socket.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8871,7 +8871,7 @@ struct sk_buff *sctp_skb_recv_datagram(struct sock *sk, int flags,
88718871
if (sk_can_busy_loop(sk)) {
88728872
sk_busy_loop(sk, noblock);
88738873

8874-
if (!skb_queue_empty(&sk->sk_receive_queue))
8874+
if (!skb_queue_empty_lockless(&sk->sk_receive_queue))
88758875
continue;
88768876
}
88778877

0 commit comments

Comments
 (0)