static bool
may_send_learning_packets(const struct bond *bond)
{
- return !bond->lacp_negotiated && bond->balance != BM_AB;
+ return !bond->lacp_negotiated && bond->balance != BM_AB &&
+ bond->active_slave;
}
/* Returns true if 'bond' needs the client to send out packets to assist with
* MAC learning on 'bond'. If this function returns true, then the client
* should iterate through its MAC learning table for the bridge on which 'bond'
* is located. For each MAC that has been learned on a port other than 'bond',
- * it should call bond_send_learning_packet().
+ * it should call bond_compose_learning_packet().
*
* This function will only return true if 'bond' is in SLB mode and LACP is not
* negotiated. Otherwise sending learning packets isn't necessary.
/* Sends a gratuitous learning packet on 'bond' from 'eth_src' on 'vlan'.
*
- * See bond_should_send_learning_packets() for description of usage. */
-int
-bond_send_learning_packet(struct bond *bond,
- const uint8_t eth_src[ETH_ADDR_LEN],
- uint16_t vlan)
+ * See bond_should_send_learning_packets() for description of usage. The
+ * caller should send the composed packet on the port associated with
+ * port_aux and takes ownership of the returned ofpbuf. */
+struct ofpbuf *
+bond_compose_learning_packet(struct bond *bond,
+ const uint8_t eth_src[ETH_ADDR_LEN],
+ uint16_t vlan, void **port_aux)
{
struct bond_slave *slave;
- struct ofpbuf packet;
+ struct ofpbuf *packet;
struct flow flow;
- int error;
assert(may_send_learning_packets(bond));
- if (!bond->active_slave) {
- /* Nowhere to send the learning packet. */
- return 0;
- }
memset(&flow, 0, sizeof flow);
memcpy(flow.dl_src, eth_src, ETH_ADDR_LEN);
slave = choose_output_slave(bond, &flow, vlan);
- ofpbuf_init(&packet, 0);
- compose_benign_packet(&packet, "Open vSwitch Bond Failover", 0xf177,
+ packet = ofpbuf_new(0);
+ compose_benign_packet(packet, "Open vSwitch Bond Failover", 0xf177,
eth_src);
if (vlan) {
- eth_push_vlan(&packet, htons(vlan));
+ eth_push_vlan(packet, htons(vlan));
}
- error = netdev_send(slave->netdev, &packet);
- ofpbuf_uninit(&packet);
- return error;
+ *port_aux = slave->aux;
+ return packet;
}
\f
/* Checks whether a packet that arrived on 'slave_' within 'bond', with an
}
}
- /* Drop all packets which arrive on backup slaves. This is similar to how
- * Linux bonding handles active-backup bonds. */
- if (bond->balance == BM_AB) {
+ switch (bond->balance) {
+ case BM_AB:
+ /* Drop all packets which arrive on backup slaves. This is similar to
+ * how Linux bonding handles active-backup bonds. */
*tags |= bond_get_active_slave_tag(bond);
if (bond->active_slave != slave) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
slave->name, ETH_ADDR_ARGS(eth_dst));
return BV_DROP;
}
+ return BV_ACCEPT;
+
+ case BM_TCP:
+ /* TCP balancing has degraded to SLB (otherwise the
+ * bond->lacp_negotiated check above would have processed this).
+ *
+ * Fall through. */
+ case BM_SLB:
+ /* Drop all packets for which we have learned a different input port,
+ * because we probably sent the packet on one slave and got it back on
+ * the other. Gratuitous ARP packets are an exception to this rule:
+ * the host has moved to another switch. The exception to the
+ * exception is if we locked the learning table to avoid reflections on
+ * bond slaves. */
+ return BV_DROP_IF_MOVED;
+
+ case BM_STABLE:
+ return BV_ACCEPT;
}
- /* Drop all packets for which we have learned a different input port,
- * because we probably sent the packet on one slave and got it back on the
- * other. Gratuitous ARP packets are an exception to this rule: the host
- * has moved to another switch. The exception to the exception is if we
- * locked the learning table to avoid reflections on bond slaves. */
- return BV_DROP_IF_MOVED;
+ NOT_REACHED();
}
/* Returns the slave (registered on 'bond' by bond_slave_register()) to which
static void
bond_unixctl_list(struct unixctl_conn *conn,
- const char *args OVS_UNUSED, void *aux OVS_UNUSED)
+ int argc OVS_UNUSED, const char *argv[] OVS_UNUSED,
+ void *aux OVS_UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct bond *bond;
static void
bond_unixctl_show(struct unixctl_conn *conn,
- const char *args, void *aux OVS_UNUSED)
+ int argc OVS_UNUSED, const char *argv[],
+ void *aux OVS_UNUSED)
{
struct ds ds = DS_EMPTY_INITIALIZER;
const struct bond_slave *slave;
const struct bond *bond;
- bond = bond_find(args);
+ bond = bond_find(argv[1]);
if (!bond) {
unixctl_command_reply(conn, 501, "no such bond");
return;
ds_put_format(&ds, "\thash %d: %"PRIu64" kB load\n",
hash, be->tx_bytes / 1024);
- if (bond->balance != BM_SLB) {
- continue;
- }
-
- /* XXX How can we list the MACs assigned to hashes? */
+ /* XXX How can we list the MACs assigned to hashes of SLB bonds? */
}
}
unixctl_command_reply(conn, 200, ds_cstr(&ds));
}
static void
-bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_,
+bond_unixctl_migrate(struct unixctl_conn *conn,
+ int argc OVS_UNUSED, const char *argv[],
void *aux OVS_UNUSED)
{
- char *args = (char *) args_;
- char *save_ptr = NULL;
- char *bond_s, *hash_s, *slave_s;
+ const char *bond_s = argv[1];
+ const char *hash_s = argv[2];
+ const char *slave_s = argv[3];
struct bond *bond;
struct bond_slave *slave;
struct bond_entry *entry;
int hash;
- bond_s = strtok_r(args, " ", &save_ptr);
- hash_s = strtok_r(NULL, " ", &save_ptr);
- slave_s = strtok_r(NULL, " ", &save_ptr);
- if (!slave_s) {
- unixctl_command_reply(conn, 501,
- "usage: bond/migrate BOND HASH SLAVE");
- return;
- }
-
bond = bond_find(bond_s);
if (!bond) {
unixctl_command_reply(conn, 501, "no such bond");
}
static void
-bond_unixctl_set_active_slave(struct unixctl_conn *conn, const char *args_,
+bond_unixctl_set_active_slave(struct unixctl_conn *conn,
+ int argc OVS_UNUSED, const char *argv[],
void *aux OVS_UNUSED)
{
- char *args = (char *) args_;
- char *save_ptr = NULL;
- char *bond_s, *slave_s;
+ const char *bond_s = argv[1];
+ const char *slave_s = argv[2];
struct bond *bond;
struct bond_slave *slave;
- bond_s = strtok_r(args, " ", &save_ptr);
- slave_s = strtok_r(NULL, " ", &save_ptr);
- if (!slave_s) {
- unixctl_command_reply(conn, 501,
- "usage: bond/set-active-slave BOND SLAVE");
- return;
- }
-
bond = bond_find(bond_s);
if (!bond) {
unixctl_command_reply(conn, 501, "no such bond");
}
static void
-enable_slave(struct unixctl_conn *conn, const char *args_, bool enable)
+enable_slave(struct unixctl_conn *conn, const char *argv[], bool enable)
{
- char *args = (char *) args_;
- char *save_ptr = NULL;
- char *bond_s, *slave_s;
+ const char *bond_s = argv[1];
+ const char *slave_s = argv[2];
struct bond *bond;
struct bond_slave *slave;
- bond_s = strtok_r(args, " ", &save_ptr);
- slave_s = strtok_r(NULL, " ", &save_ptr);
- if (!slave_s) {
- char *usage = xasprintf("usage: bond/%s-slave BOND SLAVE",
- enable ? "enable" : "disable");
- unixctl_command_reply(conn, 501, usage);
- free(usage);
- return;
- }
-
bond = bond_find(bond_s);
if (!bond) {
unixctl_command_reply(conn, 501, "no such bond");
}
static void
-bond_unixctl_enable_slave(struct unixctl_conn *conn, const char *args,
+bond_unixctl_enable_slave(struct unixctl_conn *conn,
+ int argc OVS_UNUSED, const char *argv[],
void *aux OVS_UNUSED)
{
- enable_slave(conn, args, true);
+ enable_slave(conn, argv, true);
}
static void
-bond_unixctl_disable_slave(struct unixctl_conn *conn, const char *args,
+bond_unixctl_disable_slave(struct unixctl_conn *conn,
+ int argc OVS_UNUSED, const char *argv[],
void *aux OVS_UNUSED)
{
- enable_slave(conn, args, false);
+ enable_slave(conn, argv, false);
}
static void
-bond_unixctl_hash(struct unixctl_conn *conn, const char *args_,
+bond_unixctl_hash(struct unixctl_conn *conn, int argc, const char *argv[],
void *aux OVS_UNUSED)
{
- char *args = (char *) args_;
+ const char *mac_s = argv[1];
+ const char *vlan_s = argc > 2 ? argv[2] : NULL;
+ const char *basis_s = argc > 3 ? argv[3] : NULL;
uint8_t mac[ETH_ADDR_LEN];
uint8_t hash;
char *hash_cstr;
unsigned int vlan;
uint32_t basis;
- char *mac_s, *vlan_s, *basis_s;
- char *save_ptr = NULL;
-
- mac_s = strtok_r(args, " ", &save_ptr);
- vlan_s = strtok_r(NULL, " ", &save_ptr);
- basis_s = strtok_r(NULL, " ", &save_ptr);
if (vlan_s) {
if (sscanf(vlan_s, "%u", &vlan) != 1) {
void
bond_init(void)
{
- unixctl_command_register("bond/list", "", bond_unixctl_list, NULL);
- unixctl_command_register("bond/show", "port", bond_unixctl_show, NULL);
- unixctl_command_register("bond/migrate", "port hash slave",
+ unixctl_command_register("bond/list", "", 0, 0, bond_unixctl_list, NULL);
+ unixctl_command_register("bond/show", "port", 1, 1,
+ bond_unixctl_show, NULL);
+ unixctl_command_register("bond/migrate", "port hash slave", 3, 3,
bond_unixctl_migrate, NULL);
- unixctl_command_register("bond/set-active-slave", "port slave",
+ unixctl_command_register("bond/set-active-slave", "port slave", 2, 2,
bond_unixctl_set_active_slave, NULL);
- unixctl_command_register("bond/enable-slave", "port slave",
+ unixctl_command_register("bond/enable-slave", "port slave", 2, 2,
bond_unixctl_enable_slave, NULL);
- unixctl_command_register("bond/disable-slave", "port slave",
+ unixctl_command_register("bond/disable-slave", "port slave", 2, 2,
bond_unixctl_disable_slave, NULL);
- unixctl_command_register("bond/hash", "mac [vlan] [basis]",
+ unixctl_command_register("bond/hash", "mac [vlan] [basis]", 1, 3,
bond_unixctl_hash, NULL);
}
\f
git://git.onelab.eu / sliver-openvswitch.git / blobdiff