Commit aa54d846 authored by Ivan Vecera's avatar Ivan Vecera Committed by Tony Nguyen
Browse files

i40e: Fix devlink port unregistering 



Ensure that devlink port is unregistered after unregistering
of net device.

Reproducer:
[root@host ~]# rmmod i40e
[ 4742.939386] i40e 0000:02:00.1: i40e_ptp_stop: removed PHC on enp2s0f1np1
[ 4743.059269] ------------[ cut here ]------------
[ 4743.063900] WARNING: CPU: 21 PID: 10766 at net/devlink/port.c:1078 devl_port_unregister+0x69/0x80
...

Fixes: 9e479d64 ("i40e: Add initial devlink support")
Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e96fe283

drivers/net/ethernet/intel/i40e/i40e_main.c

+6 −4
Original line number Diff line number Diff line
@@ -14213,8 +14213,7 @@ int i40e_vsi_release(struct i40e_vsi *vsi) 
	}

	set_bit(__I40E_VSI_RELEASING, vsi->state);

	uplink_seid = vsi->uplink_seid;

	if (vsi->type == I40E_VSI_MAIN)

		i40e_devlink_destroy_port(pf);



	if (vsi->type != I40E_VSI_SRIOV) {

		if (vsi->netdev_registered) {

			vsi->netdev_registered = false;
@@ -14228,6 +14227,9 @@ int i40e_vsi_release(struct i40e_vsi *vsi) 
		i40e_vsi_disable_irq(vsi);

	}



	if (vsi->type == I40E_VSI_MAIN)

		i40e_devlink_destroy_port(pf);



	spin_lock_bh(&vsi->mac_filter_hash_lock);



	/* clear the sync flag on all filters */
@@ -14402,14 +14404,14 @@ static struct i40e_vsi *i40e_vsi_reinit_setup(struct i40e_vsi *vsi) 


err_rings:

	i40e_vsi_free_q_vectors(vsi);

	if (vsi->type == I40E_VSI_MAIN)

		i40e_devlink_destroy_port(pf);

	if (vsi->netdev_registered) {

		vsi->netdev_registered = false;

		unregister_netdev(vsi->netdev);

		free_netdev(vsi->netdev);

		vsi->netdev = NULL;

	}

	if (vsi->type == I40E_VSI_MAIN)

		i40e_devlink_destroy_port(pf);

	i40e_aq_delete_element(&pf->hw, vsi->seid, NULL);

err_vsi:

	i40e_vsi_clear(vsi);