For BM_STABLE bonds, instead of choosing the sort key in the
qsort() comparator. This patch makes it a configuration setting of
each slave. This will help rest LACP out of the bonding code
further in future patches.
---
lib/bond.c | 21 +++++++++------------
lib/bond.h | 3 ++-
vswitchd/bridge.c | 6 +++++-
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/lib/bond.c b/lib/bond.c
index b1ca5d5..65ca5c0 100644
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -74,6 +74,7 @@ struct bond_slave {
uint64_t tx_bytes; /* Sum across 'tx_bytes' of entries. */
/* BM_STABLE specific bonding info. */
+ uint16_t stb_id; /* ID used for 'stb_slaves' ordering. */
size_t stb_idx; /* Index in 'bond''s 'stb_slaves' array.
Undefined value if participating in a
BTM_STABLE bond or not enabled. */
@@ -357,6 +358,10 @@ bond_reconfigure(struct bond *bond, const struct
bond_settings *s)
* bond. If 'slave_' already exists within 'bond' then this function
* reconfigures the existing slave.
*
+ * 'stb_id' is used in BM_STABLE bonds to guarantee consistent slave choices
+ * across restarts and distributed vswitch instances. It should be unique per
+ * slave, and preferably consistent across restarts and reconfigurations.
+ *
* 'netdev' must be the network device that 'slave_' represents. It is owned
* by the client, so the client must not close it before either unregistering
* 'slave_' or destroying 'bond'.
@@ -364,7 +369,8 @@ bond_reconfigure(struct bond *bond, const struct
bond_settings *s)
* If 'bond' has a LACP configuration then 'slave_' should be the same handle
* used in the LACP module. */
void
-bond_slave_register(struct bond *bond, void *slave_, struct netdev *netdev)
+bond_slave_register(struct bond *bond, void *slave_, uint16_t stb_id,
+ struct netdev *netdev)
{
struct bond_slave *slave = bond_slave_lookup(bond, slave_);
@@ -380,6 +386,7 @@ bond_slave_register(struct bond *bond, void *slave_, struct
netdev *netdev)
bond_enable_slave(slave, slave->up, NULL);
}
+ slave->stb_id = stb_id;
slave->netdev = netdev;
free(slave->name);
slave->name = xstrdup(netdev_get_name(netdev));
@@ -1273,18 +1280,8 @@ bond_stb_sort_cmp__(const void *a_, const void *b_)
const struct bond_slave *const *bp = b_;
const struct bond_slave *a = *ap;
const struct bond_slave *b = *bp;
- const struct lacp *lacp = a->bond->lacp;
- int a_id, b_id;
-
- if (lacp) {
- a_id = lacp_slave_get_port_id(lacp, a->aux);
- b_id = lacp_slave_get_port_id(lacp, b->aux);
- } else {
- a_id = netdev_get_ifindex(a->netdev);
- b_id = netdev_get_ifindex(b->netdev);
- }
- return (a_id == b_id ? 0 : (a_id < b_id ? -1 : 1));
+ return (a->stb_id == b->stb_id ? 0 : (a->stb_id < b->stb_id ? -1 : 1));
}
static bool
diff --git a/lib/bond.h b/lib/bond.h
index cb6563a..e3690ce 100644
--- a/lib/bond.h
+++ b/lib/bond.h
@@ -75,7 +75,8 @@ struct bond *bond_create(const struct bond_settings *);
void bond_destroy(struct bond *);
bool bond_reconfigure(struct bond *, const struct bond_settings *);
-void bond_slave_register(struct bond *, void *slave_, struct netdev *);
+void bond_slave_register(struct bond *, void *slave_,
+ uint16_t stable_id, struct netdev *);
void bond_slave_unregister(struct bond *, const void *slave);
void bond_run(struct bond *, struct tag_set *);
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 98b9d83..98027e0 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -3174,7 +3174,11 @@ port_reconfigure_bond(struct port *port)
}
LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
- bond_slave_register(iface->port->bond, iface, iface->netdev);
+ uint16_t stable_id = (port->lacp
+ ? lacp_slave_get_port_id(port->lacp, iface)
+ : iface->dp_ifidx);
+ bond_slave_register(iface->port->bond, iface, stable_id,
+ iface->netdev);
}
}
--
1.7.4.2
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
