From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 20 Dec 2021 13:16:23 +0000 (+0100)
Subject: 5.10-stable patches
X-Git-Tag: v4.4.296~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c46746eb9c6e669887a74c6d122b022f8da0ab31;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	revert-xsk-do-not-sleep-in-poll-when-need_wakeup-set.patch
---

diff --git a/queue-5.10/revert-xsk-do-not-sleep-in-poll-when-need_wakeup-set.patch b/queue-5.10/revert-xsk-do-not-sleep-in-poll-when-need_wakeup-set.patch
new file mode 100644
index 00000000000..c255c2f55b2
--- /dev/null
+++ b/queue-5.10/revert-xsk-do-not-sleep-in-poll-when-need_wakeup-set.patch
@@ -0,0 +1,46 @@
+From 0706a78f31c4217ca144f630063ec9561a21548d Mon Sep 17 00:00:00 2001
+From: Magnus Karlsson <magnus.karlsson@intel.com>
+Date: Fri, 17 Dec 2021 15:56:46 +0100
+Subject: Revert "xsk: Do not sleep in poll() when need_wakeup set"
+
+From: Magnus Karlsson <magnus.karlsson@intel.com>
+
+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>
+---
+ net/xdp/xsk.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/net/xdp/xsk.c
++++ b/net/xdp/xsk.c
+@@ -499,6 +499,8 @@ static __poll_t xsk_poll(struct file *fi
+ 	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 *fi
+ 		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))
diff --git a/queue-5.10/series b/queue-5.10/series
index 12621cbb2e0..4df590072e5 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -91,3 +91,4 @@ scsi-scsi_debug-fix-type-in-min_t-to-avoid-stack-oob.patch
 scsi-scsi_debug-sanity-check-block-descriptor-length-in-resp_mode_select.patch
 rcu-mark-accesses-to-rcu_state.n_force_qs.patch
 bus-ti-sysc-fix-variable-set-but-not-used-warning-for-reinit_modules.patch
+revert-xsk-do-not-sleep-in-poll-when-need_wakeup-set.patch