From: Veaceslav Falico <vfalico@redhat.com>
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, Veaceslav Falico <vfalico@redhat.com>,
Jay Vosburgh <fubar@us.ibm.com>,
Andy Gospodarek <andy@greyhouse.net>
Subject: [PATCH net-next 12/26] bonding: rework rlb_next_rx_slave() to use bond_for_each_slave()
Date: Mon, 9 Sep 2013 22:16:30 +0200 [thread overview]
Message-ID: <1378757804-3159-13-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1378757804-3159-1-git-send-email-vfalico@redhat.com>
Currently, we're using bond_for_each_slave_from(), which is really hard to
implement under RCU and/or neighbour list.
Remove it and use bond_for_each_slave() instead, taking care of the last
used slave.
Also, rename next_rx_slave to rx_slave and store the current (last)
rx_slave.
CC: Jay Vosburgh <fubar@us.ibm.com>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
drivers/net/bonding/bond_alb.c | 41 +++++++++++++++++++++--------------------
drivers/net/bonding/bond_alb.h | 4 +---
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index caa437d..1172474 100644
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -383,30 +383,31 @@ out:
static struct slave *rlb_next_rx_slave(struct bonding *bond)
{
struct alb_bond_info *bond_info = &(BOND_ALB_INFO(bond));
- struct slave *rx_slave, *slave, *start_at;
- int i = 0;
-
- if (bond_info->next_rx_slave)
- start_at = bond_info->next_rx_slave;
- else
- start_at = bond_first_slave(bond);
-
- rx_slave = NULL;
+ struct slave *before = NULL, *rx_slave = NULL, *slave;
+ struct list_head *iter;
+ bool found = false;
- bond_for_each_slave_from(bond, slave, i, start_at) {
- if (SLAVE_IS_OK(slave)) {
- if (!rx_slave) {
- rx_slave = slave;
- } else if (slave->speed > rx_slave->speed) {
+ bond_for_each_slave(bond, slave, iter) {
+ if (!SLAVE_IS_OK(slave))
+ continue;
+ if (!found) {
+ if (!before || before->speed < slave->speed)
+ before = slave;
+ } else {
+ if (!rx_slave || rx_slave->speed < slave->speed)
rx_slave = slave;
- }
}
+ if (slave == bond_info->rx_slave)
+ found = true;
}
+ /* we didn't find anything after the current or we have something
+ * better before and up to the current slave
+ */
+ if (!rx_slave || (before && rx_slave->speed < before->speed))
+ rx_slave = before;
- if (rx_slave) {
- slave = bond_next_slave(bond, rx_slave);
- bond_info->next_rx_slave = slave;
- }
+ if (rx_slave)
+ bond_info->rx_slave = rx_slave;
return rx_slave;
}
@@ -1611,7 +1612,7 @@ void bond_alb_deinit_slave(struct bonding *bond, struct slave *slave)
tlb_clear_slave(bond, slave, 0);
if (bond->alb_info.rlb_enabled) {
- bond->alb_info.next_rx_slave = NULL;
+ bond->alb_info.rx_slave = NULL;
rlb_clear_slave(bond, slave);
}
}
diff --git a/drivers/net/bonding/bond_alb.h b/drivers/net/bonding/bond_alb.h
index 28d8e4c..7736ce2 100644
--- a/drivers/net/bonding/bond_alb.h
+++ b/drivers/net/bonding/bond_alb.h
@@ -153,9 +153,7 @@ struct alb_bond_info {
u8 rx_ntt; /* flag - need to transmit
* to all rx clients
*/
- struct slave *next_rx_slave;/* next slave to be assigned
- * to a new rx client for
- */
+ struct slave *rx_slave;/* last slave to xmit from */
u8 primary_is_promisc; /* boolean */
u32 rlb_promisc_timeout_counter;/* counts primary
* promiscuity time
--
1.8.4
next prev parent reply other threads:[~2013-09-09 20:16 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 20:16 [PATCH net-next 0/26] bonding: use neighbours instead of own lists Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 01/26] net: add adj_list to save only neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 02/26] net: add RCU variant to search for netdev_adjacent link Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 03/26] net: uninline netdev neighbour functions Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 04/26] net: add netdev_adjacent->private and allow to use it Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 05/26] bonding: populate neighbour's private on enslave Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 06/26] bonding: modify bond_get_slave_by_dev() to use neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 07/26] net: add for_each iterators through neighbour lower link's private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 08/26] bonding: remove bond_for_each_slave_reverse() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 09/26] bonding: make bond_for_each_slave() use lower neighbour's private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 10/26] bonding: use bond_for_each_slave() in bond_uninit() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 11/26] bonding: rework bond_3ad_xmit_xor() to use bond_for_each_slave() only Veaceslav Falico
2013-09-09 20:16 ` Veaceslav Falico [this message]
2013-09-09 20:16 ` [PATCH net-next 13/26] bonding: rework bond_find_best_slave() to use bond_for_each_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 14/26] bonding: rework bond_ab_arp_probe() " Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 15/26] bonding: remove unused bond_for_each_slave_from() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 16/26] bonding: add bond_has_slaves() and use it Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 17/26] bonding: convert bond_has_slaves() to use the neighbour list Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 18/26] net: add a possibility to get private from netdev_adjacent->list Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 19/26] bonding: convert first/last slave logic to use neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 20/26] bonding: remove bond_prev_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 21/26] net: add a function to get the next private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 22/26] bonding: use neighbours for bond_next_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 23/26] bonding: remove slave lists Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 24/26] net: expose the master link to sysfs, and remove it from bond Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 25/26] vlan: link the upper neighbour only after registering Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 26/26] net: create sysfs symlinks for neighbour devices Veaceslav Falico
2013-09-10 11:08 ` [PATCH net-next 0/26] bonding: use neighbours instead of own lists Ding Tianhong
2013-09-10 16:41 ` Veaceslav Falico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378757804-3159-13-git-send-email-vfalico@redhat.com \
--to=vfalico@redhat.com \
--cc=andy@greyhouse.net \
--cc=fubar@us.ibm.com \
--cc=jiri@resnulli.us \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).