Commit 418e5340 authored by Paul M Stillwell Jr's avatar Paul M Stillwell Jr Committed by Jakub Kicinski
Browse files

ice: move devlink port creation/deletion 



Commit a286ba73 ("ice: reorder PF/representor devlink
port register/unregister flows") moved the code to create
and destroy the devlink PF port. This was fine, but created
a corner case issue in the case of ice_register_netdev()
failing. In that case, the driver would end up calling
ice_devlink_destroy_pf_port() twice.

Additionally, it makes no sense to tie creation of the devlink
PF port to the creation of the netdev so separate out the
code to create/destroy the devlink PF port from the netdev
code. This makes it a cleaner interface.

Fixes: a286ba73 ("ice: reorder PF/representor devlink port register/unregister flows")
Signed-off-by: default avatarPaul M Stillwell Jr <paul.m.stillwell.jr@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>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230124005714.3996270-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 458e279f

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

+0 −3
Original line number Diff line number Diff line
@@ -3235,9 +3235,6 @@ int ice_vsi_release(struct ice_vsi *vsi) 
		}

	}



	if (vsi->type == ICE_VSI_PF)

		ice_devlink_destroy_pf_port(pf);



	if (vsi->type == ICE_VSI_VF &&

	    vsi->agg_node && vsi->agg_node->valid)

		vsi->agg_node->num_vsis--;

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

+17 −8
Original line number Diff line number Diff line
@@ -4590,7 +4590,7 @@ static void ice_print_wake_reason(struct ice_pf *pf) 
}



/**

 * ice_register_netdev - register netdev and devlink port

 * ice_register_netdev - register netdev

 * @pf: pointer to the PF struct

 */

static int ice_register_netdev(struct ice_pf *pf)
@@ -4602,11 +4602,6 @@ static int ice_register_netdev(struct ice_pf *pf) 
	if (!vsi || !vsi->netdev)

		return -EIO;



	err = ice_devlink_create_pf_port(pf);

	if (err)

		goto err_devlink_create;



	SET_NETDEV_DEVLINK_PORT(vsi->netdev, &pf->devlink_port);

	err = register_netdev(vsi->netdev);

	if (err)

		goto err_register_netdev;
@@ -4617,8 +4612,6 @@ static int ice_register_netdev(struct ice_pf *pf) 


	return 0;

err_register_netdev:

	ice_devlink_destroy_pf_port(pf);

err_devlink_create:

	free_netdev(vsi->netdev);

	vsi->netdev = NULL;

	clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state);
@@ -4636,6 +4629,7 @@ static int 
ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)

{

	struct device *dev = &pdev->dev;

	struct ice_vsi *vsi;

	struct ice_pf *pf;

	struct ice_hw *hw;

	int i, err;
@@ -4918,6 +4912,18 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) 
	pcie_print_link_status(pf->pdev);



probe_done:

	err = ice_devlink_create_pf_port(pf);

	if (err)

		goto err_create_pf_port;



	vsi = ice_get_main_vsi(pf);

	if (!vsi || !vsi->netdev) {

		err = -EINVAL;

		goto err_netdev_reg;

	}



	SET_NETDEV_DEVLINK_PORT(vsi->netdev, &pf->devlink_port);



	err = ice_register_netdev(pf);

	if (err)

		goto err_netdev_reg;
@@ -4955,6 +4961,8 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent) 
err_devlink_reg_param:

	ice_devlink_unregister_params(pf);

err_netdev_reg:

	ice_devlink_destroy_pf_port(pf);

err_create_pf_port:

err_send_version_unroll:

	ice_vsi_release_all(pf);

err_alloc_sw_unroll:
@@ -5083,6 +5091,7 @@ static void ice_remove(struct pci_dev *pdev) 
	ice_setup_mc_magic_wake(pf);

	ice_vsi_release_all(pf);

	mutex_destroy(&(&pf->hw)->fdir_fltr_lock);

	ice_devlink_destroy_pf_port(pf);

	ice_set_wake(pf);

	ice_free_irq_msix_misc(pf);

	ice_for_each_vsi(pf, i) {