bonding: rebuild the lock use for bond_activebackup_arp_mon()
Subsystems (3)
PATCH v2 6/10 bonding: rebuild the lock use for bond_activebackup_arp_mon()
The bond_activebackup_arp_mon() use the bond lock for read to protect the slave list, it is no effect, and the RTNL is only called for bond_ab_arp_commit() and peer notify, for the performance better, use RCU instead of the bond lock, because the bond slave list need to called in RCU, add a new bond_first_slave_rcu() to get the first slave in RCU protection.
When bond_ab_arp_inspect() and should_notify_peers is true, the RTNL will called twice, it is a loss of performance, so make the two RTNL together to avoid performance loss.
--- drivers/net/bonding/bond_main.c | 35 +++++++++++++++++++---------------- drivers/net/bonding/bonding.h | 7 +++++++ 2 files changed, 26 insertions(+), 16 deletions(-)
drivers/net/bonding/bond_main.c +19 -16
@@ -2524,7 +2524,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)struct slave *slave;int commit =0 ; -bond_for_each_slave (bond, slave, iter) { +bond_for_each_slave_rcu (bond, slave, iter) { slave->new_link =BOND_LINK_NOCHANGE ; last_rx =slave_last_rx (bond, slave);
@@ -2586,7 +2586,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)* Called to commit link state changes noted by inspection step of * active-backup mode ARP monitor. * -* Called with RTNL and bond->lock for read. +* Called with RTNL hold. */ static void bond_ab_arp_commit (struct bonding *bond) {
@@ -2661,7 +2661,7 @@ do_failover:/* * Send ARP probes for active-backup mode ARP monitor. * -* Called with bond->lock held for read. +* Called with rcu_read_lock hold. */ static void bond_ab_arp_probe (struct bonding *bond) {
@@ -2690,14 +2690,14 @@ static void bond_ab_arp_probe(struct bonding *bond)*/ if (!bond->current_arp_slave) { - bond->current_arp_slave =bond_first_slave (bond); + bond->current_arp_slave =bond_first_slave_rcu (bond);if (!bond->current_arp_slave)return ; }bond_set_slave_inactive_flags (bond->current_arp_slave); -bond_for_each_slave (bond, slave, iter) { +bond_for_each_slave_rcu (bond, slave, iter) {if (!found && !before &&IS_UP (slave->dev)) before = slave;
@@ -2745,43 +2745,46 @@ void bond_activebackup_arp_mon(struct work_struct *work)bool should_notify_peers = false;int delta_in_ticks; -read_lock (&bond->lock); - delta_in_ticks =msecs_to_jiffies (bond->params.arp_interval); -if (!bond_has_slaves (bond)) +rcu_read_lock (); + +if (!bond_has_slaves_rcu (bond)) { +rcu_read_unlock (); goto re_arm; + } should_notify_peers =bond_should_notify_peers (bond);if (bond_ab_arp_inspect (bond)) { -read_unlock (&bond->lock); +rcu_read_unlock ();/* Race avoidance with bond_close flush of workqueue */ if (!rtnl_trylock ()) { -read_lock (&bond->lock); delta_in_ticks =1 ; should_notify_peers = false; goto re_arm; } -read_lock (&bond->lock); -bond_ab_arp_commit (bond); -read_unlock (&bond->lock); +if (should_notify_peers) { +call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , + bond->dev); + should_notify_peers = false; + } +rtnl_unlock (); -read_lock (&bond->lock); +rcu_read_lock (); }bond_ab_arp_probe (bond); +rcu_read_unlock (); re_arm:if (bond->params.arp_interval)queue_delayed_work (bond->wq, &bond->arp_work, delta_in_ticks); -read_unlock (&bond->lock); -if (should_notify_peers) {if (!rtnl_trylock ())return ;
drivers/net/bonding/bonding.h +7 -0
@@ -97,6 +97,13 @@ netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \ NULL) +#define bond_first_slave_rcu (bond) \ + ({struct list_head *__ptr = (bond_slave_list(bond)); \ + struct list_head *__next = ACCESS_ONCE(__ptr->next); \ + likely(__ptr != __next) ? \ + netdev_adjacent_get_private_rcu(__next) : NULL; \ + }) +#define bond_is_first_slave (bond, pos) (pos == bond_first_slave(bond))#define bond_is_last_slave (bond, pos) (pos == bond_last_slave(bond))
Signature · 1 line
1.8.2.1
Quoted 74 lines · Ding Tianhong
The
bond_activebackup_arp_mon()use the bond lock for read to protect the slave list, it is no effect, and the RTNL is only called forbond_ab_arp_commit()and peer notify, for the performance better, use RCU instead of the bond lock, because the bond slave list need to called in RCU, add a newbond_first_slave_rcu()to get the first slave in RCU protection.When
bond_ab_arp_inspect()andshould_notify_peersis true, the RTNL will called twice, it is a loss of performance, so make the two RTNL together to avoid performance loss.Suggested-by Jay Vosburgh <[email protected]>Suggested-by Veaceslav Falico <[email protected]>Signed-off-by Ding Tianhong <[email protected]>--- drivers/net/bonding/bond_main.c | 35 +++++++++++++++++++---------------- drivers/net/bonding/bonding.h | 7 +++++++ 2 files changed, 26 insertions(+), 16 deletions(-)drivers/net/bonding/bond_main.c +5
-7@@ -2524,7 +2524,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)struct slave *slave;int commit =0 ; -bond_for_each_slave (bond, slave, iter) { +bond_for_each_slave_rcu (bond, slave, iter) { slave->new_link =BOND_LINK_NOCHANGE ; last_rx =slave_last_rx (bond, slave);@@ -2586,7 +2586,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)* Called to commit link state changes noted by inspection step of * active-backup mode ARP monitor. * -* Called with RTNL and bond->lock for read. +* Called with RTNL hold. */ static void bond_ab_arp_commit (struct bonding *bond) {@@ -2661,7 +2661,7 @@ do_failover:/* * Send ARP probes for active-backup mode ARP monitor. * -* Called with bond->lock held for read. +* Called with rcu_read_lock hold. */ static void bond_ab_arp_probe (struct bonding *bond) {@@ -2690,14 +2690,14 @@ static void bond_ab_arp_probe(struct bonding *bond)*/ if (!bond->current_arp_slave) { - bond->current_arp_slave =bond_first_slave (bond); + bond->current_arp_slave =bond_first_slave_rcu (bond);if (!bond->current_arp_slave)return ; }bond_set_slave_inactive_flags (bond->current_arp_slave); -bond_for_each_slave (bond, slave, iter) { +bond_for_each_slave_rcu (bond, slave, iter) {if (!found && !before &&IS_UP (slave->dev)) before = slave;@@ -2745,43 +2745,46 @@ void bond_activebackup_arp_mon(struct work_struct *work)bool should_notify_peers = false;int delta_in_ticks; -read_lock (&bond->lock); - delta_in_ticks =msecs_to_jiffies (bond->params.arp_interval);
drivers/net/bonding/bond_main.c void bond_activebackup_arp_mon(struct work_struct *work) · line 2757
Quoted 10 lines
drivers/net/bonding/bond_main.c +5
-1-if (!bond_has_slaves (bond)) +rcu_read_lock (); + +if (!bond_has_slaves_rcu (bond)) { +rcu_read_unlock (); goto re_arm; + } should_notify_peers =bond_should_notify_peers (bond);
Again, bond_should_notify_peers() is not RCU-safe.
Quoted 20 lines
drivers/net/bonding/bond_main.c +3
-5if (bond_ab_arp_inspect (bond)) { -read_unlock (&bond->lock); +rcu_read_unlock ();/* Race avoidance with bond_close flush of workqueue */ if (!rtnl_trylock ()) { -read_lock (&bond->lock); delta_in_ticks =1 ; should_notify_peers = false; goto re_arm; } -read_lock (&bond->lock); -bond_ab_arp_commit (bond); -read_unlock (&bond->lock); +if (should_notify_peers) { + call_netdevice_notifiers(NETDEV_NOTIFY_PEERS,
drivers/net/bonding/bond_main.c void bond_activebackup_arp_mon(struct work_struct *work) · line 2781
Quoted 10 lines
drivers/net/bonding/bond_main.c +5
-1+ bond->dev); + should_notify_peers = false; + } +rtnl_unlock (); -read_lock (&bond->lock); +rcu_read_lock (); }bond_ab_arp_probe (bond);
Generally you might be safe in bond_ab_arp_probe() due to the synchronization done by netdev_rx_handler_unregister(), but this code may run after that (and after the unlinked slave) but before current_arp_slave is set to NULL and thus use it. Now I don't see a direct problem with that, only a complication that can bite us later. I vaguely remember that I re-worked the bond_ab_arp_probe() and the way current_arp_slave works when doing this transition in my patches.
Quoted 16 lines
drivers/net/bonding/bond_main.c +1
-2+rcu_read_unlock (); re_arm:if (bond->params.arp_interval)queue_delayed_work (bond->wq, &bond->arp_work, delta_in_ticks); -read_unlock (&bond->lock); -if (should_notify_peers) {if (!rtnl_trylock ())return ;drivers/net/bonding/bonding.h +0
-0
drivers/net/bonding/bonding.h line 106
Quoted 10 lines
drivers/net/bonding/bonding.h +7
-0@@ -97,6 +97,13 @@ netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \ NULL) +#define bond_first_slave_rcu (bond) \ + ({struct list_head *__ptr = (bond_slave_list(bond)); \ + struct list_head *__next = ACCESS_ONCE(__ptr->next); \ + likely(__ptr != __next) ? \ + netdev_adjacent_get_private_rcu(__next) : NULL; \ + }) +
Honestly, I don't like this, it sure can be re-written in a more straight-forward manner.
Quoted 4 lines
drivers/net/bonding/bonding.h +0
-0#define bond_is_first_slave (bond, pos) (pos == bond_first_slave(bond))#define bond_is_last_slave (bond, pos) (pos == bond_last_slave(bond))
Quoted 84 lines · Nikolay Aleksandrov
Quoted 83 lines · Ding Tianhong
The
bond_activebackup_arp_mon()use the bond lock for read to protect the slave list, it is no effect, and the RTNL is only called forbond_ab_arp_commit()and peer notify, for the performance better, use RCU instead of the bond lock, because the bond slave list need to called in RCU, add a newbond_first_slave_rcu()to get the first slave in RCU protection.When
bond_ab_arp_inspect()andshould_notify_peersis true, the RTNL will called twice, it is a loss of performance, so make the two RTNL together to avoid performance loss.Suggested-by Jay Vosburgh <[email protected]>Suggested-by Veaceslav Falico <[email protected]>Signed-off-by Ding Tianhong <[email protected]>--- drivers/net/bonding/bond_main.c | 35 +++++++++++++++++++---------------- drivers/net/bonding/bonding.h | 7 +++++++ 2 files changed, 26 insertions(+), 16 deletions(-)drivers/net/bonding/bond_main.c +10
-8@@ -2524,7 +2524,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)struct slave *slave;int commit =0 ; -bond_for_each_slave (bond, slave, iter) { +bond_for_each_slave_rcu (bond, slave, iter) { slave->new_link =BOND_LINK_NOCHANGE ; last_rx =slave_last_rx (bond, slave);@@ -2586,7 +2586,7 @@ static int bond_ab_arp_inspect(struct bonding *bond)* Called to commit link state changes noted by inspection step of * active-backup mode ARP monitor. * -* Called with RTNL and bond->lock for read. +* Called with RTNL hold. */ static void bond_ab_arp_commit (struct bonding *bond) {@@ -2661,7 +2661,7 @@ do_failover:/* * Send ARP probes for active-backup mode ARP monitor. * -* Called with bond->lock held for read. +* Called with rcu_read_lock hold. */ static void bond_ab_arp_probe (struct bonding *bond) {@@ -2690,14 +2690,14 @@ static void bond_ab_arp_probe(struct bonding *bond)*/ if (!bond->current_arp_slave) { - bond->current_arp_slave =bond_first_slave (bond); + bond->current_arp_slave =bond_first_slave_rcu (bond);if (!bond->current_arp_slave)return ; }bond_set_slave_inactive_flags (bond->current_arp_slave); -bond_for_each_slave (bond, slave, iter) { +bond_for_each_slave_rcu (bond, slave, iter) {if (!found && !before &&IS_UP (slave->dev)) before = slave;@@ -2745,43 +2745,46 @@ void bond_activebackup_arp_mon(struct work_struct *work)bool should_notify_peers = false;int delta_in_ticks; -read_lock (&bond->lock); - delta_in_ticks =msecs_to_jiffies (bond->params.arp_interval); -if (!bond_has_slaves (bond)) +rcu_read_lock (); + +if (!bond_has_slaves_rcu (bond)) { +rcu_read_unlock (); goto re_arm; + }
Quoted 2 lines
drivers/net/bonding/bond_main.c void bond_activebackup_arp_mon(struct work_struct *work) · line 2757
Quoted 1 line
drivers/net/bonding/bond_main.c +0
-0should_notify_peers =bond_should_notify_peers (bond);Again,
bond_should_notify_peers()is not RCU-safe.
yes.
Quoted 29 lines
Quoted 29 lines
drivers/net/bonding/bond_main.c +8
-6if (bond_ab_arp_inspect (bond)) { -read_unlock (&bond->lock); +rcu_read_unlock ();/* Race avoidance with bond_close flush of workqueue */ if (!rtnl_trylock ()) { -read_lock (&bond->lock); delta_in_ticks =1 ; should_notify_peers = false; goto re_arm; } -read_lock (&bond->lock); -bond_ab_arp_commit (bond); -read_unlock (&bond->lock); +if (should_notify_peers) { +call_netdevice_notifiers (NETDEV_NOTIFY_PEERS , + bond->dev); + should_notify_peers = false; + } +rtnl_unlock (); -read_lock (&bond->lock); +rcu_read_lock (); }
Quoted 7 lines
drivers/net/bonding/bond_main.c void bond_activebackup_arp_mon(struct work_struct *work) · line 2781
Quoted 1 line
drivers/net/bonding/bond_main.c +0
-0bond_ab_arp_probe (bond);Generally you might be safe in
bond_ab_arp_probe()due to the synchronization done bynetdev_rx_handler_unregister(), but this code may run after that (and after the unlinked slave) but beforecurrent_arp_slaveis set to NULL and thus use it. Now I don't see a direct problem with that, only a complication that can bite us later. I vaguely remember that I re-worked thebond_ab_arp_probe()and the waycurrent_arp_slaveworks when doing this transition in my patches.
maybe I miss the patch, pls send me the commit and I will check it again.
Quoted 19 lines
Quoted 19 lines
drivers/net/bonding/bond_main.c +1
-2+rcu_read_unlock (); re_arm:if (bond->params.arp_interval)queue_delayed_work (bond->wq, &bond->arp_work, delta_in_ticks); -read_unlock (&bond->lock); -if (should_notify_peers) {if (!rtnl_trylock ())return ;drivers/net/bonding/bonding.h +0
-0@@ -97,6 +97,13 @@ netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \ NULL)
Quoted 9 lines
drivers/net/bonding/bonding.h line 106
Quoted 7 lines
drivers/net/bonding/bonding.h +7
-0+#define bond_first_slave_rcu (bond) \ + ({struct list_head *__ptr = (bond_slave_list(bond)); \ + struct list_head *__next = ACCESS_ONCE(__ptr->next); \ + likely(__ptr != __next) ? \ + netdev_adjacent_get_private_rcu(__next) : NULL; \ + }) +Honestly, I don't like this, it sure can be re-written in a more straight-forward manner.
ok, I will re-write it and make it more comfortable.
Regards.
Ding
Quoted 9 lines
drivers/net/bonding/bonding.h line 109
Quoted 4 lines
drivers/net/bonding/bonding.h +0
-0#define bond_is_first_slave (bond, pos) (pos == bond_first_slave(bond))#define bond_is_last_slave (bond, pos) (pos == bond_last_slave(bond))--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 20 lines
Quoted 20 lines
drivers/net/bonding/bond_main.c +1
-2+rcu_read_unlock (); re_arm:if (bond->params.arp_interval)queue_delayed_work (bond->wq, &bond->arp_work, delta_in_ticks); -read_unlock (&bond->lock); -if (should_notify_peers) {if (!rtnl_trylock ())return ;drivers/net/bonding/bonding.h +0
-0@@ -97,6 +97,13 @@ netdev_adjacent_get_private(bond_slave_list(bond)->prev) : \ NULL)
Quoted 9 lines
drivers/net/bonding/bonding.h line 106
Quoted 7 lines
drivers/net/bonding/bonding.h +7
-0+#define bond_first_slave_rcu (bond) \ + ({struct list_head *__ptr = (bond_slave_list(bond)); \ + struct list_head *__next = ACCESS_ONCE(__ptr->next); \ + likely(__ptr != __next) ? \ + netdev_adjacent_get_private_rcu(__next) : NULL; \ + }) +Honestly, I don't like this, it sure can be re-written in a more straight-forward manner.
I have re-write the function by 2 ways, the first one just like list_first_or_null_rcu, the second one just used the exist function netdev_lower_get_next_private_rcu, I think the first one is better, it is more exactly.
1:
+#define bond_first_slave_rcu(bond) \
+ ({struct list_head *__ptr = (bond_slave_list(bond)); \
+ struct list_head *__next = ACCESS_ONCE(__ptr->next); \
+ likely(__ptr != __next) ? \
+ (list_entry_rcu(__next, struct netdev_adjacent, list))->private : NULL; \
+ })
+
2:
+#define bond_first_slave_rcu(bond) \
+ ({struct list_head *iter = (bond_slave_list(bond)); \
+ netdev_lower_get_next_private_rcu(bond->dev, &iter) ? : NULL; \
+ })
what do you think about is, maybe you have more wonderful idea, pls remind me, thanks
Regards
Ding
Quoted 5 lines
--
To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html