X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=1145e98db5efcae89d17e077141939acdbc6fb56;hp=6f573df89058fe39ce69f31c0153383488c90dfb;hb=12eb035b810ff9d537d6ff9f1eb8ad5564c1f644;hpb=4e022ec09e14ac89add74c1b4b8e3ff3873edbf0 diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 6f573df89..1145e98db 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. +/* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,10 +18,11 @@ #include #include #include +#include "async-append.h" #include "bfd.h" #include "bitmap.h" -#include "bond.h" #include "cfm.h" +#include "connectivity.h" #include "coverage.h" #include "daemon.h" #include "dirs.h" @@ -38,8 +39,10 @@ #include "ofp-print.h" #include "ofp-util.h" #include "ofpbuf.h" +#include "ofproto/bond.h" #include "ofproto/ofproto.h" #include "poll-loop.h" +#include "seq.h" #include "sha1.h" #include "shash.h" #include "smap.h" @@ -62,33 +65,21 @@ VLOG_DEFINE_THIS_MODULE(bridge); COVERAGE_DEFINE(bridge_reconfigure); -/* Configuration of an uninstantiated iface. */ -struct if_cfg { - struct hmap_node hmap_node; /* Node in bridge's if_cfg_todo. */ - const struct ovsrec_interface *cfg; /* Interface record. */ - const struct ovsrec_port *parent; /* Parent port record. */ - ofp_port_t ofport; /* Requested OpenFlow port number. */ -}; - -/* OpenFlow port slated for removal from ofproto. */ -struct ofpp_garbage { - struct list list_node; /* Node in bridge's ofpp_garbage. */ - ofp_port_t ofp_port; /* Port to be deleted. */ -}; - struct iface { - /* These members are always valid. */ + /* These members are always valid. + * + * They are immutable: they never change between iface_create() and + * iface_destroy(). */ struct 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. */ char *name; /* Host network device name. */ - - /* These members are valid only after bridge_reconfigure() causes them to - * be initialized. */ - struct hmap_node ofp_port_node; /* In struct bridge's "ifaces" hmap. */ - ofp_port_t ofp_port; /* OpenFlow port number, */ - /* OFPP_NONE if unknown. */ struct netdev *netdev; /* Network device. */ + ofp_port_t ofp_port; /* OpenFlow port number. */ + uint64_t change_seq; + + /* These members are valid only within bridge_reconfigure(). */ const char *type; /* Usually same as cfg->type. */ const struct ovsrec_interface *cfg; }; @@ -129,13 +120,12 @@ struct bridge { struct hmap ifaces; /* "struct iface"s indexed by ofp_port. */ struct hmap iface_by_name; /* "struct iface"s indexed by name. */ - struct list ofpp_garbage; /* "struct ofpp_garbage" slated for removal. */ - struct hmap if_cfg_todo; /* "struct if_cfg"s slated for creation. - Indexed on 'cfg->name'. */ - /* Port mirroring. */ struct hmap mirrors; /* "struct mirror" indexed by UUID. */ + /* Used during reconfiguration. */ + struct shash wanted_ports; + /* Synthetic local port if necessary. */ struct ovsrec_port synth_local_port; struct ovsrec_interface synth_local_iface; @@ -168,10 +158,37 @@ static struct ovsdb_idl_txn *daemonize_txn; /* Most recently processed IDL sequence number. */ static unsigned int idl_seqno; +/* Track changes to port connectivity. */ +static uint64_t connectivity_seqno = LLONG_MIN; + +/* Status update to database. + * + * Some information in the database must be kept as up-to-date as possible to + * allow controllers to respond rapidly to network outages. Those status are + * updated via the 'status_txn'. + * + * We use the global connectivity sequence number to detect the status change. + * Also, to prevent the status update from sending too much to the database, + * we check the return status of each update transaction and do not start new + * update if the previous transaction status is 'TXN_INCOMPLETE'. + * + * 'statux_txn' is NULL if there is no ongoing status update. + */ +static struct ovsdb_idl_txn *status_txn; + +/* When the status update transaction returns 'TXN_INCOMPLETE', should register a + * timeout in 'STATUS_CHECK_AGAIN_MSEC' to check again. */ +#define STATUS_CHECK_AGAIN_MSEC 100 + /* Each time this timer expires, the bridge fetches interface and mirror * statistics and pushes them into the database. */ -#define IFACE_STATS_INTERVAL (5 * 1000) /* In milliseconds. */ -static long long int iface_stats_timer = LLONG_MIN; +static int stats_timer_interval; +static long long int stats_timer = LLONG_MIN; + +/* Set to true to allow experimental use of OpenFlow 1.4. + * This is false initially because OpenFlow 1.4 is not yet safe to use: it can + * abort due to unimplemented features. */ +static bool allow_of14; /* In some datapaths, creating and destroying OpenFlow ports can be extremely * expensive. This can cause bridge_reconfigure() to take a long time during @@ -182,10 +199,9 @@ static long long int iface_stats_timer = LLONG_MIN; * This allows the rest of the code to catch up on important things like * forwarding packets. */ #define OFP_PORT_ACTION_WINDOW 10 -static bool reconfiguring = false; static void add_del_bridges(const struct ovsrec_open_vswitch *); -static void bridge_update_ofprotos(void); +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); @@ -193,9 +209,16 @@ 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_add_del_ports(struct bridge *, - const unsigned long int *splinter_vlans); -static void bridge_refresh_ofp_port(struct bridge *); +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_del_ports(struct bridge *, + const struct shash *wanted_ports); +static void bridge_add_ports(struct bridge *, + const struct shash *wanted_ports); + static void bridge_configure_datapath_id(struct bridge *); static void bridge_configure_netflow(struct bridge *); static void bridge_configure_forward_bpdu(struct bridge *); @@ -214,9 +237,6 @@ static void bridge_pick_local_hw_addr(struct bridge *, static uint64_t bridge_pick_datapath_id(struct bridge *, const uint8_t bridge_ea[ETH_ADDR_LEN], struct iface *hw_addr_iface); -static void bridge_queue_if_cfg(struct bridge *, - const struct ovsrec_interface *, - const struct ovsrec_port *); static uint64_t dpid_from_hash(const void *, size_t nbytes); static bool bridge_has_bond_fake_iface(const struct bridge *, const char *name); @@ -245,27 +265,30 @@ static bool mirror_configure(struct mirror *); static void mirror_refresh_stats(struct mirror *); static void iface_configure_lacp(struct iface *, struct lacp_slave_settings *); -static bool iface_create(struct bridge *, struct if_cfg *, - ofp_port_t ofp_port); +static bool iface_create(struct bridge *, const struct ovsrec_interface *, + const struct ovsrec_port *); static bool iface_is_internal(const struct ovsrec_interface *iface, const struct ovsrec_bridge *br); static const char *iface_get_type(const struct ovsrec_interface *, const struct ovsrec_bridge *); static void iface_destroy(struct iface *); +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 if_cfg *if_cfg_lookup(const struct bridge *, 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(const struct bridge *, const struct port *, struct iface *); 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 *); static void iface_configure_cfm(struct iface *); static void iface_refresh_cfm_stats(struct iface *); static void iface_refresh_stats(struct iface *); -static void iface_refresh_status(struct iface *); +static void iface_refresh_netdev_status(struct iface *); +static void iface_refresh_ofproto_status(struct iface *); static bool iface_is_synthetic(const struct iface *); +static ofp_port_t iface_get_requested_ofp_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.) @@ -358,7 +381,6 @@ bridge_init(const char *remote) 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); @@ -366,6 +388,7 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_link_state); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_link_resets); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_mac_in_use); + ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_ifindex); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_mtu); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_ofport); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_statistics); @@ -373,6 +396,7 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_fault); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_fault_status); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_remote_mpids); + ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_flap_count); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_health); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_remote_opstate); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_bfd_status); @@ -428,6 +452,14 @@ bridge_exit(void) ovsdb_idl_destroy(idl); } +/* Enables use of OpenFlow 1.4. This is off by default because OpenFlow 1.4 is + * not yet safe to use: it can abort due to unimplemented features. */ +void +bridge_enable_of14(void) +{ + allow_of14 = true; +} + /* Looks at the list of managers in 'ovs_cfg' and extracts their remote IP * addresses and ports into '*managersp' and '*n_managersp'. The caller is * responsible for freeing '*managersp' (with free()). @@ -468,13 +500,12 @@ collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg, managers = xmalloc(sset_count(&targets) * sizeof *managers); SSET_FOR_EACH (target, &targets) { - struct sockaddr_in *sin = &managers[n_managers]; + struct sockaddr_storage ss; - if (stream_parse_target_with_default_ports(target, - JSONRPC_TCP_PORT, - JSONRPC_SSL_PORT, - sin)) { - n_managers++; + if (stream_parse_target_with_default_port(target, OVSDB_OLD_PORT, + &ss) + && ss.ss_family == AF_INET) { + managers[n_managers++] = *(struct sockaddr_in *) &ss; } } } @@ -488,110 +519,78 @@ static void bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) { unsigned long int *splinter_vlans; - struct bridge *br; + struct sockaddr_in *managers; + struct bridge *br, *next; + int sflow_bridge_number; + size_t n_managers; COVERAGE_INC(bridge_reconfigure); - ovs_assert(!reconfiguring); - reconfiguring = true; + ofproto_set_flow_limit(smap_get_int(&ovs_cfg->other_config, "flow-limit", + OFPROTO_FLOW_LIMIT_DEFAULT)); + ofproto_set_max_idle(smap_get_int(&ovs_cfg->other_config, "max-idle", + OFPROTO_MAX_IDLE_DEFAULT)); - ofproto_set_flow_eviction_threshold( - smap_get_int(&ovs_cfg->other_config, "flow-eviction-threshold", - OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT)); + 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)); /* Destroy "struct bridge"s, "struct port"s, and "struct iface"s according - * to 'ovs_cfg' while update the "if_cfg_queue", with only very minimal - * configuration otherwise. + * to 'ovs_cfg', with only very minimal configuration otherwise. * * 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_add_del_ports(br, splinter_vlans); + bridge_collect_wanted_ports(br, splinter_vlans, &br->wanted_ports); + bridge_del_ports(br, &br->wanted_ports); } free(splinter_vlans); - /* Delete datapaths that are no longer configured, and create ones which - * don't exist but should. */ - bridge_update_ofprotos(); - - /* Make sure each "struct iface" has a correct ofp_port in its ofproto. */ - HMAP_FOR_EACH (br, node, &all_bridges) { - bridge_refresh_ofp_port(br); - } - - /* Clear database records for "if_cfg"s which haven't been instantiated. */ + /* Start pushing configuration changes down to the ofproto layer: + * + * - Delete ofprotos that are no longer configured. + * + * - Delete ports that are no longer configured. + * + * - Reconfigure existing ports to their desired configurations, or + * delete them if not possible. + * + * We have to do all the deletions before we can do any additions, because + * the ports to be added might require resources that will be freed up by + * deletions (they might especially overlap in name). */ + bridge_delete_ofprotos(); HMAP_FOR_EACH (br, node, &all_bridges) { - struct if_cfg *if_cfg; - - HMAP_FOR_EACH (if_cfg, hmap_node, &br->if_cfg_todo) { - iface_clear_db_record(if_cfg->cfg); + if (br->ofproto) { + bridge_delete_or_reconfigure_ports(br); } } - reconfigure_system_stats(ovs_cfg); -} - -static bool -bridge_reconfigure_ofp(void) -{ - long long int deadline; - struct bridge *br; - - time_refresh(); - deadline = time_msec() + OFP_PORT_ACTION_WINDOW; + /* Finish pushing configuration changes to the ofproto layer: + * + * - Create ofprotos that are missing. + * + * - Add ports that are missing. */ + HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { + if (!br->ofproto) { + int error; - /* The kernel will reject any attempt to add a given port to a datapath if - * that port already belongs to a different datapath, so we must do all - * port deletions before any port additions. */ - HMAP_FOR_EACH (br, node, &all_bridges) { - struct ofpp_garbage *garbage, *next; - - LIST_FOR_EACH_SAFE (garbage, next, list_node, &br->ofpp_garbage) { - /* 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(); - ofproto_port_del(br->ofproto, garbage->ofp_port); - list_remove(&garbage->list_node); - free(garbage); - - time_refresh(); - if (time_msec() >= deadline) { - return false; + error = ofproto_create(br->name, br->type, &br->ofproto); + if (error) { + VLOG_ERR("failed to create bridge %s: %s", br->name, + ovs_strerror(error)); + shash_destroy(&br->wanted_ports); + bridge_destroy(br); } - bridge_run_fast(); } } - HMAP_FOR_EACH (br, node, &all_bridges) { - struct if_cfg *if_cfg, *next; - - HMAP_FOR_EACH_SAFE (if_cfg, next, hmap_node, &br->if_cfg_todo) { - iface_create(br, if_cfg, OFPP_NONE); - time_refresh(); - if (time_msec() >= deadline) { - return false; - } - } + bridge_add_ports(br, &br->wanted_ports); + shash_destroy(&br->wanted_ports); } - return true; -} - -static bool -bridge_reconfigure_continue(const struct ovsrec_open_vswitch *ovs_cfg) -{ - struct sockaddr_in *managers; - int sflow_bridge_number; - size_t n_managers; - struct bridge *br; - bool done; - - ovs_assert(reconfiguring); - done = bridge_reconfigure_ofp(); + reconfigure_system_stats(ovs_cfg); /* Complete the configuration. */ sflow_bridge_number = 0; @@ -609,9 +608,10 @@ bridge_reconfigure_continue(const struct ovsrec_open_vswitch *ovs_cfg) port_configure(port); LIST_FOR_EACH (iface, port_elem, &port->ifaces) { + iface_set_ofport(iface->cfg, iface->ofp_port); iface_configure_cfm(iface); iface_configure_qos(iface, port->cfg->qos); - iface_set_mac(iface); + iface_set_mac(br, port, iface); ofproto_port_set_bfd(br->ofproto, iface->ofp_port, &iface->cfg->bfd); } @@ -626,25 +626,23 @@ bridge_reconfigure_continue(const struct ovsrec_open_vswitch *ovs_cfg) bridge_configure_stp(br); bridge_configure_tables(br); bridge_configure_dp_desc(br); - - if (smap_get(&br->cfg->other_config, "flow-eviction-threshold")) { - /* XXX: Remove this warning message eventually. */ - VLOG_WARN_ONCE("As of June 2013, flow-eviction-threshold has been" - " moved to the Open_vSwitch table. Ignoring its" - " setting in the bridge table."); - } } free(managers); - return done; + /* 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 * ofprotos which don't exist but need to. */ static void -bridge_update_ofprotos(void) +bridge_delete_ofprotos(void) { - struct bridge *br, *next; + struct bridge *br; struct sset names; struct sset types; const char *type; @@ -666,44 +664,185 @@ bridge_update_ofprotos(void) } sset_destroy(&names); sset_destroy(&types); +} - /* Add ofprotos for bridges which don't have one yet. */ - HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { - struct bridge *br2; - int error; +static ofp_port_t * +add_ofp_port(ofp_port_t port, ofp_port_t *ports, size_t *n, size_t *allocated) +{ + if (*n >= *allocated) { + ports = x2nrealloc(ports, allocated, sizeof *ports); + } + ports[(*n)++] = port; + return ports; +} - if (br->ofproto) { - continue; - } +static void +bridge_delete_or_reconfigure_ports(struct bridge *br) +{ + struct ofproto_port ofproto_port; + struct ofproto_port_dump dump; - /* Remove ports from any datapath with the same name as 'br'. If we - * don't do this, creating 'br''s ofproto will fail because a port with - * the same name as its local port already exists. */ - HMAP_FOR_EACH (br2, node, &all_bridges) { - struct ofproto_port ofproto_port; + struct sset ofproto_ports; + struct port *port, *port_next; + + /* List of "ofp_port"s to delete. We make a list instead of deleting them + * right away because ofproto implementations aren't necessarily able to + * iterate through a changing list of ports in an entirely robust way. */ + ofp_port_t *del; + size_t n, allocated; + size_t i; - if (!br2->ofproto) { + del = NULL; + n = allocated = 0; + sset_init(&ofproto_ports); + + /* Main task: Iterate over the ports in 'br->ofproto' and remove the ports + * that are not configured in the database. (This commonly happens when + * ports have been deleted, e.g. with "ovs-vsctl del-port".) + * + * Side tasks: Reconfigure the ports that are still in 'br'. Delete ports + * that have the wrong OpenFlow port number (and arrange to add them back + * with the correct OpenFlow port number). */ + OFPROTO_PORT_FOR_EACH (&ofproto_port, &dump, br->ofproto) { + ofp_port_t requested_ofp_port; + struct iface *iface; + + sset_add(&ofproto_ports, ofproto_port.name); + + iface = iface_lookup(br, ofproto_port.name); + if (!iface) { + /* No such iface is configured, so we should delete this + * ofproto_port. + * + * As a corner case exception, keep the port if it's a bond fake + * interface. */ + if (bridge_has_bond_fake_iface(br, ofproto_port.name) + && !strcmp(ofproto_port.type, "internal")) { continue; } + goto delete; + } - if (!ofproto_port_query_by_name(br2->ofproto, br->name, - &ofproto_port)) { - error = ofproto_port_del(br2->ofproto, ofproto_port.ofp_port); - if (error) { - VLOG_ERR("failed to delete port %s: %s", ofproto_port.name, - strerror(error)); - } - ofproto_port_destroy(&ofproto_port); + if (strcmp(ofproto_port.type, iface->type) + || netdev_set_config(iface->netdev, &iface->cfg->options)) { + /* The interface is the wrong type or can't be configured. + * Delete it. */ + goto delete; + } + + /* If the requested OpenFlow port for 'iface' changed, and it's not + * already the correct port, then we might want to temporarily delete + * this interface, so we can add it back again with the new OpenFlow + * port number. */ + requested_ofp_port = iface_get_requested_ofp_port(iface->cfg); + if (iface->ofp_port != OFPP_LOCAL && + requested_ofp_port != OFPP_NONE && + requested_ofp_port != iface->ofp_port) { + ofp_port_t victim_request; + struct iface *victim; + + /* Check for an existing OpenFlow port currently occupying + * 'iface''s requested port number. If there isn't one, then + * delete this port. Otherwise we need to consider further. */ + victim = iface_from_ofp_port(br, requested_ofp_port); + if (!victim) { + goto delete; + } + + /* 'victim' is a port currently using 'iface''s requested port + * number. Unless 'victim' specifically requested that port + * number, too, then we can delete both 'iface' and 'victim' + * temporarily. (We'll add both of them back again later with new + * OpenFlow port numbers.) + * + * If 'victim' did request port number 'requested_ofp_port', just + * like 'iface', then that's a configuration inconsistency that we + * can't resolve. We might as well let it keep its current port + * number. */ + victim_request = iface_get_requested_ofp_port(victim->cfg); + if (victim_request != requested_ofp_port) { + del = add_ofp_port(victim->ofp_port, del, &n, &allocated); + iface_destroy(victim); + goto delete; } } - error = ofproto_create(br->name, br->type, &br->ofproto); - if (error) { - VLOG_ERR("failed to create bridge %s: %s", br->name, - strerror(error)); - bridge_destroy(br); + /* Keep it. */ + continue; + + delete: + iface_destroy(iface); + del = add_ofp_port(ofproto_port.ofp_port, del, &n, &allocated); + } + for (i = 0; i < n; i++) { + ofproto_port_del(br->ofproto, del[i]); + } + free(del); + + /* Iterate over this module's idea of interfaces in 'br'. Remove any ports + * that we didn't see when we iterated through the datapath, i.e. ports + * that disappeared underneath use. This is an unusual situation, but it + * can happen in some cases: + * + * - An admin runs a command like "ovs-dpctl del-port" (which is a bad + * idea but could happen). + * + * - The port represented a device that disappeared, e.g. a tuntap + * device destroyed via "tunctl -d", a physical Ethernet device + * whose module was just unloaded via "rmmod", or a virtual NIC for a + * VM whose VM was just terminated. */ + HMAP_FOR_EACH_SAFE (port, port_next, hmap_node, &br->ports) { + struct iface *iface, *iface_next; + + LIST_FOR_EACH_SAFE (iface, iface_next, port_elem, &port->ifaces) { + if (!sset_contains(&ofproto_ports, iface->name)) { + iface_destroy__(iface); + } + } + + if (list_is_empty(&port->ifaces)) { + port_destroy(port); } } + sset_destroy(&ofproto_ports); +} + +static void +bridge_add_ports__(struct bridge *br, const struct shash *wanted_ports, + bool with_requested_port) +{ + struct shash_node *port_node; + + SHASH_FOR_EACH (port_node, wanted_ports) { + const struct ovsrec_port *port_cfg = port_node->data; + size_t i; + + for (i = 0; i < port_cfg->n_interfaces; i++) { + const struct ovsrec_interface *iface_cfg = port_cfg->interfaces[i]; + ofp_port_t requested_ofp_port; + + requested_ofp_port = iface_get_requested_ofp_port(iface_cfg); + if ((requested_ofp_port != OFPP_NONE) == with_requested_port) { + struct iface *iface = iface_lookup(br, iface_cfg->name); + + if (!iface) { + iface_create(br, iface_cfg, port_cfg); + } + } + } + } +} + +static void +bridge_add_ports(struct bridge *br, const struct shash *wanted_ports) +{ + /* First add interfaces that request a particular port number. */ + bridge_add_ports__(br, wanted_ports, true); + + /* Then add interfaces that want automatic port number assignment. + * We add these afterward to avoid accidentally taking a specifically + * requested port number. */ + bridge_add_ports__(br, wanted_ports, false); } static void @@ -754,15 +893,16 @@ port_configure(struct port *port) s.vlan_mode = PORT_VLAN_NATIVE_UNTAGGED; } else { /* This "can't happen" because ovsdb-server should prevent it. */ - VLOG_ERR("unknown VLAN mode %s", cfg->vlan_mode); + VLOG_WARN("port %s: unknown VLAN mode %s, falling " + "back to trunk mode", port->name, cfg->vlan_mode); s.vlan_mode = PORT_VLAN_TRUNK; } } else { if (s.vlan >= 0) { s.vlan_mode = PORT_VLAN_ACCESS; if (cfg->n_trunks) { - VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", - port->name); + VLOG_WARN("port %s: ignoring trunks in favor of implicit vlan", + port->name); } } else { s.vlan_mode = PORT_VLAN_TRUNK; @@ -822,7 +962,7 @@ bridge_configure_datapath_id(struct bridge *br) static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "bridge %s: failed to set bridge " "Ethernet address: %s", - br->name, strerror(error)); + br->name, ovs_strerror(error)); } } memcpy(br->ea, ea, ETH_ADDR_LEN); @@ -843,11 +983,17 @@ bridge_configure_datapath_id(struct bridge *br) static uint32_t bridge_get_allowed_versions(struct bridge *br) { + uint32_t allowed_versions; + if (!br->cfg->n_protocols) return 0; - return ofputil_versions_from_strings(br->cfg->protocols, - br->cfg->n_protocols); + allowed_versions = ofputil_versions_from_strings(br->cfg->protocols, + br->cfg->n_protocols); + if (!allow_of14) { + allowed_versions &= ~(1u << OFP14_VERSION); + } + return allowed_versions; } /* Set NetFlow configuration on 'br'. */ @@ -962,28 +1108,44 @@ bridge_configure_sflow(struct bridge *br, int *sflow_bridge_number) sset_destroy(&oso.targets); } +/* Returns whether a IPFIX row is valid. */ +static bool +ovsrec_ipfix_is_valid(const struct ovsrec_ipfix *ipfix) +{ + return ipfix && ipfix->n_targets > 0; +} + +/* Returns whether a Flow_Sample_Collector_Set row is valid. */ +static bool +ovsrec_fscs_is_valid(const struct ovsrec_flow_sample_collector_set *fscs, + const struct bridge *br) +{ + return ovsrec_ipfix_is_valid(fscs->ipfix) && fscs->bridge == br->cfg; +} + /* Set IPFIX configuration on 'br'. */ static void bridge_configure_ipfix(struct bridge *br) { const struct ovsrec_ipfix *be_cfg = br->cfg->ipfix; + bool valid_be_cfg = ovsrec_ipfix_is_valid(be_cfg); const struct ovsrec_flow_sample_collector_set *fe_cfg; struct ofproto_ipfix_bridge_exporter_options be_opts; struct ofproto_ipfix_flow_exporter_options *fe_opts = NULL; size_t n_fe_opts = 0; OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) { - if (fe_cfg->bridge == br->cfg) { + if (ovsrec_fscs_is_valid(fe_cfg, br)) { n_fe_opts++; } } - if (!be_cfg && n_fe_opts == 0) { + if (!valid_be_cfg && n_fe_opts == 0) { ofproto_set_ipfix(br->ofproto, NULL, NULL, 0); return; } - if (be_cfg) { + if (valid_be_cfg) { memset(&be_opts, 0, sizeof be_opts); sset_init(&be_opts.targets); @@ -1000,6 +1162,12 @@ bridge_configure_ipfix(struct bridge *br) if (be_cfg->obs_point_id) { be_opts.obs_point_id = *be_cfg->obs_point_id; } + if (be_cfg->cache_active_timeout) { + be_opts.cache_active_timeout = *be_cfg->cache_active_timeout; + } + if (be_cfg->cache_max_flows) { + be_opts.cache_max_flows = *be_cfg->cache_max_flows; + } } if (n_fe_opts > 0) { @@ -1007,20 +1175,24 @@ bridge_configure_ipfix(struct bridge *br) fe_opts = xcalloc(n_fe_opts, sizeof *fe_opts); opts = fe_opts; OVSREC_FLOW_SAMPLE_COLLECTOR_SET_FOR_EACH(fe_cfg, idl) { - if (fe_cfg->bridge == br->cfg) { + if (ovsrec_fscs_is_valid(fe_cfg, br)) { opts->collector_set_id = fe_cfg->id; sset_init(&opts->targets); sset_add_array(&opts->targets, fe_cfg->ipfix->targets, fe_cfg->ipfix->n_targets); + opts->cache_active_timeout = fe_cfg->ipfix->cache_active_timeout + ? *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++; } } } - ofproto_set_ipfix(br->ofproto, be_cfg ? &be_opts : NULL, fe_opts, + ofproto_set_ipfix(br->ofproto, valid_be_cfg ? &be_opts : NULL, fe_opts, n_fe_opts); - if (be_cfg) { + if (valid_be_cfg) { sset_destroy(&be_opts.targets); } @@ -1209,7 +1381,7 @@ bridge_configure_stp(struct bridge *br) } } - if (bitmap_scan(port_num_bitmap, 0, STP_MAX_PORTS) != STP_MAX_PORTS + if (bitmap_scan(port_num_bitmap, 1, 0, STP_MAX_PORTS) != STP_MAX_PORTS && port_num_counter) { VLOG_ERR("bridge %s: must manually configure all STP port " "IDs or none, disabling", br->name); @@ -1277,156 +1449,26 @@ add_del_bridges(const struct ovsrec_open_vswitch *cfg) shash_destroy(&new_br); } -static void -iface_set_ofp_port(struct iface *iface, ofp_port_t ofp_port) -{ - struct bridge *br = iface->port->bridge; - - ovs_assert(iface->ofp_port == OFPP_NONE && ofp_port != OFPP_NONE); - iface->ofp_port = ofp_port; - hmap_insert(&br->ifaces, &iface->ofp_port_node, - hash_int(ofp_to_u16(ofp_port), 0)); - iface_set_ofport(iface->cfg, ofp_port); -} - /* Configures 'netdev' based on the "options" column in 'iface_cfg'. * Returns 0 if successful, otherwise a positive errno value. */ static int iface_set_netdev_config(const struct ovsrec_interface *iface_cfg, struct netdev *netdev) { - int error; - - error = netdev_set_config(netdev, &iface_cfg->options); - if (error) { - VLOG_WARN("could not configure network device %s (%s)", - iface_cfg->name, strerror(error)); - } - return error; + return netdev_set_config(netdev, &iface_cfg->options); } -/* This function determines whether 'ofproto_port', which is attached to - * br->ofproto's datapath, is one that we want in 'br'. - * - * If it is, it returns true, after creating an iface (if necessary), - * configuring the iface's netdev according to the iface's options, and setting - * iface's ofp_port member to 'ofproto_port->ofp_port'. - * - * If, on the other hand, 'port' should be removed, it returns false. The - * caller should later detach the port from br->ofproto. */ -static bool -bridge_refresh_one_ofp_port(struct bridge *br, - const struct ofproto_port *ofproto_port) -{ - const char *name = ofproto_port->name; - const char *type = ofproto_port->type; - ofp_port_t ofp_port = ofproto_port->ofp_port; - - struct iface *iface = iface_lookup(br, name); - if (iface) { - /* Check that the name-to-number mapping is one-to-one. */ - if (iface->ofp_port != OFPP_NONE) { - VLOG_WARN("bridge %s: interface %s reported twice", - br->name, name); - return false; - } else if (iface_from_ofp_port(br, ofp_port)) { - VLOG_WARN("bridge %s: interface %"PRIu16" reported twice", - br->name, ofp_port); - return false; - } - - /* There's a configured interface named 'name'. */ - if (strcmp(type, iface->type) - || iface_set_netdev_config(iface->cfg, iface->netdev)) { - /* It's the wrong type, or it's the right type but can't be - * configured as the user requested, so we must destroy it. */ - return false; - } else { - /* It's the right type and configured correctly. Keep it. */ - iface_set_ofp_port(iface, ofp_port); - return true; - } - } else if (bridge_has_bond_fake_iface(br, name) - && !strcmp(type, "internal")) { - /* It's a bond fake iface. Keep it. */ - return true; - } else { - /* There's no configured interface named 'name', but there might be an - * interface of that name queued to be created. - * - * If there is, and it has the correct type, then try to configure it - * and add it. If that's successful, we'll keep it. Otherwise, we'll - * delete it and later try to re-add it. */ - struct if_cfg *if_cfg = if_cfg_lookup(br, name); - return (if_cfg - && !strcmp(type, iface_get_type(if_cfg->cfg, br->cfg)) - && iface_create(br, if_cfg, ofp_port)); - } -} - -/* Update bridges "if_cfg"s, "struct port"s, and "struct iface"s to be - * consistent with the ofp_ports in "br->ofproto". */ -static void -bridge_refresh_ofp_port(struct bridge *br) -{ - struct ofproto_port_dump dump; - struct ofproto_port ofproto_port; - struct port *port, *port_next; - - /* Clear each "struct iface"s ofp_port so we can get its correct value. */ - hmap_clear(&br->ifaces); - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - struct iface *iface; - - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - iface->ofp_port = OFPP_NONE; - } - } - - /* Obtain the correct "ofp_port"s from ofproto. Find any if_cfg's which - * already exist in the datapath and promote them to full fledged "struct - * iface"s. Mark ports in the datapath which don't belong as garbage. */ - OFPROTO_PORT_FOR_EACH (&ofproto_port, &dump, br->ofproto) { - if (!bridge_refresh_one_ofp_port(br, &ofproto_port)) { - struct ofpp_garbage *garbage = xmalloc(sizeof *garbage); - garbage->ofp_port = ofproto_port.ofp_port; - list_push_front(&br->ofpp_garbage, &garbage->list_node); - } - } - - /* Some ifaces may not have "ofp_port"s in ofproto and therefore don't - * deserve to have "struct iface"s. Demote these to "if_cfg"s so that - * later they can be added to ofproto. */ - HMAP_FOR_EACH_SAFE (port, port_next, hmap_node, &br->ports) { - struct iface *iface, *iface_next; - - LIST_FOR_EACH_SAFE (iface, iface_next, port_elem, &port->ifaces) { - if (iface->ofp_port == OFPP_NONE) { - bridge_queue_if_cfg(br, iface->cfg, port->cfg); - iface_destroy(iface); - } - } - - if (list_is_empty(&port->ifaces)) { - port_destroy(port); - } - } -} - -/* 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'. */ static int iface_do_create(const struct bridge *br, - const struct if_cfg *if_cfg, + const struct ovsrec_interface *iface_cfg, + const struct ovsrec_port *port_cfg, ofp_port_t *ofp_portp, struct netdev **netdevp) { - const struct ovsrec_interface *iface_cfg = if_cfg->cfg; - const struct ovsrec_port *port_cfg = if_cfg->parent; struct netdev *netdev = NULL; int error; @@ -1441,7 +1483,7 @@ iface_do_create(const struct bridge *br, iface_get_type(iface_cfg, br->cfg), &netdev); if (error) { VLOG_WARN("could not open network device %s (%s)", - iface_cfg->name, strerror(error)); + iface_cfg->name, ovs_strerror(error)); goto error; } @@ -1450,24 +1492,16 @@ iface_do_create(const struct bridge *br, goto error; } - if (*ofp_portp == OFPP_NONE) { - ofp_port_t ofp_port = if_cfg->ofport; - - error = ofproto_port_add(br->ofproto, netdev, &ofp_port); - if (error) { - goto error; - } - *ofp_portp = ofp_port; - - VLOG_INFO("bridge %s: added interface %s on port %d", - br->name, iface_cfg->name, *ofp_portp); - } else { - VLOG_DBG("bridge %s: interface %s is on port %d", - br->name, iface_cfg->name, *ofp_portp); + *ofp_portp = iface_pick_ofport(iface_cfg); + error = ofproto_port_add(br->ofproto, netdev, ofp_portp); + if (error) { + goto error; } - if ((port_cfg->vlan_mode && !strcmp(port_cfg->vlan_mode, "splinter")) - || iface_is_internal(iface_cfg, br->cfg)) { + 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); } @@ -1487,31 +1521,21 @@ error: * * Return true if an iface is successfully created, false otherwise. */ static bool -iface_create(struct bridge *br, struct if_cfg *if_cfg, ofp_port_t ofp_port) +iface_create(struct bridge *br, const struct ovsrec_interface *iface_cfg, + const struct ovsrec_port *port_cfg) { - const struct ovsrec_interface *iface_cfg = if_cfg->cfg; - const struct ovsrec_port *port_cfg = if_cfg->parent; - struct netdev *netdev; struct iface *iface; + ofp_port_t ofp_port; struct port *port; int error; - bool ok = true; - /* 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, if_cfg, &ofp_port, &netdev); - bridge_run_fast(); + error = iface_do_create(br, iface_cfg, port_cfg, &ofp_port, &netdev); if (error) { - iface_set_ofport(iface_cfg, OFPP_NONE); iface_clear_db_record(iface_cfg); - ok = false; - goto done; + return false; } /* Get or create the port structure. */ @@ -1527,16 +1551,16 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, ofp_port_t ofp_port) hash_string(iface_cfg->name, 0)); iface->port = port; iface->name = xstrdup(iface_cfg->name); - iface->ofp_port = OFPP_NONE; + iface->ofp_port = ofp_port; iface->netdev = netdev; iface->type = iface_get_type(iface_cfg, br->cfg); iface->cfg = iface_cfg; - - iface_set_ofp_port(iface, ofp_port); + hmap_insert(&br->ifaces, &iface->ofp_port_node, + hash_ofp_port(ofp_port)); /* Populate initial status in database. */ iface_refresh_stats(iface); - iface_refresh_status(iface); + iface_refresh_netdev_status(iface); /* Add bond fake iface if necessary. */ if (port_is_bond_fake_iface(port)) { @@ -1549,13 +1573,12 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, ofp_port_t ofp_port) error = netdev_open(port->name, "internal", &netdev); if (!error) { - ofp_port_t fake_ofp_port = if_cfg->ofport; - + ofp_port_t fake_ofp_port = OFPP_NONE; ofproto_port_add(br->ofproto, netdev, &fake_ofp_port); netdev_close(netdev); } else { VLOG_WARN("could not open network device %s (%s)", - port->name, strerror(error)); + port->name, ovs_strerror(error)); } } else { /* Already exists, nothing to do. */ @@ -1563,11 +1586,7 @@ iface_create(struct bridge *br, struct if_cfg *if_cfg, ofp_port_t ofp_port) } } -done: - hmap_remove(&br->if_cfg_todo, &if_cfg->hmap_node); - free(if_cfg); - - return ok; + return true; } /* Set forward BPDU option. */ @@ -1604,31 +1623,15 @@ bridge_configure_mac_table(struct bridge *br) } static void -bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], - struct iface **hw_addr_iface) +find_local_hw_addr(const struct bridge *br, uint8_t ea[ETH_ADDR_LEN], + const struct port *fake_br, struct iface **hw_addr_iface) { struct hmapx mirror_output_ports; - const char *hwaddr; struct port *port; bool found_addr = false; int error; int i; - *hw_addr_iface = NULL; - - /* 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)) { - 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)) { - VLOG_ERR("bridge %s: cannot set MAC address to zero", br->name); - } else { - return; - } - } - /* Mirror output ports don't participate in picking the local hardware * address. ofproto can't help us find out whether a given port is a * mirror output because we haven't configured mirrors yet, so we need to @@ -1684,6 +1687,16 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], continue; } + /* For fake bridges we only choose from ports with the same tag */ + if (fake_br && fake_br->cfg && fake_br->cfg->tag) { + if (!port->cfg->tag) { + continue; + } + if (*port->cfg->tag != *fake_br->cfg->tag) { + continue; + } + } + /* Grab MAC. */ error = netdev_get_etheraddr(iface->netdev, iface_ea); if (error) { @@ -1712,6 +1725,30 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], hmapx_destroy(&mirror_output_ports); } +static void +bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], + struct iface **hw_addr_iface) +{ + const char *hwaddr; + *hw_addr_iface = NULL; + + /* 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)) { + 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)) { + VLOG_ERR("bridge %s: cannot set MAC address to zero", br->name); + } else { + return; + } + } + + /* Find a local hw address */ + find_local_hw_addr(br, ea, NULL, hw_addr_iface); +} + /* Choose and returns the datapath ID for bridge 'br' given that the bridge * Ethernet address is 'bridge_ea'. If 'bridge_ea' is the Ethernet address of * an interface on 'br', then that interface must be passed in as @@ -1781,21 +1818,27 @@ dpid_from_hash(const void *data, size_t n) } static void -iface_refresh_status(struct iface *iface) +iface_refresh_netdev_status(struct iface *iface) { struct smap smap; enum netdev_features current; - int64_t bps; - int mtu; - int64_t mtu_64; + enum netdev_flags flags; + const char *link_state; uint8_t mac[ETH_ADDR_LEN]; - int error; + int64_t bps, mtu_64, ifindex64, link_resets; + int mtu, error; if (iface_is_synthetic(iface)) { return; } + if (iface->change_seq == netdev_get_change_seq(iface->netdev)) { + return; + } + + iface->change_seq = netdev_get_change_seq(iface->netdev); + smap_init(&smap); if (!netdev_get_status(iface->netdev, &smap)) { @@ -1806,6 +1849,21 @@ iface_refresh_status(struct iface *iface) smap_destroy(&smap); + error = netdev_get_flags(iface->netdev, &flags); + if (!error) { + const char *state = flags & NETDEV_UP ? "up" : "down"; + + ovsrec_interface_set_admin_state(iface->cfg, state); + } else { + ovsrec_interface_set_admin_state(iface->cfg, NULL); + } + + link_state = netdev_get_carrier(iface->netdev) ? "up" : "down"; + ovsrec_interface_set_link_state(iface->cfg, link_state); + + link_resets = netdev_get_carrier_resets(iface->netdev); + ovsrec_interface_set_link_resets(iface->cfg, &link_resets, 1); + error = netdev_get_features(iface->netdev, ¤t, NULL, NULL, NULL); bps = !error ? netdev_features_to_bps(current, 0) : 0; if (bps) { @@ -1835,6 +1893,44 @@ iface_refresh_status(struct iface *iface) } else { ovsrec_interface_set_mac_in_use(iface->cfg, NULL); } + + /* The netdev may return a negative number (such as -EOPNOTSUPP) + * if there is no valid ifindex number. */ + ifindex64 = netdev_get_ifindex(iface->netdev); + if (ifindex64 < 0) { + ifindex64 = 0; + } + ovsrec_interface_set_ifindex(iface->cfg, &ifindex64, 1); +} + +static void +iface_refresh_ofproto_status(struct iface *iface) +{ + struct smap smap; + int current, error; + + if (iface_is_synthetic(iface)) { + return; + } + + current = ofproto_port_is_lacp_current(iface->port->bridge->ofproto, + iface->ofp_port); + if (current >= 0) { + bool bl = current; + ovsrec_interface_set_lacp_current(iface->cfg, &bl, 1); + } else { + ovsrec_interface_set_lacp_current(iface->cfg, NULL, 0); + } + + iface_refresh_cfm_stats(iface); + + smap_init(&smap); + error = ofproto_port_get_bfd_status(iface->port->bridge->ofproto, + iface->ofp_port, &smap); + if (error >= 0) { + ovsrec_interface_set_bfd_status(iface->cfg, &smap); + } + smap_destroy(&smap); } /* Writes 'iface''s CFM statistics to the database. 'iface' must not be @@ -1844,17 +1940,23 @@ iface_refresh_cfm_stats(struct iface *iface) { const struct ovsrec_interface *cfg = iface->cfg; struct ofproto_cfm_status status; + int error; - if (!ofproto_port_get_cfm_status(iface->port->bridge->ofproto, - iface->ofp_port, &status)) { + error = ofproto_port_get_cfm_status(iface->port->bridge->ofproto, + iface->ofp_port, &status); + if (error < 0) { + /* Do nothing if there is no status change since last update. */ + } else if (error > 0) { ovsrec_interface_set_cfm_fault(cfg, NULL, 0); ovsrec_interface_set_cfm_fault_status(cfg, NULL, 0); ovsrec_interface_set_cfm_remote_opstate(cfg, NULL); + ovsrec_interface_set_cfm_flap_count(cfg, NULL, 0); ovsrec_interface_set_cfm_health(cfg, NULL, 0); ovsrec_interface_set_cfm_remote_mpids(cfg, NULL, 0); } else { const char *reasons[CFM_FAULT_N_REASONS]; int64_t cfm_health = status.health; + int64_t cfm_flap_count = status.flap_count; bool faulted = status.faults != 0; size_t i, j; @@ -1869,6 +1971,8 @@ iface_refresh_cfm_stats(struct iface *iface) } ovsrec_interface_set_cfm_fault_status(cfg, (char **) reasons, j); + ovsrec_interface_set_cfm_flap_count(cfg, &cfm_flap_count, 1); + if (status.remote_opstate >= 0) { const char *remote_opstate = status.remote_opstate ? "up" : "down"; ovsrec_interface_set_cfm_remote_opstate(cfg, remote_opstate); @@ -1884,6 +1988,8 @@ iface_refresh_cfm_stats(struct iface *iface) } else { ovsrec_interface_set_cfm_health(cfg, NULL, 0); } + + free(status.rmps); } } @@ -1964,14 +2070,51 @@ br_refresh_stp_status(struct bridge *br) } static void -port_refresh_stp_status(struct port *port) +port_refresh_stp_status(struct port *port) +{ + struct ofproto *ofproto = port->bridge->ofproto; + struct iface *iface; + struct ofproto_port_stp_status status; + struct smap smap; + + if (port_is_synthetic(port)) { + return; + } + + /* STP doesn't currently support bonds. */ + if (!list_is_singleton(&port->ifaces)) { + ovsrec_port_set_status(port->cfg, NULL); + return; + } + + iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem); + if (ofproto_port_get_stp_status(ofproto, iface->ofp_port, &status)) { + return; + } + + if (!status.enabled) { + ovsrec_port_set_status(port->cfg, NULL); + return; + } + + /* Set Status column. */ + smap_init(&smap); + smap_add_format(&smap, "stp_port_id", STP_PORT_ID_FMT, status.port_id); + smap_add(&smap, "stp_state", stp_state_name(status.state)); + smap_add_format(&smap, "stp_sec_in_state", "%u", status.sec_in_state); + smap_add(&smap, "stp_role", stp_role_name(status.role)); + ovsrec_port_set_status(port->cfg, &smap); + smap_destroy(&smap); +} + +static void +port_refresh_stp_stats(struct port *port) { struct ofproto *ofproto = port->bridge->ofproto; struct iface *iface; - struct ofproto_port_stp_status status; + struct ofproto_port_stp_stats stats; char *keys[3]; int64_t int_values[3]; - struct smap smap; if (port_is_synthetic(port)) { return; @@ -1979,38 +2122,26 @@ port_refresh_stp_status(struct port *port) /* STP doesn't currently support bonds. */ if (!list_is_singleton(&port->ifaces)) { - ovsrec_port_set_status(port->cfg, NULL); return; } iface = CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem); - - if (ofproto_port_get_stp_status(ofproto, iface->ofp_port, &status)) { + if (ofproto_port_get_stp_stats(ofproto, iface->ofp_port, &stats)) { return; } - if (!status.enabled) { - ovsrec_port_set_status(port->cfg, NULL); + if (!stats.enabled) { ovsrec_port_set_statistics(port->cfg, NULL, NULL, 0); return; } - /* Set Status column. */ - smap_init(&smap); - smap_add_format(&smap, "stp_port_id", STP_PORT_ID_FMT, status.port_id); - smap_add(&smap, "stp_state", stp_state_name(status.state)); - smap_add_format(&smap, "stp_sec_in_state", "%u", status.sec_in_state); - smap_add(&smap, "stp_role", stp_role_name(status.role)); - ovsrec_port_set_status(port->cfg, &smap); - smap_destroy(&smap); - /* Set Statistics column. */ keys[0] = "stp_tx_count"; - int_values[0] = status.tx_count; + int_values[0] = stats.tx_count; keys[1] = "stp_rx_count"; - int_values[1] = status.rx_count; + int_values[1] = stats.rx_count; keys[2] = "stp_error_count"; - int_values[2] = status.error_count; + int_values[2] = stats.error_count; ovsrec_port_set_statistics(port->cfg, keys, int_values, ARRAY_SIZE(int_values)); @@ -2055,7 +2186,7 @@ run_system_stats(void) } } -static inline const char * +static const char * ofp12_controller_role_to_str(enum ofp12_controller_role role) { switch (role) { @@ -2115,158 +2246,24 @@ refresh_controller_status(void) ofproto_free_ofproto_controller_info(&info); } -/* "Instant" stats. - * - * Some information in the database must be kept as up-to-date as possible to - * allow controllers to respond rapidly to network outages. We call these - * statistics "instant" stats. - * - * We wish to update these statistics every INSTANT_INTERVAL_MSEC milliseconds, - * assuming that they've changed. The only means we have to determine whether - * they have changed are: - * - * - Try to commit changes to the database. If nothing changed, then - * ovsdb_idl_txn_commit() returns TXN_UNCHANGED, otherwise some other - * value. - * - * - instant_stats_run() is called late in the run loop, after anything that - * might change any of the instant stats. - * - * We use these two facts together to avoid waking the process up every - * INSTANT_INTERVAL_MSEC whether there is any change or not. - */ - -/* Minimum interval between writing updates to the instant stats to the - * database. */ -#define INSTANT_INTERVAL_MSEC 100 - -/* Current instant stats database transaction, NULL if there is no ongoing - * transaction. */ -static struct ovsdb_idl_txn *instant_txn; - -/* Next time (in msec on monotonic clock) at which we will update the instant - * stats. */ -static long long int instant_next_txn = LLONG_MIN; - -/* True if the run loop has run since we last saw that the instant stats were - * unchanged, that is, this is true if we need to wake up at 'instant_next_txn' - * to refresh the instant stats. */ -static bool instant_stats_could_have_changed; - -static void -instant_stats_run(void) -{ - enum ovsdb_idl_txn_status status; - - instant_stats_could_have_changed = true; - - if (!instant_txn) { - struct bridge *br; - - if (time_msec() < instant_next_txn) { - return; - } - instant_next_txn = time_msec() + INSTANT_INTERVAL_MSEC; - - instant_txn = ovsdb_idl_txn_create(idl); - HMAP_FOR_EACH (br, node, &all_bridges) { - struct iface *iface; - struct port *port; - - br_refresh_stp_status(br); - - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - port_refresh_stp_status(port); - } - - HMAP_FOR_EACH (iface, name_node, &br->iface_by_name) { - enum netdev_flags flags; - struct smap smap; - const char *link_state; - int64_t link_resets; - int current, error; - - if (iface_is_synthetic(iface)) { - continue; - } - - current = ofproto_port_is_lacp_current(br->ofproto, - iface->ofp_port); - if (current >= 0) { - bool bl = current; - ovsrec_interface_set_lacp_current(iface->cfg, &bl, 1); - } else { - ovsrec_interface_set_lacp_current(iface->cfg, NULL, 0); - } - - error = netdev_get_flags(iface->netdev, &flags); - if (!error) { - const char *state = flags & NETDEV_UP ? "up" : "down"; - ovsrec_interface_set_admin_state(iface->cfg, state); - } else { - ovsrec_interface_set_admin_state(iface->cfg, NULL); - } - - link_state = netdev_get_carrier(iface->netdev) ? "up" : "down"; - ovsrec_interface_set_link_state(iface->cfg, link_state); - - link_resets = netdev_get_carrier_resets(iface->netdev); - ovsrec_interface_set_link_resets(iface->cfg, &link_resets, 1); - - iface_refresh_cfm_stats(iface); - - smap_init(&smap); - if (!ofproto_port_get_bfd_status(br->ofproto, iface->ofp_port, - &smap)) { - ovsrec_interface_set_bfd_status(iface->cfg, &smap); - smap_destroy(&smap); - } - } - } - } - - status = ovsdb_idl_txn_commit(instant_txn); - if (status != TXN_INCOMPLETE) { - ovsdb_idl_txn_destroy(instant_txn); - instant_txn = NULL; - } - if (status == TXN_UNCHANGED) { - instant_stats_could_have_changed = false; - } -} - static void -instant_stats_wait(void) -{ - if (instant_txn) { - ovsdb_idl_txn_wait(instant_txn); - } else if (instant_stats_could_have_changed) { - poll_timer_wait_until(instant_next_txn); - } -} - -/* 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) +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); } } @@ -2275,38 +2272,33 @@ bridge_run(void) { static struct ovsrec_open_vswitch null_cfg; const struct ovsrec_open_vswitch *cfg; - struct ovsdb_idl_txn *reconf_txn = NULL; - struct sset types; - const char *type; bool vlan_splinters_changed; struct bridge *br; + int stats_interval; ovsrec_open_vswitch_init(&null_cfg); - /* (Re)configure if necessary. */ - if (!reconfiguring) { - ovsdb_idl_run(idl); + ovsdb_idl_run(idl); - if (ovsdb_idl_is_lock_contended(idl)) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - struct bridge *br, *next_br; + if (ovsdb_idl_is_lock_contended(idl)) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + struct bridge *br, *next_br; - VLOG_ERR_RL(&rl, "another ovs-vswitchd process is running, " - "disabling this process (pid %ld) until it goes away", - (long int) getpid()); + VLOG_ERR_RL(&rl, "another ovs-vswitchd process is running, " + "disabling this process (pid %ld) until it goes away", + (long int) getpid()); - HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { - bridge_destroy(br); - } - /* 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)) { - return; + HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { + bridge_destroy(br); } + /* 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)) { + return; } cfg = ovsrec_open_vswitch_first(idl); @@ -2323,18 +2315,7 @@ bridge_run(void) "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 @@ -2349,59 +2330,39 @@ bridge_run(void) stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert); } - if (!reconfiguring) { - /* 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) { - 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) { - idl_seqno = ovsdb_idl_get_seqno(idl); - if (cfg) { - reconf_txn = ovsdb_idl_txn_create(idl); - bridge_reconfigure(cfg); - } else { - /* We still need to reconfigure to avoid dangling pointers to - * now-destroyed ovsrec structures inside bridge data. */ - bridge_reconfigure(&null_cfg); + /* 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) { + HMAP_FOR_EACH (br, node, &all_bridges) { + if (ofproto_has_vlan_usage_changed(br->ofproto)) { + vlan_splinters_changed = true; + break; } } } - if (reconfiguring) { - if (!reconf_txn) { - reconf_txn = ovsdb_idl_txn_create(idl); - } - - if (bridge_reconfigure_continue(cfg ? cfg : &null_cfg)) { - reconfiguring = false; + if (ovsdb_idl_get_seqno(idl) != idl_seqno || vlan_splinters_changed) { + struct ovsdb_idl_txn *txn; - if (cfg) { - ovsrec_open_vswitch_set_cur_cfg(cfg, cfg->next_cfg); - } + idl_seqno = ovsdb_idl_get_seqno(idl); + txn = ovsdb_idl_txn_create(idl); + bridge_reconfigure(cfg ? cfg : &null_cfg); - /* If we are completing our initial configuration for this run - * of ovs-vswitchd, then keep the transaction around to monitor - * it for completion. */ - if (!initial_config_done) { - initial_config_done = true; - daemonize_txn = reconf_txn; - reconf_txn = NULL; - } + if (cfg) { + ovsrec_open_vswitch_set_cur_cfg(cfg, cfg->next_cfg); } - } - if (reconf_txn) { - ovsdb_idl_txn_commit(reconf_txn); - ovsdb_idl_txn_destroy(reconf_txn); - reconf_txn = NULL; + /* If we are completing our initial configuration for this run + * of ovs-vswitchd, then keep the transaction around to monitor + * it for completion. */ + if (initial_config_done) { + ovsdb_idl_txn_commit(txn); + ovsdb_idl_txn_destroy(txn); + } else { + initial_config_done = true; + daemonize_txn = txn; + } } if (daemonize_txn) { @@ -2414,12 +2375,23 @@ bridge_run(void) * process that forked us to exit successfully. */ daemonize_complete(); + vlog_enable_async(); + VLOG_INFO_ONCE("%s (Open vSwitch) %s", program_name, VERSION); } } + /* Statistics update interval should always be greater than or equal to + * 5000 ms. */ + stats_interval = MAX(smap_get_int(&cfg->other_config, + "stats-update-interval", 5000), 5000); + if (stats_timer_interval != stats_interval) { + stats_timer_interval = stats_interval; + stats_timer = LLONG_MIN; + } + /* Refresh interface and mirror stats if necessary. */ - if (time_msec() >= iface_stats_timer) { + if (time_msec() >= stats_timer) { if (cfg) { struct ovsdb_idl_txn *txn; @@ -2433,8 +2405,9 @@ bridge_run(void) LIST_FOR_EACH (iface, port_elem, &port->ifaces) { iface_refresh_stats(iface); - iface_refresh_status(iface); } + + port_refresh_stp_stats(port); } HMAP_FOR_EACH (m, hmap_node, &br->mirrors) { @@ -2447,11 +2420,47 @@ bridge_run(void) ovsdb_idl_txn_destroy(txn); /* XXX */ } - iface_stats_timer = time_msec() + IFACE_STATS_INTERVAL; + stats_timer = time_msec() + stats_timer_interval; + } + + if (!status_txn) { + uint64_t seq; + + /* Check the need to update status. */ + seq = seq_read(connectivity_seq_get()); + if (seq != connectivity_seqno) { + connectivity_seqno = seq; + status_txn = ovsdb_idl_txn_create(idl); + HMAP_FOR_EACH (br, node, &all_bridges) { + struct port *port; + + br_refresh_stp_status(br); + HMAP_FOR_EACH (port, hmap_node, &br->ports) { + struct iface *iface; + + port_refresh_stp_status(port); + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { + iface_refresh_netdev_status(iface); + iface_refresh_ofproto_status(iface); + } + } + } + } + } + + if (status_txn) { + enum ovsdb_idl_txn_status status; + + status = ovsdb_idl_txn_commit(status_txn); + /* Do not destroy "status_txn" if the transaction is + * "TXN_INCOMPLETE". */ + if (status != TXN_INCOMPLETE) { + ovsdb_idl_txn_destroy(status_txn); + status_txn = NULL; + } } run_system_stats(); - instant_stats_run(); } void @@ -2465,10 +2474,6 @@ bridge_wait(void) ovsdb_idl_txn_wait(daemonize_txn); } - if (reconfiguring) { - poll_immediate_wake(); - } - sset_init(&types); ofproto_enumerate_types(&types); SSET_FOR_EACH (type, &types) { @@ -2482,11 +2487,21 @@ bridge_wait(void) HMAP_FOR_EACH (br, node, &all_bridges) { ofproto_wait(br->ofproto); } - poll_timer_wait_until(iface_stats_timer); + + poll_timer_wait_until(stats_timer); + } + + /* If the status database transaction is 'TXN_INCOMPLETE' in this run, + * register a timeout in 'STATUS_CHECK_AGAIN_MSEC'. Else, wait on the + * global connectivity sequence number. Note, this also helps batch + * multiple status changes into one transaction. */ + if (status_txn) { + poll_timer_wait_until(time_msec() + STATUS_CHECK_AGAIN_MSEC); + } else { + seq_wait(connectivity_seq_get(), connectivity_seqno); } system_stats_wait(); - instant_stats_wait(); } /* Adds some memory usage statistics for bridges into 'usage', for use with @@ -2495,6 +2510,15 @@ void 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); @@ -2509,13 +2533,11 @@ struct qos_unixctl_show_cbdata { }; static void -qos_unixctl_show_cb(unsigned int queue_id, - const struct smap *details, - void *aux) +qos_unixctl_show_queue(unsigned int queue_id, + const struct smap *details, + struct iface *iface, + struct ds *ds) { - struct qos_unixctl_show_cbdata *data = aux; - struct ds *ds = data->ds; - struct iface *iface = data->iface; struct netdev_queue_stats stats; struct smap_node *node; int error; @@ -2546,7 +2568,7 @@ qos_unixctl_show_cb(unsigned int queue_id, } } else { ds_put_format(ds, "\tFailed to get statistics for queue %u: %s", - queue_id, strerror(error)); + queue_id, ovs_strerror(error)); } } @@ -2559,8 +2581,6 @@ qos_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED, struct iface *iface; const char *type; struct smap_node *node; - struct qos_unixctl_show_cbdata data; - int error; iface = iface_find(argv[1]); if (!iface) { @@ -2571,19 +2591,22 @@ qos_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED, netdev_get_qos(iface->netdev, &type, &smap); 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); SMAP_FOR_EACH (node, &smap) { ds_put_format(&ds, "%s: %s\n", node->key, node->value); } - 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)); + 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); + unixctl_command_reply(conn, ds_cstr(&ds)); } else { ds_put_format(&ds, "QoS not configured on %s\n", iface->name); @@ -2617,9 +2640,6 @@ bridge_create(const struct ovsrec_bridge *br_cfg) hmap_init(&br->iface_by_name); hmap_init(&br->mirrors); - hmap_init(&br->if_cfg_todo); - list_init(&br->ofpp_garbage); - hmap_insert(&all_bridges, &br->node, hash_string(br->name, 0)); } @@ -2629,8 +2649,6 @@ bridge_destroy(struct bridge *br) if (br) { struct mirror *mirror, *next_mirror; struct port *port, *next_port; - struct if_cfg *if_cfg, *next_if_cfg; - struct ofpp_garbage *garbage, *next_garbage; HMAP_FOR_EACH_SAFE (port, next_port, hmap_node, &br->ports) { port_destroy(port); @@ -2638,15 +2656,6 @@ bridge_destroy(struct bridge *br) HMAP_FOR_EACH_SAFE (mirror, next_mirror, hmap_node, &br->mirrors) { mirror_destroy(mirror); } - HMAP_FOR_EACH_SAFE (if_cfg, next_if_cfg, hmap_node, &br->if_cfg_todo) { - hmap_remove(&br->if_cfg_todo, &if_cfg->hmap_node); - free(if_cfg); - } - LIST_FOR_EACH_SAFE (garbage, next_garbage, list_node, - &br->ofpp_garbage) { - list_remove(&garbage->list_node); - free(garbage); - } hmap_remove(&all_bridges, &br->node); ofproto_destroy(br->ofproto); @@ -2654,7 +2663,6 @@ bridge_destroy(struct bridge *br) hmap_destroy(&br->ports); hmap_destroy(&br->iface_by_name); hmap_destroy(&br->mirrors); - hmap_destroy(&br->if_cfg_todo); free(br->name); free(br->type); free(br); @@ -2741,44 +2749,23 @@ bridge_get_controllers(const struct bridge *br, } static void -bridge_queue_if_cfg(struct bridge *br, - const struct ovsrec_interface *cfg, - const struct ovsrec_port *parent) -{ - struct if_cfg *if_cfg = xmalloc(sizeof *if_cfg); - - if_cfg->cfg = cfg; - if_cfg->parent = parent; - if_cfg->ofport = iface_pick_ofport(cfg); - hmap_insert(&br->if_cfg_todo, &if_cfg->hmap_node, - hash_string(if_cfg->cfg->name, 0)); -} - -/* Deletes "struct port"s and "struct iface"s under 'br' which aren't - * consistent with 'br->cfg'. Updates 'br->if_cfg_queue' with interfaces which - * 'br' needs to complete its configuration. */ -static void -bridge_add_del_ports(struct bridge *br, - const unsigned long int *splinter_vlans) +bridge_collect_wanted_ports(struct bridge *br, + const unsigned long int *splinter_vlans, + struct shash *wanted_ports) { - struct shash_node *port_node; - struct port *port, *next; - struct shash new_ports; size_t i; - ovs_assert(hmap_is_empty(&br->if_cfg_todo)); + shash_init(wanted_ports); - /* Collect new ports. */ - shash_init(&new_ports); for (i = 0; i < br->cfg->n_ports; i++) { const char *name = br->cfg->ports[i]->name; - if (!shash_add_once(&new_ports, name, br->cfg->ports[i])) { + if (!shash_add_once(wanted_ports, name, br->cfg->ports[i])) { VLOG_WARN("bridge %s: %s specified twice as bridge port", br->name, name); } } if (bridge_get_controllers(br, NULL) - && !shash_find(&new_ports, br->name)) { + && !shash_find(wanted_ports, br->name)) { VLOG_WARN("bridge %s: no port named %s, synthesizing one", br->name, br->name); @@ -2794,17 +2781,27 @@ bridge_add_del_ports(struct bridge *br, br->synth_local_ifacep = &br->synth_local_iface; - shash_add(&new_ports, br->name, &br->synth_local_port); + shash_add(wanted_ports, br->name, &br->synth_local_port); } if (splinter_vlans) { - add_vlan_splinter_ports(br, splinter_vlans, &new_ports); + add_vlan_splinter_ports(br, splinter_vlans, wanted_ports); } +} + +/* Deletes "struct port"s and "struct iface"s under 'br' which aren't + * consistent with 'br->cfg'. Updates 'br->if_cfg_queue' with interfaces which + * 'br' needs to complete its configuration. */ +static void +bridge_del_ports(struct bridge *br, const struct shash *wanted_ports) +{ + struct shash_node *port_node; + struct port *port, *next; /* Get rid of deleted ports. * Get rid of deleted interfaces on ports that still exist. */ HMAP_FOR_EACH_SAFE (port, next, hmap_node, &br->ports) { - port->cfg = shash_find_data(&new_ports, port->name); + port->cfg = shash_find_data(wanted_ports, port->name); if (!port->cfg) { port_destroy(port); } else { @@ -2812,9 +2809,8 @@ bridge_add_del_ports(struct bridge *br, } } - /* Update iface->cfg and iface->type in interfaces that still exist. - * Add new interfaces to creation queue. */ - SHASH_FOR_EACH (port_node, &new_ports) { + /* Update iface->cfg and iface->type in interfaces that still exist. */ + SHASH_FOR_EACH (port_node, wanted_ports) { const struct ovsrec_port *port = port_node->data; size_t i; @@ -2832,12 +2828,10 @@ bridge_add_del_ports(struct bridge *br, " dev@openvswitch.org with concerns.", cfg->name); } else { - bridge_queue_if_cfg(br, cfg, port); + /* We will add new interfaces later. */ } } } - - shash_destroy(&new_ports); } /* Initializes 'oc' appropriately as a management service controller for @@ -2895,7 +2889,8 @@ bridge_configure_local_iface_netdev(struct bridge *br, /* 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_aton(c->local_ip, &ip)) { + if (!local_iface || !c->local_ip + || !inet_pton(AF_INET, c->local_ip, &ip)) { return; } @@ -2905,7 +2900,7 @@ bridge_configure_local_iface_netdev(struct bridge *br, /* Configure the IP address and netmask. */ if (!c->local_netmask - || !inet_aton(c->local_netmask, &mask) + || !inet_pton(AF_INET, c->local_netmask, &mask) || !mask.s_addr) { mask.s_addr = guess_netmask(ip.s_addr); } @@ -2916,7 +2911,7 @@ bridge_configure_local_iface_netdev(struct bridge *br, /* Configure the default gateway. */ if (c->local_gateway - && inet_aton(c->local_gateway, &gateway) + && inet_pton(AF_INET, c->local_gateway, &gateway) && gateway.s_addr) { if (!netdev_add_router(netdev, gateway)) { VLOG_INFO("bridge %s: configured gateway "IP_FMT, @@ -3077,7 +3072,7 @@ bridge_configure_tables(struct bridge *br) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); int n_tables; - int i, j; + int i, j, k; n_tables = ofproto_get_n_tables(br->ofproto); j = 0; @@ -3088,6 +3083,8 @@ bridge_configure_tables(struct bridge *br) s.max_flows = UINT_MAX; s.groups = NULL; s.n_groups = 0; + s.n_prefix_fields = 0; + memset(s.prefix_fields, ~0, sizeof(s.prefix_fields)); if (j < br->cfg->n_flow_tables && i == br->cfg->key_flow_tables[j]) { struct ovsrec_flow_table *cfg = br->cfg->value_flow_tables[j++]; @@ -3098,7 +3095,6 @@ bridge_configure_tables(struct bridge *br) } if (cfg->overflow_policy && !strcmp(cfg->overflow_policy, "evict")) { - size_t k; s.groups = xmalloc(cfg->n_groups * sizeof *s.groups); for (k = 0; k < cfg->n_groups; k++) { @@ -3119,6 +3115,41 @@ bridge_configure_tables(struct bridge *br) } } } + /* Prefix lookup fields. */ + s.n_prefix_fields = 0; + for (k = 0; k < cfg->n_prefixes; k++) { + const char *name = cfg->prefixes[k]; + const struct mf_field *mf = mf_from_name(name); + if (!mf) { + VLOG_WARN("bridge %s: 'prefixes' with unknown field: %s", + br->name, name); + continue; + } + if (mf->flow_be32ofs < 0 || mf->n_bits % 32) { + VLOG_WARN("bridge %s: 'prefixes' with incompatible field: " + "%s", br->name, name); + continue; + } + if (s.n_prefix_fields >= ARRAY_SIZE(s.prefix_fields)) { + VLOG_WARN("bridge %s: 'prefixes' with too many fields, " + "field not used: %s", br->name, name); + continue; + } + s.prefix_fields[s.n_prefix_fields++] = mf->id; + } + if (s.n_prefix_fields > 0) { + int k; + struct ds ds = DS_EMPTY_INITIALIZER; + for (k = 0; k < s.n_prefix_fields; k++) { + if (k) { + ds_put_char(&ds, ','); + } + ds_put_cstr(&ds, mf_from_id(s.prefix_fields[k])->name); + } + VLOG_INFO("bridge %s table %d: Prefix lookup with: %s.", + br->name, i, ds_cstr(&ds)); + ds_destroy(&ds); + } } ofproto_configure_table(br->ofproto, i, &s); @@ -3196,7 +3227,7 @@ port_destroy(struct port *port) } LIST_FOR_EACH_SAFE (iface, next, port_elem, &port->ifaces) { - iface_destroy(iface); + iface_destroy__(iface); } hmap_remove(&br->ports, &port->hmap_node); @@ -3255,8 +3286,8 @@ port_configure_lacp(struct port *port, struct lacp_settings *s) system_id = smap_get(&port->cfg->other_config, "lacp-system-id"); if (system_id) { - if (sscanf(system_id, ETH_ADDR_SCAN_FMT, - ETH_ADDR_SCAN_ARGS(s->id)) != ETH_ADDR_SCAN_COUNT) { + if (!ovs_scan(system_id, ETH_ADDR_SCAN_FMT, + ETH_ADDR_SCAN_ARGS(s->id))) { VLOG_WARN("port %s: LACP system ID (%s) must be an Ethernet" " address.", port->name, system_id); return NULL; @@ -3279,6 +3310,10 @@ port_configure_lacp(struct port *port, struct lacp_settings *s) lacp_time = smap_get(&port->cfg->other_config, "lacp-time"); s->fast = lacp_time && !strcasecmp(lacp_time, "fast"); + + s->fallback_ab_cfg = smap_get_bool(&port->cfg->other_config, + "lacp-fallback-ab", false); + return s; } @@ -3367,6 +3402,9 @@ port_configure_bond(struct port *port, struct bond_settings *s) s->fake_iface = port->cfg->bond_fake_iface; + s->lacp_fallback_ab_cfg = smap_get_bool(&port->cfg->other_config, + "lacp-fallback-ab", false); + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { netdev_set_miimon_interval(iface->netdev, miimon_interval); } @@ -3411,7 +3449,7 @@ iface_get_type(const struct ovsrec_interface *iface, } static void -iface_destroy(struct iface *iface) +iface_destroy__(struct iface *iface) { if (iface) { struct port *port = iface->port; @@ -3435,6 +3473,19 @@ iface_destroy(struct iface *iface) } } +static void +iface_destroy(struct iface *iface) +{ + if (iface) { + struct port *port = iface->port; + + iface_destroy__(iface); + if (list_is_empty(&port->ifaces)) { + port_destroy(port); + } + } +} + static struct iface * iface_lookup(const struct bridge *br, const char *name) { @@ -3465,28 +3516,12 @@ iface_find(const char *name) return NULL; } -static struct if_cfg * -if_cfg_lookup(const struct bridge *br, const char *name) -{ - struct if_cfg *if_cfg; - - HMAP_FOR_EACH_WITH_HASH (if_cfg, hmap_node, hash_string(name, 0), - &br->if_cfg_todo) { - if (!strcmp(if_cfg->cfg->name, name)) { - return if_cfg; - } - } - - return NULL; -} - static struct iface * iface_from_ofp_port(const struct bridge *br, ofp_port_t ofp_port) { struct iface *iface; - HMAP_FOR_EACH_IN_BUCKET (iface, ofp_port_node, - hash_int(ofp_to_u16(ofp_port), 0), + HMAP_FOR_EACH_IN_BUCKET (iface, ofp_port_node, hash_ofp_port(ofp_port), &br->ifaces) { if (iface->ofp_port == ofp_port) { return iface; @@ -3498,24 +3533,36 @@ iface_from_ofp_port(const struct bridge *br, ofp_port_t ofp_port) /* Set Ethernet address of 'iface', if one is specified in the configuration * file. */ static void -iface_set_mac(struct iface *iface) +iface_set_mac(const struct bridge *br, const struct port *port, struct iface *iface) { - uint8_t ea[ETH_ADDR_LEN]; + uint8_t ea[ETH_ADDR_LEN], *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; + } 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; + } - if (!strcmp(iface->type, "internal") - && iface->cfg->mac && eth_addr_from_string(iface->cfg->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, strerror(error)); + iface->name, ovs_strerror(error)); } } } @@ -3525,10 +3572,9 @@ iface_set_mac(struct iface *iface) static void iface_set_ofport(const struct ovsrec_interface *if_cfg, ofp_port_t ofport) { - int64_t port_; - port_ = (ofport == OFPP_NONE) ? -1 : ofp_to_u16(ofport); if (if_cfg && !ovsdb_idl_row_is_synthetic(&if_cfg->header_)) { - ovsrec_interface_set_ofport(if_cfg, &port_, 1); + int64_t port = ofport == OFPP_NONE ? -1 : ofp_to_u16(ofport); + ovsrec_interface_set_ofport(if_cfg, &port, 1); } } @@ -3541,6 +3587,7 @@ static void iface_clear_db_record(const struct ovsrec_interface *if_cfg) { if (!ovsdb_idl_row_is_synthetic(&if_cfg->header_)) { + iface_set_ofport(if_cfg, OFPP_NONE); ovsrec_interface_set_status(if_cfg, NULL); ovsrec_interface_set_admin_state(if_cfg, NULL); ovsrec_interface_set_duplex(if_cfg, NULL); @@ -3553,14 +3600,10 @@ iface_clear_db_record(const struct ovsrec_interface *if_cfg) ovsrec_interface_set_cfm_remote_mpids(if_cfg, NULL, 0); ovsrec_interface_set_lacp_current(if_cfg, NULL, 0); ovsrec_interface_set_statistics(if_cfg, NULL, NULL, 0); + ovsrec_interface_set_ifindex(if_cfg, NULL, 0); } } -struct iface_delete_queues_cbdata { - struct netdev *netdev; - const struct ovsdb_datum *queues; -}; - static bool queue_ids_include(const struct ovsdb_datum *queues, int64_t target) { @@ -3570,17 +3613,6 @@ queue_ids_include(const struct ovsdb_datum *queues, int64_t target) return ovsdb_datum_find_key(queues, &atom, OVSDB_TYPE_INTEGER) != UINT_MAX; } -static void -iface_delete_queues(unsigned int queue_id, - const struct smap *details OVS_UNUSED, void *cbdata_) -{ - struct iface_delete_queues_cbdata *cbdata = cbdata_; - - if (!queue_ids_include(cbdata->queues, queue_id)) { - netdev_delete_queue(cbdata->netdev, queue_id); - } -} - static void iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) { @@ -3591,7 +3623,10 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) if (!qos || qos->type[0] == '\0' || qos->n_queues < 1) { netdev_set_qos(iface->netdev, NULL, NULL); } else { - struct iface_delete_queues_cbdata cbdata; + const struct ovsdb_datum *queues; + struct netdev_queue_dump dump; + unsigned int queue_id; + struct smap details; bool queue_zero; size_t i; @@ -3599,10 +3634,15 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) netdev_set_qos(iface->netdev, qos->type, &qos->other_config); /* Deconfigure queues that were deleted. */ - cbdata.netdev = iface->netdev; - cbdata.queues = ovsrec_qos_get_queues(qos, OVSDB_TYPE_INTEGER, - OVSDB_TYPE_UUID); - netdev_dump_queues(iface->netdev, iface_delete_queues, &cbdata); + queues = ovsrec_qos_get_queues(qos, OVSDB_TYPE_INTEGER, + OVSDB_TYPE_UUID); + smap_init(&details); + NETDEV_QUEUE_FOR_EACH (&queue_id, &details, &dump, iface->netdev) { + if (!queue_ids_include(queues, queue_id)) { + netdev_delete_queue(iface->netdev, queue_id); + } + } + smap_destroy(&details); /* Configure queues for 'iface'. */ queue_zero = false; @@ -3635,8 +3675,8 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) } if (iface->ofp_port != OFPP_NONE) { - const struct ofproto_port_queue *port_queues = queues_buf.data; - size_t n_queues = queues_buf.size / sizeof *port_queues; + const struct ofproto_port_queue *port_queues = ofpbuf_data(&queues_buf); + size_t n_queues = ofpbuf_size(&queues_buf) / sizeof *port_queues; ofproto_port_set_queues(iface->port->bridge->ofproto, iface->ofp_port, port_queues, n_queues); @@ -3713,14 +3753,27 @@ iface_is_synthetic(const struct iface *iface) } static ofp_port_t -iface_pick_ofport(const struct ovsrec_interface *cfg) +iface_validate_ofport__(size_t n, int64_t *ofport) +{ + return (n && *ofport >= 1 && *ofport < ofp_to_u16(OFPP_MAX) + ? u16_to_ofp(*ofport) + : OFPP_NONE); +} + +static ofp_port_t +iface_get_requested_ofp_port(const struct ovsrec_interface *cfg) { - ofp_port_t ofport = cfg->n_ofport ? u16_to_ofp(*cfg->ofport) - : OFPP_NONE; - return cfg->n_ofport_request ? u16_to_ofp(*cfg->ofport_request) - : ofport; + return iface_validate_ofport__(cfg->n_ofport_request, cfg->ofport_request); } +static ofp_port_t +iface_pick_ofport(const struct ovsrec_interface *cfg) +{ + ofp_port_t requested_ofport = iface_get_requested_ofp_port(cfg); + return (requested_ofport != OFPP_NONE + ? requested_ofport + : iface_validate_ofport__(cfg->n_ofport, cfg->ofport)); +} /* Port mirroring. */ @@ -4056,10 +4109,10 @@ collect_splinter_vlans(const struct ovsrec_open_vswitch *ovs_cfg) if (!netdev_open(vlan_dev->name, "system", &netdev)) { if (!netdev_get_in4(netdev, NULL, NULL) || !netdev_get_in6(netdev, NULL)) { - vlandev_del(vlan_dev->name); - } else { /* 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); } @@ -4083,7 +4136,7 @@ collect_splinter_vlans(const struct ovsrec_open_vswitch *ovs_cfg) sset_destroy(&splinter_ifaces); - if (bitmap_scan(splinter_vlans, 0, 4096) >= 4096) { + if (bitmap_scan(splinter_vlans, 1, 0, 4096) >= 4096) { free(splinter_vlans); return NULL; }