Commit c4a9c8e7 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: don't ignore return codes in VSI related code 



There were few smatch warnings reported by Dan:
- ice_vsi_cfg_xdp_txqs can return 0 instead of ret, which is cleaner
- return values in ice_vsi_cfg_def were ignored
- in ice_vsi_rebuild return value was ignored in case rebuild failed,
  it was a never reached code, however, rewrite it for clarity.
- ice_vsi_cfg_tc can return 0 instead of ret

Fixes: 6624e780 ("ice: split ice_vsi_setup into smaller functions")
Reported-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent fef3f92e

drivers/net/ethernet/intel/ice/ice_lib.c

+10 −7
Original line number Diff line number Diff line
@@ -2126,7 +2126,7 @@ int ice_vsi_cfg_xdp_txqs(struct ice_vsi *vsi) 
	ice_for_each_rxq(vsi, i)

		ice_tx_xsk_pool(vsi, i);



	return ret;

	return 0;

}



/**
@@ -2693,12 +2693,14 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vsi_cfg_params *params) 
		return ret;



	/* allocate memory for Tx/Rx ring stat pointers */

	if (ice_vsi_alloc_stat_arrays(vsi))

	ret = ice_vsi_alloc_stat_arrays(vsi);

	if (ret)

		goto unroll_vsi_alloc;



	ice_alloc_fd_res(vsi);



	if (ice_vsi_get_qs(vsi)) {

	ret = ice_vsi_get_qs(vsi);

	if (ret) {

		dev_err(dev, "Failed to allocate queues. vsi->idx = %d\n",

			vsi->idx);

		goto unroll_vsi_alloc_stat;
@@ -2811,6 +2813,7 @@ ice_vsi_cfg_def(struct ice_vsi *vsi, struct ice_vsi_cfg_params *params) 
		break;

	default:

		/* clean up the resources and exit */

		ret = -EINVAL;

		goto unroll_vsi_init;

	}
@@ -3508,11 +3511,11 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, u32 vsi_flags) 
		if (vsi_flags & ICE_VSI_FLAG_INIT) {

			ret = -EIO;

			goto err_vsi_cfg_tc_lan;

		} else {

		}



		kfree(coalesce);

		return ice_schedule_reset(pf, ICE_RESET_PFR);

	}

	}



	ice_vsi_realloc_stat_arrays(vsi, prev_txq, prev_rxq);
@@ -3759,7 +3762,7 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc) 
	dev = ice_pf_to_dev(pf);

	if (vsi->tc_cfg.ena_tc == ena_tc &&

	    vsi->mqprio_qopt.mode != TC_MQPRIO_MODE_CHANNEL)

		return ret;

		return 0;



	ice_for_each_traffic_class(i) {

		/* build bitmap of enabled TCs */