ice: Check all ice_vsi_rebuild() errors in function

[ Upstream commit d47bf9a495cf424fad674321d943123dc12b926d ]

Check the return value from ice_vsi_rebuild() and prevent the usage of
incorrectly configured VSI.

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: Eric Joyner <eric.joyner@intel.com>
Signed-off-by: Karen Ostrowska <karen.ostrowska@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index b168a37a5dfff6137a6322a6b5b64ebade6a49af..3f254ce0d6db76f907a7512eb08511d3e24580d5 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3979,13 +3979,17 @@ int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked)
 
        /* set for the next time the netdev is started */
        if (!netif_running(vsi->netdev)) {
-               ice_vsi_rebuild(vsi, ICE_VSI_FLAG_NO_INIT);
+               err = ice_vsi_rebuild(vsi, ICE_VSI_FLAG_NO_INIT);
+               if (err)
+                       goto rebuild_err;
                dev_dbg(ice_pf_to_dev(pf), "Link is down, queue count change happens when link is brought up\n");
                goto done;
        }
 
        ice_vsi_close(vsi);
-       ice_vsi_rebuild(vsi, ICE_VSI_FLAG_NO_INIT);
+       err = ice_vsi_rebuild(vsi, ICE_VSI_FLAG_NO_INIT);
+       if (err)
+               goto rebuild_err;
 
        ice_for_each_traffic_class(i) {
                if (vsi->tc_cfg.ena_tc & BIT(i))
@@ -3996,6 +4000,11 @@ int ice_vsi_recfg_qs(struct ice_vsi *vsi, int new_rx, int new_tx, bool locked)
        }
        ice_pf_dcb_recfg(pf, locked);
        ice_vsi_open(vsi);
+       goto done;
+
+rebuild_err:
+       dev_err(ice_pf_to_dev(pf), "Error during VSI rebuild: %d. Unload and reload the driver.\n",
+               err);
 done:
        clear_bit(ICE_CFG_BUSY, pf->state);
        return err;