Skip to content

Commit 1f7d051

Browse files
Amit Cohengregkh
authored andcommitted
net: switchdev: Convert blocking notification chain to a raw one
[ Upstream commit 62531a1effa87bdab12d5104015af72e60d926ff ] A blocking notification chain uses a read-write semaphore to protect the integrity of the chain. The semaphore is acquired for writing when adding / removing notifiers to / from the chain and acquired for reading when traversing the chain and informing notifiers about an event. In case of the blocking switchdev notification chain, recursive notifications are possible which leads to the semaphore being acquired twice for reading and to lockdep warnings being generated [1]. Specifically, this can happen when the bridge driver processes a SWITCHDEV_BRPORT_UNOFFLOADED event which causes it to emit notifications about deferred events when calling switchdev_deferred_process(). Fix this by converting the notification chain to a raw notification chain in a similar fashion to the netdev notification chain. Protect the chain using the RTNL mutex by acquiring it when modifying the chain. Events are always informed under the RTNL mutex, but add an assertion in call_switchdev_blocking_notifiers() to make sure this is not violated in the future. Maintain the "blocking" prefix as events are always emitted from process context and listeners are allowed to block. [1]: WARNING: possible recursive locking detected 6.14.0-rc4-custom-g079270089484 #1 Not tainted -------------------------------------------- ip/52731 is trying to acquire lock: ffffffff850918d8 ((switchdev_blocking_notif_chain).rwsem){++++}-{4:4}, at: blocking_notifier_call_chain+0x58/0xa0 but task is already holding lock: ffffffff850918d8 ((switchdev_blocking_notif_chain).rwsem){++++}-{4:4}, at: blocking_notifier_call_chain+0x58/0xa0 other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock((switchdev_blocking_notif_chain).rwsem); lock((switchdev_blocking_notif_chain).rwsem); *** DEADLOCK *** May be due to missing lock nesting notation 3 locks held by ip/52731: #0: ffffffff84f795b0 (rtnl_mutex){+.+.}-{4:4}, at: rtnl_newlink+0x727/0x1dc0 #1: ffffffff8731f628 (&net->rtnl_mutex){+.+.}-{4:4}, at: rtnl_newlink+0x790/0x1dc0 #2: ffffffff850918d8 ((switchdev_blocking_notif_chain).rwsem){++++}-{4:4}, at: blocking_notifier_call_chain+0x58/0xa0 stack backtrace: ... ? __pfx_down_read+0x10/0x10 ? __pfx_mark_lock+0x10/0x10 ? __pfx_switchdev_port_attr_set_deferred+0x10/0x10 blocking_notifier_call_chain+0x58/0xa0 switchdev_port_attr_notify.constprop.0+0xb3/0x1b0 ? __pfx_switchdev_port_attr_notify.constprop.0+0x10/0x10 ? mark_held_locks+0x94/0xe0 ? switchdev_deferred_process+0x11a/0x340 switchdev_port_attr_set_deferred+0x27/0xd0 switchdev_deferred_process+0x164/0x340 br_switchdev_port_unoffload+0xc8/0x100 [bridge] br_switchdev_blocking_event+0x29f/0x580 [bridge] notifier_call_chain+0xa2/0x440 blocking_notifier_call_chain+0x6e/0xa0 switchdev_bridge_port_unoffload+0xde/0x1a0 ... Fixes: f7a70d650b0b6 ("net: bridge: switchdev: Ensure deferred event delivery on unoffload") Signed-off-by: Amit Cohen <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Reviewed-by: Simon Horman <[email protected]> Reviewed-by: Vladimir Oltean <[email protected]> Tested-by: Vladimir Oltean <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent ee086c8 commit 1f7d051

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

net/switchdev/switchdev.c

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ bool switchdev_port_obj_act_is_deferred(struct net_device *dev,
381381
EXPORT_SYMBOL_GPL(switchdev_port_obj_act_is_deferred);
382382

383383
static ATOMIC_NOTIFIER_HEAD(switchdev_notif_chain);
384-
static BLOCKING_NOTIFIER_HEAD(switchdev_blocking_notif_chain);
384+
static RAW_NOTIFIER_HEAD(switchdev_blocking_notif_chain);
385385

386386
/**
387387
* register_switchdev_notifier - Register notifier
@@ -427,28 +427,39 @@ EXPORT_SYMBOL_GPL(call_switchdev_notifiers);
427427

428428
int register_switchdev_blocking_notifier(struct notifier_block *nb)
429429
{
430-
struct blocking_notifier_head *chain = &switchdev_blocking_notif_chain;
430+
struct raw_notifier_head *chain = &switchdev_blocking_notif_chain;
431+
int err;
432+
433+
rtnl_lock();
434+
err = raw_notifier_chain_register(chain, nb);
435+
rtnl_unlock();
431436

432-
return blocking_notifier_chain_register(chain, nb);
437+
return err;
433438
}
434439
EXPORT_SYMBOL_GPL(register_switchdev_blocking_notifier);
435440

436441
int unregister_switchdev_blocking_notifier(struct notifier_block *nb)
437442
{
438-
struct blocking_notifier_head *chain = &switchdev_blocking_notif_chain;
443+
struct raw_notifier_head *chain = &switchdev_blocking_notif_chain;
444+
int err;
439445

440-
return blocking_notifier_chain_unregister(chain, nb);
446+
rtnl_lock();
447+
err = raw_notifier_chain_unregister(chain, nb);
448+
rtnl_unlock();
449+
450+
return err;
441451
}
442452
EXPORT_SYMBOL_GPL(unregister_switchdev_blocking_notifier);
443453

444454
int call_switchdev_blocking_notifiers(unsigned long val, struct net_device *dev,
445455
struct switchdev_notifier_info *info,
446456
struct netlink_ext_ack *extack)
447457
{
458+
ASSERT_RTNL();
448459
info->dev = dev;
449460
info->extack = extack;
450-
return blocking_notifier_call_chain(&switchdev_blocking_notif_chain,
451-
val, info);
461+
return raw_notifier_call_chain(&switchdev_blocking_notif_chain,
462+
val, info);
452463
}
453464
EXPORT_SYMBOL_GPL(call_switchdev_blocking_notifiers);
454465

0 commit comments

Comments
 (0)