UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ice: move devlink port creation/deletion 

Commit a286ba7387 ("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: a286ba7387 ("ice: reorder PF/representor devlink port register/unregister flows")
Signed-off-by: Paul 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: Tony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230124005714.3996270-1-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Paul M Stillwell Jr 2023-01-23 16:57:14 -08:00 committed by Jakub Kicinski
parent 458e279f86
commit 418e53401e
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/intel/ice/ice_lib.c
View File

@ -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 && if (vsi->type == ICE_VSI_VF &&
vsi->agg_node && vsi->agg_node->valid) vsi->agg_node && vsi->agg_node->valid)
vsi->agg_node->num_vsis--; vsi->agg_node->num_vsis--;

25
drivers/net/ethernet/intel/ice/ice_main.c
View File

@ -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 * @pf: pointer to the PF struct
*/ */
static int ice_register_netdev(struct ice_pf *pf) 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) if (!vsi || !vsi->netdev)
return -EIO; 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); err = register_netdev(vsi->netdev);
if (err) if (err)
goto err_register_netdev; goto err_register_netdev;
@ -4617,8 +4612,6 @@ static int ice_register_netdev(struct ice_pf *pf)
return 0; return 0;
err_register_netdev: err_register_netdev:
ice_devlink_destroy_pf_port(pf);
err_devlink_create:
free_netdev(vsi->netdev); free_netdev(vsi->netdev);
vsi->netdev = NULL; vsi->netdev = NULL;
clear_bit(ICE_VSI_NETDEV_ALLOCD, vsi->state); 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) ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct ice_vsi *vsi;
struct ice_pf *pf; struct ice_pf *pf;
struct ice_hw *hw; struct ice_hw *hw;
int i, err; 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); pcie_print_link_status(pf->pdev);
probe_done: 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); err = ice_register_netdev(pf);
if (err) if (err)
goto err_netdev_reg; goto err_netdev_reg;
@ -4955,6 +4961,8 @@ err_init_aux_unroll:
err_devlink_reg_param: err_devlink_reg_param:
ice_devlink_unregister_params(pf); ice_devlink_unregister_params(pf);
err_netdev_reg: err_netdev_reg:
ice_devlink_destroy_pf_port(pf);
err_create_pf_port:
err_send_version_unroll: err_send_version_unroll:
ice_vsi_release_all(pf); ice_vsi_release_all(pf);
err_alloc_sw_unroll: err_alloc_sw_unroll:
@ -5083,6 +5091,7 @@ static void ice_remove(struct pci_dev *pdev)
ice_setup_mc_magic_wake(pf); ice_setup_mc_magic_wake(pf);
ice_vsi_release_all(pf); ice_vsi_release_all(pf);
mutex_destroy(&(&pf->hw)->fdir_fltr_lock); mutex_destroy(&(&pf->hw)->fdir_fltr_lock);
ice_devlink_destroy_pf_port(pf);
ice_set_wake(pf); ice_set_wake(pf);
ice_free_irq_msix_misc(pf); ice_free_irq_msix_misc(pf);
ice_for_each_vsi(pf, i) { ice_for_each_vsi(pf, i) {