-/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <errno.h>
#include <inttypes.h>
#include <stdlib.h>
+
#include "async-append.h"
#include "bfd.h"
#include "bitmap.h"
#include "coverage.h"
#include "daemon.h"
#include "dirs.h"
-#include "dynamic-string.h"
+#include "dpif.h"
#include "hash.h"
-#include "hmap.h"
+#include "openvswitch/hmap.h"
#include "hmapx.h"
+#include "if-notifier.h"
#include "jsonrpc.h"
#include "lacp.h"
-#include "list.h"
+#include "lib/netdev-dpdk.h"
#include "mac-learning.h"
#include "mcast-snooping.h"
-#include "meta-flow.h"
#include "netdev.h"
-#include "ofp-print.h"
-#include "ofp-util.h"
-#include "ofpbuf.h"
+#include "nx-match.h"
#include "ofproto/bond.h"
#include "ofproto/ofproto.h"
+#include "openvswitch/dynamic-string.h"
+#include "openvswitch/list.h"
+#include "openvswitch/meta-flow.h"
+#include "openvswitch/ofp-print.h"
+#include "openvswitch/ofp-util.h"
+#include "openvswitch/ofpbuf.h"
+#include "openvswitch/vlog.h"
+#include "ovs-lldp.h"
#include "ovs-numa.h"
+#include "packets.h"
#include "poll-loop.h"
#include "seq.h"
+#include "sflow_api.h"
#include "sha1.h"
-#include "shash.h"
+#include "openvswitch/shash.h"
#include "smap.h"
#include "socket-util.h"
#include "stream.h"
#include "timeval.h"
#include "util.h"
#include "unixctl.h"
-#include "vlandev.h"
#include "lib/vswitch-idl.h"
#include "xenserver.h"
-#include "vlog.h"
-#include "sflow_api.h"
#include "vlan-bitmap.h"
VLOG_DEFINE_THIS_MODULE(bridge);
*
* They are immutable: they never change between iface_create() and
* iface_destroy(). */
- struct list port_elem; /* Element in struct port's "ifaces" list. */
+ struct ovs_list port_elem; /* Element in struct port's "ifaces" list. */
struct hmap_node name_node; /* In struct bridge's "iface_by_name" hmap. */
struct hmap_node ofp_port_node; /* In struct bridge's "ifaces" hmap. */
struct port *port; /* Containing port. */
/* These members are valid only within bridge_reconfigure(). */
const char *type; /* Usually same as cfg->type. */
+ const char *netdev_type; /* type that should be used for netdev_open. */
const struct ovsrec_interface *cfg;
};
/* An ordinary bridge port has 1 interface.
* A bridge port for bonding has at least 2 interfaces. */
- struct list ifaces; /* List of "struct iface"s. */
+ struct ovs_list ifaces; /* List of "struct iface"s. */
};
struct bridge {
struct hmap_node node; /* In 'all_bridges'. */
char *name; /* User-specified arbitrary name. */
char *type; /* Datapath type. */
- uint8_t ea[ETH_ADDR_LEN]; /* Bridge Ethernet Address. */
- uint8_t default_ea[ETH_ADDR_LEN]; /* Default MAC. */
+ struct eth_addr ea; /* Bridge Ethernet Address. */
+ struct eth_addr default_ea; /* Default MAC. */
const struct ovsrec_bridge *cfg;
/* OpenFlow switch processing. */
/* Port mirroring. */
struct hmap mirrors; /* "struct mirror" indexed by UUID. */
+ /* Auto Attach */
+ struct hmap mappings; /* "struct" indexed by UUID */
+
/* Used during reconfiguration. */
struct shash wanted_ports;
struct ovsrec_interface *synth_local_ifacep;
};
+struct aa_mapping {
+ struct hmap_node hmap_node; /* In struct bridge's "mappings" hmap. */
+ struct bridge *bridge;
+ uint32_t isid;
+ uint16_t vlan;
+ char *br_name;
+};
+
/* All bridges, indexed by name. */
static struct hmap all_bridges = HMAP_INITIALIZER(&all_bridges);
* timeout in 'STATUS_CHECK_AGAIN_MSEC' to check again. */
#define STATUS_CHECK_AGAIN_MSEC 100
+/* Statistics update to database. */
+static struct ovsdb_idl_txn *stats_txn;
+
/* Each time this timer expires, the bridge fetches interface and mirror
* statistics and pushes them into the database. */
static int stats_timer_interval;
static long long int stats_timer = LLONG_MIN;
-/* In some datapaths, creating and destroying OpenFlow ports can be extremely
- * expensive. This can cause bridge_reconfigure() to take a long time during
- * which no other work can be done. To deal with this problem, we limit port
- * adds and deletions to a window of OFP_PORT_ACTION_WINDOW milliseconds per
- * call to bridge_reconfigure(). If there is more work to do after the limit
- * is reached, 'need_reconfigure', is flagged and it's done on the next loop.
- * This allows the rest of the code to catch up on important things like
- * forwarding packets. */
-#define OFP_PORT_ACTION_WINDOW 10
+/* Each time this timer expires, the bridge fetches the list of port/VLAN
+ * membership that has been modified by the AA.
+ */
+#define AA_REFRESH_INTERVAL (1000) /* In milliseconds. */
+static long long int aa_refresh_timer = LLONG_MIN;
+
+/* Whenever system interfaces are added, removed or change state, the bridge
+ * will be reconfigured.
+ */
+static struct if_notifier *ifnotifier;
+static bool ifaces_changed = false;
static void add_del_bridges(const struct ovsrec_open_vswitch *);
static void bridge_run__(void);
static void bridge_create(const struct ovsrec_bridge *);
-static void bridge_destroy(struct bridge *);
+static void bridge_destroy(struct bridge *, bool del);
static struct bridge *bridge_lookup(const char *name);
static unixctl_cb_func bridge_unixctl_dump_flows;
static unixctl_cb_func bridge_unixctl_reconnect;
static size_t bridge_get_controllers(const struct bridge *br,
struct ovsrec_controller ***controllersp);
static void bridge_collect_wanted_ports(struct bridge *,
- const unsigned long *splinter_vlans,
struct shash *wanted_ports);
static void bridge_delete_ofprotos(void);
static void bridge_delete_or_reconfigure_ports(struct bridge *);
static void bridge_configure_mcast_snooping(struct bridge *);
static void bridge_configure_sflow(struct bridge *, int *sflow_bridge_number);
static void bridge_configure_ipfix(struct bridge *);
-static void bridge_configure_stp(struct bridge *);
-static void bridge_configure_rstp(struct bridge *);
+static void bridge_configure_spanning_tree(struct bridge *);
static void bridge_configure_tables(struct bridge *);
static void bridge_configure_dp_desc(struct bridge *);
+static void bridge_configure_aa(struct bridge *);
+static void bridge_aa_refresh_queued(struct bridge *);
+static bool bridge_aa_need_refresh(struct bridge *);
static void bridge_configure_remotes(struct bridge *,
const struct sockaddr_in *managers,
size_t n_managers);
-static void bridge_pick_local_hw_addr(struct bridge *,
- uint8_t ea[ETH_ADDR_LEN],
+static void bridge_pick_local_hw_addr(struct bridge *, struct eth_addr *ea,
struct iface **hw_addr_iface);
static uint64_t bridge_pick_datapath_id(struct bridge *,
- const uint8_t bridge_ea[ETH_ADDR_LEN],
+ const struct eth_addr bridge_ea,
struct iface *hw_addr_iface);
static uint64_t dpid_from_hash(const void *, size_t nbytes);
static bool bridge_has_bond_fake_iface(const struct bridge *,
const char *name);
static bool port_is_bond_fake_iface(const struct port *);
+static unixctl_cb_func qos_unixctl_show_types;
static unixctl_cb_func qos_unixctl_show;
static struct port *port_create(struct bridge *, const struct ovsrec_port *);
const struct ovsrec_interface *);
static ofp_port_t iface_pick_ofport(const struct ovsrec_interface *);
-/* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.)
- *
- * This is deprecated. It is only for compatibility with broken device drivers
- * in old versions of Linux that do not properly support VLANs when VLAN
- * devices are not used. When broken device drivers are no longer in
- * widespread use, we will delete these interfaces. */
-
-/* True if VLAN splinters are enabled on any interface, false otherwise.*/
-static bool vlan_splinters_enabled_anywhere;
-
-static bool vlan_splinters_is_enabled(const struct ovsrec_interface *);
-static unsigned long int *collect_splinter_vlans(
- const struct ovsrec_open_vswitch *);
-static void configure_splinter_port(struct port *);
-static void add_vlan_splinter_ports(struct bridge *,
- const unsigned long int *splinter_vlans,
- struct shash *ports);
+
+static void discover_types(const struct ovsrec_open_vswitch *cfg);
static void
bridge_init_ofproto(const struct ovsrec_open_vswitch *cfg)
shash_destroy_free_data(&iface_hints);
initialized = true;
}
+
+static void
+if_change_cb(void *aux OVS_UNUSED)
+{
+ ifaces_changed = true;
+}
\f
/* Public functions. */
ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_cur_cfg);
ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_statistics);
+ ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_datapath_types);
+ ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_iface_types);
ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_external_ids);
ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_ovs_version);
ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_db_version);
ovsdb_idl_omit(idl, &ovsrec_open_vswitch_col_system_version);
ovsdb_idl_omit_alert(idl, &ovsrec_bridge_col_datapath_id);
+ ovsdb_idl_omit_alert(idl, &ovsrec_bridge_col_datapath_version);
ovsdb_idl_omit_alert(idl, &ovsrec_bridge_col_status);
ovsdb_idl_omit_alert(idl, &ovsrec_bridge_col_rstp_status);
ovsdb_idl_omit_alert(idl, &ovsrec_bridge_col_stp_enable);
ovsdb_idl_omit_alert(idl, &ovsrec_port_col_rstp_status);
ovsdb_idl_omit_alert(idl, &ovsrec_port_col_rstp_statistics);
ovsdb_idl_omit_alert(idl, &ovsrec_port_col_statistics);
+ ovsdb_idl_omit_alert(idl, &ovsrec_port_col_bond_active_slave);
ovsdb_idl_omit(idl, &ovsrec_port_col_external_ids);
-
+ ovsdb_idl_omit_alert(idl, &ovsrec_port_col_trunks);
+ ovsdb_idl_omit_alert(idl, &ovsrec_port_col_vlan_mode);
ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_admin_state);
ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_duplex);
ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_link_speed);
ovsdb_idl_omit(idl, &ovsrec_ssl_col_external_ids);
/* Register unixctl commands. */
+ unixctl_command_register("qos/show-types", "interface", 1, 1,
+ qos_unixctl_show_types, NULL);
unixctl_command_register("qos/show", "interface", 1, 1,
qos_unixctl_show, NULL);
unixctl_command_register("bridge/dump-flows", "bridge", 1, 1,
lacp_init();
bond_init();
cfm_init();
+ bfd_init();
ovs_numa_init();
stp_init();
+ lldp_init();
rstp_init();
+ ifnotifier = if_notifier_create(if_change_cb, NULL);
}
void
{
struct bridge *br, *next_br;
+ if_notifier_destroy(ifnotifier);
HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) {
- bridge_destroy(br);
+ bridge_destroy(br, false);
}
ovsdb_idl_destroy(idl);
}
* should not be and in fact is not directly involved in that. But
* ovs-vswitchd needs to make sure that ovsdb-server can reach the managers, so
* it has to tell in-band control where the managers are to enable that.
- * (Thus, only managers connected in-band are collected.)
+ * (Thus, only managers connected in-band and with non-loopback addresses
+ * are collected.)
*/
static void
collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg,
struct sockaddr_in in;
} sa;
- if (stream_parse_target_with_default_port(target, OVSDB_OLD_PORT,
+ /* Ignore loopback. */
+ if (stream_parse_target_with_default_port(target, OVSDB_PORT,
&sa.ss)
- && sa.ss.ss_family == AF_INET) {
+ && sa.ss.ss_family == AF_INET
+ && sa.in.sin_addr.s_addr != htonl(INADDR_LOOPBACK)) {
managers[n_managers++] = sa.in;
}
}
static void
bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg)
{
- unsigned long int *splinter_vlans;
struct sockaddr_in *managers;
struct bridge *br, *next;
int sflow_bridge_number;
OFPROTO_FLOW_LIMIT_DEFAULT));
ofproto_set_max_idle(smap_get_int(&ovs_cfg->other_config, "max-idle",
OFPROTO_MAX_IDLE_DEFAULT));
- ofproto_set_n_dpdk_rxqs(smap_get_int(&ovs_cfg->other_config,
- "n-dpdk-rxqs", 0));
ofproto_set_cpu_mask(smap_get(&ovs_cfg->other_config, "pmd-cpu-mask"));
ofproto_set_threads(
* This is mostly an update to bridge data structures. Nothing is pushed
* down to ofproto or lower layers. */
add_del_bridges(ovs_cfg);
- splinter_vlans = collect_splinter_vlans(ovs_cfg);
HMAP_FOR_EACH (br, node, &all_bridges) {
- bridge_collect_wanted_ports(br, splinter_vlans, &br->wanted_ports);
+ bridge_collect_wanted_ports(br, &br->wanted_ports);
bridge_del_ports(br, &br->wanted_ports);
}
- free(splinter_vlans);
/* Start pushing configuration changes down to the ofproto layer:
*
VLOG_ERR("failed to create bridge %s: %s", br->name,
ovs_strerror(error));
shash_destroy(&br->wanted_ports);
- bridge_destroy(br);
+ bridge_destroy(br, true);
+ } else {
+ /* Trigger storing datapath version. */
+ seq_change(connectivity_seq_get());
}
}
}
iface_set_mac(br, port, iface);
ofproto_port_set_bfd(br->ofproto, iface->ofp_port,
&iface->cfg->bfd);
+ ofproto_port_set_lldp(br->ofproto, iface->ofp_port,
+ &iface->cfg->lldp);
}
}
bridge_configure_mirrors(br);
bridge_configure_netflow(br);
bridge_configure_sflow(br, &sflow_bridge_number);
bridge_configure_ipfix(br);
- bridge_configure_stp(br);
- bridge_configure_rstp(br);
+ bridge_configure_spanning_tree(br);
bridge_configure_tables(br);
bridge_configure_dp_desc(br);
+ bridge_configure_aa(br);
}
free(managers);
goto delete;
}
- if (strcmp(ofproto_port.type, iface->type)
+ if (strcmp(ofproto_port.type, iface->netdev_type)
|| netdev_set_config(iface->netdev, &iface->cfg->options, NULL)) {
/* The interface is the wrong type or can't be configured.
* Delete it. */
}
}
- if (list_is_empty(&port->ifaces)) {
+ if (ovs_list_is_empty(&port->ifaces)) {
port_destroy(port);
}
}
struct ofproto_bundle_settings s;
struct iface *iface;
- if (cfg->vlan_mode && !strcmp(cfg->vlan_mode, "splinter")) {
- configure_splinter_port(port);
- return;
- }
-
/* Get name. */
s.name = port->name;
/* Get slaves. */
s.n_slaves = 0;
- s.slaves = xmalloc(list_size(&port->ifaces) * sizeof *s.slaves);
+ s.slaves = xmalloc(ovs_list_size(&port->ifaces) * sizeof *s.slaves);
LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
s.slaves[s.n_slaves++] = iface->ofp_port;
}
static void
bridge_configure_datapath_id(struct bridge *br)
{
- uint8_t ea[ETH_ADDR_LEN];
+ struct eth_addr ea;
uint64_t dpid;
struct iface *local_iface;
struct iface *hw_addr_iface;
char *dpid_string;
- bridge_pick_local_hw_addr(br, ea, &hw_addr_iface);
+ bridge_pick_local_hw_addr(br, &ea, &hw_addr_iface);
local_iface = iface_from_ofp_port(br, OFPP_LOCAL);
if (local_iface) {
int error = netdev_set_etheraddr(local_iface->netdev, ea);
br->name, ovs_strerror(error));
}
}
- memcpy(br->ea, ea, ETH_ADDR_LEN);
+ br->ea = ea;
dpid = bridge_pick_datapath_id(br, ea, hw_addr_iface);
if (dpid != ofproto_get_datapath_id(br->ofproto)) {
static uint32_t
bridge_get_allowed_versions(struct bridge *br)
{
- if (!br->cfg->n_protocols)
+ if (!br->cfg->n_protocols) {
return 0;
+ }
return ofputil_versions_from_strings(br->cfg->protocols,
br->cfg->n_protocols);
struct ofproto_ipfix_bridge_exporter_options be_opts;
struct ofproto_ipfix_flow_exporter_options *fe_opts = NULL;
size_t n_fe_opts = 0;
+ const char *virtual_obs_id;
OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) {
if (ovsrec_fscs_is_valid(fe_cfg, br)) {
be_opts.enable_output_sampling = !smap_get_bool(&be_cfg->other_config,
"enable-output-sampling", false);
+
+ virtual_obs_id = smap_get(&be_cfg->other_config, "virtual_obs_id");
+ be_opts.virtual_obs_id = nullable_xstrdup(virtual_obs_id);
}
if (n_fe_opts > 0) {
? *fe_cfg->ipfix->cache_active_timeout : 0;
opts->cache_max_flows = fe_cfg->ipfix->cache_max_flows
? *fe_cfg->ipfix->cache_max_flows : 0;
+ opts->enable_tunnel_sampling = smap_get_bool(
+ &fe_cfg->ipfix->other_config,
+ "enable-tunnel-sampling", true);
+ virtual_obs_id = smap_get(&fe_cfg->ipfix->other_config,
+ "virtual_obs_id");
+ opts->virtual_obs_id = nullable_xstrdup(virtual_obs_id);
opts++;
}
}
if (valid_be_cfg) {
sset_destroy(&be_opts.targets);
+ free(be_opts.virtual_obs_id);
}
if (n_fe_opts > 0) {
size_t i;
for (i = 0; i < n_fe_opts; i++) {
sset_destroy(&opts->targets);
+ free(opts->virtual_obs_id);
opts++;
}
free(fe_opts);
}
/* STP over bonds is not supported. */
- if (!list_is_singleton(&port->ifaces)) {
+ if (!ovs_list_is_singleton(&port->ifaces)) {
VLOG_ERR("port %s: cannot enable STP on bonds, disabling",
port->name);
port_s->enable = false;
return;
}
- iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem);
+ iface = CONTAINER_OF(ovs_list_front(&port->ifaces), struct iface, port_elem);
/* Internal ports shouldn't participate in spanning tree, so
* skip them. */
}
/* RSTP over bonds is not supported. */
- if (!list_is_singleton(&port->ifaces)) {
+ if (!ovs_list_is_singleton(&port->ifaces)) {
VLOG_ERR("port %s: cannot enable RSTP on bonds, disabling",
port->name);
port_s->enable = false;
return;
}
- iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem);
+ iface = CONTAINER_OF(ovs_list_front(&port->ifaces), struct iface, port_elem);
/* Internal ports shouldn't participate in spanning tree, so
* skip them. */
port_s->priority = RSTP_DEFAULT_PORT_PRIORITY;
}
+ config_str = smap_get(&port->cfg->other_config, "rstp-admin-p2p-mac");
+ if (config_str) {
+ port_s->admin_p2p_mac_state = strtoul(config_str, NULL, 0);
+ } else {
+ port_s->admin_p2p_mac_state = RSTP_ADMIN_P2P_MAC_FORCE_TRUE;
+ }
+
+ port_s->admin_port_state = smap_get_bool(&port->cfg->other_config,
+ "rstp-admin-port-state", true);
+
port_s->admin_edge_port = smap_get_bool(&port->cfg->other_config,
"rstp-port-admin-edge", false);
port_s->auto_edge = smap_get_bool(&port->cfg->other_config,
/* Set spanning tree configuration on 'br'. */
static void
-bridge_configure_stp(struct bridge *br)
+bridge_configure_stp(struct bridge *br, bool enable_stp)
{
- struct ofproto_rstp_status rstp_status;
-
- ofproto_get_rstp_status(br->ofproto, &rstp_status);
- if (!br->cfg->stp_enable) {
+ if (!enable_stp) {
ofproto_set_stp(br->ofproto, NULL);
- } else if (rstp_status.enabled) {
- /* Do not activate STP if RSTP is enabled. */
- VLOG_ERR("STP cannot be enabled if RSTP is running.");
- ofproto_set_stp(br->ofproto, NULL);
- ovsrec_bridge_set_stp_enable(br->cfg, false);
} else {
struct ofproto_stp_settings br_s;
const char *config_str;
config_str = smap_get(&br->cfg->other_config, "stp-system-id");
if (config_str) {
- uint8_t ea[ETH_ADDR_LEN];
+ struct eth_addr ea;
- if (eth_addr_from_string(config_str, ea)) {
+ if (eth_addr_from_string(config_str, &ea)) {
br_s.system_id = eth_addr_to_uint64(ea);
} else {
br_s.system_id = eth_addr_to_uint64(br->ea);
}
static void
-bridge_configure_rstp(struct bridge *br)
+bridge_configure_rstp(struct bridge *br, bool enable_rstp)
{
- struct ofproto_stp_status stp_status;
-
- ofproto_get_stp_status(br->ofproto, &stp_status);
- if (!br->cfg->rstp_enable) {
- ofproto_set_rstp(br->ofproto, NULL);
- } else if (stp_status.enabled) {
- /* Do not activate RSTP if STP is enabled. */
- VLOG_ERR("RSTP cannot be enabled if STP is running.");
+ if (!enable_rstp) {
ofproto_set_rstp(br->ofproto, NULL);
- ovsrec_bridge_set_rstp_enable(br->cfg, false);
} else {
struct ofproto_rstp_settings br_s;
const char *config_str;
config_str = smap_get(&br->cfg->other_config, "rstp-address");
if (config_str) {
- uint8_t ea[ETH_ADDR_LEN];
+ struct eth_addr ea;
- if (eth_addr_from_string(config_str, ea)) {
+ if (eth_addr_from_string(config_str, &ea)) {
br_s.address = eth_addr_to_uint64(ea);
}
else {
}
}
+static void
+bridge_configure_spanning_tree(struct bridge *br)
+{
+ bool enable_rstp = br->cfg->rstp_enable;
+ bool enable_stp = br->cfg->stp_enable;
+
+ if (enable_rstp && enable_stp) {
+ VLOG_WARN("%s: RSTP and STP are mutually exclusive but both are "
+ "configured; enabling RSTP", br->name);
+ enable_stp = false;
+ }
+
+ bridge_configure_stp(br, enable_stp);
+ bridge_configure_rstp(br, enable_rstp);
+}
+
static bool
bridge_has_bond_fake_iface(const struct bridge *br, const char *name)
{
static bool
port_is_bond_fake_iface(const struct port *port)
{
- return port->cfg->bond_fake_iface && !list_is_short(&port->ifaces);
+ return port->cfg->bond_fake_iface && !ovs_list_is_short(&port->ifaces);
}
static void
add_del_bridges(const struct ovsrec_open_vswitch *cfg)
{
struct bridge *br, *next;
+ struct shash_node *node;
struct shash new_br;
size_t i;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
const struct ovsrec_bridge *br_cfg = cfg->bridges[i];
- if (strchr(br_cfg->name, '/')) {
+ if (strchr(br_cfg->name, '/') || strchr(br_cfg->name, '\\')) {
/* Prevent remote ovsdb-server users from accessing arbitrary
- * directories, e.g. consider a bridge named "../../../etc/". */
+ * directories, e.g. consider a bridge named "../../../etc/".
+ *
+ * Prohibiting "\" is only necessary on Windows but it's no great
+ * loss elsewhere. */
VLOG_WARN_RL(&rl, "ignoring bridge with invalid name \"%s\"",
br_cfg->name);
} else if (!shash_add_once(&new_br, br_cfg->name, br_cfg)) {
br->cfg = shash_find_data(&new_br, br->name);
if (!br->cfg || strcmp(br->type, ofproto_normalize_type(
br->cfg->datapath_type))) {
- bridge_destroy(br);
+ bridge_destroy(br, true);
}
}
/* Add new bridges. */
- for (i = 0; i < cfg->n_bridges; i++) {
- const struct ovsrec_bridge *br_cfg = cfg->bridges[i];
+ SHASH_FOR_EACH(node, &new_br) {
+ const struct ovsrec_bridge *br_cfg = node->data;
struct bridge *br = bridge_lookup(br_cfg->name);
if (!br) {
bridge_create(br_cfg);
static int
iface_do_create(const struct bridge *br,
const struct ovsrec_interface *iface_cfg,
- const struct ovsrec_port *port_cfg,
ofp_port_t *ofp_portp, struct netdev **netdevp,
char **errp)
{
struct netdev *netdev = NULL;
int error;
+ const char *type;
if (netdev_is_reserved_name(iface_cfg->name)) {
VLOG_WARN("could not create interface %s, name is reserved",
goto error;
}
- error = netdev_open(iface_cfg->name,
- iface_get_type(iface_cfg, br->cfg), &netdev);
+ type = ofproto_port_open_type(br->cfg->datapath_type,
+ iface_get_type(iface_cfg, br->cfg));
+ error = netdev_open(iface_cfg->name, type, &netdev);
if (error) {
VLOG_WARN_BUF(errp, "could not open network device %s (%s)",
iface_cfg->name, ovs_strerror(error));
VLOG_INFO("bridge %s: added interface %s on port %d",
br->name, iface_cfg->name, *ofp_portp);
- if (port_cfg->vlan_mode && !strcmp(port_cfg->vlan_mode, "splinter")) {
- netdev_turn_flags_on(netdev, NETDEV_UP, NULL);
- }
-
*netdevp = netdev;
return 0;
/* Do the bits that can fail up front. */
ovs_assert(!iface_lookup(br, iface_cfg->name));
- error = iface_do_create(br, iface_cfg, port_cfg, &ofp_port, &netdev, &errp);
+ error = iface_do_create(br, iface_cfg, &ofp_port, &netdev, &errp);
if (error) {
iface_clear_db_record(iface_cfg, errp);
free(errp);
/* Create the iface structure. */
iface = xzalloc(sizeof *iface);
- list_push_back(&port->ifaces, &iface->port_elem);
+ ovs_list_push_back(&port->ifaces, &iface->port_elem);
hmap_insert(&br->iface_by_name, &iface->name_node,
hash_string(iface_cfg->name, 0));
iface->port = port;
iface->ofp_port = ofp_port;
iface->netdev = netdev;
iface->type = iface_get_type(iface_cfg, br->cfg);
+ iface->netdev_type = ofproto_port_open_type(br->cfg->datapath_type,
+ iface->type);
iface->cfg = iface_cfg;
hmap_insert(&br->ifaces, &iface->ofp_port_node,
hash_ofp_port(ofp_port));
}
HMAP_FOR_EACH (port, hmap_node, &br->ports) {
- bool flood = smap_get_bool(&port->cfg->other_config,
+ struct ofproto_mcast_snooping_port_settings port_s;
+ port_s.flood = smap_get_bool(&port->cfg->other_config,
"mcast-snooping-flood", false);
- if (ofproto_port_set_mcast_snooping(br->ofproto, port, flood)) {
+ port_s.flood_reports = smap_get_bool(&port->cfg->other_config,
+ "mcast-snooping-flood-reports", false);
+ if (ofproto_port_set_mcast_snooping(br->ofproto, port, &port_s)) {
VLOG_ERR("port %s: could not configure mcast snooping",
port->name);
}
}
static void
-find_local_hw_addr(const struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
+find_local_hw_addr(const struct bridge *br, struct eth_addr *ea,
const struct port *fake_br, struct iface **hw_addr_iface)
{
struct hmapx mirror_output_ports;
/* Otherwise choose the minimum non-local MAC address among all of the
* interfaces. */
HMAP_FOR_EACH (port, hmap_node, &br->ports) {
- uint8_t iface_ea[ETH_ADDR_LEN];
+ struct eth_addr iface_ea;
struct iface *candidate;
struct iface *iface;
/* Choose the MAC address to represent the port. */
iface = NULL;
- if (port->cfg->mac && eth_addr_from_string(port->cfg->mac, iface_ea)) {
+ if (port->cfg->mac && eth_addr_from_string(port->cfg->mac,
+ &iface_ea)) {
/* Find the interface with this Ethernet address (if any) so that
* we can provide the correct devname to the caller. */
LIST_FOR_EACH (candidate, port_elem, &port->ifaces) {
- uint8_t candidate_ea[ETH_ADDR_LEN];
- if (!netdev_get_etheraddr(candidate->netdev, candidate_ea)
+ struct eth_addr candidate_ea;
+ if (!netdev_get_etheraddr(candidate->netdev, &candidate_ea)
&& eth_addr_equals(iface_ea, candidate_ea)) {
iface = candidate;
}
}
}
+ /* A port always has at least one interface. */
+ ovs_assert(iface != NULL);
+
/* The local port doesn't count (since we're trying to choose its
* MAC address anyway). */
if (iface->ofp_port == OFPP_LOCAL) {
}
/* Grab MAC. */
- error = netdev_get_etheraddr(iface->netdev, iface_ea);
+ error = netdev_get_etheraddr(iface->netdev, &iface_ea);
if (error) {
continue;
}
!eth_addr_is_local(iface_ea) &&
!eth_addr_is_reserved(iface_ea) &&
!eth_addr_is_zero(iface_ea) &&
- (!found_addr || eth_addr_compare_3way(iface_ea, ea) < 0))
+ (!found_addr || eth_addr_compare_3way(iface_ea, *ea) < 0))
{
- memcpy(ea, iface_ea, ETH_ADDR_LEN);
+ *ea = iface_ea;
*hw_addr_iface = iface;
found_addr = true;
}
}
if (!found_addr) {
- memcpy(ea, br->default_ea, ETH_ADDR_LEN);
+ *ea = br->default_ea;
*hw_addr_iface = NULL;
}
}
static void
-bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN],
+bridge_pick_local_hw_addr(struct bridge *br, struct eth_addr *ea,
struct iface **hw_addr_iface)
{
const char *hwaddr;
/* Did the user request a particular MAC? */
hwaddr = smap_get(&br->cfg->other_config, "hwaddr");
if (hwaddr && eth_addr_from_string(hwaddr, ea)) {
- if (eth_addr_is_multicast(ea)) {
+ if (eth_addr_is_multicast(*ea)) {
VLOG_ERR("bridge %s: cannot set MAC address to multicast "
- "address "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(ea));
- } else if (eth_addr_is_zero(ea)) {
+ "address "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(*ea));
+ } else if (eth_addr_is_zero(*ea)) {
VLOG_ERR("bridge %s: cannot set MAC address to zero", br->name);
} else {
return;
* 'hw_addr_iface' must be passed in as a null pointer. */
static uint64_t
bridge_pick_datapath_id(struct bridge *br,
- const uint8_t bridge_ea[ETH_ADDR_LEN],
+ const struct eth_addr bridge_ea,
struct iface *hw_addr_iface)
{
/*
static uint64_t
dpid_from_hash(const void *data, size_t n)
{
- uint8_t hash[SHA1_DIGEST_SIZE];
-
- BUILD_ASSERT_DECL(sizeof hash >= ETH_ADDR_LEN);
- sha1_bytes(data, n, hash);
- eth_addr_mark_random(hash);
- return eth_addr_to_uint64(hash);
+ union {
+ uint8_t bytes[SHA1_DIGEST_SIZE];
+ struct eth_addr ea;
+ } hash;
+
+ sha1_bytes(data, n, hash.bytes);
+ eth_addr_mark_random(&hash.ea);
+ return eth_addr_to_uint64(hash.ea);
}
static void
enum netdev_features current;
enum netdev_flags flags;
const char *link_state;
- uint8_t mac[ETH_ADDR_LEN];
+ struct eth_addr mac;
int64_t bps, mtu_64, ifindex64, link_resets;
int mtu, error;
ovsrec_interface_set_mtu(iface->cfg, NULL, 0);
}
- error = netdev_get_etheraddr(iface->netdev, mac);
+ error = netdev_get_etheraddr(iface->netdev, &mac);
if (!error) {
- char mac_string[32];
+ char mac_string[ETH_ADDR_STRLEN + 1];
- sprintf(mac_string, ETH_ADDR_FMT, ETH_ADDR_ARGS(mac));
+ snprintf(mac_string, sizeof mac_string,
+ ETH_ADDR_FMT, ETH_ADDR_ARGS(mac));
ovsrec_interface_set_mac_in_use(iface->cfg, mac_string);
} else {
ovsrec_interface_set_mac_in_use(iface->cfg, NULL);
reasons[j++] = cfm_fault_reason_to_str(reason);
}
}
- ovsrec_interface_set_cfm_fault_status(cfg, (char **) reasons, j);
+ ovsrec_interface_set_cfm_fault_status(cfg, reasons, j);
ovsrec_interface_set_cfm_flap_count(cfg, &cfm_flap_count, 1);
iface_refresh_stats(struct iface *iface)
{
#define IFACE_STATS \
- IFACE_STAT(rx_packets, "rx_packets") \
- IFACE_STAT(tx_packets, "tx_packets") \
- IFACE_STAT(rx_bytes, "rx_bytes") \
- IFACE_STAT(tx_bytes, "tx_bytes") \
- IFACE_STAT(rx_dropped, "rx_dropped") \
- IFACE_STAT(tx_dropped, "tx_dropped") \
- IFACE_STAT(rx_errors, "rx_errors") \
- IFACE_STAT(tx_errors, "tx_errors") \
- IFACE_STAT(rx_frame_errors, "rx_frame_err") \
- IFACE_STAT(rx_over_errors, "rx_over_err") \
- IFACE_STAT(rx_crc_errors, "rx_crc_err") \
- IFACE_STAT(collisions, "collisions")
+ IFACE_STAT(rx_packets, "rx_packets") \
+ IFACE_STAT(tx_packets, "tx_packets") \
+ IFACE_STAT(rx_bytes, "rx_bytes") \
+ IFACE_STAT(tx_bytes, "tx_bytes") \
+ IFACE_STAT(rx_dropped, "rx_dropped") \
+ IFACE_STAT(tx_dropped, "tx_dropped") \
+ IFACE_STAT(rx_errors, "rx_errors") \
+ IFACE_STAT(tx_errors, "tx_errors") \
+ IFACE_STAT(rx_frame_errors, "rx_frame_err") \
+ IFACE_STAT(rx_over_errors, "rx_over_err") \
+ IFACE_STAT(rx_crc_errors, "rx_crc_err") \
+ IFACE_STAT(collisions, "collisions") \
+ IFACE_STAT(rx_1_to_64_packets, "rx_1_to_64_packets") \
+ IFACE_STAT(rx_65_to_127_packets, "rx_65_to_127_packets") \
+ IFACE_STAT(rx_128_to_255_packets, "rx_128_to_255_packets") \
+ IFACE_STAT(rx_256_to_511_packets, "rx_256_to_511_packets") \
+ IFACE_STAT(rx_512_to_1023_packets, "rx_512_to_1023_packets") \
+ IFACE_STAT(rx_1024_to_1522_packets, "rx_1024_to_1518_packets") \
+ IFACE_STAT(rx_1523_to_max_packets, "rx_1523_to_max_packets") \
+ IFACE_STAT(tx_1_to_64_packets, "tx_1_to_64_packets") \
+ IFACE_STAT(tx_65_to_127_packets, "tx_65_to_127_packets") \
+ IFACE_STAT(tx_128_to_255_packets, "tx_128_to_255_packets") \
+ IFACE_STAT(tx_256_to_511_packets, "tx_256_to_511_packets") \
+ IFACE_STAT(tx_512_to_1023_packets, "tx_512_to_1023_packets") \
+ IFACE_STAT(tx_1024_to_1522_packets, "tx_1024_to_1518_packets") \
+ IFACE_STAT(tx_1523_to_max_packets, "tx_1523_to_max_packets") \
+ IFACE_STAT(tx_multicast_packets, "tx_multicast_packets") \
+ IFACE_STAT(rx_broadcast_packets, "rx_broadcast_packets") \
+ IFACE_STAT(tx_broadcast_packets, "tx_broadcast_packets") \
+ IFACE_STAT(rx_undersized_errors, "rx_undersized_errors") \
+ IFACE_STAT(rx_oversize_errors, "rx_oversize_errors") \
+ IFACE_STAT(rx_fragmented_errors, "rx_fragmented_errors") \
+ IFACE_STAT(rx_jabber_errors, "rx_jabber_errors")
#define IFACE_STAT(MEMBER, NAME) + 1
enum { N_IFACE_STATS = IFACE_STATS };
#undef IFACE_STAT
int64_t values[N_IFACE_STATS];
- char *keys[N_IFACE_STATS];
+ const char *keys[N_IFACE_STATS];
int n;
struct netdev_stats stats;
#undef IFACE_STATS
}
+static void
+br_refresh_datapath_info(struct bridge *br)
+{
+ const char *version;
+
+ version = (br->ofproto && br->ofproto->ofproto_class->get_datapath_version
+ ? br->ofproto->ofproto_class->get_datapath_version(br->ofproto)
+ : NULL);
+
+ ovsrec_bridge_set_datapath_version(br->cfg,
+ version ? version : "<unknown>");
+}
+
static void
br_refresh_stp_status(struct bridge *br)
{
}
/* STP doesn't currently support bonds. */
- if (!list_is_singleton(&port->ifaces)) {
+ if (!ovs_list_is_singleton(&port->ifaces)) {
ovsrec_port_set_status(port->cfg, NULL);
return;
}
- iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem);
+ iface = CONTAINER_OF(ovs_list_front(&port->ifaces), struct iface, port_elem);
if (ofproto_port_get_stp_status(ofproto, iface->ofp_port, &status)) {
return;
}
struct ofproto *ofproto = port->bridge->ofproto;
struct iface *iface;
struct ofproto_port_stp_stats stats;
- char *keys[3];
+ const char *keys[3];
int64_t int_values[3];
if (port_is_synthetic(port)) {
}
/* STP doesn't currently support bonds. */
- if (!list_is_singleton(&port->ifaces)) {
+ if (!ovs_list_is_singleton(&port->ifaces)) {
return;
}
- iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem);
+ iface = CONTAINER_OF(ovs_list_front(&port->ifaces), struct iface, port_elem);
if (ofproto_port_get_stp_stats(ofproto, iface->ofp_port, &stats)) {
return;
}
}
smap_add_format(&smap, "rstp_bridge_id", RSTP_ID_FMT,
RSTP_ID_ARGS(status.bridge_id));
- smap_add_format(&smap, "rstp_root_path_cost", "%d",
+ smap_add_format(&smap, "rstp_root_path_cost", "%"PRIu32,
status.root_path_cost);
smap_add_format(&smap, "rstp_root_id", RSTP_ID_FMT,
RSTP_ID_ARGS(status.root_id));
struct ofproto *ofproto = port->bridge->ofproto;
struct iface *iface;
struct ofproto_port_rstp_status status;
- char *keys[3];
- int64_t int_values[3];
+ const char *keys[4];
+ int64_t int_values[4];
struct smap smap;
if (port_is_synthetic(port)) {
}
/* RSTP doesn't currently support bonds. */
- if (!list_is_singleton(&port->ifaces)) {
+ if (!ovs_list_is_singleton(&port->ifaces)) {
ovsrec_port_set_rstp_status(port->cfg, NULL);
return;
}
- iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem);
+ iface = CONTAINER_OF(ovs_list_front(&port->ifaces), struct iface, port_elem);
if (ofproto_port_get_rstp_status(ofproto, iface->ofp_port, &status)) {
return;
}
rstp_port_role_name(status.role));
smap_add_format(&smap, "rstp_port_state", "%s",
rstp_state_name(status.state));
+ smap_add_format(&smap, "rstp_designated_bridge_id", RSTP_ID_FMT,
+ RSTP_ID_ARGS(status.designated_bridge_id));
+ smap_add_format(&smap, "rstp_designated_port_id", RSTP_PORT_ID_FMT,
+ status.designated_port_id);
+ smap_add_format(&smap, "rstp_designated_path_cost", "%"PRIu32,
+ status.designated_path_cost);
ovsrec_port_set_rstp_status(port->cfg, &smap);
smap_destroy(&smap);
int_values[1] = status.rx_count;
keys[2] = "rstp_uptime";
int_values[2] = status.uptime;
+ keys[3] = "rstp_error_count";
+ int_values[3] = status.error_count;
ovsrec_port_set_rstp_statistics(port->cfg, keys, int_values,
ARRAY_SIZE(int_values));
}
+static void
+port_refresh_bond_status(struct port *port, bool force_update)
+{
+ struct eth_addr mac;
+
+ /* Return if port is not a bond */
+ if (ovs_list_is_singleton(&port->ifaces)) {
+ return;
+ }
+
+ if (bond_get_changed_active_slave(port->name, &mac, force_update)) {
+ struct ds mac_s;
+
+ ds_init(&mac_s);
+ ds_put_format(&mac_s, ETH_ADDR_FMT, ETH_ADDR_ARGS(mac));
+ ovsrec_port_set_bond_active_slave(port->cfg, ds_cstr(&mac_s));
+ ds_destroy(&mac_s);
+ }
+}
+
static bool
enable_system_stats(const struct ovsrec_open_vswitch *cfg)
{
static void
run_stats_update(void)
{
- static struct ovsdb_idl_txn *stats_txn;
const struct ovsrec_open_vswitch *cfg = ovsrec_open_vswitch_first(idl);
int stats_interval;
}
}
+static void
+stats_update_wait(void)
+{
+ /* If the 'stats_txn' is non-null (transaction incomplete), waits for the
+ * transaction to complete. Otherwise, waits for the 'stats_timer'. */
+ if (stats_txn) {
+ ovsdb_idl_txn_wait(stats_txn);
+ } else {
+ poll_timer_wait_until(stats_timer);
+ }
+}
+
/* Update bridge/port/interface status if necessary. */
static void
run_status_update(void)
br_refresh_stp_status(br);
br_refresh_rstp_status(br);
+ br_refresh_datapath_info(br);
HMAP_FOR_EACH (port, hmap_node, &br->ports) {
struct iface *iface;
port_refresh_stp_status(port);
port_refresh_rstp_status(port);
+ port_refresh_bond_status(port, status_txn_try_again);
LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
iface_refresh_netdev_status(iface);
iface_refresh_ofproto_status(iface);
}
}
}
+
+ /* Refresh AA port status if necessary. */
+ if (time_msec() >= aa_refresh_timer) {
+ struct bridge *br;
+
+ HMAP_FOR_EACH (br, node, &all_bridges) {
+ if (bridge_aa_need_refresh(br)) {
+ struct ovsdb_idl_txn *txn;
+
+ txn = ovsdb_idl_txn_create(idl);
+ bridge_aa_refresh_queued(br);
+ ovsdb_idl_txn_commit(txn);
+ ovsdb_idl_txn_destroy(txn);
+ }
+ }
+
+ aa_refresh_timer = time_msec() + AA_REFRESH_INTERVAL;
+ }
}
static void
static struct ovsrec_open_vswitch null_cfg;
const struct ovsrec_open_vswitch *cfg;
- bool vlan_splinters_changed;
-
ovsrec_open_vswitch_init(&null_cfg);
ovsdb_idl_run(idl);
+ if_notifier_run();
+
if (ovsdb_idl_is_lock_contended(idl)) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1);
struct bridge *br, *next_br;
(long int) getpid());
HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) {
- bridge_destroy(br);
+ bridge_destroy(br, false);
}
/* Since we will not be running system_stats_run() in this process
* with the current situation of multiple ovs-vswitchd daemons,
* disable system stats collection. */
system_stats_enable(false);
return;
- } else if (!ovsdb_idl_has_lock(idl)) {
+ } else if (!ovsdb_idl_has_lock(idl)
+ || !ovsdb_idl_has_ever_connected(idl)) {
+ /* Returns if not holding the lock or not done retrieving db
+ * contents. */
return;
}
cfg = ovsrec_open_vswitch_first(idl);
+ if (cfg) {
+ dpdk_init(&cfg->other_config);
+ }
+
/* Initialize the ofproto library. This only needs to run once, but
* it must be done after the configuration is set. If the
* initialization has already occurred, bridge_init_ofproto()
stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert);
}
- /* If VLAN splinters are in use, then we need to reconfigure if VLAN
- * usage has changed. */
- vlan_splinters_changed = false;
- if (vlan_splinters_enabled_anywhere) {
- struct bridge *br;
-
- HMAP_FOR_EACH (br, node, &all_bridges) {
- if (ofproto_has_vlan_usage_changed(br->ofproto)) {
- vlan_splinters_changed = true;
- break;
- }
- }
- }
-
- if (ovsdb_idl_get_seqno(idl) != idl_seqno || vlan_splinters_changed) {
+ if (ovsdb_idl_get_seqno(idl) != idl_seqno || ifaces_changed) {
struct ovsdb_idl_txn *txn;
+ ifaces_changed = false;
+
idl_seqno = ovsdb_idl_get_seqno(idl);
txn = ovsdb_idl_txn_create(idl);
bridge_reconfigure(cfg ? cfg : &null_cfg);
if (cfg) {
ovsrec_open_vswitch_set_cur_cfg(cfg, cfg->next_cfg);
+ discover_types(cfg);
}
/* If we are completing our initial configuration for this run
ovsdb_idl_txn_wait(daemonize_txn);
}
+ if_notifier_wait();
+ if (ifaces_changed) {
+ poll_immediate_wake();
+ }
+
sset_init(&types);
ofproto_enumerate_types(&types);
SSET_FOR_EACH (type, &types) {
HMAP_FOR_EACH (br, node, &all_bridges) {
ofproto_wait(br->ofproto);
}
-
- poll_timer_wait_until(stats_timer);
+ stats_update_wait();
+ status_update_wait();
}
- status_update_wait();
system_stats_wait();
}
}
}
+static void
+qos_unixctl_show_types(struct unixctl_conn *conn, int argc OVS_UNUSED,
+ const char *argv[], void *aux OVS_UNUSED)
+{
+ struct ds ds = DS_EMPTY_INITIALIZER;
+ struct sset types = SSET_INITIALIZER(&types);
+ struct iface *iface;
+ const char * types_name;
+ int error;
+
+ iface = iface_find(argv[1]);
+ if (!iface) {
+ unixctl_command_reply_error(conn, "no such interface");
+ return;
+ }
+
+ error = netdev_get_qos_types(iface->netdev, &types);
+ if (!error) {
+ if (!sset_is_empty(&types)) {
+ SSET_FOR_EACH (types_name, &types) {
+ ds_put_format(&ds, "QoS type: %s\n", types_name);
+ }
+ unixctl_command_reply(conn, ds_cstr(&ds));
+ } else {
+ ds_put_format(&ds, "No QoS types supported for interface: %s\n",
+ iface->name);
+ unixctl_command_reply(conn, ds_cstr(&ds));
+ }
+ } else {
+ ds_put_format(&ds, "%s: failed to retrieve supported QoS types (%s)",
+ iface->name, ovs_strerror(error));
+ unixctl_command_reply_error(conn, ds_cstr(&ds));
+ }
+
+ sset_destroy(&types);
+ ds_destroy(&ds);
+}
+
static void
qos_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED,
const char *argv[], void *aux OVS_UNUSED)
struct iface *iface;
const char *type;
struct smap_node *node;
+ int error;
iface = iface_find(argv[1]);
if (!iface) {
return;
}
- netdev_get_qos(iface->netdev, &type, &smap);
+ error = netdev_get_qos(iface->netdev, &type, &smap);
+ if (!error) {
+ if (*type != '\0') {
+ struct netdev_queue_dump dump;
+ struct smap details;
+ unsigned int queue_id;
- if (*type != '\0') {
- struct netdev_queue_dump dump;
- struct smap details;
- unsigned int queue_id;
+ ds_put_format(&ds, "QoS: %s %s\n", iface->name, type);
- ds_put_format(&ds, "QoS: %s %s\n", iface->name, type);
+ SMAP_FOR_EACH (node, &smap) {
+ ds_put_format(&ds, "%s: %s\n", node->key, node->value);
+ }
- SMAP_FOR_EACH (node, &smap) {
- ds_put_format(&ds, "%s: %s\n", node->key, node->value);
- }
+ smap_init(&details);
+ NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, iface->netdev) {
+ qos_unixctl_show_queue(queue_id, &details, iface, &ds);
+ }
+ smap_destroy(&details);
- smap_init(&details);
- NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, iface->netdev) {
- qos_unixctl_show_queue(queue_id, &details, iface, &ds);
+ unixctl_command_reply(conn, ds_cstr(&ds));
+ } else {
+ ds_put_format(&ds, "QoS not configured on %s\n", iface->name);
+ unixctl_command_reply_error(conn, ds_cstr(&ds));
}
- smap_destroy(&details);
-
- unixctl_command_reply(conn, ds_cstr(&ds));
} else {
- ds_put_format(&ds, "QoS not configured on %s\n", iface->name);
+ ds_put_format(&ds, "%s: failed to retrieve QOS configuration (%s)\n",
+ iface->name, ovs_strerror(error));
unixctl_command_reply_error(conn, ds_cstr(&ds));
}
/* Derive the default Ethernet address from the bridge's UUID. This should
* be unique and it will be stable between ovs-vswitchd runs. */
- memcpy(br->default_ea, &br_cfg->header_.uuid, ETH_ADDR_LEN);
- eth_addr_mark_random(br->default_ea);
+ memcpy(&br->default_ea, &br_cfg->header_.uuid, ETH_ADDR_LEN);
+ eth_addr_mark_random(&br->default_ea);
hmap_init(&br->ports);
hmap_init(&br->ifaces);
hmap_init(&br->iface_by_name);
hmap_init(&br->mirrors);
+ hmap_init(&br->mappings);
hmap_insert(&all_bridges, &br->node, hash_string(br->name, 0));
}
static void
-bridge_destroy(struct bridge *br)
+bridge_destroy(struct bridge *br, bool del)
{
if (br) {
struct mirror *mirror, *next_mirror;
}
hmap_remove(&all_bridges, &br->node);
- ofproto_destroy(br->ofproto);
+ ofproto_destroy(br->ofproto, del);
hmap_destroy(&br->ifaces);
hmap_destroy(&br->ports);
hmap_destroy(&br->iface_by_name);
hmap_destroy(&br->mirrors);
+ hmap_destroy(&br->mappings);
free(br->name);
free(br->type);
free(br);
static void
bridge_collect_wanted_ports(struct bridge *br,
- const unsigned long int *splinter_vlans,
struct shash *wanted_ports)
{
size_t i;
shash_add(wanted_ports, br->name, &br->synth_local_port);
}
-
- if (splinter_vlans) {
- add_vlan_splinter_ports(br, splinter_vlans, wanted_ports);
- }
}
/* Deletes "struct port"s and "struct iface"s under 'br' which aren't
const struct ovsrec_interface *cfg = port->interfaces[i];
struct iface *iface = iface_lookup(br, cfg->name);
const char *type = iface_get_type(cfg, br->cfg);
+ const char *dp_type = br->cfg->datapath_type;
+ const char *netdev_type = ofproto_port_open_type(dp_type, type);
if (iface) {
iface->cfg = cfg;
iface->type = type;
+ iface->netdev_type = netdev_type;
} else if (!strcmp(type, "null")) {
VLOG_WARN_ONCE("%s: The null interface type is deprecated and"
" may be removed in February 2013. Please email"
/* If there's no local interface or no IP address, give up. */
local_iface = iface_from_ofp_port(br, OFPP_LOCAL);
- if (!local_iface || !c->local_ip
- || !inet_pton(AF_INET, c->local_ip, &ip)) {
+ if (!local_iface || !c->local_ip || !ip_parse(c->local_ip, &ip.s_addr)) {
return;
}
/* Configure the IP address and netmask. */
if (!c->local_netmask
- || !inet_pton(AF_INET, c->local_netmask, &mask)
+ || !ip_parse(c->local_netmask, &mask.s_addr)
|| !mask.s_addr) {
mask.s_addr = guess_netmask(ip.s_addr);
}
/* Configure the default gateway. */
if (c->local_gateway
- && inet_pton(AF_INET, c->local_gateway, &gateway)
+ && ip_parse(c->local_gateway, &gateway.s_addr)
&& gateway.s_addr) {
if (!netdev_add_router(netdev, gateway)) {
VLOG_INFO("bridge %s: configured gateway "IP_FMT,
for (i = 0; i < n_controllers; i++) {
struct ovsrec_controller *c = controllers[i];
- if (!strncmp(c->target, "punix:", 6)
- || !strncmp(c->target, "unix:", 5)) {
+ if (daemon_should_self_confine()
+ && (!strncmp(c->target, "punix:", 6)
+ || !strncmp(c->target, "unix:", 5))) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
char *whitelist;
continue;
}
} else {
- whitelist = xasprintf("punix:%s/%s.controller",
+ whitelist = xasprintf("punix:%s/%s.",
ovs_rundir(), br->name);
- if (!equal_pathnames(c->target, whitelist, SIZE_MAX)) {
+ if (!equal_pathnames(c->target, whitelist, strlen(whitelist))
+ || strchr(c->target + strlen(whitelist), '/')) {
/* Prevent remote ovsdb-server users from accessing
* arbitrary Unix domain sockets and overwriting arbitrary
* local files. */
VLOG_ERR_RL(&rl, "bridge %s: Not adding Unix domain socket "
"controller \"%s\" due to possibility of "
"overwriting local files. Instead, specify "
- "whitelisted \"%s\" or connect to "
- "\"unix:%s/%s.mgmt\" (which is always "
- "available without special configuration).",
+ "path in whitelisted format \"%s*\" or "
+ "connect to \"unix:%s/%s.mgmt\" (which is "
+ "always available without special "
+ "configuration).",
br->name, c->target, whitelist,
ovs_rundir(), br->name);
free(whitelist);
s.name = NULL;
s.max_flows = UINT_MAX;
s.groups = NULL;
+ s.enable_eviction = false;
s.n_groups = 0;
s.n_prefix_fields = 0;
memset(s.prefix_fields, ~0, sizeof(s.prefix_fields));
if (cfg->n_flow_limit && *cfg->flow_limit < UINT_MAX) {
s.max_flows = *cfg->flow_limit;
}
- if (cfg->overflow_policy
- && !strcmp(cfg->overflow_policy, "evict")) {
+ s.enable_eviction = (cfg->overflow_policy
+ && !strcmp(cfg->overflow_policy, "evict"));
+ if (cfg->n_groups) {
s.groups = xmalloc(cfg->n_groups * sizeof *s.groups);
for (k = 0; k < cfg->n_groups; k++) {
const char *string = cfg->groups[k];
}
}
}
+
/* Prefix lookup fields. */
s.n_prefix_fields = 0;
for (k = 0; k < cfg->n_prefixes; k++) {
ofproto_set_dp_desc(br->ofproto,
smap_get(&br->cfg->other_config, "dp-desc"));
}
+
+static struct aa_mapping *
+bridge_aa_mapping_find(struct bridge *br, const int64_t isid)
+{
+ struct aa_mapping *m;
+
+ HMAP_FOR_EACH_IN_BUCKET (m,
+ hmap_node,
+ hash_bytes(&isid, sizeof isid, 0),
+ &br->mappings) {
+ if (isid == m->isid) {
+ return m;
+ }
+ }
+ return NULL;
+}
+
+static struct aa_mapping *
+bridge_aa_mapping_create(struct bridge *br,
+ const int64_t isid,
+ const int64_t vlan)
+{
+ struct aa_mapping *m;
+
+ m = xzalloc(sizeof *m);
+ m->bridge = br;
+ m->isid = isid;
+ m->vlan = vlan;
+ m->br_name = xstrdup(br->name);
+ hmap_insert(&br->mappings,
+ &m->hmap_node,
+ hash_bytes(&isid, sizeof isid, 0));
+
+ return m;
+}
+
+static void
+bridge_aa_mapping_destroy(struct aa_mapping *m)
+{
+ if (m) {
+ struct bridge *br = m->bridge;
+
+ if (br->ofproto) {
+ ofproto_aa_mapping_unregister(br->ofproto, m);
+ }
+
+ hmap_remove(&br->mappings, &m->hmap_node);
+ if (m->br_name) {
+ free(m->br_name);
+ }
+ free(m);
+ }
+}
+
+static bool
+bridge_aa_mapping_configure(struct aa_mapping *m)
+{
+ struct aa_mapping_settings s;
+
+ s.isid = m->isid;
+ s.vlan = m->vlan;
+
+ /* Configure. */
+ ofproto_aa_mapping_register(m->bridge->ofproto, m, &s);
+
+ return true;
+}
+
+static void
+bridge_configure_aa(struct bridge *br)
+{
+ const struct ovsdb_datum *mc;
+ struct ovsrec_autoattach *auto_attach = br->cfg->auto_attach;
+ struct aa_settings aa_s;
+ struct aa_mapping *m, *next;
+ size_t i;
+
+ if (!auto_attach) {
+ ofproto_set_aa(br->ofproto, NULL, NULL);
+ return;
+ }
+
+ memset(&aa_s, 0, sizeof aa_s);
+ aa_s.system_description = auto_attach->system_description;
+ aa_s.system_name = auto_attach->system_name;
+ ofproto_set_aa(br->ofproto, NULL, &aa_s);
+
+ mc = ovsrec_autoattach_get_mappings(auto_attach,
+ OVSDB_TYPE_INTEGER,
+ OVSDB_TYPE_INTEGER);
+ HMAP_FOR_EACH_SAFE (m, next, hmap_node, &br->mappings) {
+ union ovsdb_atom atom;
+
+ atom.integer = m->isid;
+ if (ovsdb_datum_find_key(mc, &atom, OVSDB_TYPE_UUID) == UINT_MAX) {
+ VLOG_INFO("Deleting isid=%"PRIu32", vlan=%"PRIu16,
+ m->isid, m->vlan);
+ bridge_aa_mapping_destroy(m);
+ }
+ }
+
+ /* Add new mappings and reconfigure existing ones. */
+ for (i = 0; i < auto_attach->n_mappings; ++i) {
+ struct aa_mapping *m =
+ bridge_aa_mapping_find(br, auto_attach->key_mappings[i]);
+
+ if (!m) {
+ VLOG_INFO("Adding isid=%"PRId64", vlan=%"PRId64,
+ auto_attach->key_mappings[i],
+ auto_attach->value_mappings[i]);
+ m = bridge_aa_mapping_create(br,
+ auto_attach->key_mappings[i],
+ auto_attach->value_mappings[i]);
+
+ if (!bridge_aa_mapping_configure(m)) {
+ bridge_aa_mapping_destroy(m);
+ }
+ }
+ }
+}
+
+static bool
+bridge_aa_need_refresh(struct bridge *br)
+{
+ return ofproto_aa_vlan_get_queue_size(br->ofproto) > 0;
+}
+
+static void
+bridge_aa_update_trunks(struct port *port, struct bridge_aa_vlan *m)
+{
+ int64_t *trunks = NULL;
+ unsigned int i = 0;
+ bool found = false, reconfigure = false;
+
+ for (i = 0; i < port->cfg->n_trunks; i++) {
+ if (port->cfg->trunks[i] == m->vlan) {
+ found = true;
+ break;
+ }
+ }
+
+ switch (m->oper) {
+ case BRIDGE_AA_VLAN_OPER_ADD:
+ if (!found) {
+ trunks = xmalloc(sizeof *trunks * (port->cfg->n_trunks + 1));
+
+ for (i = 0; i < port->cfg->n_trunks; i++) {
+ trunks[i] = port->cfg->trunks[i];
+ }
+ trunks[i++] = m->vlan;
+ reconfigure = true;
+ }
+
+ break;
+
+ case BRIDGE_AA_VLAN_OPER_REMOVE:
+ if (found) {
+ unsigned int j = 0;
+
+ trunks = xmalloc(sizeof *trunks * (port->cfg->n_trunks - 1));
+
+ for (i = 0; i < port->cfg->n_trunks; i++) {
+ if (port->cfg->trunks[i] != m->vlan) {
+ trunks[j++] = port->cfg->trunks[i];
+ }
+ }
+ i = j;
+ reconfigure = true;
+ }
+
+ break;
+
+ case BRIDGE_AA_VLAN_OPER_UNDEF:
+ default:
+ VLOG_WARN("unrecognized operation %u", m->oper);
+ break;
+ }
+
+ if (reconfigure) {
+ /* VLAN switching under trunk mode cause the trunk port to switch all
+ * VLANs, see ovs-vswitchd.conf.db
+ */
+ if (i == 0) {
+ static char *vlan_mode_access = "access";
+ ovsrec_port_set_vlan_mode(port->cfg, vlan_mode_access);
+ }
+
+ if (i == 1) {
+ static char *vlan_mode_trunk = "trunk";
+ ovsrec_port_set_vlan_mode(port->cfg, vlan_mode_trunk);
+ }
+
+ ovsrec_port_set_trunks(port->cfg, trunks, i);
+
+ /* Force reconfigure of the port. */
+ port_configure(port);
+ }
+}
+
+static void
+bridge_aa_refresh_queued(struct bridge *br)
+{
+ struct ovs_list *list = xmalloc(sizeof *list);
+ struct bridge_aa_vlan *node, *next;
+
+ ovs_list_init(list);
+ ofproto_aa_vlan_get_queued(br->ofproto, list);
+
+ LIST_FOR_EACH_SAFE (node, next, list_node, list) {
+ struct port *port;
+
+ VLOG_INFO("ifname=%s, vlan=%u, oper=%u", node->port_name, node->vlan,
+ node->oper);
+
+ port = port_lookup(br, node->port_name);
+ if (port) {
+ bridge_aa_update_trunks(port, node);
+ }
+
+ ovs_list_remove(&node->list_node);
+ free(node->port_name);
+ free(node);
+ }
+
+ free(list);
+}
+
\f
/* Port functions. */
port->bridge = br;
port->name = xstrdup(cfg->name);
port->cfg = cfg;
- list_init(&port->ifaces);
+ ovs_list_init(&port->ifaces);
hmap_insert(&br->ports, &port->hmap_node, hash_string(port->name, 0));
return port;
return NULL;
}
} else {
- memcpy(s->id, port->bridge->ea, ETH_ADDR_LEN);
+ s->id = port->bridge->ea;
}
if (eth_addr_is_zero(s->id)) {
0);
s->priority = (priority > 0 && priority <= UINT16_MAX
? priority
- : UINT16_MAX - !list_is_short(&port->ifaces));
+ : UINT16_MAX - !ovs_list_is_short(&port->ifaces));
lacp_time = smap_get(&port->cfg->other_config, "lacp-time");
s->fast = lacp_time && !strcasecmp(lacp_time, "fast");
{
const char *detect_s;
struct iface *iface;
+ const char *mac_s;
int miimon_interval;
s->name = port->name;
LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
netdev_set_miimon_interval(iface->netdev, miimon_interval);
}
+
+ mac_s = port->cfg->bond_active_slave;
+ if (!mac_s || !ovs_scan(mac_s, ETH_ADDR_SCAN_FMT,
+ ETH_ADDR_SCAN_ARGS(s->active_slave_mac))) {
+ /* OVSDB did not store the last active interface */
+ s->active_slave_mac = eth_addr_zero;
+ }
}
/* Returns true if 'port' is synthetic, that is, if we constructed it locally
type = iface->type[0] ? iface->type : "system";
}
- return ofproto_port_open_type(br->datapath_type, type);
+ return type;
}
static void
hmap_remove(&br->ifaces, &iface->ofp_port_node);
}
- list_remove(&iface->port_elem);
+ ovs_list_remove(&iface->port_elem);
hmap_remove(&br->iface_by_name, &iface->name_node);
/* The user is changing configuration here, so netdev_remove needs to be
struct port *port = iface->port;
iface_destroy__(iface);
- if (list_is_empty(&port->ifaces)) {
+ if (ovs_list_is_empty(&port->ifaces)) {
port_destroy(port);
}
}
static void
iface_set_mac(const struct bridge *br, const struct port *port, struct iface *iface)
{
- uint8_t ea[ETH_ADDR_LEN], *mac = NULL;
+ struct eth_addr ea, *mac = NULL;
struct iface *hw_addr_iface;
if (strcmp(iface->type, "internal")) {
return;
}
- if (iface->cfg->mac && eth_addr_from_string(iface->cfg->mac, ea)) {
- mac = ea;
+ if (iface->cfg->mac && eth_addr_from_string(iface->cfg->mac, &ea)) {
+ mac = &ea;
} else if (port->cfg->fake_bridge) {
/* Fake bridge and no MAC set in the configuration. Pick a local one. */
- find_local_hw_addr(br, ea, port, &hw_addr_iface);
- mac = ea;
+ find_local_hw_addr(br, &ea, port, &hw_addr_iface);
+ mac = &ea;
}
if (mac) {
VLOG_ERR("interface %s: ignoring mac in Interface record "
"(use Bridge record to set local port's mac)",
iface->name);
- } else if (eth_addr_is_multicast(mac)) {
+ } else if (eth_addr_is_multicast(*mac)) {
VLOG_ERR("interface %s: cannot set MAC to multicast address",
iface->name);
} else {
- int error = netdev_set_etheraddr(iface->netdev, mac);
+ int error = netdev_set_etheraddr(iface->netdev, *mac);
if (error) {
VLOG_ERR("interface %s: setting MAC failed (%s)",
iface->name, ovs_strerror(error));
ofpbuf_init(&queues_buf, 0);
- if (!qos || qos->type[0] == '\0' || qos->n_queues < 1) {
+ if (!qos || qos->type[0] == '\0') {
netdev_set_qos(iface->netdev, NULL, NULL);
} else {
const struct ovsdb_datum *queues;
}
if (iface->ofp_port != OFPP_NONE) {
- const struct ofproto_port_queue *port_queues = ofpbuf_data(&queues_buf);
- size_t n_queues = ofpbuf_size(&queues_buf) / sizeof *port_queues;
+ const struct ofproto_port_queue *port_queues = queues_buf.data;
+ size_t n_queues = queues_buf.size / sizeof *port_queues;
ofproto_port_set_queues(iface->port->bridge->ofproto, iface->ofp_port,
port_queues, n_queues);
}
netdev_set_policing(iface->netdev,
- iface->cfg->ingress_policing_rate,
- iface->cfg->ingress_policing_burst);
+ MIN(UINT32_MAX, iface->cfg->ingress_policing_rate),
+ MIN(UINT32_MAX, iface->cfg->ingress_policing_burst));
ofpbuf_uninit(&queues_buf);
}
return false;
}
+ if (cfg->snaplen) {
+ s.snaplen = *cfg->snaplen;
+ } else {
+ s.snaplen = 0;
+ }
+
/* Get port selection. */
if (cfg->select_all) {
size_t n_ports = hmap_count(&m->bridge->ports);
return true;
}
-\f
-/* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.)
- *
- * This is deprecated. It is only for compatibility with broken device drivers
- * in old versions of Linux that do not properly support VLANs when VLAN
- * devices are not used. When broken device drivers are no longer in
- * widespread use, we will delete these interfaces. */
-
-static struct ovsrec_port **recs;
-static size_t n_recs, allocated_recs;
-
-/* Adds 'rec' to a list of recs that have to be destroyed when the VLAN
- * splinters are reconfigured. */
-static void
-register_rec(struct ovsrec_port *rec)
-{
- if (n_recs >= allocated_recs) {
- recs = x2nrealloc(recs, &allocated_recs, sizeof *recs);
- }
- recs[n_recs++] = rec;
-}
-
-/* Frees all of the ports registered with register_reg(). */
-static void
-free_registered_recs(void)
-{
- size_t i;
-
- for (i = 0; i < n_recs; i++) {
- struct ovsrec_port *port = recs[i];
- size_t j;
-
- for (j = 0; j < port->n_interfaces; j++) {
- struct ovsrec_interface *iface = port->interfaces[j];
- free(iface->name);
- free(iface);
- }
-
- smap_destroy(&port->other_config);
- free(port->interfaces);
- free(port->name);
- free(port->tag);
- free(port);
- }
- n_recs = 0;
-}
-
-/* Returns true if VLAN splinters are enabled on 'iface_cfg', false
- * otherwise. */
-static bool
-vlan_splinters_is_enabled(const struct ovsrec_interface *iface_cfg)
-{
- return smap_get_bool(&iface_cfg->other_config, "enable-vlan-splinters",
- false);
-}
-
-/* Figures out the set of VLANs that are in use for the purpose of VLAN
- * splinters.
- *
- * If VLAN splinters are enabled on at least one interface and any VLANs are in
- * use, returns a 4096-bit bitmap with a 1-bit for each in-use VLAN (bits 0 and
- * 4095 will not be set). The caller is responsible for freeing the bitmap,
- * with free().
- *
- * If VLANs splinters are not enabled on any interface or if no VLANs are in
- * use, returns NULL.
- *
- * Updates 'vlan_splinters_enabled_anywhere'. */
-static unsigned long int *
-collect_splinter_vlans(const struct ovsrec_open_vswitch *ovs_cfg)
-{
- unsigned long int *splinter_vlans;
- struct sset splinter_ifaces;
- const char *real_dev_name;
- struct shash *real_devs;
- struct shash_node *node;
- struct bridge *br;
- size_t i;
-
- /* Free space allocated for synthesized ports and interfaces, since we're
- * in the process of reconstructing all of them. */
- free_registered_recs();
-
- splinter_vlans = bitmap_allocate(4096);
- sset_init(&splinter_ifaces);
- vlan_splinters_enabled_anywhere = false;
- for (i = 0; i < ovs_cfg->n_bridges; i++) {
- struct ovsrec_bridge *br_cfg = ovs_cfg->bridges[i];
- size_t j;
-
- for (j = 0; j < br_cfg->n_ports; j++) {
- struct ovsrec_port *port_cfg = br_cfg->ports[j];
- int k;
-
- for (k = 0; k < port_cfg->n_interfaces; k++) {
- struct ovsrec_interface *iface_cfg = port_cfg->interfaces[k];
-
- if (vlan_splinters_is_enabled(iface_cfg)) {
- vlan_splinters_enabled_anywhere = true;
- sset_add(&splinter_ifaces, iface_cfg->name);
- vlan_bitmap_from_array__(port_cfg->trunks,
- port_cfg->n_trunks,
- splinter_vlans);
- }
- }
-
- if (port_cfg->tag && *port_cfg->tag > 0 && *port_cfg->tag < 4095) {
- bitmap_set1(splinter_vlans, *port_cfg->tag);
- }
- }
- }
-
- if (!vlan_splinters_enabled_anywhere) {
- free(splinter_vlans);
- sset_destroy(&splinter_ifaces);
- return NULL;
- }
-
- HMAP_FOR_EACH (br, node, &all_bridges) {
- if (br->ofproto) {
- ofproto_get_vlan_usage(br->ofproto, splinter_vlans);
- }
- }
-
- /* Don't allow VLANs 0 or 4095 to be splintered. VLAN 0 should appear on
- * the real device. VLAN 4095 is reserved and Linux doesn't allow a VLAN
- * device to be created for it. */
- bitmap_set0(splinter_vlans, 0);
- bitmap_set0(splinter_vlans, 4095);
-
- /* Delete all VLAN devices that we don't need. */
- vlandev_refresh();
- real_devs = vlandev_get_real_devs();
- SHASH_FOR_EACH (node, real_devs) {
- const struct vlan_real_dev *real_dev = node->data;
- const struct vlan_dev *vlan_dev;
- bool real_dev_has_splinters;
-
- real_dev_has_splinters = sset_contains(&splinter_ifaces,
- real_dev->name);
- HMAP_FOR_EACH (vlan_dev, hmap_node, &real_dev->vlan_devs) {
- if (!real_dev_has_splinters
- || !bitmap_is_set(splinter_vlans, vlan_dev->vid)) {
- struct netdev *netdev;
-
- if (!netdev_open(vlan_dev->name, "system", &netdev)) {
- if (!netdev_get_in4(netdev, NULL, NULL) ||
- !netdev_get_in6(netdev, NULL)) {
- /* It has an IP address configured, so we don't own
- * it. Don't delete it. */
- } else {
- vlandev_del(vlan_dev->name);
- }
- netdev_close(netdev);
- }
- }
-
- }
- }
-
- /* Add all VLAN devices that we need. */
- SSET_FOR_EACH (real_dev_name, &splinter_ifaces) {
- int vid;
-
- BITMAP_FOR_EACH_1 (vid, 4096, splinter_vlans) {
- if (!vlandev_get_name(real_dev_name, vid)) {
- vlandev_add(real_dev_name, vid);
- }
- }
- }
-
- vlandev_refresh();
-
- sset_destroy(&splinter_ifaces);
-
- if (bitmap_scan(splinter_vlans, 1, 0, 4096) >= 4096) {
- free(splinter_vlans);
- return NULL;
- }
- return splinter_vlans;
-}
-
-/* Pushes the configure of VLAN splinter port 'port' (e.g. eth0.9) down to
- * ofproto. */
-static void
-configure_splinter_port(struct port *port)
-{
- struct ofproto *ofproto = port->bridge->ofproto;
- ofp_port_t realdev_ofp_port;
- const char *realdev_name;
- struct iface *vlandev, *realdev;
-
- ofproto_bundle_unregister(port->bridge->ofproto, port);
-
- vlandev = CONTAINER_OF(list_front(&port->ifaces), struct iface,
- port_elem);
-
- realdev_name = smap_get(&port->cfg->other_config, "realdev");
- realdev = iface_lookup(port->bridge, realdev_name);
- realdev_ofp_port = realdev ? realdev->ofp_port : 0;
-
- ofproto_port_set_realdev(ofproto, vlandev->ofp_port, realdev_ofp_port,
- *port->cfg->tag);
-}
-
-static struct ovsrec_port *
-synthesize_splinter_port(const char *real_dev_name,
- const char *vlan_dev_name, int vid)
-{
- struct ovsrec_interface *iface;
- struct ovsrec_port *port;
-
- iface = xmalloc(sizeof *iface);
- ovsrec_interface_init(iface);
- iface->name = xstrdup(vlan_dev_name);
- iface->type = "system";
-
- port = xmalloc(sizeof *port);
- ovsrec_port_init(port);
- port->interfaces = xmemdup(&iface, sizeof iface);
- port->n_interfaces = 1;
- port->name = xstrdup(vlan_dev_name);
- port->vlan_mode = "splinter";
- port->tag = xmalloc(sizeof *port->tag);
- *port->tag = vid;
-
- smap_add(&port->other_config, "realdev", real_dev_name);
-
- register_rec(port);
- return port;
-}
-
-/* For each interface with 'br' that has VLAN splinters enabled, adds a
- * corresponding ovsrec_port to 'ports' for each splinter VLAN marked with a
- * 1-bit in the 'splinter_vlans' bitmap. */
-static void
-add_vlan_splinter_ports(struct bridge *br,
- const unsigned long int *splinter_vlans,
- struct shash *ports)
-{
- size_t i;
-
- /* We iterate through 'br->cfg->ports' instead of 'ports' here because
- * we're modifying 'ports'. */
- for (i = 0; i < br->cfg->n_ports; i++) {
- const char *name = br->cfg->ports[i]->name;
- struct ovsrec_port *port_cfg = shash_find_data(ports, name);
- size_t j;
-
- for (j = 0; j < port_cfg->n_interfaces; j++) {
- struct ovsrec_interface *iface_cfg = port_cfg->interfaces[j];
-
- if (vlan_splinters_is_enabled(iface_cfg)) {
- const char *real_dev_name;
- uint16_t vid;
-
- real_dev_name = iface_cfg->name;
- BITMAP_FOR_EACH_1 (vid, 4096, splinter_vlans) {
- const char *vlan_dev_name;
-
- vlan_dev_name = vlandev_get_name(real_dev_name, vid);
- if (vlan_dev_name
- && !shash_find(ports, vlan_dev_name)) {
- shash_add(ports, vlan_dev_name,
- synthesize_splinter_port(
- real_dev_name, vlan_dev_name, vid));
- }
- }
- }
- }
- }
-}
+\f
static void
mirror_refresh_stats(struct mirror *m)
{
struct ofproto *ofproto = m->bridge->ofproto;
uint64_t tx_packets, tx_bytes;
- char *keys[2];
+ const char *keys[2];
int64_t values[2];
size_t stat_cnt = 0;
ovsrec_mirror_set_statistics(m->cfg, keys, values, stat_cnt);
}
+
+/*
+ * Add registered netdev and dpif types to ovsdb to allow external
+ * applications to query the capabilities of the Open vSwitch instance
+ * running on the node.
+ */
+static void
+discover_types(const struct ovsrec_open_vswitch *cfg)
+{
+ struct sset types;
+
+ /* Datapath types. */
+ sset_init(&types);
+ dp_enumerate_types(&types);
+ const char **datapath_types = sset_array(&types);
+ ovsrec_open_vswitch_set_datapath_types(cfg, datapath_types,
+ sset_count(&types));
+ free(datapath_types);
+ sset_destroy(&types);
+
+ /* Port types. */
+ sset_init(&types);
+ netdev_enumerate_types(&types);
+ const char **iface_types = sset_array(&types);
+ ovsrec_open_vswitch_set_iface_types(cfg, iface_types, sset_count(&types));
+ free(iface_types);
+ sset_destroy(&types);
+}
projects / cascardo / ovs.git / blobdiff