Skip to content

Commit 3d501f5

Browse files
ffmancerakuba-moo
authored andcommitted
Revert "udp: avoid calling sock_def_readable() if possible"
This reverts commit 612b1c0. On a scenario with multiple threads blocking on a recvfrom(), we need to call sock_def_readable() on every __udp_enqueue_schedule_skb() otherwise the threads won't be woken up as __skb_wait_for_more_packets() is using prepare_to_wait_exclusive(). Link: https://bugzilla.redhat.com/2308477 Fixes: 612b1c0 ("udp: avoid calling sock_def_readable() if possible") Signed-off-by: Fernando Fernandez Mancera <[email protected]> Reviewed-by: Eric Dumazet <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent cecc155 commit 3d501f5

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

net/ipv4/udp.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1674,7 +1674,6 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
16741674
struct sk_buff_head *list = &sk->sk_receive_queue;
16751675
int rmem, err = -ENOMEM;
16761676
spinlock_t *busy = NULL;
1677-
bool becomes_readable;
16781677
int size, rcvbuf;
16791678

16801679
/* Immediately drop when the receive queue is full.
@@ -1715,19 +1714,12 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb)
17151714
*/
17161715
sock_skb_set_dropcount(sk, skb);
17171716

1718-
becomes_readable = skb_queue_empty(list);
17191717
__skb_queue_tail(list, skb);
17201718
spin_unlock(&list->lock);
17211719

1722-
if (!sock_flag(sk, SOCK_DEAD)) {
1723-
if (becomes_readable ||
1724-
sk->sk_data_ready != sock_def_readable ||
1725-
READ_ONCE(sk->sk_peek_off) >= 0)
1726-
INDIRECT_CALL_1(sk->sk_data_ready,
1727-
sock_def_readable, sk);
1728-
else
1729-
sk_wake_async_rcu(sk, SOCK_WAKE_WAITD, POLL_IN);
1730-
}
1720+
if (!sock_flag(sk, SOCK_DEAD))
1721+
INDIRECT_CALL_1(sk->sk_data_ready, sock_def_readable, sk);
1722+
17311723
busylock_release(busy);
17321724
return 0;
17331725

0 commit comments

Comments
 (0)