Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa6ccf3f authored by Brett Creeley's avatar Brett Creeley Committed by Jeff Kirsher
Browse files

ice: Fix couple of issues in ice_vsi_release 



Currently the driver is calling ice_napi_del() and then
unregister_netdev(). The call to unregister_netdev() will result in a
call to ice_stop() and then ice_vsi_close(). This is where we call
napi_disable() for all the MSI-X vectors. This flow is reversed so make
the changes to ensure napi_disable() happens prior to napi_del().

Before calling napi_del() and free_netdev() make sure
unregister_netdev() was called. This is done by making sure the
__ICE_DOWN bit is set in the vsi->state for the interested VSI.

Signed-off-by: default avatarBrett Creeley <brett.creeley@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 8d5fce19

drivers/net/ethernet/intel/ice/ice.h

+0 −1
Original line number Diff line number Diff line
@@ -451,7 +451,6 @@ int ice_set_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size); 
int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size);

void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);

void ice_print_link_msg(struct ice_vsi *vsi, bool isup);

void ice_napi_del(struct ice_vsi *vsi);

#ifdef CONFIG_DCB

int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked);

void ice_pf_dis_all_vsi(struct ice_pf *pf, bool locked);

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

+13 −11
Original line number Diff line number Diff line
@@ -2754,19 +2754,14 @@ int ice_vsi_release(struct ice_vsi *vsi) 


	if (vsi->type == ICE_VSI_VF)

		vf = &pf->vf[vsi->vf_id];

	/* do not unregister and free netdevs while driver is in the reset

	 * recovery pending state. Since reset/rebuild happens through PF

	 * service task workqueue, its not a good idea to unregister netdev

	 * that is associated to the PF that is running the work queue items

	 * currently. This is done to avoid check_flush_dependency() warning

	 * on this wq

	 */

	if (vsi->netdev && !ice_is_reset_in_progress(pf->state)) {

		ice_napi_del(vsi);

	/* do not unregister while driver is in the reset recovery pending

	 * state. Since reset/rebuild happens through PF service task workqueue,

	 * it's not a good idea to unregister netdev that is associated to the

	 * PF that is running the work queue items currently. This is done to

	 * avoid check_flush_dependency() warning on this wq

	 */

	if (vsi->netdev && !ice_is_reset_in_progress(pf->state))

		unregister_netdev(vsi->netdev);

		free_netdev(vsi->netdev);

		vsi->netdev = NULL;

	}



	if (test_bit(ICE_FLAG_RSS_ENA, pf->flags))

		ice_rss_clean(vsi);
@@ -2799,6 +2794,13 @@ int ice_vsi_release(struct ice_vsi *vsi) 
	ice_rm_vsi_lan_cfg(vsi->port_info, vsi->idx);

	ice_vsi_delete(vsi);

	ice_vsi_free_q_vectors(vsi);



	/* make sure unregister_netdev() was called by checking __ICE_DOWN */

	if (vsi->netdev && test_bit(__ICE_DOWN, vsi->state)) {

		free_netdev(vsi->netdev);

		vsi->netdev = NULL;

	}



	ice_vsi_clear_rings(vsi);



	ice_vsi_put_qs(vsi);

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

+1 −1
Original line number Diff line number Diff line
@@ -1667,7 +1667,7 @@ static int ice_req_irq_msix_misc(struct ice_pf *pf) 
 * ice_napi_del - Remove NAPI handler for the VSI

 * @vsi: VSI for which NAPI handler is to be removed

 */

void ice_napi_del(struct ice_vsi *vsi)

static void ice_napi_del(struct ice_vsi *vsi)

{

	int v_idx;