X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbond.c;h=b3ae0c4b19ccf588358311dc150342dd35028b63;hb=550f0db4e0fb3bf9952e8a88b71242491b9dde2a;hp=c05e0c80648b2b7dede1ab537c0047df97ba8251;hpb=5dd165d3d86094b7f094752b1e5e001f6bf5c1b7;p=sliver-openvswitch.git diff --git a/lib/bond.c b/lib/bond.c index c05e0c806..b3ae0c4b1 100644 --- a/lib/bond.c +++ b/lib/bond.c @@ -75,9 +75,6 @@ struct bond_slave { struct list bal_node; /* In bond_rebalance()'s 'bals' list. */ struct list entries; /* 'struct bond_entry's assigned here. */ uint64_t tx_bytes; /* Sum across 'tx_bytes' of entries. */ - - /* BM_STABLE specific bonding info. */ - uint32_t stb_id; /* ID used for 'stb_slaves' ordering. */ }; /* A bond, that is, a set of network devices grouped to improve performance or @@ -104,9 +101,6 @@ struct bond { long long int next_rebalance; /* Next rebalancing time. */ bool send_learning_packets; - /* BM_STABLE specific bonding info. */ - tag_type stb_tag; /* Tag associated with this bond. */ - /* Legacy compatibility. */ long long int next_fake_iface_update; /* LLONG_MAX if disabled. */ @@ -114,6 +108,8 @@ struct bond { * where we can't otherwise provide revalidation feedback to the client. * That's only unixctl commands now; I hope no other cases will arise. */ struct tag_set unixctl_tags; + + int ref_cnt; }; static struct hmap all_bonds = HMAP_INITIALIZER(&all_bonds); @@ -134,6 +130,7 @@ static struct bond_entry *lookup_bond_entry(const struct bond *, static tag_type bond_get_active_slave_tag(const struct bond *); static struct bond_slave *choose_output_slave(const struct bond *, const struct flow *, + struct flow_wildcards *, uint16_t vlan, tag_type *tags); static void bond_update_fake_slave_stats(struct bond *); @@ -147,8 +144,6 @@ bond_mode_from_string(enum bond_mode *balance, const char *s) *balance = BM_TCP; } else if (!strcmp(s, bond_mode_to_string(BM_SLB))) { *balance = BM_SLB; - } else if (!strcmp(s, bond_mode_to_string(BM_STABLE))) { - *balance = BM_STABLE; } else if (!strcmp(s, bond_mode_to_string(BM_AB))) { *balance = BM_AB; } else { @@ -165,8 +160,6 @@ bond_mode_to_string(enum bond_mode balance) { return "balance-tcp"; case BM_SLB: return "balance-slb"; - case BM_STABLE: - return "stable"; case BM_AB: return "active-backup"; } @@ -187,8 +180,8 @@ bond_create(const struct bond_settings *s) bond = xzalloc(sizeof *bond); hmap_init(&bond->slaves); bond->no_slaves_tag = tag_create_random(); - bond->stb_tag = tag_create_random(); bond->next_fake_iface_update = LLONG_MAX; + bond->ref_cnt = 1; bond_reconfigure(bond, s); @@ -197,9 +190,21 @@ bond_create(const struct bond_settings *s) return bond; } +struct bond * +bond_ref(const struct bond *bond_) +{ + struct bond *bond = CONST_CAST(struct bond *, bond_); + + if (bond) { + ovs_assert(bond->ref_cnt > 0); + bond->ref_cnt++; + } + return bond; +} + /* Frees 'bond'. */ void -bond_destroy(struct bond *bond) +bond_unref(struct bond *bond) { struct bond_slave *slave, *next_slave; @@ -207,6 +212,11 @@ bond_destroy(struct bond *bond) return; } + ovs_assert(bond->ref_cnt > 0); + if (--bond->ref_cnt) { + return; + } + hmap_remove(&all_bonds, &bond->hmap_node); HMAP_FOR_EACH_SAFE (slave, next_slave, hmap_node, &bond->slaves) { @@ -256,12 +266,6 @@ bond_reconfigure(struct bond *bond, const struct bond_settings *s) if (bond->balance != s->balance) { bond->balance = s->balance; revalidate = true; - - if (bond->balance == BM_STABLE) { - VLOG_WARN_ONCE("Stable bond mode is deprecated and may be removed" - " in February 2013. Please email" - " dev@openvswitch.org with concerns."); - } } if (bond->basis != s->basis) { @@ -303,17 +307,12 @@ bond_slave_set_netdev__(struct bond_slave *slave, struct netdev *netdev) * 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'. */ void -bond_slave_register(struct bond *bond, void *slave_, uint32_t stb_id, - struct netdev *netdev) +bond_slave_register(struct bond *bond, void *slave_, struct netdev *netdev) { struct bond_slave *slave = bond_slave_lookup(bond, slave_); @@ -331,11 +330,6 @@ bond_slave_register(struct bond *bond, void *slave_, uint32_t stb_id, bond_enable_slave(slave, netdev_get_carrier(netdev), NULL); } - if (slave->stb_id != stb_id) { - slave->stb_id = stb_id; - bond->bond_revalidate = true; - } - bond_slave_set_netdev__(slave, netdev); free(slave->name); @@ -438,17 +432,12 @@ bond_run(struct bond *bond, struct tag_set *tags, enum lacp_status lacp_status) } if (bond->bond_revalidate) { - bond->bond_revalidate = false; + struct bond_slave *slave; + bond->bond_revalidate = false; bond_entry_reset(bond); - if (bond->balance != BM_STABLE) { - struct bond_slave *slave; - - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - tag_set_add(tags, slave->tag); - } - } else { - tag_set_add(tags, bond->stb_tag); + HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { + tag_set_add(tags, slave->tag); } tag_set_add(tags, bond->no_slaves_tag); } @@ -533,11 +522,11 @@ bond_compose_learning_packet(struct bond *bond, tag_type tags = 0; struct flow flow; - assert(may_send_learning_packets(bond)); + ovs_assert(may_send_learning_packets(bond)); memset(&flow, 0, sizeof flow); memcpy(flow.dl_src, eth_src, ETH_ADDR_LEN); - slave = choose_output_slave(bond, &flow, vlan, &tags); + slave = choose_output_slave(bond, &flow, NULL, vlan, &tags); packet = ofpbuf_new(0); compose_rarp(packet, eth_src); @@ -570,6 +559,10 @@ bond_check_admissibility(struct bond *bond, const void *slave_, { struct bond_slave *slave = bond_slave_lookup(bond, slave_); + if (!slave) { + return BV_DROP; + } + /* LACP bonds have very loose admissibility restrictions because we can * assume the remote switch is aware of the bond and will "do the right * thing". However, as a precaution we drop packets on disabled slaves @@ -587,7 +580,7 @@ bond_check_admissibility(struct bond *bond, const void *slave_, /* Drop all multicast packets on inactive slaves. */ if (eth_addr_is_multicast(eth_dst)) { *tags |= bond_get_active_slave_tag(bond); - if (bond->active_slave != bond_slave_lookup(bond, slave_)) { + if (bond->active_slave != slave) { return BV_DROP; } } @@ -621,9 +614,6 @@ bond_check_admissibility(struct bond *bond, const void *slave_, * 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; } NOT_REACHED(); @@ -640,14 +630,19 @@ bond_check_admissibility(struct bond *bond, const void *slave_, * packet belongs to (so for an access port it will be the access port's VLAN). * * Adds a tag to '*tags' that associates the flow with the returned slave. + * + * If 'wc' is non-NULL, bitwise-OR's 'wc' with the set of bits that were + * significant in the selection. At some point earlier, 'wc' should + * have been initialized (e.g., by flow_wildcards_init_catchall()). */ void * bond_choose_output_slave(struct bond *bond, const struct flow *flow, - uint16_t vlan, tag_type *tags) + struct flow_wildcards *wc, uint16_t vlan, + tag_type *tags) { - struct bond_slave *slave = choose_output_slave(bond, flow, vlan, tags); + struct bond_slave *slave = choose_output_slave(bond, flow, wc, vlan, tags); if (slave) { - *tags |= bond->balance == BM_STABLE ? bond->stb_tag : slave->tag; + *tags |= slave->tag; return slave->aux; } else { *tags |= bond->no_slaves_tag; @@ -1297,23 +1292,18 @@ bond_slave_lookup(struct bond *bond, const void *slave_) static void bond_enable_slave(struct bond_slave *slave, bool enable, struct tag_set *tags) { - struct bond *bond = slave->bond; slave->delay_expires = LLONG_MAX; if (enable != slave->enabled) { slave->enabled = enable; if (!slave->enabled) { - VLOG_WARN("interface %s: disabled", slave->name); + VLOG_INFO("interface %s: disabled", slave->name); if (tags) { tag_set_add(tags, slave->tag); } } else { - VLOG_WARN("interface %s: enabled", slave->name); + VLOG_INFO("interface %s: enabled", slave->name); slave->tag = tag_create_random(); } - - if (bond->balance == BM_STABLE) { - bond->bond_revalidate = true; - } } } @@ -1373,7 +1363,7 @@ bond_hash_tcp(const struct flow *flow, uint16_t vlan, uint32_t basis) static unsigned int bond_hash(const struct bond *bond, const struct flow *flow, uint16_t vlan) { - assert(bond->balance == BM_TCP || bond->balance == BM_SLB); + ovs_assert(bond->balance == BM_TCP || bond->balance == BM_SLB); return (bond->balance == BM_TCP ? bond_hash_tcp(flow, vlan, bond->basis) @@ -1387,38 +1377,9 @@ lookup_bond_entry(const struct bond *bond, const struct flow *flow, return &bond->hash[bond_hash(bond, flow, vlan) & BOND_MASK]; } -/* This function uses Highest Random Weight hashing to choose an output slave. - * This approach only reassigns a minimal number of flows when slaves are - * enabled or disabled. Unfortunately, it has O(n) performance against the - * number of slaves. There exist algorithms which are O(1), but have slightly - * more complex implementations and require the use of memory. This may need - * to be reimplemented if it becomes a performance bottleneck. */ -static struct bond_slave * -choose_stb_slave(const struct bond *bond, uint32_t flow_hash) -{ - struct bond_slave *best, *slave; - uint32_t best_hash; - - best = NULL; - best_hash = 0; - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - if (slave->enabled) { - uint32_t hash; - - hash = hash_2words(flow_hash, slave->stb_id); - if (!best || hash > best_hash) { - best = slave; - best_hash = hash; - } - } - } - - return best; -} - static struct bond_slave * choose_output_slave(const struct bond *bond, const struct flow *flow, - uint16_t vlan, tag_type *tags) + struct flow_wildcards *wc, uint16_t vlan, tag_type *tags) { struct bond_entry *e; @@ -1432,18 +1393,18 @@ choose_output_slave(const struct bond *bond, const struct flow *flow, case BM_AB: return bond->active_slave; - case BM_STABLE: - return choose_stb_slave(bond, bond_hash_tcp(flow, vlan, bond->basis)); - case BM_TCP: if (bond->lacp_status != LACP_NEGOTIATED) { /* Must have LACP negotiations for TCP balanced bonds. */ return NULL; } + if (wc) { + flow_mask_hash_fields(flow, wc, NX_HASH_FIELDS_SYMMETRIC_L4); + } /* Fall Through. */ case BM_SLB: - if (!bond_is_balanced(bond)) { - return choose_stb_slave(bond, bond_hash(bond, flow, vlan)); + if (wc) { + flow_mask_hash_fields(flow, wc, NX_HASH_FIELDS_ETH_SRC); } e = lookup_bond_entry(bond, flow, vlan); if (!e->slave || !e->slave->enabled) { @@ -1512,7 +1473,7 @@ bond_choose_active_slave(struct bond *bond, struct tag_set *tags) bond->send_learning_packets = true; } else if (old_active_slave) { - VLOG_WARN_RL(&rl, "bond %s: all interfaces disabled", bond->name); + VLOG_INFO_RL(&rl, "bond %s: all interfaces disabled", bond->name); } }