Skip to content

Commit

Permalink
net: bonding: correctly annotate RCU in bond_should_notify_peers()
Browse files Browse the repository at this point in the history
RCU use in bond_should_notify_peers() looks wrong, since it does
rcu_dereference(), leaves the critical section, and uses the
pointer after that.

Luckily, it's called either inside a nested RCU critical section
or with the RTNL held.

Annotate it with rcu_dereference_rtnl() instead, and remove the
inner RCU critical section.

Fixes: 4cb4f97 ("bonding: rebuild the lock use for bond_mii_monitor()")
Reviewed-by: Jiri Pirko <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
Acked-by: Jay Vosburgh <[email protected]>
Link: https://patch.msgid.link/20240719094119.35c62455087d.I68eb9c0f02545b364b79a59f2110f2cf5682a8e2@changeid
Signed-off-by: Paolo Abeni <[email protected]>
  • Loading branch information
jmberg-intel authored and Paolo Abeni committed Jul 23, 2024
1 parent 39a9c25 commit 3ba359c
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/net/bonding/bond_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1121,13 +1121,10 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
return bestslave;
}

/* must be called in RCU critical section or with RTNL held */
static bool bond_should_notify_peers(struct bonding *bond)
{
struct slave *slave;

rcu_read_lock();
slave = rcu_dereference(bond->curr_active_slave);
rcu_read_unlock();
struct slave *slave = rcu_dereference_rtnl(bond->curr_active_slave);

if (!slave || !bond->send_peer_notif ||
bond->send_peer_notif %
Expand Down

0 comments on commit 3ba359c

Please sign in to comment.