X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fbond.c;h=dc0d76b580e7e79ea1a1a8237d9e8e50396c2a01;hb=0a407cd6f2129793940bfbd42dc39fe97e93e14b;hp=d3b0e30a49e18bb838384f0ade994b0b48efcdee;hpb=244b2160105d5ca7c5160f75680dc2ed01134c36;p=sliver-openvswitch.git diff --git a/lib/bond.c b/lib/bond.c index d3b0e30a4..dc0d76b58 100644 --- a/lib/bond.c +++ b/lib/bond.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * 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,18 +21,20 @@ #include #include #include +#include #include "coverage.h" #include "dynamic-string.h" #include "flow.h" #include "hmap.h" +#include "lacp.h" #include "list.h" #include "netdev.h" #include "odp-util.h" #include "ofpbuf.h" #include "packets.h" #include "poll-loop.h" -#include "tag.h" +#include "shash.h" #include "timeval.h" #include "unixctl.h" #include "vlog.h" @@ -48,7 +50,6 @@ 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. */ struct list list_node; /* In bond_slave's 'entries' list. */ }; @@ -59,25 +60,18 @@ struct bond_slave { void *aux; /* Client-provided handle for this slave. */ struct netdev *netdev; /* Network device, owned by the client. */ + unsigned int change_seq; /* Tracks changes in 'netdev'. */ char *name; /* Name (a copy of netdev_get_name(netdev)). */ /* Link status. */ long long delay_expires; /* Time after which 'enabled' may change. */ - bool up; /* Last link status read from netdev. */ bool enabled; /* May be chosen for flows? */ - bool lacp_may_enable; /* LACP considers this interface bondable. */ - tag_type tag; /* Tag associated with this slave. */ + bool may_enable; /* Client considers this slave bondable. */ /* Rebalancing info. Used only by bond_rebalance(). */ 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. */ - 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. */ }; /* A bond, that is, a set of network devices grouped to improve performance or @@ -92,9 +86,10 @@ struct bond { /* Bonding info. */ enum bond_mode balance; /* Balancing mode, one of BM_*. */ struct bond_slave *active_slave; - tag_type no_slaves_tag; /* Tag for flows when all slaves disabled. */ int updelay, downdelay; /* Delay before slave goes up/down, in ms. */ - bool lacp_negotiated; /* LACP negotiations were successful. */ + enum lacp_status lacp_status; /* Status of LACP negotiations. */ + bool bond_revalidate; /* True if flows need revalidation. */ + uint32_t basis; /* Basis for flow hash function. */ /* SLB specific bonding info. */ struct bond_entry *hash; /* An array of (BOND_MASK + 1) elements. */ @@ -102,51 +97,41 @@ struct bond { long long int next_rebalance; /* Next rebalancing time. */ bool send_learning_packets; - /* BM_STABLE specific bonding info. */ - struct bond_slave **stb_slaves; /* Ordered list of enabled slaves. */ - size_t n_stb_slaves; /* Number of slaves in 'stb_slaves'. */ - size_t len_stb_slaves; /* Slaves allocated in 'stb_slaves'. */ - bool stb_need_sort; /* True if stb_slaves is not sorted. */ - - - /* Monitoring. */ - enum bond_detect_mode detect; /* Link status mode, one of BLSM_*. */ - struct netdev_monitor *monitor; /* detect == BLSM_CARRIER only. */ - long long int miimon_interval; /* Miimon status refresh interval. */ - long long int miimon_next_update; /* Time of next miimon update. */ - /* Legacy compatibility. */ long long int next_fake_iface_update; /* LLONG_MAX if disabled. */ + bool lacp_fallback_ab; /* Fallback to active-backup on LACP failure. */ - /* Tag set saved for next bond_run(). This tag set is a kluge for cases - * 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; + atomic_int ref_cnt; }; -static struct hmap all_bonds = HMAP_INITIALIZER(&all_bonds); - -static void bond_entry_reset(struct bond *); -static struct bond_slave *bond_slave_lookup(struct bond *, const void *slave_); -static bool bond_is_link_up(struct bond *, struct netdev *); -static void bond_enable_slave(struct bond_slave *, bool enable, - struct tag_set *); -static bool bond_stb_sort(struct bond *); -static void bond_stb_enable_slave(struct bond_slave *); -static void bond_link_status_update(struct bond_slave *, struct tag_set *); -static void bond_choose_active_slave(struct bond *, struct tag_set *); -static bool bond_is_tcp_hash(const struct bond *); +static struct ovs_rwlock rwlock = OVS_RWLOCK_INITIALIZER; +static struct hmap all_bonds__ = HMAP_INITIALIZER(&all_bonds__); +static struct hmap *const all_bonds OVS_GUARDED_BY(rwlock) = &all_bonds__; + +static void bond_entry_reset(struct bond *) OVS_REQ_WRLOCK(rwlock); +static struct bond_slave *bond_slave_lookup(struct bond *, const void *slave_) + OVS_REQ_RDLOCK(rwlock); +static void bond_enable_slave(struct bond_slave *, bool enable) + OVS_REQ_WRLOCK(rwlock); +static void bond_link_status_update(struct bond_slave *) + OVS_REQ_WRLOCK(rwlock); +static void bond_choose_active_slave(struct bond *) + OVS_REQ_WRLOCK(rwlock);; static unsigned int bond_hash_src(const uint8_t mac[ETH_ADDR_LEN], - uint16_t vlan); -static unsigned int bond_hash_tcp(const struct flow *, uint16_t vlan); + uint16_t vlan, uint32_t basis); +static unsigned int bond_hash_tcp(const struct flow *, uint16_t vlan, + uint32_t basis); static struct bond_entry *lookup_bond_entry(const struct bond *, const struct flow *, - uint16_t vlan); -static tag_type bond_get_active_slave_tag(const struct bond *); + uint16_t vlan) + OVS_REQ_RDLOCK(rwlock); static struct bond_slave *choose_output_slave(const struct bond *, const struct flow *, - uint16_t vlan); -static void bond_update_fake_slave_stats(struct bond *); + struct flow_wildcards *, + uint16_t vlan) + OVS_REQ_RDLOCK(rwlock); +static void bond_update_fake_slave_stats(struct bond *) + OVS_REQ_RDLOCK(rwlock); /* Attempts to parse 's' as the name of a bond balancing mode. If successful, * stores the mode in '*balance' and returns true. Otherwise returns false @@ -158,8 +143,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 { @@ -176,42 +159,12 @@ 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"; } NOT_REACHED(); } -/* Attempts to parse 's' as the name of a bond link status detection mode. If - * successful, stores the mode in '*detect' and returns true. Otherwise - * returns false without modifying '*detect'. */ -bool -bond_detect_mode_from_string(enum bond_detect_mode *detect, const char *s) -{ - if (!strcmp(s, bond_detect_mode_to_string(BLSM_CARRIER))) { - *detect = BLSM_CARRIER; - } else if (!strcmp(s, bond_detect_mode_to_string(BLSM_MIIMON))) { - *detect = BLSM_MIIMON; - } else { - return false; - } - return true; -} - -/* Returns a string representing 'detect'. */ -const char * -bond_detect_mode_to_string(enum bond_detect_mode detect) -{ - switch (detect) { - case BLSM_CARRIER: - return "carrier"; - case BLSM_MIIMON: - return "miimon"; - } - NOT_REACHED(); -} /* Creates and returns a new bond whose configuration is initially taken from * 's'. @@ -225,28 +178,46 @@ bond_create(const struct bond_settings *s) bond = xzalloc(sizeof *bond); hmap_init(&bond->slaves); - bond->no_slaves_tag = tag_create_random(); - bond->miimon_next_update = LLONG_MAX; bond->next_fake_iface_update = LLONG_MAX; + atomic_init(&bond->ref_cnt, 1); bond_reconfigure(bond, s); + return bond; +} - tag_set_init(&bond->unixctl_tags); +struct bond * +bond_ref(const struct bond *bond_) +{ + struct bond *bond = CONST_CAST(struct bond *, bond_); + if (bond) { + int orig; + atomic_add(&bond->ref_cnt, 1, &orig); + ovs_assert(orig > 0); + } return bond; } /* Frees 'bond'. */ void -bond_destroy(struct bond *bond) +bond_unref(struct bond *bond) { struct bond_slave *slave, *next_slave; + int orig; if (!bond) { return; } - hmap_remove(&all_bonds, &bond->hmap_node); + atomic_sub(&bond->ref_cnt, 1, &orig); + ovs_assert(orig > 0); + if (orig != 1) { + return; + } + + ovs_rwlock_wrlock(&rwlock); + hmap_remove(all_bonds, &bond->hmap_node); + ovs_rwlock_unlock(&rwlock); HMAP_FOR_EACH_SAFE (slave, next_slave, hmap_node, &bond->slaves) { hmap_remove(&bond->slaves, &slave->hmap_node); @@ -257,9 +228,6 @@ bond_destroy(struct bond *bond) hmap_destroy(&bond->slaves); free(bond->hash); - - netdev_monitor_destroy(bond->monitor); - free(bond->name); free(bond); } @@ -278,43 +246,37 @@ bond_reconfigure(struct bond *bond, const struct bond_settings *s) { bool revalidate = false; + ovs_rwlock_wrlock(&rwlock); if (!bond->name || strcmp(bond->name, s->name)) { if (bond->name) { - hmap_remove(&all_bonds, &bond->hmap_node); + hmap_remove(all_bonds, &bond->hmap_node); free(bond->name); } bond->name = xstrdup(s->name); - hmap_insert(&all_bonds, &bond->hmap_node, hash_string(bond->name, 0)); + hmap_insert(all_bonds, &bond->hmap_node, hash_string(bond->name, 0)); } - bond->detect = s->detect; - bond->miimon_interval = s->miimon_interval; bond->updelay = s->up_delay; bond->downdelay = s->down_delay; - bond->rebalance_interval = s->rebalance_interval; - if (bond->balance != s->balance) { - bond->balance = s->balance; + if (bond->lacp_fallback_ab != s->lacp_fallback_ab_cfg) { + bond->lacp_fallback_ab = s->lacp_fallback_ab_cfg; revalidate = true; } - if (bond->detect == BLSM_CARRIER) { - struct bond_slave *slave; - - if (!bond->monitor) { - bond->monitor = netdev_monitor_create(); - } + if (bond->rebalance_interval != s->rebalance_interval) { + bond->rebalance_interval = s->rebalance_interval; + revalidate = true; + } - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - netdev_monitor_add(bond->monitor, slave->netdev); - } - } else { - netdev_monitor_destroy(bond->monitor); - bond->monitor = NULL; + if (bond->balance != s->balance) { + bond->balance = s->balance; + revalidate = true; + } - if (bond->miimon_next_update == LLONG_MAX) { - bond->miimon_next_update = time_msec() + bond->miimon_interval; - } + if (bond->basis != s->basis) { + bond->basis = s->basis; + revalidate = true; } if (s->fake_iface) { @@ -325,49 +287,45 @@ bond_reconfigure(struct bond *bond, const struct bond_settings *s) bond->next_fake_iface_update = LLONG_MAX; } - if (bond->balance != BM_STABLE) { - free(bond->stb_slaves); - bond->stb_slaves = NULL; - } else if (!bond->stb_slaves) { - struct bond_slave *slave; - - bond->n_stb_slaves = 0; - bond->len_stb_slaves = 0; - bond->stb_slaves = NULL; - - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - if (slave->enabled) { - bond_stb_enable_slave(slave); - } - } + if (bond->bond_revalidate) { + revalidate = true; + bond->bond_revalidate = false; } if (bond->balance == BM_AB || !bond->hash || revalidate) { bond_entry_reset(bond); } + ovs_rwlock_unlock(&rwlock); return revalidate; } +static void +bond_slave_set_netdev__(struct bond_slave *slave, struct netdev *netdev) + OVS_REQ_WRLOCK(rwlock) +{ + if (slave->netdev != netdev) { + slave->netdev = netdev; + slave->change_seq = 0; + } +} + /* Registers 'slave_' as a slave of 'bond'. The 'slave_' pointer is an * arbitrary client-provided pointer that uniquely identifies a slave within a * 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_, uint16_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_); + struct bond_slave *slave; + ovs_rwlock_wrlock(&rwlock); + slave = bond_slave_lookup(bond, slave_); if (!slave) { slave = xzalloc(sizeof *slave); @@ -375,21 +333,36 @@ bond_slave_register(struct bond *bond, void *slave_, uint16_t stb_id, slave->bond = bond; slave->aux = slave_; slave->delay_expires = LLONG_MAX; - slave->up = bond_is_link_up(bond, netdev); slave->name = xstrdup(netdev_get_name(netdev)); + bond->bond_revalidate = true; slave->enabled = false; - bond_enable_slave(slave, slave->up, NULL); + bond_enable_slave(slave, netdev_get_carrier(netdev)); } - if (slave->stb_id != stb_id) { - bond->stb_need_sort = true; - slave->stb_id = stb_id; - } + bond_slave_set_netdev__(slave, netdev); - slave->netdev = netdev; free(slave->name); slave->name = xstrdup(netdev_get_name(netdev)); + ovs_rwlock_unlock(&rwlock); +} + +/* Updates the network device to be used with 'slave_' to 'netdev'. + * + * This is useful if the caller closes and re-opens the network device + * registered with bond_slave_register() but doesn't need to change anything + * else. */ +void +bond_slave_set_netdev(struct bond *bond, void *slave_, struct netdev *netdev) +{ + struct bond_slave *slave; + + ovs_rwlock_wrlock(&rwlock); + slave = bond_slave_lookup(bond, slave_); + if (slave) { + bond_slave_set_netdev__(slave, netdev); + } + ovs_rwlock_unlock(&rwlock); } /* Unregisters 'slave_' from 'bond'. If 'bond' does not contain such a slave @@ -399,14 +372,17 @@ bond_slave_register(struct bond *bond, void *slave_, uint16_t stb_id, void bond_slave_unregister(struct bond *bond, const void *slave_) { - struct bond_slave *slave = bond_slave_lookup(bond, slave_); + struct bond_slave *slave; bool del_active; + ovs_rwlock_wrlock(&rwlock); + slave = bond_slave_lookup(bond, slave_); if (!slave) { - return; + goto out; } - bond_enable_slave(slave, false, NULL); + bond->bond_revalidate = true; + bond_enable_slave(slave, false); del_active = bond->active_slave == slave; if (bond->hash) { @@ -425,51 +401,50 @@ bond_slave_unregister(struct bond *bond, const void *slave_) free(slave); if (del_active) { - struct tag_set tags; - - tag_set_init(&tags); - bond_choose_active_slave(bond, &tags); + bond_choose_active_slave(bond); bond->send_learning_packets = true; } +out: + ovs_rwlock_unlock(&rwlock); } -/* Should be called on each slave in 'bond' before bond_run() to indicate the - * results of lacp_slave_may_enable() on 'slave_'. */ +/* Should be called on each slave in 'bond' before bond_run() to indicate + * whether or not 'slave_' may be enabled. This function is intended to allow + * other protocols to have some impact on bonding decisions. For example LACP + * or high level link monitoring protocols may decide that a given slave should + * not be able to send traffic. */ void -bond_slave_set_lacp_may_enable(struct bond *bond, void *slave_, - bool may_enable) +bond_slave_set_may_enable(struct bond *bond, void *slave_, bool may_enable) { - bond_slave_lookup(bond, slave_)->lacp_may_enable = may_enable; + ovs_rwlock_wrlock(&rwlock); + bond_slave_lookup(bond, slave_)->may_enable = may_enable; + ovs_rwlock_unlock(&rwlock); } -/* Performs periodic maintenance on 'bond'. The caller must provide 'tags' to - * allow tagged flows to be invalidated. +/* Performs periodic maintenance on 'bond'. + * + * Returns true if the caller should revalidate its flows. * * The caller should check bond_should_send_learning_packets() afterward. */ -void -bond_run(struct bond *bond, struct tag_set *tags, bool lacp_negotiated) +bool +bond_run(struct bond *bond, enum lacp_status lacp_status) { struct bond_slave *slave; - bool is_tcp_hash = bond_is_tcp_hash(bond); + bool revalidate; - bond->lacp_negotiated = lacp_negotiated; - - /* Update link status. */ - if (bond->detect == BLSM_CARRIER - || time_msec() >= bond->miimon_next_update) - { - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - slave->up = bond_is_link_up(bond, slave->netdev); - } - bond->miimon_next_update = time_msec() + bond->miimon_interval; + ovs_rwlock_wrlock(&rwlock); + if (bond->lacp_status != lacp_status) { + bond->lacp_status = lacp_status; + bond->bond_revalidate = true; } /* Enable slaves based on link status and LACP feedback. */ HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - bond_link_status_update(slave, tags); + bond_link_status_update(slave); + slave->change_seq = netdev_change_seq(slave->netdev); } if (!bond->active_slave || !bond->active_slave->enabled) { - bond_choose_active_slave(bond, tags); + bond_choose_active_slave(bond); } /* Update fake bond interface stats. */ @@ -478,18 +453,11 @@ bond_run(struct bond *bond, struct tag_set *tags, bool lacp_negotiated) bond->next_fake_iface_update = time_msec() + 1000; } - if (bond_stb_sort(bond) || is_tcp_hash != bond_is_tcp_hash(bond)) { - struct bond_slave *slave; + revalidate = bond->bond_revalidate; + bond->bond_revalidate = false; + ovs_rwlock_unlock(&rwlock); - bond_entry_reset(bond); - HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { - tag_set_add(tags, slave->tag); - } - } - - /* Invalidate any tags required by */ - tag_set_union(tags, &bond->unixctl_tags); - tag_set_init(&bond->unixctl_tags); + return revalidate; } /* Causes poll_block() to wake up when 'bond' needs something to be done. */ @@ -498,26 +466,25 @@ bond_wait(struct bond *bond) { struct bond_slave *slave; - if (bond->detect == BLSM_CARRIER) { - netdev_monitor_poll_wait(bond->monitor); - } else { - poll_timer_wait_until(bond->miimon_next_update); - } - + ovs_rwlock_rdlock(&rwlock); HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { if (slave->delay_expires != LLONG_MAX) { poll_timer_wait_until(slave->delay_expires); } + + if (slave->change_seq != netdev_change_seq(slave->netdev)) { + poll_immediate_wake(); + } } if (bond->next_fake_iface_update != LLONG_MAX) { poll_timer_wait_until(bond->next_fake_iface_update); } - /* Ensure that any saved tags get revalidated right away. */ - if (!tag_set_is_empty(&bond->unixctl_tags)) { + if (bond->bond_revalidate) { poll_immediate_wake(); } + ovs_rwlock_unlock(&rwlock); /* We don't wait for bond->next_rebalance because rebalancing can only run * at a flow account checkpoint. ofproto does checkpointing on its own @@ -530,60 +497,64 @@ bond_wait(struct bond *bond) static bool may_send_learning_packets(const struct bond *bond) { - return !bond->lacp_negotiated && bond->balance != BM_AB; + return ((bond->lacp_status == LACP_DISABLED + && (bond->balance == BM_SLB || bond->balance == BM_AB)) + || (bond->lacp_fallback_ab && bond->lacp_status == LACP_CONFIGURED)) + && 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. + * This function will only return true if 'bond' is in SLB or active-backup + * mode and LACP is not negotiated. Otherwise sending learning packets isn't + * necessary. * * Calling this function resets the state that it checks. */ bool bond_should_send_learning_packets(struct bond *bond) { - bool send = bond->send_learning_packets && may_send_learning_packets(bond); + bool send; + + ovs_rwlock_wrlock(&rwlock); + send = bond->send_learning_packets && may_send_learning_packets(bond); bond->send_learning_packets = false; + ovs_rwlock_unlock(&rwlock); return send; } /* 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; - } + ovs_rwlock_rdlock(&rwlock); + 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); + slave = choose_output_slave(bond, &flow, NULL, vlan); - ofpbuf_init(&packet, 0); - compose_benign_packet(&packet, "Open vSwitch Bond Failover", 0xf177, - eth_src); + packet = ofpbuf_new(0); + compose_rarp(packet, eth_src); if (vlan) { - eth_set_vlan_tci(&packet, htons(vlan)); + eth_push_vlan(packet, htons(vlan)); } - error = netdev_send(slave->netdev, &packet); - ofpbuf_uninit(&packet); - return error; + *port_aux = slave->aux; + ovs_rwlock_unlock(&rwlock); + return packet; } /* Checks whether a packet that arrived on 'slave_' within 'bond', with an @@ -603,28 +574,84 @@ bond_send_learning_packet(struct bond *bond, */ enum bond_verdict bond_check_admissibility(struct bond *bond, const void *slave_, - const uint8_t eth_dst[ETH_ADDR_LEN], tag_type *tags) + const uint8_t eth_dst[ETH_ADDR_LEN]) { - /* Admit all packets if LACP has been negotiated, because that means that - * the remote switch is aware of the bond and will "do the right thing". */ - if (bond->lacp_negotiated) { - return BV_ACCEPT; + enum bond_verdict verdict = BV_DROP; + struct bond_slave *slave; + + ovs_rwlock_rdlock(&rwlock); + slave = bond_slave_lookup(bond, slave_); + if (!slave) { + goto out; + } + + /* 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 + * because no correctly implemented partner switch should be sending + * packets to them. + * + * If LACP is configured, but LACP negotiations have been unsuccessful, we + * drop all incoming traffic except if lacp_fallback_ab is enabled. */ + switch (bond->lacp_status) { + case LACP_NEGOTIATED: + verdict = slave->enabled ? BV_ACCEPT : BV_DROP; + goto out; + case LACP_CONFIGURED: + if (!bond->lacp_fallback_ab) { + goto out; + } + case LACP_DISABLED: + break; } /* 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_)) { - return BV_DROP; + if (bond->active_slave != slave) { + goto out; } } - /* 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; + switch (bond->balance) { + case BM_TCP: + /* TCP balanced bonds require successful LACP negotiations. Based on the + * above check, LACP is off or lacp_fallback_ab is true on this bond. + * If lacp_fallback_ab is true fall through to BM_AB case else, we + * drop all incoming traffic. */ + if (!bond->lacp_fallback_ab) { + goto out; + } + + case BM_AB: + /* Drop all packets which arrive on backup slaves. This is similar to + * how Linux bonding handles active-backup bonds. */ + if (bond->active_slave != slave) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + + VLOG_DBG_RL(&rl, "active-backup bond received packet on backup" + " slave (%s) destined for " ETH_ADDR_FMT, + slave->name, ETH_ADDR_ARGS(eth_dst)); + goto out; + } + verdict = BV_ACCEPT; + goto out; + + 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. */ + verdict = BV_DROP_IF_MOVED; + goto out; + } + + NOT_REACHED(); +out: + ovs_rwlock_unlock(&rwlock); + return verdict; + } /* Returns the slave (registered on 'bond' by bond_slave_register()) to which @@ -637,28 +664,32 @@ bond_check_admissibility(struct bond *bond, const void *slave_, * nonzero only for trunk ports), whereas 'vlan' is the logical VLAN that the * 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) { - struct bond_slave *slave = choose_output_slave(bond, flow, vlan); - if (slave) { - *tags |= slave->tag; - return slave->aux; - } else { - *tags |= bond->no_slaves_tag; - return NULL; - } + struct bond_slave *slave; + void *aux; + + ovs_rwlock_rdlock(&rwlock); + slave = choose_output_slave(bond, flow, wc, vlan); + aux = slave ? slave->aux : NULL; + ovs_rwlock_unlock(&rwlock); + + return aux; } /* Rebalancing. */ static bool -bond_is_balanced(const struct bond *bond) +bond_is_balanced(const struct bond *bond) OVS_REQ_RDLOCK(rwlock) { - return bond->balance == BM_SLB || bond->balance == BM_TCP; + return bond->rebalance_interval + && (bond->balance == BM_SLB || bond->balance == BM_TCP); } /* Notifies 'bond' that 'n_bytes' bytes were sent in 'flow' within 'vlan'. */ @@ -666,14 +697,15 @@ void bond_account(struct bond *bond, const struct flow *flow, uint16_t vlan, uint64_t n_bytes) { - + ovs_rwlock_wrlock(&rwlock); if (bond_is_balanced(bond)) { lookup_bond_entry(bond, flow, vlan)->tx_bytes += n_bytes; } + ovs_rwlock_unlock(&rwlock); } static struct bond_slave * -bond_slave_from_bal_node(struct list *bal) +bond_slave_from_bal_node(struct list *bal) OVS_REQ_RDLOCK(rwlock) { return CONTAINER_OF(bal, struct bond_slave, bal_node); } @@ -703,7 +735,7 @@ log_bals(struct bond *bond, const struct list *bals) if (&e->list_node != list_front(&slave->entries)) { ds_put_cstr(&ds, " + "); } - ds_put_format(&ds, "h%td: %"PRIu64"kB", + ds_put_format(&ds, "h%"PRIdPTR": %"PRIu64"kB", e - bond->hash, e->tx_bytes / 1024); } ds_put_cstr(&ds, ")"); @@ -716,14 +748,13 @@ log_bals(struct bond *bond, const struct list *bals) /* Shifts 'hash' from its current slave to 'to'. */ static void -bond_shift_load(struct bond_entry *hash, struct bond_slave *to, - struct tag_set *set) +bond_shift_load(struct bond_entry *hash, struct bond_slave *to) { struct bond_slave *from = hash->slave; struct bond *bond = from->bond; uint64_t delta = hash->tx_bytes; - VLOG_INFO("bond %s: shift %"PRIu64"kB of load (with hash %td) " + VLOG_INFO("bond %s: shift %"PRIu64"kB of load (with hash %"PRIdPTR") " "from %s to %s (now carrying %"PRIu64"kB and " "%"PRIu64"kB load, respectively)", bond->name, delta / 1024, hash - bond->hash, @@ -736,12 +767,12 @@ bond_shift_load(struct bond_entry *hash, struct bond_slave *to, to->tx_bytes += delta; /* Arrange for flows to be revalidated. */ - tag_set_add(set, hash->tag); hash->slave = to; - hash->tag = tag_create_random(); + bond->bond_revalidate = true; } -/* 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. * @@ -770,8 +801,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; } } @@ -808,13 +843,15 @@ reinsert_bal(struct list *bals, struct bond_slave *slave) * The caller should have called bond_account() for each active flow, to ensure * that flow data is consistently accounted at this point. */ void -bond_rebalance(struct bond *bond, struct tag_set *tags) +bond_rebalance(struct bond *bond) { struct bond_slave *slave; struct bond_entry *e; struct list bals; + ovs_rwlock_wrlock(&rwlock); if (!bond_is_balanced(bond) || time_msec() < bond->next_rebalance) { + ovs_rwlock_unlock(&rwlock); return; } bond->next_rebalance = time_msec() + bond->rebalance_interval; @@ -858,11 +895,11 @@ 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); + bond_shift_load(e, to); /* Delete element from from->entries. * @@ -890,17 +927,18 @@ bond_rebalance(struct bond *bond, struct tag_set *tags) e->slave = NULL; } } + ovs_rwlock_unlock(&rwlock); } /* Bonding unixctl user interface functions. */ static struct bond * -bond_find(const char *name) +bond_find(const char *name) OVS_REQ_RDLOCK(rwlock) { struct bond *bond; HMAP_FOR_EACH_WITH_HASH (bond, hmap_node, hash_string(name, 0), - &all_bonds) { + all_bonds) { if (!strcmp(bond->name, name)) { return bond; } @@ -923,14 +961,16 @@ bond_lookup_slave(struct bond *bond, const char *slave_name) 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; ds_put_cstr(&ds, "bond\ttype\tslaves\n"); - HMAP_FOR_EACH (bond, hmap_node, &all_bonds) { + ovs_rwlock_rdlock(&rwlock); + HMAP_FOR_EACH (bond, hmap_node, all_bonds) { const struct bond_slave *slave; size_t i; @@ -946,76 +986,80 @@ bond_unixctl_list(struct unixctl_conn *conn, } ds_put_char(&ds, '\n'); } - unixctl_command_reply(conn, 200, ds_cstr(&ds)); + ovs_rwlock_unlock(&rwlock); + unixctl_command_reply(conn, ds_cstr(&ds)); ds_destroy(&ds); } static void -bond_unixctl_show(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +bond_print_details(struct ds *ds, const struct bond *bond) + OVS_REQ_RDLOCK(rwlock) { - struct ds ds = DS_EMPTY_INITIALIZER; + struct shash slave_shash = SHASH_INITIALIZER(&slave_shash); + const struct shash_node **sorted_slaves = NULL; const struct bond_slave *slave; - const struct bond *bond; - - bond = bond_find(args); - if (!bond) { - unixctl_command_reply(conn, 501, "no such bond"); - return; - } + int i; - ds_put_format(&ds, "bond_mode: %s\n", + ds_put_format(ds, "---- %s ----\n", bond->name); + ds_put_format(ds, "bond_mode: %s\n", bond_mode_to_string(bond->balance)); - if (bond->balance != BM_AB) { - ds_put_format(&ds, "bond-hash-algorithm: %s\n", - bond_is_tcp_hash(bond) ? "balance-tcp" : "balance-slb"); - } + ds_put_format(ds, "bond-hash-basis: %"PRIu32"\n", bond->basis); - ds_put_format(&ds, "bond-detect-mode: %s\n", - bond->monitor ? "carrier" : "miimon"); - - if (!bond->monitor) { - ds_put_format(&ds, "bond-miimon-interval: %lld\n", - bond->miimon_interval); - } - - ds_put_format(&ds, "updelay: %d ms\n", bond->updelay); - ds_put_format(&ds, "downdelay: %d ms\n", bond->downdelay); + ds_put_format(ds, "updelay: %d ms\n", bond->updelay); + ds_put_format(ds, "downdelay: %d ms\n", bond->downdelay); if (bond_is_balanced(bond)) { - ds_put_format(&ds, "next rebalance: %lld ms\n", + ds_put_format(ds, "next rebalance: %lld ms\n", bond->next_rebalance - time_msec()); } - ds_put_format(&ds, "lacp_negotiated: %s\n", - bond->lacp_negotiated ? "true" : "false"); + ds_put_cstr(ds, "lacp_status: "); + switch (bond->lacp_status) { + case LACP_NEGOTIATED: + ds_put_cstr(ds, "negotiated\n"); + break; + case LACP_CONFIGURED: + ds_put_cstr(ds, "configured\n"); + break; + case LACP_DISABLED: + ds_put_cstr(ds, "off\n"); + break; + default: + ds_put_cstr(ds, "\n"); + break; + } HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { + shash_add(&slave_shash, slave->name, slave); + } + sorted_slaves = shash_sort(&slave_shash); + + for (i = 0; i < shash_count(&slave_shash); i++) { struct bond_entry *be; - struct flow flow; + + slave = sorted_slaves[i]->data; /* Basic info. */ - ds_put_format(&ds, "\nslave %s: %s\n", + ds_put_format(ds, "\nslave %s: %s\n", slave->name, slave->enabled ? "enabled" : "disabled"); if (slave == bond->active_slave) { - ds_put_cstr(&ds, "\tactive slave\n"); + ds_put_cstr(ds, "\tactive slave\n"); } if (slave->delay_expires != LLONG_MAX) { - ds_put_format(&ds, "\t%s expires in %lld ms\n", + ds_put_format(ds, "\t%s expires in %lld ms\n", slave->enabled ? "downdelay" : "updelay", slave->delay_expires - time_msec()); } - ds_put_format(&ds, "\tlacp_may_enable: %s\n", - slave->lacp_may_enable ? "true" : "false"); + ds_put_format(ds, "\tmay_enable: %s\n", + slave->may_enable ? "true" : "false"); if (!bond_is_balanced(bond)) { continue; } /* Hashes. */ - memset(&flow, 0, sizeof flow); for (be = bond->hash; be <= &bond->hash[BOND_MASK]; be++) { int hash = be - bond->hash; @@ -1023,223 +1067,244 @@ bond_unixctl_show(struct unixctl_conn *conn, continue; } - ds_put_format(&ds, "\thash %d: %"PRIu64" kB load\n", + 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 of SLB bonds? */ + } + } + shash_destroy(&slave_shash); + free(sorted_slaves); + ds_put_cstr(ds, "\n"); +} + +static void +bond_unixctl_show(struct unixctl_conn *conn, + int argc, const char *argv[], + void *aux OVS_UNUSED) +{ + struct ds ds = DS_EMPTY_INITIALIZER; + + ovs_rwlock_rdlock(&rwlock); + if (argc > 1) { + const struct bond *bond = bond_find(argv[1]); + + if (!bond) { + unixctl_command_reply_error(conn, "no such bond"); + goto out; + } + bond_print_details(&ds, bond); + } else { + const struct bond *bond; - /* XXX How can we list the MACs assigned to hashes? */ + HMAP_FOR_EACH (bond, hmap_node, all_bonds) { + bond_print_details(&ds, bond); } } - unixctl_command_reply(conn, 200, ds_cstr(&ds)); + + unixctl_command_reply(conn, ds_cstr(&ds)); ds_destroy(&ds); + +out: + ovs_rwlock_unlock(&rwlock); } 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; - } - + ovs_rwlock_wrlock(&rwlock); bond = bond_find(bond_s); if (!bond) { - unixctl_command_reply(conn, 501, "no such bond"); - return; + unixctl_command_reply_error(conn, "no such bond"); + goto out; } if (bond->balance != BM_SLB) { - unixctl_command_reply(conn, 501, "not an SLB bond"); - return; + unixctl_command_reply_error(conn, "not an SLB bond"); + goto out; } if (strspn(hash_s, "0123456789") == strlen(hash_s)) { hash = atoi(hash_s) & BOND_MASK; } else { - unixctl_command_reply(conn, 501, "bad hash"); - return; + unixctl_command_reply_error(conn, "bad hash"); + goto out; } slave = bond_lookup_slave(bond, slave_s); if (!slave) { - unixctl_command_reply(conn, 501, "no such slave"); - return; + unixctl_command_reply_error(conn, "no such slave"); + goto out; } if (!slave->enabled) { - unixctl_command_reply(conn, 501, "cannot migrate to disabled slave"); - return; + unixctl_command_reply_error(conn, "cannot migrate to disabled slave"); + goto out; } entry = &bond->hash[hash]; - tag_set_add(&bond->unixctl_tags, entry->tag); + bond->bond_revalidate = true; entry->slave = slave; - entry->tag = tag_create_random(); - unixctl_command_reply(conn, 200, "migrated"); + unixctl_command_reply(conn, "migrated"); + +out: + ovs_rwlock_unlock(&rwlock); } 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; - } - + ovs_rwlock_wrlock(&rwlock); bond = bond_find(bond_s); if (!bond) { - unixctl_command_reply(conn, 501, "no such bond"); - return; + unixctl_command_reply_error(conn, "no such bond"); + goto out; } slave = bond_lookup_slave(bond, slave_s); if (!slave) { - unixctl_command_reply(conn, 501, "no such slave"); - return; + unixctl_command_reply_error(conn, "no such slave"); + goto out; } if (!slave->enabled) { - unixctl_command_reply(conn, 501, "cannot make disabled slave active"); - return; + unixctl_command_reply_error(conn, "cannot make disabled slave active"); + goto out; } if (bond->active_slave != slave) { - tag_set_add(&bond->unixctl_tags, bond_get_active_slave_tag(bond)); + bond->bond_revalidate = true; bond->active_slave = slave; - bond->active_slave->tag = tag_create_random(); VLOG_INFO("bond %s: active interface is now %s", bond->name, slave->name); bond->send_learning_packets = true; - unixctl_command_reply(conn, 200, "done"); + unixctl_command_reply(conn, "done"); } else { - unixctl_command_reply(conn, 200, "no change"); + unixctl_command_reply(conn, "no change"); } +out: + ovs_rwlock_unlock(&rwlock); } 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; - } - + ovs_rwlock_wrlock(&rwlock); bond = bond_find(bond_s); if (!bond) { - unixctl_command_reply(conn, 501, "no such bond"); - return; + unixctl_command_reply_error(conn, "no such bond"); + goto out; } slave = bond_lookup_slave(bond, slave_s); if (!slave) { - unixctl_command_reply(conn, 501, "no such slave"); - return; + unixctl_command_reply_error(conn, "no such slave"); + goto out; } - bond_enable_slave(slave, enable, &bond->unixctl_tags); - unixctl_command_reply(conn, 501, enable ? "enabled" : "disabled"); + bond_enable_slave(slave, enable); + unixctl_command_reply(conn, enable ? "enabled" : "disabled"); + +out: + ovs_rwlock_unlock(&rwlock); } 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; - char *mac_s, *vlan_s; - char *save_ptr = NULL; - - mac_s = strtok_r(args, " ", &save_ptr); - vlan_s = strtok_r(NULL, " ", &save_ptr); + uint32_t basis; if (vlan_s) { - if (sscanf(vlan_s, "%u", &vlan) != 1) { - unixctl_command_reply(conn, 501, "invalid vlan"); + if (!ovs_scan(vlan_s, "%u", &vlan)) { + unixctl_command_reply_error(conn, "invalid vlan"); + return; + } + } else { + vlan = 0; + } + + if (basis_s) { + if (!ovs_scan(basis_s, "%"SCNu32, &basis)) { + unixctl_command_reply_error(conn, "invalid basis"); return; } } else { - vlan = OFP_VLAN_NONE; + basis = 0; } - if (sscanf(mac_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) - == ETH_ADDR_SCAN_COUNT) { - hash = bond_hash_src(mac, vlan) & BOND_MASK; + if (ovs_scan(mac_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))) { + hash = bond_hash_src(mac, vlan, basis) & BOND_MASK; hash_cstr = xasprintf("%u", hash); - unixctl_command_reply(conn, 200, hash_cstr); + unixctl_command_reply(conn, hash_cstr); free(hash_cstr); } else { - unixctl_command_reply(conn, 501, "invalid mac"); + unixctl_command_reply_error(conn, "invalid mac"); } } void bond_init(void) { - unixctl_command_register("bond/list", bond_unixctl_list, NULL); - unixctl_command_register("bond/show", bond_unixctl_show, NULL); - unixctl_command_register("bond/migrate", bond_unixctl_migrate, NULL); - unixctl_command_register("bond/set-active-slave", - bond_unixctl_set_active_slave, NULL); - unixctl_command_register("bond/enable-slave", bond_unixctl_enable_slave, - NULL); - unixctl_command_register("bond/disable-slave", bond_unixctl_disable_slave, + unixctl_command_register("bond/list", "", 0, 0, bond_unixctl_list, NULL); + unixctl_command_register("bond/show", "[port]", 0, 1, bond_unixctl_show, NULL); - unixctl_command_register("bond/hash", bond_unixctl_hash, NULL); + unixctl_command_register("bond/migrate", "port hash slave", 3, 3, + bond_unixctl_migrate, NULL); + 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", 2, 2, + bond_unixctl_enable_slave, NULL); + unixctl_command_register("bond/disable-slave", "port slave", 2, 2, + bond_unixctl_disable_slave, NULL); + unixctl_command_register("bond/hash", "mac [vlan] [basis]", 1, 3, + bond_unixctl_hash, NULL); } static void @@ -1275,100 +1340,25 @@ bond_slave_lookup(struct bond *bond, const void *slave_) return NULL; } -static bool -bond_is_link_up(struct bond *bond, struct netdev *netdev) -{ - return (bond->detect == BLSM_CARRIER - ? netdev_get_carrier(netdev) - : netdev_get_miimon(netdev)); -} - -static int -bond_stb_sort_cmp__(const void *a_, const void *b_) -{ - const struct bond_slave *const *ap = a_; - const struct bond_slave *const *bp = b_; - const struct bond_slave *a = *ap; - const struct bond_slave *b = *bp; - uint16_t aid = a->stb_id; - uint16_t bid = b->stb_id; - - return aid < bid ? -1 : aid > bid; -} - -static bool -bond_stb_sort(struct bond *bond) -{ - size_t i; - - if (!bond->stb_slaves || !bond->stb_need_sort) { - return false; - } - bond->stb_need_sort = false; - - qsort(bond->stb_slaves, bond->n_stb_slaves, sizeof *bond->stb_slaves, - bond_stb_sort_cmp__); - - for (i = 0; i < bond->n_stb_slaves; i++) { - bond->stb_slaves[i]->stb_idx = i; - } - - return true; -} - -static void -bond_stb_enable_slave(struct bond_slave *slave) -{ - struct bond *bond = slave->bond; - - if (!bond->stb_slaves) { - return; - } - - bond->stb_need_sort = true; - - if (slave->enabled) { - if (bond->len_stb_slaves <= bond->n_stb_slaves) { - bond->stb_slaves = x2nrealloc(bond->stb_slaves, - &bond->len_stb_slaves, - sizeof *bond->stb_slaves); - } - - slave->stb_idx = bond->n_stb_slaves++; - bond->stb_slaves[slave->stb_idx] = slave; - } else { - size_t index = slave->stb_idx; - bond->stb_slaves[index] = bond->stb_slaves[--bond->n_stb_slaves]; - bond->stb_slaves[index]->stb_idx = index; - } -} - static void -bond_enable_slave(struct bond_slave *slave, bool enable, struct tag_set *tags) +bond_enable_slave(struct bond_slave *slave, bool enable) { slave->delay_expires = LLONG_MAX; if (enable != slave->enabled) { + slave->bond->bond_revalidate = true; slave->enabled = enable; - if (!slave->enabled) { - VLOG_WARN("interface %s: disabled", slave->name); - if (tags) { - tag_set_add(tags, slave->tag); - } - } else { - VLOG_WARN("interface %s: enabled", slave->name); - slave->tag = tag_create_random(); - } - bond_stb_enable_slave(slave); + VLOG_INFO("interface %s: %s", slave->name, + slave->enabled ? "enabled" : "disabled"); } } static void -bond_link_status_update(struct bond_slave *slave, struct tag_set *tags) +bond_link_status_update(struct bond_slave *slave) { struct bond *bond = slave->bond; bool up; - up = slave->up && slave->lacp_may_enable; + up = netdev_get_carrier(slave->netdev) && slave->may_enable; if ((up == slave->enabled) != (slave->delay_expires == LLONG_MAX)) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); VLOG_INFO_RL(&rl, "interface %s: link state %s", @@ -1378,7 +1368,7 @@ bond_link_status_update(struct bond_slave *slave, struct tag_set *tags) VLOG_INFO_RL(&rl, "interface %s: will not be %s", slave->name, up ? "disabled" : "enabled"); } else { - int delay = (bond->lacp_negotiated ? 0 + int delay = (bond->lacp_status != LACP_DISABLED ? 0 : up ? bond->updelay : bond->downdelay); slave->delay_expires = time_msec() + delay; if (delay) { @@ -1393,43 +1383,36 @@ bond_link_status_update(struct bond_slave *slave, struct tag_set *tags) } if (time_msec() >= slave->delay_expires) { - bond_enable_slave(slave, up, tags); + bond_enable_slave(slave, up); } } -static bool -bond_is_tcp_hash(const struct bond *bond) -{ - return (bond->balance == BM_TCP || bond->balance == BM_STABLE) - && bond->lacp_negotiated; -} - static unsigned int -bond_hash_src(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan) +bond_hash_src(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan, uint32_t basis) { - return hash_bytes(mac, ETH_ADDR_LEN, vlan); + return hash_3words(hash_bytes(mac, ETH_ADDR_LEN, 0), vlan, basis); } static unsigned int -bond_hash_tcp(const struct flow *flow, uint16_t vlan) +bond_hash_tcp(const struct flow *flow, uint16_t vlan, uint32_t basis) { struct flow hash_flow = *flow; - hash_flow.vlan_tci = vlan; + hash_flow.vlan_tci = htons(vlan); /* The symmetric quality of this hash function is not required, but * flow_hash_symmetric_l4 already exists, and is sufficient for our * purposes, so we use it out of convenience. */ - return flow_hash_symmetric_l4(&hash_flow, 0); + return flow_hash_symmetric_l4(&hash_flow, basis); } static unsigned int bond_hash(const struct bond *bond, const struct flow *flow, uint16_t vlan) { - assert(bond->balance != BM_AB); + ovs_assert(bond->balance == BM_TCP || bond->balance == BM_SLB); - return (bond_is_tcp_hash(bond) - ? bond_hash_tcp(flow, vlan) - : bond_hash_src(flow->dl_src, vlan)); + return (bond->balance == BM_TCP + ? bond_hash_tcp(flow, vlan, bond->basis) + : bond_hash_src(flow->dl_src, vlan, bond->basis)); } static struct bond_entry * @@ -1441,24 +1424,39 @@ lookup_bond_entry(const struct bond *bond, const struct flow *flow, static struct bond_slave * choose_output_slave(const struct bond *bond, const struct flow *flow, - uint16_t vlan) + struct flow_wildcards *wc, uint16_t vlan) { struct bond_entry *e; + int balance; + + balance = bond->balance; + if (bond->lacp_status == LACP_CONFIGURED) { + /* LACP has been configured on this bond but negotiations were + * unsuccussful. If lacp_fallback_ab is enabled use active- + * backup mode else drop all traffic. */ + if (!bond->lacp_fallback_ab) { + return NULL; + } + balance = BM_AB; + } - switch (bond->balance) { + switch (balance) { case BM_AB: return bond->active_slave; - case BM_STABLE: - if (bond->n_stb_slaves) { - return bond->stb_slaves[bond_hash(bond, flow, vlan) - % bond->n_stb_slaves]; - } else { - return bond->active_slave; + 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: - case BM_TCP: + 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) { e->slave = CONTAINER_OF(hmap_random_node(&bond->slaves), @@ -1466,7 +1464,6 @@ choose_output_slave(const struct bond *bond, const struct flow *flow, if (!e->slave->enabled) { e->slave = bond->active_slave; } - e->tag = tag_create_random(); } return e->slave; @@ -1492,7 +1489,7 @@ bond_choose_slave(const struct bond *bond) best = NULL; HMAP_FOR_EACH (slave, hmap_node, &bond->slaves) { if (slave->delay_expires != LLONG_MAX - && slave->lacp_may_enable + && slave->may_enable && (!best || slave->delay_expires < best->delay_expires)) { best = slave; } @@ -1501,7 +1498,7 @@ bond_choose_slave(const struct bond *bond) } static void -bond_choose_active_slave(struct bond *bond, struct tag_set *tags) +bond_choose_active_slave(struct bond *bond) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); struct bond_slave *old_active_slave = bond->active_slave; @@ -1516,29 +1513,15 @@ bond_choose_active_slave(struct bond *bond, struct tag_set *tags) "remaining %lld ms updelay (since no interface was " "enabled)", bond->name, bond->active_slave->name, bond->active_slave->delay_expires - time_msec()); - bond_enable_slave(bond->active_slave, true, tags); - } - - if (!old_active_slave) { - tag_set_add(tags, bond->no_slaves_tag); + bond_enable_slave(bond->active_slave, true); } 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); } } -/* Returns the tag for 'bond''s active slave, or 'bond''s no_slaves_tag if - * there is no active slave. */ -static tag_type -bond_get_active_slave_tag(const struct bond *bond) -{ - return (bond->active_slave - ? bond->active_slave->tag - : bond->no_slaves_tag); -} - /* Attempts to make the sum of the bond slaves' statistics appear on the fake * bond interface. */ static void @@ -1570,7 +1553,7 @@ bond_update_fake_slave_stats(struct bond *bond) } } - if (!netdev_open_default(bond->name, &bond_dev)) { + if (!netdev_open(bond->name, "system", &bond_dev)) { netdev_set_stats(bond_dev, &bond_stats); netdev_close(bond_dev); }