Commit 405d9999 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Tony Nguyen
Browse files

ice: replace synchronize_rcu with synchronize_net 



Given that ice_qp_dis() is called under rtnl_lock, synchronize_net() can
be called instead of synchronize_rcu() so that XDP rings can finish its
job in a faster way. Also let us do this as earlier in XSK queue disable
flow.

Additionally, turn off regular Tx queue before disabling irqs and NAPI.

Fixes: 2d4238f5 ("ice: Add support for AF_XDP")
Reviewed-by: default avatarShannon Nelson <shannon.nelson@amd.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 1ff72a2f

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

+4 −5
Original line number Diff line number Diff line
@@ -52,10 +52,8 @@ static void ice_qp_reset_stats(struct ice_vsi *vsi, u16 q_idx) 
static void ice_qp_clean_rings(struct ice_vsi *vsi, u16 q_idx)

{

	ice_clean_tx_ring(vsi->tx_rings[q_idx]);

	if (ice_is_xdp_ena_vsi(vsi)) {

		synchronize_rcu();

	if (ice_is_xdp_ena_vsi(vsi))

		ice_clean_tx_ring(vsi->xdp_rings[q_idx]);

	}

	ice_clean_rx_ring(vsi->rx_rings[q_idx]);

}
@@ -180,11 +178,12 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx) 
		usleep_range(1000, 2000);

	}



	synchronize_net();

	netif_tx_stop_queue(netdev_get_tx_queue(vsi->netdev, q_idx));



	ice_qvec_dis_irq(vsi, rx_ring, q_vector);

	ice_qvec_toggle_napi(vsi, q_vector, false);



	netif_tx_stop_queue(netdev_get_tx_queue(vsi->netdev, q_idx));



	ice_fill_txq_meta(vsi, tx_ring, &txq_meta);

	err = ice_vsi_stop_tx_ring(vsi, ICE_NO_RESET, 0, tx_ring, &txq_meta);

	if (err)