Commit 89861c48 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Tony Nguyen
Browse files

ice: move headroom initialization to ice_setup_rx_ctx 



ice_rx_offset(), that is supposed to initialize the Rx buffer headroom,
relies on ICE_RX_FLAGS_RING_BUILD_SKB flag as well as XDP prog presence.

Currently, the callsite of mentioned function is placed incorrectly
within ice_setup_rx_ring() where Rx ring's build skb flag is not
set yet. This causes the XDP_REDIRECT to be partially broken due to
inability to create xdp_frame in the headroom space, as the headroom is
0.

Fix this by moving ice_rx_offset() to ice_setup_rx_ctx() after the flag
setting.

Fixes: f1b1f409 ("ice: store the result of ice_rx_offset() onto ice_ring")
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: default avatarKiran Bhandare <kiranx.bhandare@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent a8660626

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

+18 −0
Original line number Diff line number Diff line
@@ -274,6 +274,22 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) 
	tlan_ctx->legacy_int = ICE_TX_LEGACY;

}



/**

 * ice_rx_offset - Return expected offset into page to access data

 * @rx_ring: Ring we are requesting offset of

 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int ice_rx_offset(struct ice_ring *rx_ring)

{

	if (ice_ring_uses_build_skb(rx_ring))

		return ICE_SKB_PAD;

	else if (ice_is_xdp_ena_vsi(rx_ring->vsi))

		return XDP_PACKET_HEADROOM;



	return 0;

}



/**

 * ice_setup_rx_ctx - Configure a receive ring context

 * @ring: The Rx ring to configure
@@ -413,6 +429,8 @@ int ice_setup_rx_ctx(struct ice_ring *ring) 
	else

		ice_set_ring_build_skb_ena(ring);



	ring->rx_offset = ice_rx_offset(ring);



	/* init queue specific tail register */

	ring->tail = hw->hw_addr + QRX_TAIL(pf_q);

	writel(0, ring->tail);

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

+0 −17
Original line number Diff line number Diff line
@@ -443,22 +443,6 @@ void ice_free_rx_ring(struct ice_ring *rx_ring) 
	}

}



/**

 * ice_rx_offset - Return expected offset into page to access data

 * @rx_ring: Ring we are requesting offset of

 *

 * Returns the offset value for ring into the data buffer.

 */

static unsigned int ice_rx_offset(struct ice_ring *rx_ring)

{

	if (ice_ring_uses_build_skb(rx_ring))

		return ICE_SKB_PAD;

	else if (ice_is_xdp_ena_vsi(rx_ring->vsi))

		return XDP_PACKET_HEADROOM;



	return 0;

}



/**

 * ice_setup_rx_ring - Allocate the Rx descriptors

 * @rx_ring: the Rx ring to set up
@@ -493,7 +477,6 @@ int ice_setup_rx_ring(struct ice_ring *rx_ring) 


	rx_ring->next_to_use = 0;

	rx_ring->next_to_clean = 0;

	rx_ring->rx_offset = ice_rx_offset(rx_ring);



	if (ice_is_xdp_ena_vsi(rx_ring->vsi))

		WRITE_ONCE(rx_ring->xdp_prog, rx_ring->vsi->xdp_prog);