Skip to content

Commit 072256d

Browse files
Veaceslav Falicodavem330
Veaceslav Falico
authored andcommitted
bonding: make slave status notifications GFP_ATOMIC
Currently we're using GFP_KERNEL, however there are some path(s) where we can hold some spinlocks, specifically bond->curr_slave_lock: [ 4.722916] BUG: sleeping function called from invalid context at mm/slub.c:965 [ 4.724438] in_atomic(): 1, irqs_disabled(): 0, pid: 940, name: ifup-eth [ 4.726034] 5 locks held by ifup-eth/940: ...snip... [ 4.734646] #4: (&bond->curr_slave_lock){+...+.}, at: [<ffffffffa00badc6>] bond_enslave+0xda6/0xdd0 [bonding] ...snip... [ 4.759081] [<ffffffffa00b6f11>] bond_change_active_slave+0x191/0x3b0 [bonding] [ 4.760917] [<ffffffffa00b7227>] bond_select_active_slave+0xf7/0x1d0 [bonding] [ 4.762751] [<ffffffffa00badce>] bond_enslave+0xdae/0xdd0 [bonding] ...snip... As it's out of hot path and is a really rare event - change the gfp_t flags to GFP_ATOMIC to avoid sleeping under spinlock. v2: convert new notify calls to GFP_ATOMIC. CC: Thomas Glanzmann <[email protected]> CC: Ding Tianhong <[email protected]> CC: Jay Vosburgh <[email protected]> CC: Andy Gospodarek <[email protected]> Signed-off-by: Veaceslav Falico <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e90c148 commit 072256d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/net/bonding/bonding.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,15 +293,15 @@ static inline void bond_set_active_slave(struct slave *slave)
293293
{
294294
if (slave->backup) {
295295
slave->backup = 0;
296-
rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_KERNEL);
296+
rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);
297297
}
298298
}
299299

300300
static inline void bond_set_backup_slave(struct slave *slave)
301301
{
302302
if (!slave->backup) {
303303
slave->backup = 1;
304-
rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_KERNEL);
304+
rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);
305305
}
306306
}
307307

@@ -313,7 +313,7 @@ static inline void bond_set_slave_state(struct slave *slave,
313313

314314
slave->backup = slave_state;
315315
if (notify) {
316-
rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_KERNEL);
316+
rtmsg_ifinfo(RTM_NEWLINK, slave->dev, 0, GFP_ATOMIC);
317317
slave->should_notify = 0;
318318
} else {
319319
if (slave->should_notify)
@@ -343,7 +343,7 @@ static inline void bond_slave_state_notify(struct bonding *bond)
343343

344344
bond_for_each_slave(bond, tmp, iter) {
345345
if (tmp->should_notify) {
346-
rtmsg_ifinfo(RTM_NEWLINK, tmp->dev, 0, GFP_KERNEL);
346+
rtmsg_ifinfo(RTM_NEWLINK, tmp->dev, 0, GFP_ATOMIC);
347347
tmp->should_notify = 0;
348348
}
349349
}

0 commit comments

Comments
 (0)