[Intel-wired-lan] [PATCH iwl-next] ice: Remove and readd netdev during devlink reload
Vadim Fedorenko
vadim.fedorenko at linux.dev
Tue Jan 23 18:00:57 UTC 2024
On 23/01/2024 11:18, Wojciech Drewek wrote:
> Recent changes to the devlink reload (commit 9b2348e2d6c9
> ("devlink: warn about existing entities during reload-reinit"))
> force the drivers to destroy devlink ports during reinit.
> Adjust ice driver to this requirement, unregister netdvice, destroy
> devlink port. ice_init_eth() was removed and all the common code
> between probe and reload was moved to ice_load().
>
> During devlink reload we can't take devl_lock (it's already taken)
> and in ice_probe() we have to lock it. Use devl_* variant of the API
> which does not acquire and release devl_lock. Guard ice_load()
> with devl_lock only in case of probe.
>
> Introduce ice_debugfs_fwlog_deinit() in order to release PF's
> debugfs entries. Move ice_debugfs_exit() call to ice_module_exit().
>
> Suggested-by: Jiri Pirko <jiri at nvidia.com>
> Signed-off-by: Wojciech Drewek <wojciech.drewek at intel.com>
> ---
> drivers/net/ethernet/intel/ice/ice.h | 3 +
> drivers/net/ethernet/intel/ice/ice_debugfs.c | 10 +
> drivers/net/ethernet/intel/ice/ice_devlink.c | 68 ++++++-
> drivers/net/ethernet/intel/ice/ice_fwlog.c | 2 +
> drivers/net/ethernet/intel/ice/ice_main.c | 189 ++++++-------------
> 5 files changed, 139 insertions(+), 133 deletions(-)
>
[...]
> +/**
> + * ice_devlink_reinit_up - do reinit of the given PF
> + * @pf: pointer to the PF struct
> + */
> +static int ice_devlink_reinit_up(struct ice_pf *pf)
> +{
> + struct ice_vsi *vsi = ice_get_main_vsi(pf);
> + struct ice_vsi_cfg_params params = {};
no need for empy init here ...
> + int err;
> +
> + err = ice_init_dev(pf);
> + if (err)
> + return err;
> +
> + params = ice_vsi_to_params(vsi);
... because it's completely overwritten here.
> + params.flags = ICE_VSI_FLAG_INIT;
> +
> + rtnl_lock();
> + err = ice_vsi_cfg(vsi, ¶ms);
> + if (err)
> + goto err_vsi_cfg;
> + rtnl_unlock();
> +
> + /* No need to take devl_lock, it's already taken by devlink API */
> + err = ice_load(pf);
> + if (err)
> + goto err_load;
> +
> + return 0;
> +
> +err_load:
> + rtnl_lock();
> + ice_vsi_decfg(vsi);
> +err_vsi_cfg:
> + rtnl_unlock();
> + ice_deinit_dev(pf);
> + return err;
> +}
> +
More information about the Intel-wired-lan
mailing list