ice: Add new VSI states to track netdev alloc/registration

Add two new VSI states, one to track if a netdev for the VSI has been
allocated and the other to track if the netdev has been registered.
Call unregister_netdev/free_netdev only when the corresponding state
bits are set.

Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Tony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index 2cb09af3148c2b5112ffd1c3114481b7498526b6..5e1a680e8a8e0a678982b21ae39e26f43212bef3 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -241,6 +241,8 @@ enum ice_pf_state {
 enum ice_vsi_state {
        ICE_VSI_DOWN,
        ICE_VSI_NEEDS_RESTART,
+       ICE_VSI_NETDEV_ALLOCD,
+       ICE_VSI_NETDEV_REGISTERED,
        ICE_VSI_UMAC_FLTR_CHANGED,
        ICE_VSI_MMAC_FLTR_CHANGED,
        ICE_VSI_VLAN_FLTR_CHANGED,

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 162f01b42147c021a919caa68d3db5df0ff07e63..40a9b034d73b4cc712c1fbd4e9fd2df6c57045c2 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -2752,11 +2752,14 @@ int ice_vsi_release(struct ice_vsi *vsi)
         * 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)) {
+       if (vsi->netdev && !ice_is_reset_in_progress(pf->state) &&
+           (test_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state))) {
                unregister_netdev(vsi->netdev);
-               ice_devlink_destroy_port(vsi);
+               clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
        }
 
+       ice_devlink_destroy_port(vsi);
+
        if (test_bit(ICE_FLAG_RSS_ENA, pf->flags))
                ice_rss_clean(vsi);
 
@@ -2811,10 +2814,16 @@ int ice_vsi_release(struct ice_vsi *vsi)
        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_VSI_DOWN, vsi->state)) {
-               free_netdev(vsi->netdev);
-               vsi->netdev = NULL;
+       if (vsi->netdev) {
+               if (test_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state)) {
+                       unregister_netdev(vsi->netdev);
+                       clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
+               }
+               if (test_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state)) {
+                       free_netdev(vsi->netdev);
+                       vsi->netdev = NULL;
+                       clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
+               }
        }
 
        if (vsi->type == ICE_VSI_VF &&

diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index 032101680e09a8f5719403bcbf759367c70d2295..035c593bce612d52bf53e3929e129a47bc5024fb 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -2977,6 +2977,7 @@ static int ice_cfg_netdev(struct ice_vsi *vsi)
        if (!netdev)
                return -ENOMEM;
 
+       set_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
        vsi->netdev = netdev;
        np = netdev_priv(netdev);
        np->vsi = vsi;
@@ -3189,6 +3190,7 @@ unroll_napi_add:
        if (vsi) {
                ice_napi_del(vsi);
                if (vsi->netdev) {
+                       clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
                        free_netdev(vsi->netdev);
                        vsi->netdev = NULL;
                }
@@ -3958,6 +3960,7 @@ static int ice_register_netdev(struct ice_pf *pf)
        if (err)
                goto err_register_netdev;
 
+       set_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
        netif_carrier_off(vsi->netdev);
        netif_tx_stop_all_queues(vsi->netdev);
        err = ice_devlink_create_port(vsi);
@@ -3969,9 +3972,11 @@ static int ice_register_netdev(struct ice_pf *pf)
        return 0;
 err_devlink_create:
        unregister_netdev(vsi->netdev);
+       clear_bit(ICE_VSI_NETDEV_REGISTERED, vsi->state);
 err_register_netdev:
        free_netdev(vsi->netdev);
        vsi->netdev = NULL;
+       clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
        return err;
 }