ice: fix stack hogs from struct ice_vsi_ctx structures

struct ice_vsi_ctx has gotten large enough that function local declarations
of it on the stack are causing stack hogs.  Fix that by allocating the
structs on heap.  Cleanup some formatting issues in the code around these
changes and fix incorrect data type uses of returned functions in a couple
places.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 18 insertions, 9 deletions

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 0731b8994958..aff348e42562 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3707,30 +3707,39 @@ static int ice_vsi_update_bridge_mode(struct ice_vsi *vsi, u16 bmode)
         struct device *dev = &vsi->back->pdev->dev;
         struct ice_aqc_vsi_props *vsi_props;
         struct ice_hw *hw = &vsi->back->hw;
-        struct ice_vsi_ctx ctxt = { 0 };
+        struct ice_vsi_ctx *ctxt;
         enum ice_status status;
+        int ret = 0;
 
         vsi_props = &vsi->info;
-        ctxt.info = vsi->info;
+
+        ctxt = devm_kzalloc(dev, sizeof(*ctxt), GFP_KERNEL);
+        if (!ctxt)
+                return -ENOMEM;
+
+        ctxt->info = vsi->info;
 
         if (bmode == BRIDGE_MODE_VEB)
                 /* change from VEPA to VEB mode */
-                ctxt.info.sw_flags |= ICE_AQ_VSI_SW_FLAG_ALLOW_LB;
+                ctxt->info.sw_flags |= ICE_AQ_VSI_SW_FLAG_ALLOW_LB;
         else
                 /* change from VEB to VEPA mode */
-                ctxt.info.sw_flags &= ~ICE_AQ_VSI_SW_FLAG_ALLOW_LB;
-        ctxt.info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SW_VALID);
+                ctxt->info.sw_flags &= ~ICE_AQ_VSI_SW_FLAG_ALLOW_LB;
+        ctxt->info.valid_sections = cpu_to_le16(ICE_AQ_VSI_PROP_SW_VALID);
 
-        status = ice_update_vsi(hw, vsi->idx, &ctxt, NULL);
+        status = ice_update_vsi(hw, vsi->idx, ctxt, NULL);
         if (status) {
                 dev_err(dev, "update VSI for bridge mode failed, bmode = %d err %d aq_err %d\n",
                         bmode, status, hw->adminq.sq_last_status);
-                return -EIO;
+                ret = -EIO;
+                goto out;
         }
         /* Update sw flags for book keeping */
-        vsi_props->sw_flags = ctxt.info.sw_flags;
+        vsi_props->sw_flags = ctxt->info.sw_flags;
 
-        return 0;
+out:
+        devm_kfree(dev, ctxt);
+        return ret;
 }
 
 /**