X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=c69557bd835186b4d5d2447f93195a211ea90165;hb=c97fb13280c565f55ed0de7cf0bf06ffe8320b70;hp=18e4ef2401ca8b397dc8fad7dfc37dbbe7ef0072;hpb=83c19ab15aa7b2d63632ac9694541759bc8d2351;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 18e4ef24..c69557bd 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. @@ -118,6 +118,11 @@ struct bond_entry { tag_type iface_tag; /* Tag associated with iface_idx. */ }; +enum bond_mode { + BM_SLB, /* Source Load Balance (Default). */ + BM_AB /* Active Backup. */ +}; + #define MAX_MIRRORS 32 typedef uint32_t mirror_mask_t; #define MIRROR_MASK_C(X) UINT32_C(X) @@ -155,17 +160,23 @@ 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. */ + + /* 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. */ @@ -280,6 +291,9 @@ static void iface_send_packet(struct iface *, struct ofpbuf *packet); 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; @@ -317,6 +331,17 @@ bridge_init(const char *remote) bond_init(); } +void +bridge_exit(void) +{ + struct bridge *br, *next_br; + + LIST_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { + bridge_destroy(br); + } + ovsdb_idl_destroy(idl); +} + /* Performs configuration that is only necessary once at ovs-vswitchd startup, * but for which the ovs-vswitchd configuration 'cfg' is required. */ static void @@ -384,30 +409,6 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) svec_destroy(&dpif_types); } -/* Initializes 'options' and fills it with the options for 'if_cfg'. Merges - * keys from "options" and "other_config", preferring "options" keys over - * "other_config" keys. */ -static void -iface_get_options(const struct ovsrec_interface *if_cfg, struct shash *options) -{ - size_t i; - - shash_from_ovs_idl_map(if_cfg->key_options, if_cfg->value_options, - if_cfg->n_options, options); - - for (i = 0; i < if_cfg->n_other_config; i++) { - char *key = if_cfg->key_other_config[i]; - char *value = if_cfg->value_other_config[i]; - - if (!shash_find_data(options, key)) { - shash_add(options, key, value); - } else { - VLOG_WARN("%s: ignoring \"other_config\" key %s that conflicts " - "with \"options\" key %s", if_cfg->name, key, key); - } - } -} - /* Callback for iterate_and_prune_ifaces(). */ static bool check_iface(struct bridge *br, struct iface *iface, void *aux OVS_UNUSED) @@ -605,38 +606,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. */ @@ -646,10 +644,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). */ @@ -657,7 +658,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; } @@ -684,7 +685,9 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) shash_init(&args); if (iface) { - iface_get_options(iface->cfg, &args); + shash_from_ovs_idl_map(iface->cfg->key_options, + iface->cfg->value_options, + iface->cfg->n_options, &args); } error = netdev_open(&options, &netdev); shash_destroy(&args); @@ -722,14 +725,21 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) struct shash args; shash_init(&args); - iface_get_options(iface->cfg, &args); - netdev_reconfigure(iface->netdev, &args); + shash_from_ovs_idl_map(iface->cfg->key_options, + iface->cfg->value_options, + iface->cfg->n_options, &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) { @@ -1110,6 +1120,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_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) { @@ -1247,6 +1323,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) { @@ -1271,6 +1390,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); @@ -1290,18 +1423,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) { @@ -1319,8 +1440,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); @@ -1912,8 +2035,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. */ @@ -1926,19 +2049,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)); } @@ -1949,7 +2070,6 @@ bridge_fetch_dp_ifaces(struct bridge *br) : -1)); } } - free(dpif_ports); } /* Bridge packet processing functions. */ @@ -1964,6 +2084,7 @@ static struct bond_entry * lookup_bond_entry(const struct port *port, const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan) { + assert(port->bond_mode == BM_SLB); return &port->bond_hash[bond_hash(mac, vlan)]; } @@ -2006,7 +2127,13 @@ 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 { + } 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 if (port->bond_mode == BM_SLB){ struct bond_entry *e = lookup_bond_entry(port, dl_src, vlan); if (e->iface_idx < 0 || e->iface_idx >= port->n_ifaces || !port->ifaces[e->iface_idx]->enabled) { @@ -2022,6 +2149,8 @@ choose_output_iface(const struct port *port, const uint8_t *dl_src, } *tags |= e->iface_tag; iface = port->ifaces[e->iface_idx]; + } else { + NOT_REACHED(); } *dp_ifidx = iface->dp_ifidx; *tags |= iface->tag; /* Currently only used for bonding. */ @@ -2038,8 +2167,8 @@ bond_link_status_update(struct iface *iface, bool carrier) /* Nothing to do. */ return; } - VLOG_INFO_RL(&rl, "interface %s: carrier %s", - iface->name, carrier ? "detected" : "dropped"); + VLOG_INFO_RL(&rl, "interface %s: link state %s", + iface->name, carrier ? "up" : "down"); if (carrier == iface->enabled) { iface->delay_expires = LLONG_MAX; VLOG_INFO_RL(&rl, "interface %s: will not be %s", @@ -2177,18 +2306,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; + + iface = port_lookup_iface(port, devname); + if (iface) { + bool up = netdev_get_carrier(iface->netdev); + + bond_link_status_update(iface, up); + port_update_bond_compat(port); + } + free(devname); + } + } else { + assert(port->miimon); - bond_link_status_update(iface, carrier); - port_update_bond_compat(port); + 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_status_update(iface, up); + port_update_bond_compat(port); + } + port->bond_miimon_next_update = time_msec() + + port->bond_miimon_interval; } - free(devname); } for (j = 0; j < port->n_ifaces; j++) { @@ -2222,7 +2369,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) { @@ -2793,7 +2948,8 @@ bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { if (nl_attr_type(a) == ODPAT_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_SLB) { uint16_t vlan = (flow->vlan_tci ? vlan_tci_to_vid(flow->vlan_tci) : OFP_VLAN_NONE); @@ -2819,7 +2975,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_SLB + && now >= port->bond_next_rebalance) { port->bond_next_rebalance = now + port->bond_rebalance_interval; bond_rebalance_port(port); } @@ -2846,6 +3003,20 @@ 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"; + + switch (bm) { + case BM_SLB: return bm_slb; + case BM_AB: return bm_ab; + } + + 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. */ @@ -2954,6 +3125,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_SLB); + 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)", @@ -2996,6 +3169,8 @@ bond_rebalance_port(struct port *port) struct bond_entry *e; size_t i; + assert(port->bond_mode == BM_SLB); + /* 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 @@ -3208,7 +3383,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; @@ -3218,7 +3393,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) { @@ -3266,10 +3442,24 @@ bond_unixctl_show(struct unixctl_conn *conn, return; } + ds_put_format(&ds, "bond_mode: %s\n", + bond_mode_to_string(port->bond_mode)); + 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_SLB) { + 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; @@ -3286,6 +3476,10 @@ bond_unixctl_show(struct unixctl_conn *conn, iface->delay_expires - time_msec()); } + if (port->bond_mode != BM_SLB) { + continue; + } + /* Hashes. */ for (be = port->bond_hash; be <= &port->bond_hash[BOND_MASK]; be++) { int hash = be - port->bond_hash; @@ -3345,6 +3539,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 { @@ -3584,8 +3783,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; unsigned long *trunks; int vlan; size_t i; @@ -3611,6 +3811,41 @@ 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 { + 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++) { @@ -3777,12 +4012,13 @@ port_update_bonding(struct port *port) free(port->bond_hash); port->bond_hash = NULL; port->bond_compat_is_stale = true; - port->bond_fake_iface = false; } + + port->bond_fake_iface = false; } else { size_t i; - if (!port->bond_hash) { + if (port->bond_mode == BM_SLB && !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]; @@ -3797,13 +4033,18 @@ 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_SLB) { + 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); + } } } } @@ -3815,7 +4056,7 @@ port_update_bond_compat(struct port *port) struct compat_bond bond; size_t i; - if (port->n_ifaces < 2) { + if (port->n_ifaces < 2 || port->bond_mode != BM_SLB) { proc_net_compat_update_bond(port->name, NULL); return; } @@ -3984,6 +4225,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) { @@ -4079,6 +4324,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;