devlink: Fix warning when unregistering a port
Subsystems (2)
PATCH 1/1 devlink: Fix warning when unregistering a port
When a devlink port is unregistered, its type is expected to be unset or otherwise a WARNING is generated [1]. This was supposed to be handled by cited commit by clearing the type upon 'NETDEV_PRE_UNINIT'.
The assumption was that no other events can be generated for the netdev after this event, but this proved to be wrong. After the event is generated, netdev_wait_allrefs_any() will rebroadcast a 'NETDEV_UNREGISTER' until the netdev's reference count drops to 1. This causes devlink to set the port type back to Ethernet.
Fix by only setting and clearing the port type upon 'NETDEV_POST_INIT' and 'NETDEV_PRE_UNINIT', respectively. For all other events, preserve the port type.
[1]
WARNING: CPU: 0 PID: 11 at net/core/devlink.c:9998 devl_port_unregister+0x2f6/0x390 net/core/devlink.c:9998 Modules linked in: CPU: 1 PID: 11 Comm: kworker/u4:1 Not tainted 6.1.0-rc3-next-20221107-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 Workqueue: netns cleanup_net RIP: 0010:devl_port_unregister+0x2f6/0x390 net/core/devlink.c:9998 [...] Call Trace: <TASK> __nsim_dev_port_del+0x1bb/0x240 drivers/net/netdevsim/dev.c:1433 nsim_dev_port_del_all drivers/net/netdevsim/dev.c:1443 [inline] nsim_dev_reload_destroy+0x171/0x510 drivers/net/netdevsim/dev.c:1660 nsim_dev_reload_down+0x6b/0xd0 drivers/net/netdevsim/dev.c:968 devlink_reload+0x1c2/0x6b0 net/core/devlink.c:4501 devlink_pernet_pre_exit+0x104/0x1c0 net/core/devlink.c:12609 ops_pre_exit_list net/core/net_namespace.c:159 [inline] cleanup_net+0x451/0xb10 net/core/net_namespace.c:594 process_one_work+0x9bf/0x1710 kernel/workqueue.c:2289 worker_thread+0x665/0x1080 kernel/workqueue.c:2436 kthread+0x2e4/0x3a0 kernel/kthread.c:376 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:308 </TASK>
--- net/core/devlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/devlink.c +2 -2
@@ -10177,7 +10177,7 @@ static int devlink_netdevice_event(struct notifier_block *nb,* we take into account netdev pointer appearing in this * namespace. */ -__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_ETH , +__devlink_port_type_set (devlink_port, devlink_port->type, netdev);break ;case NETDEV_UNREGISTER :
@@ -10185,7 +10185,7 @@ static int devlink_netdevice_event(struct notifier_block *nb,* also during net namespace change so we need to clear * pointer to netdev that is going to another net namespace. */ -__devlink_port_type_set (devlink_port,DEVLINK_PORT_TYPE_ETH , +__devlink_port_type_set (devlink_port, devlink_port->type,NULL );break ;case NETDEV_PRE_UNINIT :
Signature · 1 line
2.37.3
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Thu, 10 Nov 2022 10:51:50 +0200 you wrote:
When a devlink port is unregistered, its type is expected to be unset or otherwise a WARNING is generated [1]. This was supposed to be handled by cited commit by clearing the type upon '
NETDEV_PRE_UNINIT'.The assumption was that no other events can be generated for the netdev after this event, but this proved to be wrong. After the event is generated,
netdev_wait_allrefs_any()will rebroadcast a 'NETDEV_UNREGISTER' until the netdev's reference count drops to 1. This causes devlink to set the port type back to Ethernet.[...]
Here is the summary with links:
- [net-next] devlink: Fix warning when unregistering a port
https://git.kernel.org/netdev/net-next/c/1fb22ed67195
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html