Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-11-05 14:08:48 +0100
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-11-05 14:09:59 +0100
commitb6ef0b30d4eed25b2242019bf5171ad6a4b2de1b (patch)
treef041db54457264123b80463b14d997339ad250c7
parentcee6533c527801a4adf488b7bf8679f943a4d293 (diff)
i40e: Fix receive buffer starvation for AF_XDP (jsc#SLE-8025).
-rw-r--r--patches.suse/i40e-Fix-receive-buffer-starvation-for-AF_XDP.patch35
-rw-r--r--series.conf1
2 files changed, 36 insertions, 0 deletions
diff --git a/patches.suse/i40e-Fix-receive-buffer-starvation-for-AF_XDP.patch b/patches.suse/i40e-Fix-receive-buffer-starvation-for-AF_XDP.patch
new file mode 100644
index 0000000000..f8553df5b0
--- /dev/null
+++ b/patches.suse/i40e-Fix-receive-buffer-starvation-for-AF_XDP.patch
@@ -0,0 +1,35 @@
+From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Date: Mon, 7 Oct 2019 15:07:24 -0700
+Subject: i40e: Fix receive buffer starvation for AF_XDP
+Patch-mainline: v5.4-rc6
+Git-commit: 2c19e395e061a1c1442e0623ce5ec88ecc6c5a9b
+References: jsc#SLE-8025
+
+Magnus's fix to resolve a potential receive buffer starvation for AF_XDP
+got applied to both the i40e_xsk_umem_enable/disable() functions, when it
+should have only been applied to the "enable". So clean up the undesired
+code in the disable function.
+
+CC: Magnus Karlsson <magnus.karlsson@intel.com>
+Fixes: 1f459bdc2007 ("i40e: fix potential RX buffer starvation for AF_XDP")
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
++++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
+@@ -157,11 +157,6 @@ static int i40e_xsk_umem_disable(struct
+ err = i40e_queue_pair_enable(vsi, qid);
+ if (err)
+ return err;
+-
+- /* Kick start the NAPI context so that receiving will start */
+- err = i40e_xsk_wakeup(vsi->netdev, qid, XDP_WAKEUP_RX);
+- if (err)
+- return err;
+ }
+
+ return 0;
diff --git a/series.conf b/series.conf
index 96d8f87e18..d3468ebdbc 100644
--- a/series.conf
+++ b/series.conf
@@ -2893,6 +2893,7 @@
patches.suse/igb-igc-Don-t-warn-on-fatal-read-failures-when-the-d.patch
patches.suse/igb-Enable-media-autosense-for-the-i350.patch
patches.suse/igb-Fix-constant-media-auto-sense-switching-when-no-.patch
+ patches.suse/i40e-Fix-receive-buffer-starvation-for-AF_XDP.patch
patches.suse/powerpc-powernv-Fix-CPU-idle-to-be-called-with-IRQs-.patch
patches.suse/scsi-qla2xxx-fixup-incorrect-usage-of-host_byte.patch
patches.suse/scsi-lpfc-Check-queue-pointer-before-use.patch