On 30.01.2024 12:36, Jiri Pirko wrote:
> Tue, Jan 30, 2024 at 11:31:01AM CET, [email protected] 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
>
> s/netdvice/netdevice/
>
>> 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_pf_deinit() in order to release PF's
>> debugfs entries. Move ice_debugfs_exit() call to ice_module_exit().
>
> Sounds something like 3 patches to me :)
Hmmm, yea I think I can extract debugfs part but the rest feels
logically cohesive to me so I'll keep it together.
>
>
>>
>> Suggested-by: Jiri Pirko <[email protected]>
>> Reviewed-by: Przemek Kitszel <[email protected]>
>> Reviewed-by: Vadim Fedorenko <[email protected]>
>> Reviewed-by: Simon Horman <[email protected]>
>> Reviewed-by: Brett Creeley <[email protected]>
>> Signed-off-by: Wojciech Drewek <[email protected]>
>> ---
>> v2: empty init removed in ice_devlink_reinit_up
>> v3: refactor locking pattern as Brett suggested
>> v4: fix wrong function name in commit message
>> ---
>> 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 ++++++-------------
>
> Yeah. Would be better to split. But up to you.