X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbond.c;h=aca18a2d8c96ee3a91ed6e2b59f4d1e6cb8730f7;hb=485e2766d816a18e1a51ddf5e12e55f38aeedf89;hp=77812edf77cdea16d7b58e896ca187b9643faf69;hpb=00ed83143a0a2df95304926b4e8de3cdc9b89065;p=sliver-openvswitch.git diff --git a/lib/bond.c b/lib/bond.c index 77812edf7..aca18a2d8 100644 --- a/lib/bond.c +++ b/lib/bond.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ #include #include #include +#include #include "coverage.h" #include "dynamic-string.h" @@ -50,7 +51,7 @@ VLOG_DEFINE_THIS_MODULE(bond); struct bond_entry { struct bond_slave *slave; /* Assigned slave, NULL if unassigned. */ uint64_t tx_bytes; /* Count of bytes recently transmitted. */ - tag_type tag; /* Tag for entry<->slave association. */ + tag_type tag; /* Tag for entry<->facet association. */ struct list list_node; /* In bond_slave's 'entries' list. */ }; @@ -74,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 @@ -103,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. */ @@ -146,8 +141,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 { @@ -164,8 +157,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"; } @@ -186,7 +177,6 @@ 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_reconfigure(bond, s); @@ -296,17 +286,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_); @@ -324,11 +309,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); @@ -431,17 +411,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); } @@ -488,7 +463,7 @@ static bool may_send_learning_packets(const struct bond *bond) { return bond->lacp_status == LACP_DISABLED - && bond->balance != BM_STABLE + && (bond->balance == BM_SLB || bond->balance == BM_AB) && bond->active_slave; } @@ -526,7 +501,7 @@ 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); @@ -614,9 +589,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,7 +612,7 @@ bond_choose_output_slave(struct bond *bond, const struct flow *flow, { struct bond_slave *slave = choose_output_slave(bond, flow, 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; @@ -736,7 +708,8 @@ bond_shift_load(struct bond_entry *hash, struct bond_slave *to, hash->tag = tag_create_random(); } -/* Pick and returns a bond_entry to migrate to 'to' (the least-loaded slave), +/* Picks and returns a bond_entry to migrate from 'from' (the most heavily + * loaded bond slave) to a bond slave that has 'to_tx_bytes' bytes of load, * given that doing so must decrease the ratio of the load on the two slaves by * at least 0.1. Returns NULL if there is no appropriate entry. * @@ -765,8 +738,12 @@ choose_entry_to_migrate(const struct bond_slave *from, uint64_t to_tx_bytes) delta = e->tx_bytes; old_ratio = (double)from->tx_bytes / to_tx_bytes; new_ratio = (double)(from->tx_bytes - delta) / (to_tx_bytes + delta); - if (old_ratio - new_ratio > 0.1) { - /* Would decrease the ratio, move it. */ + if (old_ratio - new_ratio > 0.1 + && fabs(new_ratio - 1.0) < fabs(old_ratio - 1.0)) { + /* We're aiming for an ideal ratio of 1, meaning both the 'from' + and 'to' slave have the same load. Therefore, we only move an + entry if it decreases the load on 'from', and brings us closer + to equal traffic load. */ return e; } } @@ -853,8 +830,8 @@ bond_rebalance(struct bond *bond, struct tag_set *tags) break; } - /* 'from' is carrying significantly more load than 'to', and that load - * is split across at least two different hashes. */ + /* 'from' is carrying significantly more load than 'to'. Pick a hash + * to move from 'from' to 'to'. */ e = choose_entry_to_migrate(from, to->tx_bytes); if (e) { bond_shift_load(e, to, tags); @@ -1285,23 +1262,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; - } } } @@ -1361,7 +1333,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) @@ -1375,35 +1347,6 @@ 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) @@ -1420,9 +1363,6 @@ 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. */ @@ -1430,9 +1370,6 @@ choose_output_slave(const struct bond *bond, const struct flow *flow, } /* Fall Through. */ case BM_SLB: - if (!bond_is_balanced(bond)) { - return choose_stb_slave(bond, bond_hash(bond, flow, vlan)); - } e = lookup_bond_entry(bond, flow, vlan); if (!e->slave || !e->slave->enabled) { e->slave = CONTAINER_OF(hmap_random_node(&bond->slaves), @@ -1500,7 +1437,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); } }