netdev - RE: [iwl-next v1] ice: Check all ice_vsi

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <IA1PR11MB621994292EF59CD938ACBCF5E9F92@IA1PR11MB6219.namprd11.prod.outlook.com>
Date: Wed, 5 Jun 2024 13:51:47 +0000
From: "Ostrowska, Karen" <karen.ostrowska@...el.com>
To: Simon Horman <horms@...nel.org>
CC: "intel-wired-lan@...ts.osuosl.org" <intel-wired-lan@...ts.osuosl.org>,
	"Joyner, Eric" <eric.joyner@...el.com>, "netdev@...r.kernel.org"
	<netdev@...r.kernel.org>, Michal Swiatkowski
	<michal.swiatkowski@...ux.intel.com>, "Kitszel, Przemyslaw"
	<przemyslaw.kitszel@...el.com>
Subject: RE: [iwl-next v1] ice: Check all ice_vsi_rebuild() errors in function

-----Original Message-----
From: Simon Horman <horms@...nel.org> 
Sent: Tuesday, June 4, 2024 4:47 PM
To: Ostrowska, Karen <karen.ostrowska@...el.com>
Cc: intel-wired-lan@...ts.osuosl.org; Joyner, Eric <eric.joyner@...el.com>; netdev@...r.kernel.org; Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>; Kitszel, Przemyslaw <przemyslaw.kitszel@...el.com>
Subject: Re: [iwl-next v1] ice: Check all ice_vsi_rebuild() errors in function

On Tue, May 28, 2024 at 11:01:40AM +0200, Karen Ostrowska wrote:
> From: Eric Joyner <eric.joyner@...el.com>
> 
> Check the return value from ice_vsi_rebuild() and prevent the usage of 
> incorrectly configured VSI.
> 
> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@...ux.intel.com>
> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@...el.com>
> Signed-off-by: Eric Joyner <eric.joyner@...el.com>
> Signed-off-by: Karen Ostrowska <karen.ostrowska@...el.com>
> ---
>  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);
>
> Hi Karen,
>
> This seems to be a good improvement to me, thanks.
> But I do winder if we can go a bit further:
>
> * Should the return value of ice_vsi_open() also be checked?
> * Should the return value of ice_vsi_recfg_qs() be checked?
>
> Also, I think the following is appropriate here:
>
>	goto done;

	Yes, definitely. Thanks for remarks!
> +
> +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;
> --
> 2.31.1
> 
>