ice: modify error handling when setting XSK pool in ndo_bpf

Don't bail out right when spotting an error within ice_qp_{dis,ena}()
but rather track error and go through whole flow of disabling and
enabling queue pair.

Fixes: 2d4238f55697 ("ice: Add support for AF_XDP")
Reviewed-by: Shannon Nelson <shannon.nelson@amd.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@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 ba50af9a59293374340b58cb6048546fd4cdb097..902096b000f5a026fde1d38cf93d0a79097b265b 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_xsk.c
+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
@@ -162,6 +162,7 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)
        struct ice_tx_ring *tx_ring;
        struct ice_rx_ring *rx_ring;
        int timeout = 50;
+       int fail = 0;
        int err;
 
        if (q_idx >= vsi->num_rxq || q_idx >= vsi->num_txq)
@@ -186,8 +187,8 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 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)
-               return err;
+       if (!fail)
+               fail = err;
        if (ice_is_xdp_ena_vsi(vsi)) {
                struct ice_tx_ring *xdp_ring = vsi->xdp_rings[q_idx];
 
@@ -195,15 +196,15 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)
                ice_fill_txq_meta(vsi, xdp_ring, &txq_meta);
                err = ice_vsi_stop_tx_ring(vsi, ICE_NO_RESET, 0, xdp_ring,
                                           &txq_meta);
-               if (err)
-                       return err;
+               if (!fail)
+                       fail = err;
        }
 
        ice_vsi_ctrl_one_rx_ring(vsi, false, q_idx, false);
        ice_qp_clean_rings(vsi, q_idx);
        ice_qp_reset_stats(vsi, q_idx);
 
-       return 0;
+       return fail;
 }
 
 /**
@@ -216,32 +217,33 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx)
 static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx)
 {
        struct ice_q_vector *q_vector;
+       int fail = 0;
        int err;
 
        err = ice_vsi_cfg_single_txq(vsi, vsi->tx_rings, q_idx);
-       if (err)
-               return err;
+       if (!fail)
+               fail = err;
 
        if (ice_is_xdp_ena_vsi(vsi)) {
                struct ice_tx_ring *xdp_ring = vsi->xdp_rings[q_idx];
 
                err = ice_vsi_cfg_single_txq(vsi, vsi->xdp_rings, q_idx);
-               if (err)
-                       return err;
+               if (!fail)
+                       fail = err;
                ice_set_ring_xdp(xdp_ring);
                ice_tx_xsk_pool(vsi, q_idx);
        }
 
        err = ice_vsi_cfg_single_rxq(vsi, q_idx);
-       if (err)
-               return err;
+       if (!fail)
+               fail = err;
 
        q_vector = vsi->rx_rings[q_idx]->q_vector;
        ice_qvec_cfg_msix(vsi, q_vector);
 
        err = ice_vsi_ctrl_one_rx_ring(vsi, true, q_idx, true);
-       if (err)
-               return err;
+       if (!fail)
+               fail = err;
 
        ice_qvec_toggle_napi(vsi, q_vector, true);
        ice_qvec_ena_irq(vsi, q_vector);
@@ -249,7 +251,7 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx)
        netif_tx_start_queue(netdev_get_tx_queue(vsi->netdev, q_idx));
        clear_bit(ICE_CFG_BUSY, vsi->state);
 
-       return 0;
+       return fail;
 }
 
 /**