| Message ID | 20191007220724.16279-1-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Jeff Kirsher |
| Headers | show |
| Series | [net] i40e: Fix receive buffer starvation for AF_XDP | expand |
> -----Original Message----- > From: Intel-wired-lan [mailto:intel-wired-lan-bounces@osuosl.org] On > Behalf Of Jeff Kirsher > Sent: Monday, October 7, 2019 3:07 PM > To: intel-wired-lan@lists.osuosl.org > Cc: Karlsson, Magnus <magnus.karlsson@intel.com> > Subject: [Intel-wired-lan] [net] i40e: Fix receive buffer starvation for AF_XDP > > 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> > --- > drivers/net/ethernet/intel/i40e/i40e_xsk.c | 5 ----- > 1 file changed, 5 deletions(-) Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c index b1c3227ae4ab..a05dfecdd9b4 100644 --- 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 i40e_vsi *vsi, u16 qid) 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;
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> --- drivers/net/ethernet/intel/i40e/i40e_xsk.c | 5 ----- 1 file changed, 5 deletions(-)