net: devlink: move netdev notifier block to dest namespace during reload
Subsystems (2)
v2 cover net: devlink: move netdev notifier block to dest namespace during reload
From: Jiri Pirko <[email protected]>
Patch #1 is just a dependency of patch #2, which is the actual fix. Patch #3 adds a small check that would uncover the original bug instantly.
Jiri Pirko (3):
net: introduce a helper to move notifier block to different namespace
net: devlink: move netdev notifier block to dest namespace during
reload
net: devlink: add WARN_ON to check return value of
unregister_netdevice_notifier_net() call
include/linux/netdevice.h | 2 ++ net/core/dev.c | 22 ++++++++++++++++++---- net/core/devlink.c | 9 ++++++--- 3 files changed, 26 insertions(+), 7 deletions(-)
Signature · 1 line
2.37.3
PATCH v2 1/3 net: introduce a helper to move notifier block to different namespace
From: Jiri Pirko <[email protected]>
Currently, net_dev() netdev notifier variant follows the netdev with per-net notifier from namespace to namespace. This is implemented by move_netdevice_notifiers_dev_net() helper.
For devlink it is needed to re-register per-net notifier during devlink reload. Introduce a new helper called move_netdevice_notifier_net() and share the unregister/register code with existing move_netdevice_notifiers_dev_net() helper.
---v1->v2:
- made __move_netdevice_notifier_net() static
- remove unnecessary move_netdevice_notifier_net() export
--- include/linux/netdevice.h | 2 ++ net/core/dev.c | 22 ++++++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-)
include/linux/netdevice.h +2 -0
@@ -2828,6 +2828,8 @@ int unregister_netdevice_notifier(struct notifier_block *nb);int register_netdevice_notifier_net (struct net *net,struct notifier_block *nb);int unregister_netdevice_notifier_net (struct net *net,struct notifier_block *nb); +void move_netdevice_notifier_net (struct net *src_net,struct net *dst_net, +struct notifier_block *nb);int register_netdevice_notifier_dev_net (struct net_device *dev,struct notifier_block *nb,struct netdev_net_notifier *nn);
net/core/dev.c +18 -4
@@ -1876,6 +1876,22 @@ int unregister_netdevice_notifier_net(struct net *net, }EXPORT_SYMBOL (unregister_netdevice_notifier_net); +static void __move_netdevice_notifier_net (struct net *src_net, +struct net *dst_net, +struct notifier_block *nb) +{ +__unregister_netdevice_notifier_net (src_net, nb); +__register_netdevice_notifier_net (dst_net, nb, true); +} + +void move_netdevice_notifier_net (struct net *src_net,struct net *dst_net, +struct notifier_block *nb) +{ +rtnl_lock (); +__move_netdevice_notifier_net (src_net, dst_net, nb); +rtnl_unlock (); +} +int register_netdevice_notifier_dev_net (struct net_device *dev,struct notifier_block *nb,struct netdev_net_notifier *nn)
@@ -1912,10 +1928,8 @@ static void move_netdevice_notifiers_dev_net(struct net_device *dev, {struct netdev_net_notifier *nn; -list_for_each_entry (nn, &dev->net_notifier_list, list) { -__unregister_netdevice_notifier_net (dev_net (dev), nn->nb); -__register_netdevice_notifier_net (net, nn->nb, true); - } +list_for_each_entry (nn, &dev->net_notifier_list, list) +__move_netdevice_notifier_net (dev_net (dev), net, nn->nb); }/**
Signature · 1 line
2.37.3
Re: [patch net-next v2 1/3] net: introduce a helper to move notifier block to different namespace
Quoted 6 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
Currently,
net_dev()netdev notifier variant follows the netdev with per-net notifier from namespace to namespace. This is implemented bymove_netdevice_notifiers_dev_net()helper.
Quoted 6 lines
For devlink it is needed to re-register per-net notifier during devlink reload. Introduce a new helper called
move_netdevice_notifier_net()and share the unregister/register code with existingmove_netdevice_notifiers_dev_net()helper.Signed-off-by Jiri Pirko <[email protected]>
I'm not sure what is net_dev(), but the code looks fine:
PATCH v2 2/3 net: devlink: move netdev notifier block to dest namespace during reload
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
The notifier block tracking netdev changes in devlink is registered during devlink_alloc() per-net, it is then unregistered
in devlink_free(). When devlink moves from net namespace to another one, the notifier block needs to move along.
Fix this by adding forgotten call to move the block.
--- net/core/devlink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
net/core/devlink.c +4 -1
@@ -4502,8 +4502,11 @@ static int devlink_reload(struct devlink *devlink, struct net *dest_net,if (err)return err; -if (dest_net && !net_eq (dest_net, curr_net)) +if (dest_net && !net_eq (dest_net, curr_net)) { +move_netdevice_notifier_net (curr_net, dest_net, + &devlink->netdevice_nb);write_pnet (&devlink->_net, dest_net); + } err = devlink->ops->reload_up (devlink, action, limit, actions_performed, extack);devlink_reload_failed_set (devlink, !!err);
Signature · 1 line
2.37.3
PATCH v2 3/3 net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
In reply to Jiri PirkoFrom: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a WARN_ON() to yell about it.
--- net/core/devlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/core/devlink.c +2 -2
@@ -9843,8 +9843,8 @@ void devlink_free(struct devlink *devlink)xa_destroy (&devlink->snapshot_ids); -unregister_netdevice_notifier_net (devlink_net (devlink), - &devlink->netdevice_nb); +WARN_ON (unregister_netdevice_notifier_net (devlink_net (devlink), + &devlink->netdevice_nb));xa_erase (&devlinks, devlink->index);
Signature · 1 line
2.37.3
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 7 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 11 lines · Ido Schimmel
Quoted 7 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>Reviewed-by Ido Schimmel <[email protected]>
Please consider WARN_ON_ONCE(), or DEBUG_NET_WARN_ON_ONCE()
Jakub Kicinski
maintainerRe: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 6 lines · On Wed, 9 Nov 2022 08:26:10 -0800 Eric Dumazet wrote:
Quoted 6 lines · Jiri Pirko
Quoted 5 lines
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>Reviewed-by Ido Schimmel <[email protected]>Please consider
WARN_ON_ONCE(), orDEBUG_NET_WARN_ON_ONCE()
Do you have any general guidance on when to pick WARN() vs WARN_ONCE()? Or should we always prefer _ONCE() going forward?
Let me take the first 2 in, to lower the syzbot volume.
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 10 lines · Wed, Nov 09, 2022 at 10:45:36PM CET, [email protected] wrote:
Quoted 9 lines · On Wed, 9 Nov 2022 08:26:10 -0800 Eric Dumazet wrote:
Quoted 9 lines · Jiri Pirko
Quoted 7 lines
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Ido Schimmel <[email protected]>Please consider
WARN_ON_ONCE(), orDEBUG_NET_WARN_ON_ONCE()Do you have any general guidance on when to pick
WARN()vsWARN_ONCE()? Or should we always prefer_ONCE()going forward?
Good question. If so, it should be documented or spotted by checkpatch.
Quoted 2 lines
Let me take the first 2 in, to lower the syzbot volume.
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 12 lines · Jiri Pirko
Quoted 10 lines · Wed, Nov 09, 2022 at 10:45:36PM CET, [email protected] wrote:
Quoted 9 lines · On Wed, 9 Nov 2022 08:26:10 -0800 Eric Dumazet wrote:
Quoted 9 lines · Jiri Pirko
Quoted 7 lines
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>
Quoted 11 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Ido Schimmel <[email protected]>Please consider
WARN_ON_ONCE(), orDEBUG_NET_WARN_ON_ONCE()Do you have any general guidance on when to pick
WARN()vsWARN_ONCE()? Or should we always prefer_ONCE()going forward?Good question. If so, it should be documented or spotted by checkpatch.
Quoted 2 lines
Let me take the first 2 in, to lower the syzbot volume.
Well, I am not sure what you call 'lower syzbot volume'
netdevsim netdevsim0 netdevsim3 (unregistering): unset [1, 0] type 2 family 0 port 6081 - 0
------------[ cut here ]------------ WARNING: CPU: 1 PID: 41 at net/core/devlink.c:10001 devl_port_unregister+0x2f6/0x390 net/core/devlink.c:10001 Modules linked in: CPU: 0 PID: 41 Comm: kworker/u4:2 Not tainted 6.1.0-rc3-syzkaller-00887-g0c9ef08a4d0f #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:10001 Code: e8 3f 37 0b fa 85 ed 0f 85 7a fd ff ff e8 62 3a 0b fa 0f 0b e9
6e fd ff ff e8 56 3a 0b fa 0f 0b e9 53 ff ff ff e8 4a 3a 0b fa <0f> 0b e9 94 fd ff ff e8 ae ac 57 fa e9 78 ff ff ff e8 74 ac 57 fa
RSP: 0018:ffffc90000b27a08 EFLAGS: 00010293
RAX: 0000000000000000 RBX: ffff88806ee3f810 RCX: 0000000000000000
RDX: ffff8880175e1d40 RSI: ffffffff877177d6 RDI: 0000000000000005
RBP: 0000000000000002 R08: 0000000000000005 R09: 0000000000000000
R10: 0000000000000002 R11: 0000000000000000 R12: ffff88806ee3f810
R13: ffff88806ee3f808 R14: ffff88806ee3e800 R15: ffff88806ee3f800
FS: 0000000000000000(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 000000c00023dee0 CR3: 0000000074faf000 CR4: 00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
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+0x1c4/0x6e0 net/core/devlink.c:4501 devlink_pernet_pre_exit+0x104/0x1c0 net/core/devlink.c:12615 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:306 </TASK>
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 25 lines · Eric Dumazet
Quoted 12 lines · Jiri Pirko
Quoted 10 lines · Wed, Nov 09, 2022 at 10:45:36PM CET, [email protected] wrote:
Quoted 9 lines · On Wed, 9 Nov 2022 08:26:10 -0800 Eric Dumazet wrote:
Quoted 9 lines · Jiri Pirko
Quoted 7 lines
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>Quoted 11 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Ido Schimmel <[email protected]>Please consider
WARN_ON_ONCE(), orDEBUG_NET_WARN_ON_ONCE()Do you have any general guidance on when to pick
WARN()vsWARN_ONCE()? Or should we always prefer_ONCE()going forward?Good question. If so, it should be documented or spotted by checkpatch.
Quoted 2 lines
Let me take the first 2 in, to lower the syzbot volume.
Quoted 7 lines
Well, I am not sure what you call 'lower syzbot volume'
netdevsim netdevsim0 netdevsim3 (unregistering): unset [1, 0] type 2 family 0 port 6081 - 0
------------[ cut here ]------------ WARNING: CPU: 1 PID: 41 at net/core/devlink.c:10001 devl_port_unregister+0x2f6/0x390 net/core/devlink.c:10001
Hi Eric,
That's a different bug than the one fixed by this patchset. Should be fixed by this patch:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
Quoted 36 lines
Modules linked in: CPU: 0 PID: 41 Comm: kworker/u4:2 Not tainted 6.1.0-rc3-syzkaller-00887-g0c9ef08a4d0f #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:10001 Code: e8 3f 37 0b fa 85 ed 0f 85 7a fd ff ff e8 62 3a 0b fa 0f 0b e96e fd ff ff e8 56 3a 0b fa 0f 0b e9 53 ff ff ff e8 4a 3a 0b fa <0f> 0b e9 94 fd ff ff e8 ae ac 57 fa e9 78 ff ff ff e8 74 ac 57 fa
RSP: 0018:ffffc90000b27a08 EFLAGS: 00010293
RAX: 0000000000000000 RBX:ffff88806ee3f810RCX: 0000000000000000
RDX:ffff8880175e1d40RSI:ffffffff877177d6RDI: 0000000000000005
RBP: 0000000000000002 R08: 0000000000000005 R09: 0000000000000000
R10: 0000000000000002 R11: 0000000000000000 R12:ffff88806ee3f810
R13:ffff88806ee3f808R14:ffff88806ee3e800R15:ffff88806ee3f800
FS: 0000000000000000(0000) GS:ffff8880b9a00000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2:000000c00023dee0CR3:0000000074faf000CR4:00000000003506f0
DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
DR3: 0000000000000000 DR6:00000000fffe0ff0DR7: 0000000000000400Call 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+0x1c4/0x6e0 net/core/devlink.c:4501 devlink_pernet_pre_exit+0x104/0x1c0 net/core/devlink.c:12615 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:306 </TASK>
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
Quoted 35 lines · Ido Schimmel
Quoted 25 lines · Eric Dumazet
Quoted 12 lines · Jiri Pirko
Quoted 10 lines · Wed, Nov 09, 2022 at 10:45:36PM CET, [email protected] wrote:
Quoted 9 lines · On Wed, 9 Nov 2022 08:26:10 -0800 Eric Dumazet wrote:
Quoted 9 lines · Jiri Pirko
Quoted 7 lines
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>Quoted 11 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Reviewed-by Ido Schimmel <[email protected]>Please consider
WARN_ON_ONCE(), orDEBUG_NET_WARN_ON_ONCE()Do you have any general guidance on when to pick
WARN()vsWARN_ONCE()? Or should we always prefer_ONCE()going forward?Good question. If so, it should be documented or spotted by checkpatch.
Quoted 2 lines
Let me take the first 2 in, to lower the syzbot volume.
Quoted 7 lines
Well, I am not sure what you call 'lower syzbot volume'
netdevsim netdevsim0 netdevsim3 (unregistering): unset [1, 0] type 2 family 0 port 6081 - 0
------------[ cut here ]------------ WARNING: CPU: 1 PID: 41 at net/core/devlink.c:10001 devl_port_unregister+0x2f6/0x390 net/core/devlink.c:10001
Quoted 6 lines
Hi Eric,
That's a different bug than the one fixed by this patchset. Should be fixed by this patch:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
OK, I will dup the new syzbot report, thanks.
Re: [patch net-next v2 3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call
In reply to Eric DumazetQuoted 8 lines · Wed, Nov 09, 2022 at 05:26:10PM CET, [email protected] wrote:
Quoted 7 lines · Ido Schimmel
Quoted 5 lines · Jiri Pirko
From: Jiri Pirko <[email protected]>
As the return value is not 0 only in case there is no such notifier block registered, add a
WARN_ON()to yell about it.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Suggested-by Ido Schimmel <[email protected]>Signed-off-by Jiri Pirko <[email protected]>Reviewed-by Ido Schimmel <[email protected]>Please consider
WARN_ON_ONCE(), orDEBUG_NET_WARN_ON_ONCE()
Well, in this case, I think that plain WARN_ON is fine as this happens only during driver cleanup which is not expected to happen very often (or not at all) in real world scenarios.
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Tue, 8 Nov 2022 14:22:05 +0100 you wrote:
From: Jiri Pirko <[email protected]>
Patch #1 is just a dependency of patch #2, which is the actual fix. Patch #3 adds a small check that would uncover the original bug instantly.
Quoted 8 lines
Jiri Pirko (3):
net: introduce a helper to move notifier block to different namespace
net: devlink: move netdev notifier block to dest namespace during
reload
net: devlink: addWARN_ONto check return value of
unregister_netdevice_notifier_net()call[...]
Here is the summary with links:
- [net-next,v2,1/3] net: introduce a helper to move notifier block to different namespace
https://git.kernel.org/netdev/net-next/c/3e52fba03a20 - [net-next,v2,2/3] net: devlink: move netdev notifier block to dest namespace during reload https://git.kernel.org/netdev/net-next/c/15feb56e30ef
- [net-next,v2,3/3] net: devlink: add WARN_ON to check return value of unregister_netdevice_notifier_net() call (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html