-/* Copyright (c) 2008, 2009, 2010 Nicira Networks
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "cfm.h"
#include "classifier.h"
#include "coverage.h"
+#include "daemon.h"
#include "dirs.h"
#include "dpif.h"
#include "dynamic-string.h"
#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"
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;
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. */
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
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)
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;
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. */
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;
static void bridge_reconfigure_remotes(struct bridge *,
const struct sockaddr_in *managers,
size_t n_managers);
+static void bridge_reconfigure_remotes_late(struct bridge *);
static void bridge_get_all_ifaces(const struct bridge *, struct shash *ifaces);
static void bridge_fetch_dp_ifaces(struct bridge *);
static void bridge_flush(struct bridge *);
static uint64_t dpid_from_hash(const void *, size_t nbytes);
static unixctl_cb_func bridge_unixctl_fdb_show;
+static unixctl_cb_func qos_unixctl_show;
+
+static void lacp_run(struct port *);
+static void lacp_wait(struct port *);
+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 *);
+static void bond_run(struct port *);
+static void bond_wait(struct port *);
static void bond_rebalance_port(struct port *);
static void bond_send_learning_packets(struct port *);
static void bond_enable_slave(struct iface *iface, bool enable);
+static void port_run(struct port *);
+static void port_wait(struct port *);
static struct port *port_create(struct bridge *, const char *name);
static void port_reconfigure(struct port *, const struct ovsrec_port *);
static void port_del_ifaces(struct port *, const struct ovsrec_port *);
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 *);
const struct ovsrec_interface *if_cfg);
static void iface_destroy(struct iface *);
static struct iface *iface_lookup(const struct bridge *, const char *name);
+static struct iface *iface_find(const char *name);
static struct iface *iface_from_dp_ifidx(const struct bridge *,
uint16_t dp_ifidx);
static void iface_set_mac(struct iface *);
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;
/* Register unixctl commands. */
unixctl_command_register("fdb/show", bridge_unixctl_fdb_show, NULL);
+ unixctl_command_register("qos/show", qos_unixctl_show, NULL);
unixctl_command_register("bridge/dump-flows", bridge_unixctl_dump_flows,
NULL);
unixctl_command_register("bridge/reconnect", bridge_unixctl_reconnect,
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);
}
}
}
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)
if (port->n_ifaces) {
i++;
} else {
- VLOG_ERR("%s port has no interfaces, dropping", port->name);
+ VLOG_WARN("%s port has no interfaces, dropping", port->name);
port_destroy(port);
}
}
struct shash targets;
size_t i;
- /* Collect all of the potential targets, as the union of the "managers"
- * column and the "targets" columns of the rows pointed to by
- * "manager_options", excluding any that are out-of-band. */
+ /* Collect all of the potential targets from the "targets" columns of the
+ * rows pointed to by "manager_options", excluding any that are
+ * out-of-band. */
shash_init(&targets);
- for (i = 0; i < ovs_cfg->n_managers; i++) {
- shash_add_once(&targets, ovs_cfg->managers[i], NULL);
- }
for (i = 0; i < ovs_cfg->n_manager_options; i++) {
struct ovsrec_manager *m = ovs_cfg->manager_options[i];
* 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),
- strerror(retval));
+ VLOG_WARN("failed to remove %s interface from %s: %s",
+ 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. */
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). */
|| (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;
}
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);
dpif_name(br->dpif));
break;
} else {
- VLOG_ERR("failed to add %s interface to %s: %s",
- if_name, dpif_name(br->dpif),
- strerror(error));
+ VLOG_WARN("failed to add %s interface to %s: %s",
+ if_name, dpif_name(br->dpif),
+ strerror(error));
continue;
}
}
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);
- 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) {
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);
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);
HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
iface_update_cfm(iface);
}
+ bridge_reconfigure_remotes_late(br);
}
free(managers);
+
+ /* ovs-vswitchd has completed initialization, so allow the process that
+ * forked us to exit successfully. */
+ daemonize_complete();
}
static const char *
/* Otherwise choose the minimum non-local MAC address among all of the
* interfaces. */
- memset(ea, 0xff, sizeof ea);
+ memset(ea, 0xff, ETH_ADDR_LEN);
for (i = 0; i < br->n_ports; i++) {
struct port *port = br->ports[i];
uint8_t iface_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;
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)
{
ovsrec_interface_set_statistics(iface->cfg, keys, values, n);
}
+static bool
+enable_system_stats(const struct ovsrec_open_vswitch *cfg)
+{
+ const char *enable;
+
+ /* Use other-config:enable-system-stats by preference. */
+ enable = get_ovsrec_key_value(&cfg->header_,
+ &ovsrec_open_vswitch_col_other_config,
+ "enable-statistics");
+ if (enable) {
+ return !strcmp(enable, "true");
+ }
+
+ /* Disable by default. */
+ return false;
+}
+
static void
refresh_system_stats(const struct ovsrec_open_vswitch *cfg)
{
struct shash stats;
shash_init(&stats);
- get_system_stats(&stats);
+ if (enable_system_stats(cfg)) {
+ get_system_stats(&stats);
+ }
ovsdb_datum_from_shash(&datum, &stats);
ovsdb_idl_txn_write(&cfg->header_, &ovsrec_open_vswitch_col_statistics,
&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)
{
/* (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);
}
}
-#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) {
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);
bridge_wait(void)
{
struct bridge *br;
- struct iface *iface;
LIST_FOR_EACH (br, node, &all_bridges) {
+ size_t i;
+
ofproto_wait(br->ofproto);
if (ofproto_has_primary_controller(br->ofproto)) {
continue;
}
mac_learning_wait(br->ml);
- bond_wait(br);
- HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
- if (iface->cfm) {
- cfm_wait(iface->cfm);
- }
+ for (i = 0; i < br->n_ports; i++) {
+ port_wait(br->ports[i]);
}
}
ovsdb_idl_wait(idl);
}
ds_put_format(&ds, "%5d %4d "ETH_ADDR_FMT" %3d\n",
br->ports[e->port]->ifaces[0]->dp_ifidx,
- e->vlan, ETH_ADDR_ARGS(e->mac), mac_entry_age(e));
+ e->vlan, ETH_ADDR_ARGS(e->mac),
+ mac_entry_age(br->ml, e));
}
unixctl_command_reply(conn, 200, ds_cstr(&ds));
ds_destroy(&ds);
}
\f
+/* QoS unixctl user interface functions. */
+
+struct qos_unixctl_show_cbdata {
+ struct ds *ds;
+ struct iface *iface;
+};
+
+static void
+qos_unixctl_show_cb(unsigned int queue_id,
+ const struct shash *details,
+ void *aux)
+{
+ struct qos_unixctl_show_cbdata *data = aux;
+ struct ds *ds = data->ds;
+ struct iface *iface = data->iface;
+ struct netdev_queue_stats stats;
+ struct shash_node *node;
+ int error;
+
+ ds_put_cstr(ds, "\n");
+ if (queue_id) {
+ ds_put_format(ds, "Queue %u:\n", queue_id);
+ } else {
+ ds_put_cstr(ds, "Default:\n");
+ }
+
+ SHASH_FOR_EACH (node, details) {
+ ds_put_format(ds, "\t%s: %s\n", node->name, (char *)node->data);
+ }
+
+ error = netdev_get_queue_stats(iface->netdev, queue_id, &stats);
+ if (!error) {
+ if (stats.tx_packets != UINT64_MAX) {
+ ds_put_format(ds, "\ttx_packets: %"PRIu64"\n", stats.tx_packets);
+ }
+
+ if (stats.tx_bytes != UINT64_MAX) {
+ ds_put_format(ds, "\ttx_bytes: %"PRIu64"\n", stats.tx_bytes);
+ }
+
+ if (stats.tx_errors != UINT64_MAX) {
+ ds_put_format(ds, "\ttx_errors: %"PRIu64"\n", stats.tx_errors);
+ }
+ } else {
+ ds_put_format(ds, "\tFailed to get statistics for queue %u: %s",
+ queue_id, strerror(error));
+ }
+}
+
+static void
+qos_unixctl_show(struct unixctl_conn *conn,
+ const char *args, void *aux OVS_UNUSED)
+{
+ struct ds ds = DS_EMPTY_INITIALIZER;
+ struct shash sh = SHASH_INITIALIZER(&sh);
+ struct iface *iface;
+ const char *type;
+ struct shash_node *node;
+ struct qos_unixctl_show_cbdata data;
+ int error;
+
+ iface = iface_find(args);
+ if (!iface) {
+ unixctl_command_reply(conn, 501, "no such interface");
+ return;
+ }
+
+ netdev_get_qos(iface->netdev, &type, &sh);
+
+ if (*type != '\0') {
+ ds_put_format(&ds, "QoS: %s %s\n", iface->name, type);
+
+ SHASH_FOR_EACH (node, &sh) {
+ ds_put_format(&ds, "%s: %s\n", node->name, (char *)node->data);
+ }
+
+ data.ds = &ds;
+ data.iface = iface;
+ error = netdev_dump_queues(iface->netdev, qos_unixctl_show_cb, &data);
+
+ if (error) {
+ ds_put_format(&ds, "failed to dump queues: %s", strerror(error));
+ }
+ unixctl_command_reply(conn, 200, ds_cstr(&ds));
+ } else {
+ ds_put_format(&ds, "QoS not configured on %s\n", iface->name);
+ unixctl_command_reply(conn, 501, ds_cstr(&ds));
+ }
+
+ shash_destroy_free_data(&sh);
+ ds_destroy(&ds);
+}
+\f
/* Bridge reconfiguration functions. */
static struct bridge *
bridge_create(const struct ovsrec_bridge *br_cfg)
br->name = xstrdup(br_cfg->name);
br->cfg = br_cfg;
- br->ml = mac_learning_create();
+ br->ml = mac_learning_create(MAC_ENTRY_DEFAULT_IDLE_TIME);
eth_addr_nicira_random(br->default_ea);
hmap_init(&br->ifaces);
static int
bridge_run_one(struct bridge *br)
{
+ size_t i;
int error;
- struct iface *iface;
error = ofproto_run1(br->ofproto);
if (error) {
}
mac_learning_run(br->ml, ofproto_get_revalidate_set(br->ofproto));
- bond_run(br);
+
+ for (i = 0; i < br->n_ports; i++) {
+ port_run(br->ports[i]);
+ }
error = ofproto_run2(br->ofproto, br->flush);
br->flush = false;
- HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) {
- struct ofpbuf *packet;
-
- if (!iface->cfm) {
- continue;
- }
-
- packet = cfm_run(iface->cfm);
- if (packet) {
- iface_send_packet(iface, packet);
- ofpbuf_uninit(packet);
- free(packet);
- }
- }
-
return error;
}
struct svec snoops, old_snoops;
struct shash_node *node;
enum ofproto_fail_mode fail_mode;
+ const char *idle_time_str;
+ int idle_time;
size_t i;
/* Collect old ports. */
}
ofproto_set_fail_mode(br->ofproto, fail_mode);
+ /* Set the MAC learning aging timeout. */
+ idle_time_str = bridge_get_other_config(br->cfg, "mac-aging-time");
+ idle_time = (idle_time_str && atoi(idle_time_str)
+ ? atoi(idle_time_str)
+ : MAC_ENTRY_DEFAULT_IDLE_TIME);
+ mac_learning_set_idle_time(br->ml, idle_time);
+
/* Delete all flows if we're switching from connected to standalone or vice
* versa. (XXX Should we delete all flows if we are switching from one
* controller to another?) */
oc->max_backoff = 0;
oc->probe_interval = 60;
oc->band = OFPROTO_OUT_OF_BAND;
- oc->accept_re = NULL;
- oc->update_resolv_conf = false;
oc->rate_limit = 0;
oc->burst_limit = 0;
}
oc->probe_interval = c->inactivity_probe ? *c->inactivity_probe / 1000 : 5;
oc->band = (!c->connection_mode || !strcmp(c->connection_mode, "in-band")
? OFPROTO_IN_BAND : OFPROTO_OUT_OF_BAND);
- oc->accept_re = c->discover_accept_regex;
- oc->update_resolv_conf = c->discover_update_resolv_conf;
oc->rate_limit = c->controller_rate_limit ? *c->controller_rate_limit : 0;
oc->burst_limit = (c->controller_burst_limit
? *c->controller_burst_limit : 0);
struct iface *local_iface;
struct in_addr ip;
- /* Controller discovery does its own TCP/IP configuration later. */
- if (strcmp(c->target, "discover")) {
- return;
- }
-
/* If there's no local interface or no IP address, give up. */
local_iface = bridge_get_local_iface(br);
if (!local_iface || !c->local_ip || !inet_aton(c->local_ip, &ip)) {
if (had_primary != ofproto_has_primary_controller(br->ofproto)) {
ofproto_flush_flows(br->ofproto);
}
+}
+/* Does configuration of remotes that must happen after all of the ports and
+ * interfaces are fully configured, that is, when flow translation can be
+ * expected to succeed. (This is because ofproto_add_flow() immediately
+ * re-translates any existing facets for the rule that it replaces, if any.)
+ * In particular, it must be called after port_update_bonding(), to ensure that
+ * 'bond_hash' is non-NULL for bonded ports. */
+static void
+bridge_reconfigure_remotes_late(struct bridge *br)
+{
/* If there are no controllers and the bridge is in standalone
* mode, set up a flow that matches every packet and directs
* them to OFPP_NORMAL (which goes to us). Otherwise, the
* switch is in secure mode and we won't pass any traffic until
* a controller has been defined and it tells us to do so. */
- if (!n_controllers
+ if (!bridge_get_controllers(br, NULL)
&& ofproto_get_fail_mode(br->ofproto) == OFPROTO_FAIL_STANDALONE) {
union ofp_action action;
struct cls_rule rule;
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. */
}
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));
}
: -1));
}
}
- free(dpif_ports);
}
\f
/* 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
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;
}
}
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;
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
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];
}
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;
- if ((carrier == iface->enabled) == (iface->delay_expires == LLONG_MAX)) {
+ updelay = port->updelay;
+ downdelay = port->downdelay;
+
+ if (iface->port->lacp & LACP_NEGOTIATED) {
+ downdelay = 0;
+ updelay = 0;
+ }
+
+ 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);
}
}
}
moving_active_iface = false;
- port->bond_compat_is_stale = true;
}
/* Attempts to make the sum of the bond slaves' statistics appear on the fake
}
static void
-bond_run(struct bridge *br)
+bond_link_carrier_update(struct iface *iface, bool carrier)
{
- size_t i, j;
+ if (carrier == iface->up) {
+ return;
+ }
- for (i = 0; i < br->n_ports; i++) {
- struct port *port = br->ports[i];
+ if (iface->lacp_status & LACP_CURRENT) {
+ iface_set_lacp_expired(iface);
+ }
- if (port->n_ifaces >= 2) {
- char *devname;
+ iface->up = carrier;
+ iface->lacp_tx = 0;
+}
+
+static void
+bond_run(struct port *port)
+{
+ size_t i;
+ char *devname;
- /* Track carrier going up and down on interfaces. */
- while (!netdev_monitor_poll(port->monitor, &devname)) {
- struct iface *iface;
+ if (port->n_ifaces < 2) {
+ return;
+ }
- iface = port_lookup_iface(port, devname);
- if (iface) {
- bool carrier = netdev_get_carrier(iface->netdev);
+ if (port->monitor) {
+ assert(!port->miimon);
- bond_link_status_update(iface, carrier);
- port_update_bond_compat(port);
- }
- free(devname);
- }
+ /* Track carrier going up and down on interfaces. */
+ while (!netdev_monitor_poll(port->monitor, &devname)) {
+ struct iface *iface;
- for (j = 0; j < port->n_ifaces; j++) {
- struct iface *iface = port->ifaces[j];
- if (time_msec() >= iface->delay_expires) {
- bond_enable_slave(iface, !iface->enabled);
- }
+ 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 (port->bond_fake_iface
- && time_msec() >= port->bond_next_fake_iface_update) {
- bond_update_fake_iface_stats(port);
- port->bond_next_fake_iface_update = time_msec() + 1000;
+ if (time_msec() >= port->bond_miimon_next_update) {
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+ bool up = netdev_get_miimon(iface->netdev);
+ bond_link_carrier_update(iface, up);
}
+ port->bond_miimon_next_update = time_msec() +
+ port->bond_miimon_interval;
}
+ }
+
+ for (i = 0; i < port->n_ifaces; i++) {
+ bond_link_status_update(port->ifaces[i]);
+ }
- if (port->bond_compat_is_stale) {
- port->bond_compat_is_stale = false;
- port_update_bond_compat(port);
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+ if (time_msec() >= iface->delay_expires) {
+ bond_enable_slave(iface, !iface->enabled);
}
}
+
+ if (port->bond_fake_iface
+ && time_msec() >= port->bond_next_fake_iface_update) {
+ bond_update_fake_iface_stats(port);
+ port->bond_next_fake_iface_update = time_msec() + 1000;
+ }
}
static void
-bond_wait(struct bridge *br)
+bond_wait(struct port *port)
{
- size_t i, j;
+ size_t i;
- for (i = 0; i < br->n_ports; i++) {
- struct port *port = br->ports[i];
- if (port->n_ifaces < 2) {
- continue;
- }
+ if (port->n_ifaces < 2) {
+ return;
+ }
+
+ if (port->monitor) {
netdev_monitor_poll_wait(port->monitor);
- for (j = 0; j < port->n_ifaces; j++) {
- struct iface *iface = port->ifaces[j];
- if (iface->delay_expires != LLONG_MAX) {
- poll_timer_wait_until(iface->delay_expires);
- }
- }
- if (port->bond_fake_iface) {
- poll_timer_wait_until(port->bond_next_fake_iface_update);
+ }
+
+ if (port->miimon) {
+ poll_timer_wait_until(port->bond_miimon_next_update);
+ }
+
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+ if (iface->delay_expires != LLONG_MAX) {
+ poll_timer_wait_until(iface->delay_expires);
}
}
+
+ if (port->bond_fake_iface) {
+ poll_timer_wait_until(port->bond_next_fake_iface_update);
+ }
}
static bool
: 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);
}
return true;
}
-static void
+/* Returns true if a packet with Ethernet destination MAC 'dst' may be mirrored
+ * to a VLAN. In general most packets may be mirrored but we want to drop
+ * protocols that may confuse switches. */
+static bool
+eth_dst_may_rspan(const uint8_t dst[ETH_ADDR_LEN])
+{
+ /* If you change this function's behavior, please update corresponding
+ * documentation in vswitch.xml at the same time. */
+ if (dst[0] != 0x01) {
+ /* All the currently banned MACs happen to start with 01 currently, so
+ * this is a quick way to eliminate most of the good ones. */
+ } else {
+ if (eth_addr_is_reserved(dst)) {
+ /* Drop STP, IEEE pause frames, and other reserved protocols
+ * (01-80-c2-00-00-0x). */
+ return false;
+ }
+
+ if (dst[0] == 0x01 && dst[1] == 0x00 && dst[2] == 0x0c) {
+ /* Cisco OUI. */
+ if ((dst[3] & 0xfe) == 0xcc &&
+ (dst[4] & 0xfe) == 0xcc &&
+ (dst[5] & 0xfe) == 0xcc) {
+ /* Drop the following protocols plus others following the same
+ pattern:
+
+ CDP, VTP, DTP, PAgP (01-00-0c-cc-cc-cc)
+ Spanning Tree PVSTP+ (01-00-0c-cc-cc-cd)
+ STP Uplink Fast (01-00-0c-cd-cd-cd) */
+ return false;
+ }
+
+ if (!(dst[3] | dst[4] | dst[5])) {
+ /* Drop Inter Switch Link packets (01-00-0c-00-00-00). */
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static void
compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan,
const struct port *in_port, const struct port *out_port,
struct dst_set *set, tag_type *tags, uint16_t *nf_output_iface)
&& !dst_is_duplicate(set, &dst)) {
dst_set_add(set, &dst);
}
- } else {
+ } else if (eth_dst_may_rspan(flow->dl_dst)) {
for (i = 0; i < br->n_ports; i++) {
struct port *port = br->ports[i];
if (port_includes_vlan(port, m->out_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);
}
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;
* to the exception is if we locked the learning table to avoid
* reflections on bond slaves. If this is the case, just drop the
* packet now. */
- src_idx = mac_learning_lookup(br->ml, flow->dl_src, vlan,
- &is_grat_arp_locked);
- if (src_idx != -1 && src_idx != in_port->port_idx &&
- (!is_gratuitous_arp(flow) || is_grat_arp_locked)) {
+ if (in_port->bond_mode != BM_AB) {
+ src_idx = mac_learning_lookup(br->ml, flow->dl_src, vlan,
+ &is_grat_arp_locked);
+ if (src_idx != -1 && src_idx != in_port->port_idx &&
+ (!is_gratuitous_arp(flow) || is_grat_arp_locked)) {
return false;
+ }
+ }
+ }
+
+ /* Drop all packets which arrive on backup slaves. This is similar to how
+ * Linux bonding handles active-backup bonds. */
+ if (in_port->bond_mode == BM_AB) {
+
+ *tags |= in_port->active_iface;
+ if (in_port->active_iface != in_iface->port_ifidx) {
+ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
+
+ VLOG_WARN_RL(&rl, "active-backup bond received packet on backup"
+ " interface (%s) destined for " ETH_ADDR_FMT,
+ in_iface->name, ETH_ADDR_ARGS(flow->dl_dst));
+ return false ;
}
}
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
bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags,
const struct nlattr *actions,
size_t actions_len,
- unsigned long long int n_bytes, void *br_)
+ uint64_t n_bytes, void *br_)
{
struct bridge *br = br_;
const struct nlattr *a;
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;
}
}
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);
}
static struct ofhooks bridge_ofhooks = {
bridge_normal_ofhook_cb,
+ bridge_special_ofhook_cb,
bridge_account_flow_ofhook_cb,
bridge_account_checkpoint_ofhook_cb,
};
\f
+/* 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 port *port)
+{
+ size_t i;
+ struct ofpbuf packet;
+
+ if (!port->lacp) {
+ return;
+ }
+
+ ofpbuf_init(&packet, ETH_HEADER_LEN + LACP_PDU_LEN);
+
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+
+ 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 (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+ 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 port *port)
+{
+ size_t i;
+
+ if (!port->lacp) {
+ return;
+ }
+
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+
+ 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);
+ }
+ }
+}
+\f
/* Bonding functions. */
/* Statistics for a single interface on a bonded port, used for load-based
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. */
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)",
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
}
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. */
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;
}
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;
}
/* 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) {
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;
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) {
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)
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");
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;
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)
{
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 {
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");
}
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);
\f
/* Port functions. */
+static void
+port_run(struct port *port)
+{
+ size_t i;
+
+ lacp_run(port);
+ bond_run(port);
+
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+
+ if (iface->cfm) {
+ struct ofpbuf *packet = cfm_run(iface->cfm);
+ if (packet) {
+ iface_send_packet(iface, packet);
+ ofpbuf_uninit(packet);
+ free(packet);
+ }
+ }
+ }
+}
+
+static void
+port_wait(struct port *port)
+{
+ size_t i;
+
+ lacp_wait(port);
+ bond_wait(port);
+
+ for (i = 0; i < port->n_ifaces; i++) {
+ struct iface *iface = port->ifaces[i];
+ if (iface->cfm) {
+ cfm_wait(iface->cfm);
+ }
+ }
+}
+
static struct port *
port_create(struct bridge *br, const char *name)
{
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)
{
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;
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++) {
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) {
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) {
netdev_monitor_destroy(port->monitor);
free(port->ifaces);
bitmap_free(port->trunks);
+ free(port->bond_hash);
free(port->name);
free(port);
bridge_flush(br);
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)
{
}
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;
+ port->active_iface = -1;
+ port->no_ifaces_tag = 0;
} 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];
e->iface_idx = -1;
e->tx_bytes = 0;
}
- port->no_ifaces_tag = tag_create_random();
- bond_choose_active_iface(port);
port->bond_next_rebalance
= time_msec() + port->bond_rebalance_interval;
+ } else if (port->bond_mode == BM_AB) {
+ free(port->bond_hash);
+ port->bond_hash = NULL;
+ }
- if (port->cfg->bond_fake_iface) {
- port->bond_next_fake_iface_update = time_msec();
- }
+ if (!port->no_ifaces_tag) {
+ port->no_ifaces_tag = tag_create_random();
+ }
+
+ if (port->active_iface < 0) {
+ bond_choose_active_iface(port);
}
- port->bond_compat_is_stale = true;
+
port->bond_fake_iface = port->cfg->bond_fake_iface;
+ if (port->bond_fake_iface) {
+ port->bond_next_fake_iface_update = time_msec();
+ }
- 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);
+ }
}
}
}
+\f
+/* 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;
}
- proc_net_compat_update_bond(port->name, &bond);
- free(bond.slaves);
+ if (iface->enabled) {
+ state |= LACP_STATE_COL | LACP_STATE_DIST;
+ }
+
+ 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;
}
-\f
-/* Interface functions. */
static void
iface_send_packet(struct iface *iface, struct ofpbuf *packet)
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);
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) {
return shash_find_data(&br->iface_by_name, name);
}
+static struct iface *
+iface_find(const char *name)
+{
+ const struct bridge *br;
+
+ LIST_FOR_EACH (br, node, &all_bridges) {
+ struct iface *iface = iface_lookup(br, name);
+
+ if (iface) {
+ return iface;
+ }
+ }
+ return NULL;
+}
+
static struct iface *
iface_from_dp_ifidx(const struct bridge *br, uint16_t dp_ifidx)
{
}
}
+/* 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;
mon = iface->cfg->monitor;
if (!mon) {
+ cfm_destroy(iface->cfm);
+ iface->cfm = NULL;
return;
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff