Re: [Intel-wired-lan] [iwl-next v1] ice: Check all ice_vsi_rebuild() errors in function

[Paul Menzel]

Dear Eric, dear Karen,

Thank you for the patch.


Am 28.05.24 um 11:01 schrieb Karen Ostrowska:
From: Eric Joyner <eric.joy...@intel.com>

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

Was this found during code review, or is this seen in practice? If the 
latter, please document the test system and test case.

Reviewed-by: Michal Swiatkowski <michal.swiatkow...@linux.intel.com>
Reviewed-by: Przemek Kitszel <przemyslaw.kits...@intel.com>
Signed-off-by: Eric Joyner <eric.joy...@intel.com>
Signed-off-by: Karen Ostrowska <karen.ostrow...@intel.com>

Should there be a Fixes: tag?


Kind regards,

Paul


---
  drivers/net/ethernet/intel/ice/ice_main.c | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c 
b/drivers/net/ethernet/intel/ice/ice_main.c
index f60c022f7960..e8c30b1730a6 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -4135,15 +4135,23 @@ 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_pf_dcb_recfg(pf, locked);
        ice_vsi_open(vsi);
+
+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;