Revert "xsk: Do not sleep in poll() when need_wakeup set"

commit 0706a78f31c4217ca144f630063ec9561a21548d upstream.

This reverts commit bd0687c18e635b63233dc87f38058cd728802ab4.

This patch causes a Tx only workload to go to sleep even when it does
not have to, leading to misserable performance in skb mode. It fixed
one rare problem but created a much worse one, so this need to be
reverted while I try to craft a proper solution to the original
problem.

Fixes: bd0687c18e63 ("xsk: Do not sleep in poll() when need_wakeup set")
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20211217145646.26449-1-magnus.karlsson@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
index 12112f4b9f7ceb55d026e19eea47b499f09797f8..ca4716b92774b33d364e3e58c104d5f7e3d8df1c 100644 (file)
--- a/net/xdp/xsk.c
+++ b/net/xdp/xsk.c
@@ -499,6 +499,8 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock,
        struct xdp_sock *xs = xdp_sk(sk);
        struct xsk_buff_pool *pool;
 
+       sock_poll_wait(file, sock, wait);
+
        if (unlikely(!xsk_is_bound(xs)))
                return mask;
 
@@ -510,8 +512,6 @@ static __poll_t xsk_poll(struct file *file, struct socket *sock,
                else
                        /* Poll needs to drive Tx also in copy mode */
                        __xsk_sendmsg(sk);
-       } else {
-               sock_poll_wait(file, sock, wait);
        }
 
        if (xs->rx && !xskq_prod_is_empty(xs->rx))