X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=197b6ed44219fdc999fd23b68973f4f87eb1d944;hb=0b8b6f71d5621a726a3bf5aa1bbee27ed1f4a8fe;hp=96a24fd963e11b6310a6cda9807975541d8f5e70;hpb=fe4838bc70077fa8350b05cad77c7ce658ad2285;p=sliver-openvswitch.git diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 96a24fd96..197b6ed44 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010 Nicira Networks +/* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ #include "cfm.h" #include "classifier.h" #include "coverage.h" +#include "daemon.h" #include "dirs.h" #include "dpif.h" #include "dynamic-string.h" @@ -54,7 +55,6 @@ #include "ovsdb-data.h" #include "packets.h" #include "poll-loop.h" -#include "proc-net-compat.h" #include "process.h" #include "sha1.h" #include "shash.h" @@ -75,7 +75,10 @@ VLOG_DEFINE_THIS_MODULE(bridge); COVERAGE_DEFINE(bridge_flush); COVERAGE_DEFINE(bridge_process_flow); +COVERAGE_DEFINE(bridge_process_cfm); +COVERAGE_DEFINE(bridge_process_lacp); COVERAGE_DEFINE(bridge_reconfigure); +COVERAGE_DEFINE(bridge_lacp_update); struct dst { uint16_t vlan; @@ -92,6 +95,13 @@ static void dst_set_init(struct dst_set *); static void dst_set_add(struct dst_set *, const struct dst *); static void dst_set_free(struct dst_set *); +enum lacp_status { + LACP_CURRENT = 0x01, /* Current State. */ + LACP_EXPIRED = 0x02, /* Expired State. */ + LACP_DEFAULTED = 0x04, /* Partner is defaulted. */ + LACP_ATTACHED = 0x08, /* Attached. Interface may be choosen for flows. */ +}; + struct iface { /* These members are always valid. */ struct port *port; /* Containing port. */ @@ -106,9 +116,18 @@ struct iface { int dp_ifidx; /* Index within kernel datapath. */ struct netdev *netdev; /* Network device. */ bool enabled; /* May be chosen for flows? */ + bool up; /* Is the interface up? */ const char *type; /* Usually same as cfg->type. */ struct cfm *cfm; /* Connectivity Fault Management */ const struct ovsrec_interface *cfg; + + /* LACP information. */ + enum lacp_status lacp_status; /* LACP status. */ + uint16_t lacp_priority; /* LACP port priority. */ + struct lacp_info lacp_actor; /* LACP actor information. */ + struct lacp_info lacp_partner; /* LACP partner information. */ + long long int lacp_tx; /* Next LACP message transmission time. */ + long long int lacp_rx; /* Next LACP message receive time. */ }; #define BOND_MASK 0xff @@ -118,6 +137,12 @@ struct bond_entry { tag_type iface_tag; /* Tag associated with iface_idx. */ }; +enum bond_mode { + BM_TCP, /* Transport Layer Load Balance. */ + BM_SLB, /* Source Load Balance. */ + BM_AB /* Active Backup. */ +}; + #define MAX_MIRRORS 32 typedef uint32_t mirror_mask_t; #define MIRROR_MASK_C(X) UINT32_C(X) @@ -139,6 +164,11 @@ struct mirror { int out_vlan; }; +/* Flags for a port's lacp member. */ +#define LACP_ACTIVE 0x01 /* LACP is in active mode. */ +#define LACP_PASSIVE 0x02 /* LACP is in passive mode. */ +#define LACP_NEGOTIATED 0x04 /* LACP has successfully negotiated. */ + #define FLOOD_PORT ((struct port *) 1) /* The 'flood' output port. */ struct port { struct bridge *bridge; @@ -155,17 +185,28 @@ struct port { size_t n_ifaces, allocated_ifaces; /* Bonding info. */ - struct bond_entry *bond_hash; /* An array of (BOND_MASK + 1) elements. */ + enum bond_mode bond_mode; /* Type of the bond. BM_SLB is the default. */ int active_iface; /* Ifidx on which bcasts accepted, or -1. */ tag_type active_iface_tag; /* Tag for bcast flows. */ tag_type no_ifaces_tag; /* Tag for flows when all ifaces disabled. */ int updelay, downdelay; /* Delay before iface goes up/down, in ms. */ - bool bond_compat_is_stale; /* Need to call port_update_bond_compat()? */ bool bond_fake_iface; /* Fake a bond interface for legacy compat? */ + bool miimon; /* Use miimon instead of carrier? */ + long long int bond_miimon_interval; /* Miimon status refresh interval. */ + long long int bond_miimon_next_update; /* Time of next miimon update. */ long long int bond_next_fake_iface_update; /* Time of next update. */ + struct netdev_monitor *monitor; /* Tracks carrier up/down status. */ + + /* LACP information. */ + int lacp; /* LACP status flags. 0 if LACP is off. */ + uint16_t lacp_key; /* LACP aggregation key. */ + uint16_t lacp_priority; /* LACP system priority. */ + bool lacp_need_update; /* Need to update attached interfaces? */ + + /* SLB specific bonding info. */ + struct bond_entry *bond_hash; /* An array of (BOND_MASK + 1) elements. */ int bond_rebalance_interval; /* Interval between rebalances, in ms. */ long long int bond_next_rebalance; /* Next rebalancing time. */ - struct netdev_monitor *monitor; /* Tracks carrier up/down status. */ /* Port mirroring info. */ mirror_mask_t src_mirrors; /* Mirrors triggered when packet received. */ @@ -177,6 +218,7 @@ struct bridge { struct list node; /* Node in global list of bridges. */ char *name; /* User-specified arbitrary name. */ struct mac_learning *ml; /* MAC learning table. */ + uint8_t ea[ETH_ADDR_LEN]; /* Bridge Ethernet Address. */ uint8_t default_ea[ETH_ADDR_LEN]; /* Default MAC. */ const struct ovsrec_bridge *cfg; @@ -240,6 +282,10 @@ static uint64_t dpid_from_hash(const void *, size_t nbytes); static unixctl_cb_func bridge_unixctl_fdb_show; +static void lacp_run(struct bridge *); +static void lacp_wait(struct bridge *); +static void lacp_process_packet(const struct ofpbuf *, struct iface *); + static void bond_init(void); static void bond_run(struct bridge *); static void bond_wait(struct bridge *); @@ -255,9 +301,8 @@ static struct port *port_lookup(const struct bridge *, const char *name); static struct iface *port_lookup_iface(const struct port *, const char *name); static struct port *port_from_dp_ifidx(const struct bridge *, uint16_t dp_ifidx); -static void port_update_bond_compat(struct port *); -static void port_update_vlan_compat(struct port *); static void port_update_bonding(struct port *); +static void port_update_lacp(struct port *); static void mirror_create(struct bridge *, struct ovsrec_mirror *); static void mirror_destroy(struct mirror *); @@ -277,9 +322,16 @@ static void iface_update_qos(struct iface *, const struct ovsrec_qos *); static void iface_update_cfm(struct iface *); static void iface_refresh_cfm_stats(struct iface *iface); static void iface_send_packet(struct iface *, struct ofpbuf *packet); +static uint8_t iface_get_lacp_state(const struct iface *); +static void iface_get_lacp_priority(struct iface *, struct lacp_info *); +static void iface_set_lacp_defaulted(struct iface *); +static void iface_set_lacp_expired(struct iface *); static void shash_from_ovs_idl_map(char **keys, char **values, size_t n, struct shash *); +static void shash_to_ovs_idl_map(struct shash *, + char ***keys, char ***values, size_t *n); + /* Hooks into ofproto processing. */ static struct ofhooks bridge_ofhooks; @@ -359,34 +411,22 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) svec_init(&dpif_types); dp_enumerate_types(&dpif_types); for (i = 0; i < dpif_types.n; i++) { - struct dpif *dpif; - int retval; size_t j; dp_enumerate_names(dpif_types.names[i], &dpif_names); - /* For each dpif... */ + /* Delete each dpif whose name is not in 'bridge_names'. */ for (j = 0; j < dpif_names.n; j++) { - retval = dpif_open(dpif_names.names[j], dpif_types.names[i], &dpif); - if (!retval) { - struct svec all_names; - size_t k; - - /* ...check whether any of its names is in 'bridge_names'. */ - svec_init(&all_names); - dpif_get_all_names(dpif, &all_names); - for (k = 0; k < all_names.n; k++) { - if (svec_contains(&bridge_names, all_names.names[k])) { - goto found; - } + if (!svec_contains(&bridge_names, dpif_names.names[j])) { + struct dpif *dpif; + int retval; + + retval = dpif_open(dpif_names.names[j], dpif_types.names[i], + &dpif); + if (!retval) { + dpif_delete(dpif); + dpif_close(dpif); } - - /* No. Delete the dpif. */ - dpif_delete(dpif); - - found: - svec_destroy(&all_names); - dpif_close(dpif); } } } @@ -592,38 +632,35 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) * that port already belongs to a different datapath, so we must do all * port deletions before any port additions. */ LIST_FOR_EACH (br, node, &all_bridges) { - struct odp_port *dpif_ports; - size_t n_dpif_ports; + struct dpif_port_dump dump; struct shash want_ifaces; + struct dpif_port dpif_port; - dpif_port_list(br->dpif, &dpif_ports, &n_dpif_ports); bridge_get_all_ifaces(br, &want_ifaces); - for (i = 0; i < n_dpif_ports; i++) { - const struct odp_port *p = &dpif_ports[i]; - if (!shash_find(&want_ifaces, p->devname) - && strcmp(p->devname, br->name)) { - int retval = dpif_port_del(br->dpif, p->port); + DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { + if (!shash_find(&want_ifaces, dpif_port.name) + && strcmp(dpif_port.name, br->name)) { + int retval = dpif_port_del(br->dpif, dpif_port.port_no); if (retval) { VLOG_ERR("failed to remove %s interface from %s: %s", - p->devname, dpif_name(br->dpif), + dpif_port.name, dpif_name(br->dpif), strerror(retval)); } } } shash_destroy(&want_ifaces); - free(dpif_ports); } LIST_FOR_EACH (br, node, &all_bridges) { - struct odp_port *dpif_ports; - size_t n_dpif_ports; struct shash cur_ifaces, want_ifaces; + struct dpif_port_dump dump; + struct dpif_port dpif_port; /* Get the set of interfaces currently in this datapath. */ - dpif_port_list(br->dpif, &dpif_ports, &n_dpif_ports); shash_init(&cur_ifaces); - for (i = 0; i < n_dpif_ports; i++) { - const char *name = dpif_ports[i].devname; - shash_add_once(&cur_ifaces, name, &dpif_ports[i]); + DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { + struct dpif_port *port_info = xmalloc(sizeof *port_info); + dpif_port_clone(port_info, &dpif_port); + shash_add(&cur_ifaces, dpif_port.name, port_info); } /* Get the set of interfaces we want on this datapath. */ @@ -633,10 +670,13 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) SHASH_FOR_EACH (node, &want_ifaces) { const char *if_name = node->name; struct iface *iface = node->data; - struct odp_port *dpif_port = shash_find_data(&cur_ifaces, if_name); - const char *type = iface ? iface->type : "internal"; + struct dpif_port *dpif_port; + const char *type; int error; + type = iface ? iface->type : "internal"; + dpif_port = shash_find_data(&cur_ifaces, if_name); + /* If we have a port or a netdev already, and it's not the type we * want, then delete the port (if any) and close the netdev (if * any). */ @@ -644,7 +684,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) || (iface && iface->netdev && strcmp(type, netdev_get_type(iface->netdev)))) { if (dpif_port) { - error = ofproto_port_del(br->ofproto, dpif_port->port); + error = ofproto_port_del(br->ofproto, dpif_port->port_no); if (error) { continue; } @@ -671,7 +711,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) shash_init(&args); if (iface) { - shash_from_ovs_idl_map(iface->cfg->key_options, + shash_from_ovs_idl_map(iface->cfg->key_options, iface->cfg->value_options, iface->cfg->n_options, &args); } @@ -706,21 +746,27 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) if (iface) { iface->netdev = netdev; iface->enabled = netdev_get_carrier(iface->netdev); + iface->up = iface->enabled; } } else if (iface && iface->netdev) { struct shash args; shash_init(&args); - shash_from_ovs_idl_map(iface->cfg->key_options, + shash_from_ovs_idl_map(iface->cfg->key_options, iface->cfg->value_options, iface->cfg->n_options, &args); - netdev_reconfigure(iface->netdev, &args); + netdev_set_config(iface->netdev, &args); shash_destroy(&args); } } - free(dpif_ports); - shash_destroy(&cur_ifaces); shash_destroy(&want_ifaces); + + SHASH_FOR_EACH (node, &cur_ifaces) { + struct dpif_port *port_info = node->data; + dpif_port_destroy(port_info); + free(port_info); + } + shash_destroy(&cur_ifaces); } sflow_bridge_number = 0; LIST_FOR_EACH (br, node, &all_bridges) { @@ -746,6 +792,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) br->name, strerror(error)); } } + memcpy(br->ea, ea, ETH_ADDR_LEN); dpid = bridge_pick_datapath_id(br, ea, hw_addr_iface); ofproto_set_datapath_id(br->ofproto, dpid); @@ -864,8 +911,8 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) struct port *port = br->ports[i]; int j; - port_update_vlan_compat(port); port_update_bonding(port); + port_update_lacp(port); for (j = 0; j < port->n_ifaces; j++) { iface_update_qos(port->ifaces[j], port->cfg->qos); @@ -884,6 +931,10 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) } free(managers); + + /* ovs-vswitchd has completed initialization, so allow the process that + * forked us to exit successfully. */ + daemonize_complete(); } static const char * @@ -993,7 +1044,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], !eth_addr_is_local(iface_ea) && !eth_addr_is_reserved(iface_ea) && !eth_addr_is_zero(iface_ea) && - memcmp(iface_ea, ea, ETH_ADDR_LEN) < 0) + eth_addr_compare_3way(iface_ea, ea) < 0) { memcpy(ea, iface_ea, ETH_ADDR_LEN); *hw_addr_iface = iface; @@ -1101,6 +1152,72 @@ dpid_from_hash(const void *data, size_t n) return eth_addr_to_uint64(hash); } +static void +iface_refresh_status(struct iface *iface) +{ + struct shash sh; + + enum netdev_flags flags; + uint32_t current; + int64_t bps; + int mtu; + int64_t mtu_64; + int error; + + shash_init(&sh); + + if (!netdev_get_status(iface->netdev, &sh)) { + size_t n; + char **keys, **values; + + shash_to_ovs_idl_map(&sh, &keys, &values, &n); + ovsrec_interface_set_status(iface->cfg, keys, values, n); + + free(keys); + free(values); + } else { + ovsrec_interface_set_status(iface->cfg, NULL, NULL, 0); + } + + shash_destroy_free_data(&sh); + + error = netdev_get_flags(iface->netdev, &flags); + if (!error) { + ovsrec_interface_set_admin_state(iface->cfg, flags & NETDEV_UP ? "up" : "down"); + } + else { + ovsrec_interface_set_admin_state(iface->cfg, NULL); + } + + error = netdev_get_features(iface->netdev, ¤t, NULL, NULL, NULL); + if (!error) { + ovsrec_interface_set_duplex(iface->cfg, + netdev_features_is_full_duplex(current) + ? "full" : "half"); + /* warning: uint64_t -> int64_t conversion */ + bps = netdev_features_to_bps(current); + ovsrec_interface_set_link_speed(iface->cfg, &bps, 1); + } + else { + ovsrec_interface_set_duplex(iface->cfg, NULL); + ovsrec_interface_set_link_speed(iface->cfg, NULL, 0); + } + + + ovsrec_interface_set_link_state(iface->cfg, + netdev_get_carrier(iface->netdev) + ? "up" : "down"); + + error = netdev_get_mtu(iface->netdev, &mtu); + if (!error && mtu != INT_MAX) { + mtu_64 = mtu; + ovsrec_interface_set_mtu(iface->cfg, &mtu_64, 1); + } + else { + ovsrec_interface_set_mtu(iface->cfg, NULL, 0); + } +} + static void iface_refresh_cfm_stats(struct iface *iface) { @@ -1238,6 +1355,49 @@ refresh_system_stats(const struct ovsrec_open_vswitch *cfg) &datum); } +static inline const char * +nx_role_to_str(enum nx_role role) +{ + switch (role) { + case NX_ROLE_OTHER: + return "other"; + case NX_ROLE_MASTER: + return "master"; + case NX_ROLE_SLAVE: + return "slave"; + default: + return "*** INVALID ROLE ***"; + } +} + +static void +bridge_refresh_controller_status(const struct bridge *br) +{ + struct shash info; + const struct ovsrec_controller *cfg; + + ofproto_get_ofproto_controller_info(br->ofproto, &info); + + OVSREC_CONTROLLER_FOR_EACH(cfg, idl) { + struct ofproto_controller_info *cinfo = + shash_find_data(&info, cfg->target); + + if (cinfo) { + ovsrec_controller_set_is_connected(cfg, cinfo->is_connected); + ovsrec_controller_set_role(cfg, nx_role_to_str(cinfo->role)); + ovsrec_controller_set_status(cfg, (char **) cinfo->pairs.keys, + (char **) cinfo->pairs.values, + cinfo->pairs.n); + } else { + ovsrec_controller_set_is_connected(cfg, false); + ovsrec_controller_set_role(cfg, NULL); + ovsrec_controller_set_status(cfg, NULL, NULL, 0); + } + } + + ofproto_free_ofproto_controller_info(&info); +} + void bridge_run(void) { @@ -1262,6 +1422,20 @@ bridge_run(void) /* (Re)configure if necessary. */ database_changed = ovsdb_idl_run(idl); cfg = ovsrec_open_vswitch_first(idl); +#ifdef HAVE_OPENSSL + /* Re-configure SSL. We do this on every trip through the main loop, + * instead of just when the database changes, because the contents of the + * key and certificate files can change without the database changing. + * + * We do this before bridge_reconfigure() because that function might + * initiate SSL connections and thus requires SSL to be configured. */ + if (cfg && cfg->ssl) { + const struct ovsrec_ssl *ssl = cfg->ssl; + + stream_ssl_set_key_and_cert(ssl->private_key, ssl->certificate); + stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert); + } +#endif if (database_changed || datapath_destroyed) { if (cfg) { struct ovsdb_idl_txn *txn = ovsdb_idl_txn_create(idl); @@ -1281,18 +1455,6 @@ bridge_run(void) } } -#ifdef HAVE_OPENSSL - /* Re-configure SSL. We do this on every trip through the main loop, - * instead of just when the database changes, because the contents of the - * key and certificate files can change without the database changing. */ - if (cfg && cfg->ssl) { - const struct ovsrec_ssl *ssl = cfg->ssl; - - stream_ssl_set_key_and_cert(ssl->private_key, ssl->certificate); - stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert); - } -#endif - /* Refresh system and interface stats if necessary. */ if (time_msec() >= stats_timer) { if (cfg) { @@ -1310,8 +1472,10 @@ bridge_run(void) struct iface *iface = port->ifaces[j]; iface_refresh_stats(iface); iface_refresh_cfm_stats(iface); + iface_refresh_status(iface); } } + bridge_refresh_controller_status(br); } refresh_system_stats(cfg); ovsdb_idl_txn_commit(txn); @@ -1335,6 +1499,7 @@ bridge_wait(void) } mac_learning_wait(br->ml); + lacp_wait(br); bond_wait(br); HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) { @@ -1550,6 +1715,7 @@ bridge_run_one(struct bridge *br) } mac_learning_run(br->ml, ofproto_get_revalidate_set(br->ofproto)); + lacp_run(br); bond_run(br); error = ofproto_run2(br->ofproto, br->flush); @@ -1903,8 +2069,8 @@ bridge_get_all_ifaces(const struct bridge *br, struct shash *ifaces) static void bridge_fetch_dp_ifaces(struct bridge *br) { - struct odp_port *dpif_ports; - size_t n_dpif_ports; + struct dpif_port_dump dump; + struct dpif_port dpif_port; size_t i, j; /* Reset all interface numbers. */ @@ -1917,19 +2083,17 @@ bridge_fetch_dp_ifaces(struct bridge *br) } hmap_clear(&br->ifaces); - dpif_port_list(br->dpif, &dpif_ports, &n_dpif_ports); - for (i = 0; i < n_dpif_ports; i++) { - struct odp_port *p = &dpif_ports[i]; - struct iface *iface = iface_lookup(br, p->devname); + DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { + struct iface *iface = iface_lookup(br, dpif_port.name); if (iface) { if (iface->dp_ifidx >= 0) { VLOG_WARN("%s reported interface %s twice", - dpif_name(br->dpif), p->devname); - } else if (iface_from_dp_ifidx(br, p->port)) { + dpif_name(br->dpif), dpif_port.name); + } else if (iface_from_dp_ifidx(br, dpif_port.port_no)) { VLOG_WARN("%s reported interface %"PRIu16" twice", - dpif_name(br->dpif), p->port); + dpif_name(br->dpif), dpif_port.port_no); } else { - iface->dp_ifidx = p->port; + iface->dp_ifidx = dpif_port.port_no; hmap_insert(&br->ifaces, &iface->dp_ifidx_node, hash_int(iface->dp_ifidx, 0)); } @@ -1940,22 +2104,46 @@ bridge_fetch_dp_ifaces(struct bridge *br) : -1)); } } - free(dpif_ports); } /* Bridge packet processing functions. */ +static bool +bond_is_tcp_hash(const struct port *port) +{ + return port->bond_mode == BM_TCP && port->lacp & LACP_NEGOTIATED; +} + static int -bond_hash(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan) +bond_hash_src(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan) { return hash_bytes(mac, ETH_ADDR_LEN, vlan) & BOND_MASK; } +static int bond_hash_tcp(const struct flow *flow, uint16_t vlan) +{ + struct flow hash_flow; + + memcpy(&hash_flow, flow, sizeof hash_flow); + hash_flow.vlan_tci = 0; + + /* 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, vlan) & BOND_MASK; +} + static struct bond_entry * -lookup_bond_entry(const struct port *port, const uint8_t mac[ETH_ADDR_LEN], +lookup_bond_entry(const struct port *port, const struct flow *flow, uint16_t vlan) { - return &port->bond_hash[bond_hash(mac, vlan)]; + assert(port->bond_mode != BM_AB); + + if (bond_is_tcp_hash(port)) { + return &port->bond_hash[bond_hash_tcp(flow, vlan)]; + } else { + return &port->bond_hash[bond_hash_src(flow->dl_src, vlan)]; + } } static int @@ -1970,7 +2158,9 @@ bond_choose_iface(const struct port *port) if (iface->enabled) { return i; - } else if (iface->delay_expires < next_delay_expiration) { + } else if (iface->delay_expires < next_delay_expiration + && (iface->lacp_status & LACP_ATTACHED + || !(port->lacp & LACP_NEGOTIATED))) { best_down_slave = i; next_delay_expiration = iface->delay_expires; } @@ -1989,7 +2179,7 @@ bond_choose_iface(const struct port *port) } static bool -choose_output_iface(const struct port *port, const uint8_t *dl_src, +choose_output_iface(const struct port *port, const struct flow *flow, uint16_t vlan, uint16_t *dp_ifidx, tag_type *tags) { struct iface *iface; @@ -1997,8 +2187,14 @@ choose_output_iface(const struct port *port, const uint8_t *dl_src, assert(port->n_ifaces); if (port->n_ifaces == 1) { iface = port->ifaces[0]; + } else if (port->bond_mode == BM_AB) { + if (port->active_iface < 0) { + *tags |= port->no_ifaces_tag; + return false; + } + iface = port->ifaces[port->active_iface]; } else { - struct bond_entry *e = lookup_bond_entry(port, dl_src, vlan); + struct bond_entry *e = lookup_bond_entry(port, flow, vlan); if (e->iface_idx < 0 || e->iface_idx >= port->n_ifaces || !port->ifaces[e->iface_idx]->enabled) { /* XXX select interface properly. The current interface selection @@ -2009,7 +2205,6 @@ choose_output_iface(const struct port *port, const uint8_t *dl_src, return false; } e->iface_tag = tag_create_random(); - ((struct port *) port)->bond_compat_is_stale = true; } *tags |= e->iface_tag; iface = port->ifaces[e->iface_idx]; @@ -2020,36 +2215,58 @@ choose_output_iface(const struct port *port, const uint8_t *dl_src, } static void -bond_link_status_update(struct iface *iface, bool carrier) +bond_link_status_update(struct iface *iface) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); struct port *port = iface->port; + bool up = iface->up; + int updelay, downdelay; + + updelay = port->updelay; + downdelay = port->downdelay; + + if (iface->port->lacp & LACP_NEGOTIATED) { + downdelay = 0; + updelay = 0; + } - if ((carrier == iface->enabled) == (iface->delay_expires == LLONG_MAX)) { + if (iface->port->lacp && up) { + /* The interface is up if it's attached to an aggregator and its + * partner is synchronized. The only exception is defaulted links. + * They are not required to have synchronized partners because they + * have no partners at all. However, they will only be attached if + * negotiations failed on all interfaces in the bond. */ + up = iface->lacp_status & LACP_ATTACHED + && (iface->lacp_partner.state & LACP_STATE_SYNC + || iface->lacp_status & LACP_DEFAULTED); + } + + + if ((up == iface->enabled) == (iface->delay_expires == LLONG_MAX)) { /* Nothing to do. */ return; } - VLOG_INFO_RL(&rl, "interface %s: carrier %s", - iface->name, carrier ? "detected" : "dropped"); - if (carrier == iface->enabled) { + VLOG_INFO_RL(&rl, "interface %s: link state %s", + iface->name, up ? "up" : "down"); + if (up == iface->enabled) { iface->delay_expires = LLONG_MAX; VLOG_INFO_RL(&rl, "interface %s: will not be %s", - iface->name, carrier ? "disabled" : "enabled"); - } else if (carrier && port->active_iface < 0) { + iface->name, up ? "disabled" : "enabled"); + } else if (up && port->active_iface < 0) { bond_enable_slave(iface, true); - if (port->updelay) { + if (updelay) { VLOG_INFO_RL(&rl, "interface %s: skipping %d ms updelay since no " - "other interface is up", iface->name, port->updelay); + "other interface is up", iface->name, updelay); } } else { - int delay = carrier ? port->updelay : port->downdelay; + int delay = up ? updelay : downdelay; iface->delay_expires = time_msec() + delay; if (delay) { VLOG_INFO_RL(&rl, "interface %s: will be %s if it stays %s for %d ms", iface->name, - carrier ? "enabled" : "disabled", - carrier ? "up" : "down", + up ? "enabled" : "disabled", + up ? "up" : "down", delay); } } @@ -2117,7 +2334,6 @@ bond_enable_slave(struct iface *iface, bool enable) } moving_active_iface = false; - port->bond_compat_is_stale = true; } /* Attempts to make the sum of the bond slaves' statistics appear on the fake @@ -2157,6 +2373,21 @@ bond_update_fake_iface_stats(struct port *port) } } +static void +bond_link_carrier_update(struct iface *iface, bool carrier) +{ + if (carrier == iface->up) { + return; + } + + if (iface->lacp_status & LACP_CURRENT) { + iface_set_lacp_expired(iface); + } + + iface->up = carrier; + iface->lacp_tx = 0; +} + static void bond_run(struct bridge *br) { @@ -2168,18 +2399,36 @@ bond_run(struct bridge *br) if (port->n_ifaces >= 2) { char *devname; - /* Track carrier going up and down on interfaces. */ - while (!netdev_monitor_poll(port->monitor, &devname)) { - struct iface *iface; + if (port->monitor) { + assert(!port->miimon); - iface = port_lookup_iface(port, devname); - if (iface) { - bool carrier = netdev_get_carrier(iface->netdev); + /* Track carrier going up and down on interfaces. */ + while (!netdev_monitor_poll(port->monitor, &devname)) { + struct iface *iface; - bond_link_status_update(iface, carrier); - port_update_bond_compat(port); + iface = port_lookup_iface(port, devname); + if (iface) { + bool up = netdev_get_carrier(iface->netdev); + bond_link_carrier_update(iface, up); + } + free(devname); + } + } else { + assert(port->miimon); + + if (time_msec() >= port->bond_miimon_next_update) { + for (j = 0; j < port->n_ifaces; j++) { + struct iface *iface = port->ifaces[j]; + bool up = netdev_get_miimon(iface->netdev); + bond_link_carrier_update(iface, up); + } + port->bond_miimon_next_update = time_msec() + + port->bond_miimon_interval; } - free(devname); + } + + for (j = 0; j < port->n_ifaces; j++) { + bond_link_status_update(port->ifaces[j]); } for (j = 0; j < port->n_ifaces; j++) { @@ -2195,11 +2444,6 @@ bond_run(struct bridge *br) port->bond_next_fake_iface_update = time_msec() + 1000; } } - - if (port->bond_compat_is_stale) { - port->bond_compat_is_stale = false; - port_update_bond_compat(port); - } } } @@ -2213,7 +2457,15 @@ bond_wait(struct bridge *br) if (port->n_ifaces < 2) { continue; } - netdev_monitor_poll_wait(port->monitor); + + if (port->monitor) { + netdev_monitor_poll_wait(port->monitor); + } + + if (port->miimon) { + poll_timer_wait_until(port->bond_miimon_next_update); + } + for (j = 0; j < port->n_ifaces; j++) { struct iface *iface = port->ifaces[j]; if (iface->delay_expires != LLONG_MAX) { @@ -2235,7 +2487,7 @@ set_dst(struct dst *dst, const struct flow *flow, : in_port->vlan >= 0 ? in_port->vlan : flow->vlan_tci == 0 ? OFP_VLAN_NONE : vlan_tci_to_vid(flow->vlan_tci)); - return choose_output_iface(out_port, flow->dl_src, dst->vlan, + return choose_output_iface(out_port, flow, dst->vlan, &dst->dp_ifidx, tags); } @@ -2479,16 +2731,16 @@ compose_actions(struct bridge *br, const struct flow *flow, uint16_t vlan, const struct dst *dst = &set.dsts[i]; if (dst->vlan != cur_vlan) { if (dst->vlan == OFP_VLAN_NONE) { - nl_msg_put_flag(actions, ODPAT_STRIP_VLAN); + nl_msg_put_flag(actions, ODP_ACTION_ATTR_STRIP_VLAN); } else { ovs_be16 tci; tci = htons(dst->vlan & VLAN_VID_MASK); tci |= flow->vlan_tci & htons(VLAN_PCP_MASK); - nl_msg_put_be16(actions, ODPAT_SET_DL_TCI, tci); + nl_msg_put_be16(actions, ODP_ACTION_ATTR_SET_DL_TCI, tci); } cur_vlan = dst->vlan; } - nl_msg_put_u32(actions, ODPAT_OUTPUT, dst->dp_ifidx); + nl_msg_put_u32(actions, ODP_ACTION_ATTR_OUTPUT, dst->dp_ifidx); } dst_set_free(&set); } @@ -2646,8 +2898,14 @@ is_admissible(struct bridge *br, const struct flow *flow, bool have_packet, return false; } - /* Packets received on bonds need special attention to avoid duplicates. */ - if (in_port->n_ifaces > 1) { + /* When using LACP, do not accept packets from disabled interfaces. */ + if (in_port->lacp & LACP_NEGOTIATED && !in_iface->enabled) { + return false; + } + + /* Packets received on non-LACP bonds need special attention to avoid + * duplicates. */ + if (in_port->n_ifaces > 1 && !(in_port->lacp & LACP_NEGOTIATED)) { int src_idx; bool is_grat_arp_locked; @@ -2736,21 +2994,38 @@ bridge_normal_ofhook_cb(const struct flow *flow, const struct ofpbuf *packet, struct ofpbuf *actions, tag_type *tags, uint16_t *nf_output_iface, void *br_) { - struct iface *iface; struct bridge *br = br_; COVERAGE_INC(bridge_process_flow); + return process_flow(br, flow, packet, actions, tags, nf_output_iface); +} + +static bool +bridge_special_ofhook_cb(const struct flow *flow, + const struct ofpbuf *packet, void *br_) +{ + struct iface *iface; + struct bridge *br = br_; iface = iface_from_dp_ifidx(br, flow->in_port); if (cfm_should_process_flow(flow)) { - if (packet && iface->cfm) { + + if (iface && packet && iface->cfm) { + COVERAGE_INC(bridge_process_cfm); cfm_process_heartbeat(iface->cfm, packet); } return false; + } else if (flow->dl_type == htons(ETH_TYPE_LACP)) { + + if (iface && packet) { + COVERAGE_INC(bridge_process_lacp); + lacp_process_packet(packet, iface); + } + return false; } - return process_flow(br, flow, packet, actions, tags, nf_output_iface); + return true; } static void @@ -2782,14 +3057,14 @@ bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, return; } NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { - if (nl_attr_type(a) == ODPAT_OUTPUT) { + if (nl_attr_type(a) == ODP_ACTION_ATTR_OUTPUT) { struct port *out_port = port_from_dp_ifidx(br, nl_attr_get_u32(a)); - if (out_port && out_port->n_ifaces >= 2) { + if (out_port && out_port->n_ifaces >= 2 && + out_port->bond_mode != BM_AB) { uint16_t vlan = (flow->vlan_tci ? vlan_tci_to_vid(flow->vlan_tci) : OFP_VLAN_NONE); - struct bond_entry *e = lookup_bond_entry(out_port, - flow->dl_src, vlan); + struct bond_entry *e = lookup_bond_entry(out_port, flow, vlan); e->tx_bytes += n_bytes; } } @@ -2810,7 +3085,8 @@ bridge_account_checkpoint_ofhook_cb(void *br_) now = time_msec(); for (i = 0; i < br->n_ports; i++) { struct port *port = br->ports[i]; - if (port->n_ifaces > 1 && now >= port->bond_next_rebalance) { + if (port->n_ifaces > 1 && port->bond_mode != BM_AB + && now >= port->bond_next_rebalance) { port->bond_next_rebalance = now + port->bond_rebalance_interval; bond_rebalance_port(port); } @@ -2819,10 +3095,201 @@ bridge_account_checkpoint_ofhook_cb(void *br_) static struct ofhooks bridge_ofhooks = { bridge_normal_ofhook_cb, + bridge_special_ofhook_cb, bridge_account_flow_ofhook_cb, bridge_account_checkpoint_ofhook_cb, }; +/* LACP functions. */ + +static void +lacp_process_packet(const struct ofpbuf *packet, struct iface *iface) +{ + const struct lacp_pdu *pdu; + + if (!iface->port->lacp) { + return; + } + + pdu = parse_lacp_packet(packet); + if (!pdu) { + return; + } + + iface->lacp_status |= LACP_CURRENT; + iface->lacp_status &= ~(LACP_EXPIRED | LACP_DEFAULTED); + iface->lacp_rx = time_msec() + LACP_SLOW_TIME_RX; + + iface->lacp_actor.state = iface_get_lacp_state(iface); + if (memcmp(&iface->lacp_actor, &pdu->partner, sizeof pdu->partner)) { + iface->lacp_tx = 0; + } + + if (memcmp(&iface->lacp_partner, &pdu->actor, sizeof pdu->actor)) { + iface->port->lacp_need_update = true; + iface->lacp_partner = pdu->actor; + } +} + +static void +lacp_update_ifaces(struct port *port) +{ + size_t i; + struct iface *lead; + struct lacp_info lead_pri; + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 10); + + port->lacp_need_update = false; + COVERAGE_INC(bridge_lacp_update); + + if (!port->lacp) { + return; + } + + VLOG_DBG_RL(&rl, "port %s: re-evaluating LACP link status", port->name); + + lead = NULL; + for (i = 0; i < port->n_ifaces; i++) { + struct iface *iface = port->ifaces[i]; + struct lacp_info pri; + + iface->lacp_status |= LACP_ATTACHED; + ofproto_revalidate(port->bridge->ofproto, iface->tag); + + /* Don't allow loopback interfaces to send traffic or lead. */ + if (eth_addr_equals(iface->lacp_partner.sysid, + iface->lacp_actor.sysid)) { + VLOG_WARN_RL(&rl, "iface %s: Loopback detected. Interface is " + "connected to its own bridge", iface->name); + iface->lacp_status &= ~LACP_ATTACHED; + continue; + } + + if (iface->lacp_status & LACP_DEFAULTED) { + continue; + } + + iface_get_lacp_priority(iface, &pri); + + if (!lead || memcmp(&pri, &lead_pri, sizeof pri) < 0) { + lead = iface; + lead_pri = pri; + } + } + + if (!lead) { + port->lacp &= ~LACP_NEGOTIATED; + return; + } + + port->lacp |= LACP_NEGOTIATED; + + for (i = 0; i < port->n_ifaces; i++) { + struct iface *iface = port->ifaces[i]; + + if (iface->lacp_status & LACP_DEFAULTED + || lead->lacp_partner.key != iface->lacp_partner.key + || !eth_addr_equals(lead->lacp_partner.sysid, + iface->lacp_partner.sysid)) { + iface->lacp_status &= ~LACP_ATTACHED; + } + } +} + +static bool +lacp_iface_may_tx(const struct iface *iface) +{ + return iface->port->lacp & LACP_ACTIVE + || iface->lacp_status & (LACP_CURRENT | LACP_EXPIRED); +} + +static void +lacp_run(struct bridge *br) +{ + size_t i, j; + struct ofpbuf packet; + + ofpbuf_init(&packet, ETH_HEADER_LEN + LACP_PDU_LEN); + + for (i = 0; i < br->n_ports; i++) { + struct port *port = br->ports[i]; + + if (!port->lacp) { + continue; + } + + for (j = 0; j < port->n_ifaces; j++) { + struct iface *iface = port->ifaces[j]; + + if (time_msec() > iface->lacp_rx) { + if (iface->lacp_status & LACP_CURRENT) { + iface_set_lacp_expired(iface); + } else if (iface->lacp_status & LACP_EXPIRED) { + iface_set_lacp_defaulted(iface); + } + } + } + + if (port->lacp_need_update) { + lacp_update_ifaces(port); + } + + for (j = 0; j < port->n_ifaces; j++) { + struct iface *iface = port->ifaces[j]; + uint8_t ea[ETH_ADDR_LEN]; + int error; + + if (time_msec() < iface->lacp_tx || !lacp_iface_may_tx(iface)) { + continue; + } + + error = netdev_get_etheraddr(iface->netdev, ea); + if (!error) { + iface->lacp_actor.state = iface_get_lacp_state(iface); + compose_lacp_packet(&packet, &iface->lacp_actor, + &iface->lacp_partner, ea); + iface_send_packet(iface, &packet); + } else { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 10); + VLOG_ERR_RL(&rl, "iface %s: failed to obtain Ethernet address " + "(%s)", iface->name, strerror(error)); + } + + iface->lacp_tx = time_msec() + + (iface->lacp_partner.state & LACP_STATE_TIME + ? LACP_FAST_TIME_TX + : LACP_SLOW_TIME_TX); + } + } + ofpbuf_uninit(&packet); +} + +static void +lacp_wait(struct bridge *br) +{ + size_t i, j; + + for (i = 0; i < br->n_ports; i++) { + struct port *port = br->ports[i]; + + if (!port->lacp) { + continue; + } + + for (j = 0; j < port->n_ifaces; j++) { + struct iface *iface = port->ifaces[j]; + + if (lacp_iface_may_tx(iface)) { + poll_timer_wait_until(iface->lacp_tx); + } + + if (iface->lacp_status & (LACP_CURRENT | LACP_EXPIRED)) { + poll_timer_wait_until(iface->lacp_rx); + } + } + } +} + /* Bonding functions. */ /* Statistics for a single interface on a bonded port, used for load-based @@ -2837,6 +3304,22 @@ struct slave_balance { size_t n_hashes; }; +static const char * +bond_mode_to_string(enum bond_mode bm) { + static char *bm_slb = "balance-slb"; + static char *bm_ab = "active-backup"; + static char *bm_tcp = "balance-tcp"; + + switch (bm) { + case BM_SLB: return bm_slb; + case BM_AB: return bm_ab; + case BM_TCP: return bm_tcp; + } + + NOT_REACHED(); + return NULL; +} + /* Sorts pointers to pointers to bond_entries in ascending order by the * interface to which they are assigned, and within a single interface in * ascending order of bytes transmitted. */ @@ -2945,6 +3428,8 @@ bond_shift_load(struct slave_balance *from, struct slave_balance *to, struct port *port = from->iface->port; uint64_t delta = hash->tx_bytes; + assert(port->bond_mode != BM_AB); + VLOG_INFO("bond %s: shift %"PRIu64"kB of load (with hash %td) " "from %s to %s (now carrying %"PRIu64"kB and " "%"PRIu64"kB load, respectively)", @@ -2987,6 +3472,8 @@ bond_rebalance_port(struct port *port) struct bond_entry *e; size_t i; + assert(port->bond_mode != BM_AB); + /* Sets up 'bals' to describe each of the port's interfaces, sorted in * descending order of tx_bytes, so that bals[0] represents the most * heavily loaded slave and bals[n_bals - 1] represents the least heavily @@ -3095,7 +3582,6 @@ bond_rebalance_port(struct port *port) } if (i < from->n_hashes) { bond_shift_load(from, to, i); - port->bond_compat_is_stale = true; /* If the result of the migration changed the relative order of * 'from' and 'to' swap them back to maintain invariants. */ @@ -3133,7 +3619,7 @@ bond_send_learning_packets(struct port *port) struct ofpbuf packet; int error, n_packets, n_errors; - if (!port->n_ifaces || port->active_iface < 0) { + if (!port->n_ifaces || port->active_iface < 0 || bond_is_tcp_hash(port)) { return; } @@ -3146,8 +3632,15 @@ bond_send_learning_packets(struct port *port) struct flow flow; int retval; - if (e->port == port->port_idx - || !choose_output_iface(port, e->mac, e->vlan, &dp_ifidx, &tags)) { + if (e->port == port->port_idx) { + continue; + } + + compose_benign_packet(&packet, "Open vSwitch Bond Failover", 0xf177, + e->mac); + flow_extract(&packet, 0, ODPP_NONE, &flow); + + if (!choose_output_iface(port, &flow, e->vlan, &dp_ifidx, &tags)) { continue; } @@ -3167,9 +3660,6 @@ bond_send_learning_packets(struct port *port) /* Send packet. */ n_packets++; - compose_benign_packet(&packet, "Open vSwitch Bond Failover", 0xf177, - e->mac); - flow_extract(&packet, 0, ODPP_NONE, &flow); retval = ofproto_send_packet(br->ofproto, &flow, actions, a - actions, &packet); if (retval) { @@ -3199,7 +3689,7 @@ bond_unixctl_list(struct unixctl_conn *conn, struct ds ds = DS_EMPTY_INITIALIZER; const struct bridge *br; - ds_put_cstr(&ds, "bridge\tbond\tslaves\n"); + ds_put_cstr(&ds, "bridge\tbond\ttype\tslaves\n"); LIST_FOR_EACH (br, node, &all_bridges) { size_t i; @@ -3209,7 +3699,8 @@ bond_unixctl_list(struct unixctl_conn *conn, if (port->n_ifaces > 1) { size_t j; - ds_put_format(&ds, "%s\t%s\t", br->name, port->name); + ds_put_format(&ds, "%s\t%s\t%s\t", br->name, port->name, + bond_mode_to_string(port->bond_mode)); for (j = 0; j < port->n_ifaces; j++) { const struct iface *iface = port->ifaces[j]; if (j) { @@ -3243,6 +3734,42 @@ bond_find(const char *name) return NULL; } +static void +ds_put_lacp_state(struct ds *ds, uint8_t state) +{ + if (state & LACP_STATE_ACT) { + ds_put_cstr(ds, "activity "); + } + + if (state & LACP_STATE_TIME) { + ds_put_cstr(ds, "timeout "); + } + + if (state & LACP_STATE_AGG) { + ds_put_cstr(ds, "aggregation "); + } + + if (state & LACP_STATE_SYNC) { + ds_put_cstr(ds, "synchronized "); + } + + if (state & LACP_STATE_COL) { + ds_put_cstr(ds, "collecting "); + } + + if (state & LACP_STATE_DIST) { + ds_put_cstr(ds, "distributing "); + } + + if (state & LACP_STATE_DEF) { + ds_put_cstr(ds, "defaulted "); + } + + if (state & LACP_STATE_EXP) { + ds_put_cstr(ds, "expired "); + } +} + static void bond_unixctl_show(struct unixctl_conn *conn, const char *args, void *aux OVS_UNUSED) @@ -3257,16 +3784,45 @@ bond_unixctl_show(struct unixctl_conn *conn, return; } + ds_put_format(&ds, "bond_mode: %s\n", + bond_mode_to_string(port->bond_mode)); + + if (port->lacp) { + ds_put_format(&ds, "lacp: %s\n", + port->lacp & LACP_ACTIVE ? "active" : "passive"); + } else { + ds_put_cstr(&ds, "lacp: off\n"); + } + + if (port->bond_mode != BM_AB) { + ds_put_format(&ds, "bond-hash-algorithm: %s\n", + bond_is_tcp_hash(port) ? "balance-tcp" : "balance-slb"); + } + + + ds_put_format(&ds, "bond-detect-mode: %s\n", + port->miimon ? "miimon" : "carrier"); + + if (port->miimon) { + ds_put_format(&ds, "bond-miimon-interval: %lld\n", + port->bond_miimon_interval); + } + ds_put_format(&ds, "updelay: %d ms\n", port->updelay); ds_put_format(&ds, "downdelay: %d ms\n", port->downdelay); - ds_put_format(&ds, "next rebalance: %lld ms\n", - port->bond_next_rebalance - time_msec()); + + if (port->bond_mode != BM_AB) { + ds_put_format(&ds, "next rebalance: %lld ms\n", + port->bond_next_rebalance - time_msec()); + } + for (j = 0; j < port->n_ifaces; j++) { const struct iface *iface = port->ifaces[j]; struct bond_entry *be; + struct flow flow; /* Basic info. */ - ds_put_format(&ds, "slave %s: %s\n", + ds_put_format(&ds, "\nslave %s: %s\n", iface->name, iface->enabled ? "enabled" : "disabled"); if (j == port->active_iface) { ds_put_cstr(&ds, "\tactive slave\n"); @@ -3277,7 +3833,76 @@ bond_unixctl_show(struct unixctl_conn *conn, iface->delay_expires - time_msec()); } + if (port->lacp) { + ds_put_cstr(&ds, "\tstatus: "); + + if (iface->lacp_status & LACP_CURRENT) { + ds_put_cstr(&ds, "current "); + } + + if (iface->lacp_status & LACP_EXPIRED) { + ds_put_cstr(&ds, "expired "); + } + + if (iface->lacp_status & LACP_DEFAULTED) { + ds_put_cstr(&ds, "defaulted "); + } + + if (iface->lacp_status & LACP_ATTACHED) { + ds_put_cstr(&ds, "attached "); + } + + ds_put_cstr(&ds, "\n"); + + ds_put_cstr(&ds, "\n\tactor sysid: "); + ds_put_format(&ds, ETH_ADDR_FMT, + ETH_ADDR_ARGS(iface->lacp_actor.sysid)); + ds_put_cstr(&ds, "\n"); + + ds_put_format(&ds, "\tactor sys_priority: %u\n", + ntohs(iface->lacp_actor.sys_priority)); + + ds_put_format(&ds, "\tactor portid: %u\n", + ntohs(iface->lacp_actor.portid)); + + ds_put_format(&ds, "\tactor port_priority: %u\n", + ntohs(iface->lacp_actor.port_priority)); + + ds_put_format(&ds, "\tactor key: %u\n", + ntohs(iface->lacp_actor.key)); + + ds_put_cstr(&ds, "\tactor state: "); + ds_put_lacp_state(&ds, iface_get_lacp_state(iface)); + ds_put_cstr(&ds, "\n\n"); + + ds_put_cstr(&ds, "\tpartner sysid: "); + ds_put_format(&ds, ETH_ADDR_FMT, + ETH_ADDR_ARGS(iface->lacp_partner.sysid)); + ds_put_cstr(&ds, "\n"); + + ds_put_format(&ds, "\tpartner sys_priority: %u\n", + ntohs(iface->lacp_partner.sys_priority)); + + ds_put_format(&ds, "\tpartner portid: %u\n", + ntohs(iface->lacp_partner.portid)); + + ds_put_format(&ds, "\tpartner port_priority: %u\n", + ntohs(iface->lacp_partner.port_priority)); + + ds_put_format(&ds, "\tpartner key: %u\n", + ntohs(iface->lacp_partner.key)); + + ds_put_cstr(&ds, "\tpartner state: "); + ds_put_lacp_state(&ds, iface->lacp_partner.state); + ds_put_cstr(&ds, "\n"); + } + + if (port->bond_mode == BM_AB) { + continue; + } + /* Hashes. */ + memset(&flow, 0, sizeof flow); for (be = port->bond_hash; be <= &port->bond_hash[BOND_MASK]; be++) { int hash = be - port->bond_hash; struct mac_entry *me; @@ -3289,13 +3914,19 @@ bond_unixctl_show(struct unixctl_conn *conn, ds_put_format(&ds, "\thash %d: %"PRIu64" kB load\n", hash, be->tx_bytes / 1024); + if (port->bond_mode != BM_SLB) { + continue; + } + /* MACs. */ LIST_FOR_EACH (me, lru_node, &port->bridge->ml->lrus) { uint16_t dp_ifidx; tag_type tags = 0; - if (bond_hash(me->mac, me->vlan) == hash + + memcpy(flow.dl_src, me->mac, ETH_ADDR_LEN); + if (bond_hash_src(me->mac, me->vlan) == hash && me->port != port->port_idx - && choose_output_iface(port, me->mac, me->vlan, + && choose_output_iface(port, &flow, me->vlan, &dp_ifidx, &tags) && dp_ifidx == iface->dp_ifidx) { @@ -3336,6 +3967,11 @@ bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_, return; } + if (port->bond_mode != BM_SLB) { + unixctl_command_reply(conn, 501, "not an SLB bond"); + return; + } + if (strspn(hash_s, "0123456789") == strlen(hash_s)) { hash = atoi(hash_s) & BOND_MASK; } else { @@ -3358,7 +3994,6 @@ bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_, ofproto_revalidate(port->bridge->ofproto, entry->iface_tag); entry->iface_idx = iface->port_ifidx; entry->iface_tag = tag_create_random(); - port->bond_compat_is_stale = true; unixctl_command_reply(conn, 200, "migrated"); } @@ -3483,7 +4118,7 @@ bond_unixctl_hash(struct unixctl_conn *conn, const char *args_, if (sscanf(mac_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) == ETH_ADDR_SCAN_COUNT) { - hash = bond_hash(mac, vlan); + hash = bond_hash_src(mac, vlan); hash_cstr = xasprintf("%u", hash); unixctl_command_reply(conn, 200, hash_cstr); @@ -3547,6 +4182,17 @@ get_port_other_config(const struct ovsrec_port *port, const char *key, return value ? value : default_value; } +static const char * +get_interface_other_config(const struct ovsrec_interface *iface, + const char *key, const char *default_value) +{ + const char *value; + + value = get_ovsrec_key_value(&iface->header_, + &ovsrec_interface_col_other_config, key); + return value ? value : default_value; +} + static void port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) { @@ -3575,8 +4221,9 @@ port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) static void port_reconfigure(struct port *port, const struct ovsrec_port *cfg) { + const char *detect_mode; struct shash new_ifaces; - long long int next_rebalance; + long long int next_rebalance, miimon_next_update, lacp_priority; unsigned long *trunks; int vlan; size_t i; @@ -3602,6 +4249,43 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) port->bond_next_rebalance = next_rebalance; } + detect_mode = get_port_other_config(cfg, "bond-detect-mode", + "carrier"); + + if (!strcmp(detect_mode, "carrier")) { + port->miimon = false; + } else if (!strcmp(detect_mode, "miimon")) { + port->miimon = true; + } else { + port->miimon = false; + VLOG_WARN("port %s: unsupported bond-detect-mode %s, defaulting to " + "carrier", port->name, detect_mode); + } + + port->bond_miimon_interval = atoi( + get_port_other_config(cfg, "bond-miimon-interval", "200")); + if (port->bond_miimon_interval < 100) { + port->bond_miimon_interval = 100; + } + miimon_next_update = time_msec() + port->bond_miimon_interval; + if (port->bond_miimon_next_update > miimon_next_update) { + port->bond_miimon_next_update = miimon_next_update; + } + + if (!port->cfg->bond_mode || + !strcmp(port->cfg->bond_mode, bond_mode_to_string(BM_SLB))) { + port->bond_mode = BM_SLB; + } else if (!strcmp(port->cfg->bond_mode, bond_mode_to_string(BM_AB))) { + port->bond_mode = BM_AB; + } else if (!strcmp(port->cfg->bond_mode, bond_mode_to_string(BM_TCP))) { + port->bond_mode = BM_TCP; + } else { + port->bond_mode = BM_SLB; + VLOG_WARN("port %s: unknown bond_mode %s, defaulting to %s", + port->name, port->cfg->bond_mode, + bond_mode_to_string(port->bond_mode)); + } + /* Add new interfaces and update 'cfg' member of existing ones. */ shash_init(&new_ifaces); for (i = 0; i < cfg->n_interfaces; i++) { @@ -3634,9 +4318,45 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) iface->type = (!strcmp(if_cfg->name, port->bridge->name) ? "internal" : if_cfg->type[0] ? if_cfg->type : "system"); + + lacp_priority = + atoi(get_interface_other_config(if_cfg, "lacp-port-priority", + "0")); + + if (lacp_priority <= 0 || lacp_priority > UINT16_MAX) { + iface->lacp_priority = UINT16_MAX; + } else { + iface->lacp_priority = lacp_priority; + } } shash_destroy(&new_ifaces); + lacp_priority = + atoi(get_port_other_config(cfg, "lacp-system-priority", "0")); + + if (lacp_priority <= 0 || lacp_priority > UINT16_MAX) { + /* Prefer bondable links if unspecified. */ + port->lacp_priority = port->n_ifaces > 1 ? UINT16_MAX - 1 : UINT16_MAX; + } else { + port->lacp_priority = lacp_priority; + } + + if (!port->cfg->lacp) { + /* XXX when LACP implementation has been sufficiently tested, enable by + * default and make active on bonded ports. */ + port->lacp = 0; + } else if (!strcmp(port->cfg->lacp, "off")) { + port->lacp = 0; + } else if (!strcmp(port->cfg->lacp, "active")) { + port->lacp = LACP_ACTIVE; + } else if (!strcmp(port->cfg->lacp, "passive")) { + port->lacp = LACP_PASSIVE; + } else { + VLOG_WARN("port %s: unknown LACP mode %s", + port->name, port->cfg->lacp); + port->lacp = 0; + } + /* Get VLAN tag. */ vlan = -1; if (cfg->tag) { @@ -3705,9 +4425,6 @@ port_destroy(struct port *port) struct port *del; int i; - proc_net_compat_update_vlan(port->name, NULL, 0); - proc_net_compat_update_bond(port->name, NULL); - for (i = 0; i < MAX_MIRRORS; i++) { struct mirror *m = br->mirrors[i]; if (m && m->out_port == port) { @@ -3755,6 +4472,52 @@ port_lookup_iface(const struct port *port, const char *name) return iface && iface->port == port ? iface : NULL; } +static void +port_update_lacp(struct port *port) +{ + size_t i; + bool key_changed; + + if (!port->lacp || port->n_ifaces < 1) { + for (i = 0; i < port->n_ifaces; i++) { + iface_set_lacp_defaulted(port->ifaces[i]); + } + return; + } + + key_changed = true; + for (i = 0; i < port->n_ifaces; i++) { + struct iface *iface = port->ifaces[i]; + + if (iface->dp_ifidx <= 0 || iface->dp_ifidx > UINT16_MAX) { + port->lacp = 0; + return; + } + + if (iface->dp_ifidx == port->lacp_key) { + key_changed = false; + } + } + + if (key_changed) { + port->lacp_key = port->ifaces[0]->dp_ifidx; + } + + for (i = 0; i < port->n_ifaces; i++) { + struct iface *iface = port->ifaces[i]; + + iface->lacp_actor.sys_priority = htons(port->lacp_priority); + memcpy(&iface->lacp_actor.sysid, port->bridge->ea, ETH_ADDR_LEN); + + iface->lacp_actor.port_priority = htons(iface->lacp_priority); + iface->lacp_actor.portid = htons(iface->dp_ifidx); + iface->lacp_actor.key = htons(port->lacp_key); + + iface->lacp_tx = 0; + } + port->lacp_need_update = true; +} + static void port_update_bonding(struct port *port) { @@ -3764,16 +4527,13 @@ port_update_bonding(struct port *port) } if (port->n_ifaces < 2) { /* Not a bonded port. */ - if (port->bond_hash) { - free(port->bond_hash); - port->bond_hash = NULL; - port->bond_compat_is_stale = true; - port->bond_fake_iface = false; - } + free(port->bond_hash); + port->bond_hash = NULL; + port->bond_fake_iface = false; } else { size_t i; - if (!port->bond_hash) { + if (port->bond_mode != BM_AB && !port->bond_hash) { port->bond_hash = xcalloc(BOND_MASK + 1, sizeof *port->bond_hash); for (i = 0; i <= BOND_MASK; i++) { struct bond_entry *e = &port->bond_hash[i]; @@ -3788,128 +4548,106 @@ port_update_bonding(struct port *port) if (port->cfg->bond_fake_iface) { port->bond_next_fake_iface_update = time_msec(); } + } else if (port->bond_mode == BM_AB) { + free(port->bond_hash); + port->bond_hash = NULL; } - port->bond_compat_is_stale = true; port->bond_fake_iface = port->cfg->bond_fake_iface; - port->monitor = netdev_monitor_create(); - for (i = 0; i < port->n_ifaces; i++) { - netdev_monitor_add(port->monitor, port->ifaces[i]->netdev); + if (!port->miimon) { + port->monitor = netdev_monitor_create(); + for (i = 0; i < port->n_ifaces; i++) { + netdev_monitor_add(port->monitor, port->ifaces[i]->netdev); + } } } } + +/* Interface functions. */ static void -port_update_bond_compat(struct port *port) +iface_set_lacp_defaulted(struct iface *iface) { - struct compat_bond_hash compat_hashes[BOND_MASK + 1]; - struct compat_bond bond; - size_t i; + memset(&iface->lacp_partner, 0, sizeof iface->lacp_partner); - if (port->n_ifaces < 2) { - proc_net_compat_update_bond(port->name, NULL); - return; - } + iface->lacp_status |= LACP_DEFAULTED; + iface->lacp_status &= ~(LACP_CURRENT | LACP_EXPIRED); + iface->lacp_tx = 0; + iface->port->lacp_need_update = true; +} - bond.up = false; - bond.updelay = port->updelay; - bond.downdelay = port->downdelay; +static void +iface_set_lacp_expired(struct iface *iface) +{ + iface->lacp_status &= ~LACP_CURRENT; + iface->lacp_status |= LACP_EXPIRED; + iface->lacp_partner.state |= LACP_STATE_TIME; + iface->lacp_partner.state &= ~LACP_STATE_SYNC; - bond.n_hashes = 0; - bond.hashes = compat_hashes; - if (port->bond_hash) { - const struct bond_entry *e; - for (e = port->bond_hash; e <= &port->bond_hash[BOND_MASK]; e++) { - if (e->iface_idx >= 0 && e->iface_idx < port->n_ifaces) { - struct compat_bond_hash *cbh = &bond.hashes[bond.n_hashes++]; - cbh->hash = e - port->bond_hash; - cbh->netdev_name = port->ifaces[e->iface_idx]->name; - } - } + iface->lacp_rx = time_msec() + LACP_FAST_TIME_RX; + iface->lacp_tx = 0; +} + +static uint8_t +iface_get_lacp_state(const struct iface *iface) +{ + uint8_t state = 0; + + if (iface->port->lacp & LACP_ACTIVE) { + state |= LACP_STATE_ACT; } - bond.n_slaves = port->n_ifaces; - bond.slaves = xmalloc(port->n_ifaces * sizeof *bond.slaves); - for (i = 0; i < port->n_ifaces; i++) { - struct iface *iface = port->ifaces[i]; - struct compat_bond_slave *slave = &bond.slaves[i]; - slave->name = iface->name; + if (iface->lacp_status & LACP_ATTACHED) { + state |= LACP_STATE_SYNC; + } - /* We need to make the same determination as the Linux bonding - * code to determine whether a slave should be consider "up". - * The Linux function bond_miimon_inspect() supports four - * BOND_LINK_* states: - * - * - BOND_LINK_UP: carrier detected, updelay has passed. - * - BOND_LINK_FAIL: carrier lost, downdelay in progress. - * - BOND_LINK_DOWN: carrier lost, downdelay has passed. - * - BOND_LINK_BACK: carrier detected, updelay in progress. - * - * The function bond_info_show_slave() only considers BOND_LINK_UP - * to be "up" and anything else to be "down". - */ - slave->up = iface->enabled && iface->delay_expires == LLONG_MAX; - if (slave->up) { - bond.up = true; - } - netdev_get_etheraddr(iface->netdev, slave->mac); + if (iface->lacp_status & LACP_DEFAULTED) { + state |= LACP_STATE_DEF; } - if (port->bond_fake_iface) { - struct netdev *bond_netdev; + if (iface->lacp_status & LACP_EXPIRED) { + state |= LACP_STATE_EXP; + } - if (!netdev_open_default(port->name, &bond_netdev)) { - if (bond.up) { - netdev_turn_flags_on(bond_netdev, NETDEV_UP, true); - } else { - netdev_turn_flags_off(bond_netdev, NETDEV_UP, true); - } - netdev_close(bond_netdev); - } + if (iface->port->n_ifaces > 1) { + state |= LACP_STATE_AGG; + } + + if (iface->enabled) { + state |= LACP_STATE_COL | LACP_STATE_DIST; } - proc_net_compat_update_bond(port->name, &bond); - free(bond.slaves); + return state; } +/* Given 'iface', populates 'priority' with data representing its LACP link + * priority. If two priority objects populated by this function are compared + * using memcmp, the higher priority link will be less than the lower priority + * link. */ static void -port_update_vlan_compat(struct port *port) +iface_get_lacp_priority(struct iface *iface, struct lacp_info *priority) { - struct bridge *br = port->bridge; - char *vlandev_name = NULL; - - if (port->vlan > 0) { - /* Figure out the name that the VLAN device should actually have, if it - * existed. This takes some work because the VLAN device would not - * have port->name in its name; rather, it would have the trunk port's - * name, and 'port' would be attached to a bridge that also had the - * VLAN device one of its ports. So we need to find a trunk port that - * includes port->vlan. - * - * There might be more than one candidate. This doesn't happen on - * XenServer, so if it happens we just pick the first choice in - * alphabetical order instead of creating multiple VLAN devices. */ - size_t i; - for (i = 0; i < br->n_ports; i++) { - struct port *p = br->ports[i]; - if (port_trunks_vlan(p, port->vlan) - && p->n_ifaces - && (!vlandev_name || strcmp(p->name, vlandev_name) <= 0)) - { - uint8_t ea[ETH_ADDR_LEN]; - netdev_get_etheraddr(p->ifaces[0]->netdev, ea); - if (!eth_addr_is_multicast(ea) && - !eth_addr_is_reserved(ea) && - !eth_addr_is_zero(ea)) { - vlandev_name = p->name; - } - } - } + uint16_t partner_priority, actor_priority; + + /* Choose the lacp_info of the higher priority system by comparing their + * system priorities and mac addresses. */ + actor_priority = ntohs(iface->lacp_actor.sys_priority); + partner_priority = ntohs(iface->lacp_partner.sys_priority); + if (actor_priority < partner_priority) { + *priority = iface->lacp_actor; + } else if (partner_priority < actor_priority) { + *priority = iface->lacp_partner; + } else if (eth_addr_compare_3way(iface->lacp_actor.sysid, + iface->lacp_partner.sysid) < 0) { + *priority = iface->lacp_actor; + } else { + *priority = iface->lacp_partner; } - proc_net_compat_update_vlan(port->name, vlandev_name, port->vlan); + + /* Key and state are not used in priority comparisons. */ + priority->key = 0; + priority->state = 0; } - -/* Interface functions. */ static void iface_send_packet(struct iface *iface, struct ofpbuf *packet) @@ -3947,6 +4685,11 @@ iface_create(struct port *port, const struct ovsrec_interface *if_cfg) iface->delay_expires = LLONG_MAX; iface->netdev = NULL; iface->cfg = if_cfg; + iface_set_lacp_defaulted(iface); + + if (port->lacp & LACP_ACTIVE) { + iface_set_lacp_expired(iface); + } shash_add_assert(&br->iface_by_name, iface->name, iface); @@ -3975,6 +4718,10 @@ iface_destroy(struct iface *iface) bool del_active = port->active_iface == iface->port_ifidx; struct iface *del; + if (port->monitor) { + netdev_monitor_remove(port->monitor, iface->netdev); + } + shash_find_and_delete_assert(&br->iface_by_name, iface->name); if (iface->dp_ifidx >= 0) { @@ -4070,6 +4817,38 @@ shash_from_ovs_idl_map(char **keys, char **values, size_t n, } } +/* Creates 'keys' and 'values' arrays from 'shash'. + * + * Sets 'keys' and 'values' to heap allocated arrays representing the key-value + * pairs in 'shash'. The caller takes ownership of 'keys' and 'values'. They + * are populated with with strings taken directly from 'shash' and thus have + * the same ownership of the key-value pairs in shash. + */ +static void +shash_to_ovs_idl_map(struct shash *shash, + char ***keys, char ***values, size_t *n) +{ + size_t i, count; + char **k, **v; + struct shash_node *sn; + + count = shash_count(shash); + + k = xmalloc(count * sizeof *k); + v = xmalloc(count * sizeof *v); + + i = 0; + SHASH_FOR_EACH(sn, shash) { + k[i] = sn->name; + v[i] = sn->data; + i++; + } + + *n = count; + *keys = k; + *values = v; +} + struct iface_delete_queues_cbdata { struct netdev *netdev; const struct ovsdb_datum *queues; @@ -4143,6 +4922,8 @@ iface_update_cfm(struct iface *iface) mon = iface->cfg->monitor; if (!mon) { + cfm_destroy(iface->cfm); + iface->cfm = NULL; return; }