Merge branch 'i40e-ice-af_xdp-zc-fixes' (ec58c75a) · Commits · 戴 / test

Björn Töpel says: ==================== i40e/ice AF_XDP ZC fixes This series address two crashes in the AF_XDP zero-copy mode for ice and i40e. More details in each individual the commit message. ==================== Link: https://lore.kernel.org/r/20201211145712.72957-1-bjorn.topel@gmail.com Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/ethernet/intel/i40e/i40e_xsk.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -220,8 +220,11 @@ bool i40e_alloc_rx_buffers_zc(struct i40e_ring *rx_ring, u16 count)
		} while (count);

		no_buffers:
		if (rx_ring->next_to_use != ntu)
		if (rx_ring->next_to_use != ntu) {
		/* clear the status bits for the next_to_use descriptor */
		rx_desc->wb.qword1.status_error_len = 0;
		i40e_release_rx_desc(rx_ring, ntu);
		}

		return ok;
		}

drivers/net/ethernet/intel/ice/ice_xsk.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -446,8 +446,11 @@ bool ice_alloc_rx_bufs_zc(struct ice_ring *rx_ring, u16 count)
		}
		} while (--count);

		if (rx_ring->next_to_use != ntu)
		if (rx_ring->next_to_use != ntu) {
		/* clear the status bits for the next_to_use descriptor */
		rx_desc->wb.status_error0 = 0;
		ice_release_rx_desc(rx_ring, ntu);
		}

		return ret;
		}

Admin message