ice: remove ICE_CFG_BUSY locking from AF_XDP code

Locking used in ice_qp_ena() and ice_qp_dis() does pretty much nothing,
because ICE_CFG_BUSY is a state flag that is supposed to be set in a PF
state, not VSI one. Therefore it does not protect the queue pair from
e.g. reset.

Remove ICE_CFG_BUSY locking from ice_qp_dis() and ice_qp_ena().

Fixes: 2d4238f55697 ("ice: Add support for AF_XDP")
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com>
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
index 8693509efbe75d8cb1cbb0851409dfea7ad58b8a..5dee829bfc47c5fbe485fb3f41d95bb4857f8799 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -165,7 +165,6 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)
        struct ice_q_vector *q_vector;
        struct ice_tx_ring *tx_ring;
        struct ice_rx_ring *rx_ring;
-       int timeout = 50;
        int fail = 0;
        int err;
 
@@ -176,13 +175,6 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)
        rx_ring = vsi->rx_rings[q_idx];
        q_vector = rx_ring->q_vector;
 
-       while (test_and_set_bit(ICE_CFG_BUSY, vsi->state)) {
-               timeout--;
-               if (!timeout)
-                       return -EBUSY;
-               usleep_range(1000, 2000);
-       }
-
        synchronize_net();
        netif_carrier_off(vsi->netdev);
        netif_tx_stop_queue(netdev_get_tx_queue(vsi->netdev, q_idx));
@@ -261,7 +253,6 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx)
                netif_tx_start_queue(netdev_get_tx_queue(vsi->netdev, q_idx));
                netif_carrier_on(vsi->netdev);
        }
-       clear_bit(ICE_CFG_BUSY, vsi->state);
 
        return fail;
 }