diff options
| author | Björn Töpel | 2018-09-07 10:18:47 +0200 |
|---|---|---|
| committer | Jeff Kirsher | 2018-09-25 22:15:16 +0200 |
| commit | 411dc16ff1775517ec91cdb64be7ee0daca44e22 (patch) | |
| tree | 73b00ba78878f326e111c092c94f0d3200a4957c /drivers/net/ethernet/intel/i40e/i40e_txrx.c | |
| parent | net: xsk: add a simple buffer reuse queue (diff) | |
| download | kernel-qcow2-linux-411dc16ff1775517ec91cdb64be7ee0daca44e22.tar.gz kernel-qcow2-linux-411dc16ff1775517ec91cdb64be7ee0daca44e22.tar.xz kernel-qcow2-linux-411dc16ff1775517ec91cdb64be7ee0daca44e22.zip | |
i40e: clean zero-copy XDP Rx ring on shutdown/reset
Outstanding Rx descriptors are temporarily stored on a stash/reuse
queue. When/if the HW rings comes up again, entries from the stash are
used to re-populate the ring.
The latter required some restructuring of the allocation scheme for
the AF_XDP zero-copy implementation. There is now a fast, and a slow
allocation. The "fast allocation" is used from the fast-path and
obtains free buffers from the fill ring and the internal recycle
mechanism. The "slow allocation" is only used in ring setup, and
obtains buffers from the fill ring and the stash (if any).
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_txrx.c')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index 7f85d4ba8b54..740ea58ba938 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c @@ -1355,8 +1355,10 @@ void i40e_clean_rx_ring(struct i40e_ring *rx_ring) rx_ring->skb = NULL; } - if (rx_ring->xsk_umem) + if (rx_ring->xsk_umem) { + i40e_xsk_clean_rx_ring(rx_ring); goto skip_free; + } /* Free all the Rx ring sk_buffs */ for (i = 0; i < rx_ring->count; i++) { |