#define OFP_PORT_ACTION_WINDOW 10
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 struct bridge *bridge_lookup(const char *name);
static struct iface *iface_find(const char *name);
static struct iface *iface_from_ofp_port(const struct bridge *,
ofp_port_t ofp_port);
-static void iface_set_mac(struct iface *);
+static void iface_set_mac(struct iface *, const uint8_t *);
static void iface_set_ofport(const struct ovsrec_interface *, ofp_port_t ofport);
static void iface_clear_db_record(const struct ovsrec_interface *if_cfg);
static void iface_configure_qos(struct iface *, const struct ovsrec_qos *);
ovsdb_idl_omit_alert(idl, &ovsrec_port_col_status);
ovsdb_idl_omit_alert(idl, &ovsrec_port_col_statistics);
ovsdb_idl_omit(idl, &ovsrec_port_col_external_ids);
- ovsdb_idl_omit(idl, &ovsrec_port_col_fake_bridge);
ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_admin_state);
ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_duplex);
COVERAGE_INC(bridge_reconfigure);
- ofproto_set_flow_eviction_threshold(
- smap_get_int(&ovs_cfg->other_config, "flow-eviction-threshold",
- OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT));
+ ofproto_set_flow_limit(smap_get_int(&ovs_cfg->other_config, "flow-limit",
+ OFPROTO_FLOW_LIMIT_DEFAULT));
- ofproto_set_n_handler_threads(
- smap_get_int(&ovs_cfg->other_config, "n-handler-threads", 0));
+ ofproto_set_threads(
+ smap_get_int(&ovs_cfg->other_config, "n-handler-threads", 0),
+ smap_get_int(&ovs_cfg->other_config, "n-revalidator-threads", 0));
bridge_configure_flow_miss_model(smap_get(&ovs_cfg->other_config,
"force-miss-model"));
LIST_FOR_EACH (iface, port_elem, &port->ifaces) {
iface_configure_cfm(iface);
iface_configure_qos(iface, port->cfg->qos);
- iface_set_mac(iface);
+ iface_set_mac(iface, port->cfg->fake_bridge ? br->ea : NULL);
ofproto_port_set_bfd(br->ofproto, iface->ofp_port,
&iface->cfg->bfd);
}
}
}
free(managers);
+
+ /* The ofproto-dpif provider does some final reconfiguration in its
+ * ->type_run() function. We have to call it before notifying the database
+ * client that reconfiguration is complete, otherwise there is a very
+ * narrow race window in which e.g. ofproto/trace will not recognize the
+ * new configuration (sometimes this causes unit test failures). */
+ bridge_run__();
}
/* Delete ofprotos which aren't configured or have the wrong type. Create
enum ofproto_flow_miss_model model = OFPROTO_HANDLE_MISS_AUTO;
if (opt) {
- if (strcmp(opt, "with-facets")) {
+ if (!strcmp(opt, "with-facets")) {
model = OFPROTO_HANDLE_MISS_WITH_FACETS;
- } else if (strcmp(opt, "without-facets")) {
+ } else if (!strcmp(opt, "without-facets")) {
model = OFPROTO_HANDLE_MISS_WITHOUT_FACETS;
}
}
return netdev_set_config(netdev, &iface_cfg->options);
}
-/* Opens a network device for 'if_cfg' and configures it. If '*ofp_portp'
- * is OFPP_NONE, adds the network device to br->ofproto and stores the OpenFlow
- * port number in '*ofp_portp'; otherwise leaves br->ofproto and '*ofp_portp'
- * untouched.
+/* Opens a network device for 'if_cfg' and configures it. Adds the network
+ * device to br->ofproto and stores the OpenFlow port number in '*ofp_portp'.
*
* If successful, returns 0 and stores the network device in '*netdevp'. On
* failure, returns a positive errno value and stores NULL in '*netdevp'. */
struct port *port;
int error;
- /* Do the bits that can fail up front.
- *
- * It's a bit dangerous to call bridge_run_fast() here as ofproto's
- * internal datastructures may not be consistent. Eventually, when port
- * additions and deletions are cheaper, these calls should be removed. */
- bridge_run_fast();
+ /* 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);
- bridge_run_fast();
if (error) {
iface_set_ofport(iface_cfg, OFPP_NONE);
iface_clear_db_record(iface_cfg);
}
}
-static inline const char *
+static const char *
ofp12_controller_role_to_str(enum ofp12_controller_role role)
{
switch (role) {
}
}
\f
-/* Performs periodic activity required by bridges that needs to be done with
- * the least possible latency.
- *
- * It makes sense to call this function a couple of times per poll loop, to
- * provide a significant performance boost on some benchmarks with ofprotos
- * that use the ofproto-dpif implementation. */
-void
-bridge_run_fast(void)
+static void
+bridge_run__(void)
{
+ struct bridge *br;
struct sset types;
const char *type;
- struct bridge *br;
+ /* Let each datapath type do the work that it needs to do. */
sset_init(&types);
ofproto_enumerate_types(&types);
SSET_FOR_EACH (type, &types) {
- ofproto_type_run_fast(type);
+ ofproto_type_run(type);
}
sset_destroy(&types);
+ /* Let each bridge do the work that it needs to do. */
HMAP_FOR_EACH (br, node, &all_bridges) {
- ofproto_run_fast(br->ofproto);
+ ofproto_run(br->ofproto);
}
}
{
static struct ovsrec_open_vswitch null_cfg;
const struct ovsrec_open_vswitch *cfg;
- struct sset types;
- const char *type;
bool vlan_splinters_changed;
struct bridge *br;
"flow-restore-wait", false));
}
- /* Let each datapath type do the work that it needs to do. */
- sset_init(&types);
- ofproto_enumerate_types(&types);
- SSET_FOR_EACH (type, &types) {
- ofproto_type_run(type);
- }
- sset_destroy(&types);
-
- /* Let each bridge do the work that it needs to do. */
- HMAP_FOR_EACH (br, node, &all_bridges) {
- ofproto_run(br->ofproto);
- }
+ bridge_run__();
/* 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
bridge_get_memory_usage(struct simap *usage)
{
struct bridge *br;
+ struct sset types;
+ const char *type;
+
+ sset_init(&types);
+ ofproto_enumerate_types(&types);
+ SSET_FOR_EACH (type, &types) {
+ ofproto_type_get_memory_usage(type, usage);
+ }
+ sset_destroy(&types);
HMAP_FOR_EACH (br, node, &all_bridges) {
ofproto_get_memory_usage(br->ofproto, usage);
/* Set Ethernet address of 'iface', if one is specified in the configuration
* file. */
static void
-iface_set_mac(struct iface *iface)
+iface_set_mac(struct iface *iface, const uint8_t *mac)
{
uint8_t ea[ETH_ADDR_LEN];
- if (!strcmp(iface->type, "internal")
- && iface->cfg->mac && eth_addr_from_string(iface->cfg->mac, ea)) {
+ if (strcmp(iface->type, "internal")) {
+ return;
+ }
+
+ if (iface->cfg->mac && eth_addr_from_string(iface->cfg->mac, ea)) {
+ mac = ea;
+ }
+
+ if (mac) {
if (iface->ofp_port == OFPP_LOCAL) {
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(ea)) {
+ } 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, ea);
+ int error = netdev_set_etheraddr(iface->netdev, mac);
if (error) {
VLOG_ERR("interface %s: setting MAC failed (%s)",
iface->name, ovs_strerror(error));
git://git.onelab.eu / sliver-openvswitch.git / blobdiff