X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fbridge.c;fp=vswitchd%2Fbridge.c;h=127e0b7cfd525128923a715b279eeb733ad1c418;hb=007948177581f3b3dad188221593d0e4bdca6ba0;hp=55c9f40af32c981db9f3cfea2eb0254b0a5aa9f4;hpb=2db65bf72c008cf7ee658d0b44744b39495ead14;p=sliver-openvswitch.git diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 55c9f40af..127e0b7cf 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -15,153 +15,86 @@ #include #include "bridge.h" -#include "byte-order.h" #include #include -#include -#include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include #include "bitmap.h" #include "bond.h" #include "cfm.h" -#include "classifier.h" #include "coverage.h" #include "daemon.h" #include "dirs.h" -#include "dpif.h" #include "dynamic-string.h" -#include "flow.h" #include "hash.h" #include "hmap.h" #include "jsonrpc.h" #include "lacp.h" #include "list.h" -#include "mac-learning.h" #include "netdev.h" -#include "netlink.h" -#include "odp-util.h" #include "ofp-print.h" #include "ofpbuf.h" -#include "ofproto/netflow.h" #include "ofproto/ofproto.h" -#include "ovsdb-data.h" -#include "packets.h" #include "poll-loop.h" -#include "process.h" #include "sha1.h" #include "shash.h" #include "socket-util.h" #include "stream-ssl.h" #include "sset.h" -#include "svec.h" #include "system-stats.h" #include "timeval.h" #include "util.h" #include "unixctl.h" -#include "vconn.h" #include "vswitchd/vswitch-idl.h" #include "xenserver.h" #include "vlog.h" #include "sflow_api.h" +#include "vlan-bitmap.h" VLOG_DEFINE_THIS_MODULE(bridge); -COVERAGE_DEFINE(bridge_flush); -COVERAGE_DEFINE(bridge_process_flow); COVERAGE_DEFINE(bridge_reconfigure); -struct dst { - struct iface *iface; - uint16_t vlan; -}; - -struct dst_set { - struct dst builtin[32]; - struct dst *dsts; - size_t n, allocated; -}; - -static void dst_set_init(struct dst_set *); -static void dst_set_add(struct dst_set *, const struct dst *); -static void dst_set_free(struct dst_set *); - struct iface { /* These members are always valid. */ 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 port *port; /* Containing port. */ char *name; /* Host network device name. */ tag_type tag; /* Tag associated with this interface. */ /* These members are valid only after bridge_reconfigure() causes them to * be initialized. */ - struct hmap_node dp_ifidx_node; /* In struct bridge's "ifaces" hmap. */ - int dp_ifidx; /* Index within kernel datapath. */ + struct hmap_node ofp_port_node; /* In struct bridge's "ifaces" hmap. */ + int ofp_port; /* OpenFlow port number, -1 if unknown. */ struct netdev *netdev; /* Network device. */ const char *type; /* Usually same as cfg->type. */ const struct ovsrec_interface *cfg; }; -#define MAX_MIRRORS 32 -typedef uint32_t mirror_mask_t; -#define MIRROR_MASK_C(X) UINT32_C(X) -BUILD_ASSERT_DECL(sizeof(mirror_mask_t) * CHAR_BIT >= MAX_MIRRORS); struct mirror { + struct uuid uuid; /* UUID of this "mirror" record in database. */ + struct hmap_node hmap_node; /* In struct bridge's "mirrors" hmap. */ struct bridge *bridge; - size_t idx; char *name; - struct uuid uuid; /* UUID of this "mirror" record in database. */ - - /* Selection criteria. */ - struct sset src_ports; /* Source port names. */ - struct sset dst_ports; /* Destination port names. */ - int *vlans; - size_t n_vlans; - - /* Output. */ - struct port *out_port; - int out_vlan; }; -#define FLOOD_PORT ((struct port *) 1) /* The 'flood' output port. */ struct port { struct bridge *bridge; struct hmap_node hmap_node; /* Element in struct bridge's "ports" hmap. */ char *name; - int vlan; /* -1=trunk port, else a 12-bit VLAN ID. */ - unsigned long *trunks; /* Bitmap of trunked VLANs, if 'vlan' == -1. - * NULL if all VLANs are trunked. */ const struct ovsrec_port *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 lacp *lacp; /* NULL if LACP is not enabled. */ - - /* Bonding info. */ - struct bond *bond; - - /* Port mirroring info. */ - mirror_mask_t src_mirrors; /* Mirrors triggered when packet received. */ - mirror_mask_t dst_mirrors; /* Mirrors triggered when packet sent. */ - bool is_mirror_output_port; /* Does port mirroring send frames here? */ }; struct bridge { - struct list node; /* Node in global list of bridges. */ + struct hmap_node node; /* In 'all_bridges'. */ char *name; /* User-specified arbitrary name. */ - struct mac_learning *ml; /* MAC learning table. */ + char *type; /* Datapath type. */ uint8_t ea[ETH_ADDR_LEN]; /* Bridge Ethernet Address. */ uint8_t default_ea[ETH_ADDR_LEN]; /* Default MAC. */ const struct ovsrec_bridge *cfg; @@ -169,22 +102,13 @@ struct bridge { /* OpenFlow switch processing. */ struct ofproto *ofproto; /* OpenFlow switch. */ - /* Kernel datapath information. */ - struct dpif *dpif; /* Datapath. */ - struct hmap ifaces; /* "struct iface"s indexed by dp_ifidx. */ - /* Bridge ports. */ struct hmap ports; /* "struct port"s indexed by name. */ - struct shash iface_by_name; /* "struct iface"s indexed by name. */ - - /* Bonding. */ - bool has_bonded_ports; - - /* Flow tracking. */ - bool flush; + struct hmap ifaces; /* "struct iface"s indexed by ofp_port. */ + struct hmap iface_by_name; /* "struct iface"s indexed by name. */ /* Port mirroring. */ - struct mirror *mirrors[MAX_MIRRORS]; + struct hmap mirrors; /* "struct mirror" indexed by UUID. */ /* Synthetic local port if necessary. */ struct ovsrec_port synth_local_port; @@ -192,8 +116,8 @@ struct bridge { struct ovsrec_interface *synth_local_ifacep; }; -/* List of all bridges. */ -static struct list all_bridges = LIST_INITIALIZER(&all_bridges); +/* All bridges, indexed by name. */ +static struct hmap all_bridges = HMAP_INITIALIZER(&all_bridges); /* OVSDB IDL used to obtain configuration. */ static struct ovsdb_idl *idl; @@ -209,21 +133,26 @@ static long long int stats_timer = LLONG_MIN; #define DB_LIMIT_INTERVAL (1 * 1000) /* In milliseconds. */ static long long int db_limiter = LLONG_MIN; -static struct bridge *bridge_create(const struct ovsrec_bridge *br_cfg); +static void add_del_bridges(const struct ovsrec_open_vswitch *); +static void bridge_del_ofprotos(void); +static bool bridge_add_ofprotos(struct bridge *); +static void bridge_create(const struct ovsrec_bridge *); static void bridge_destroy(struct bridge *); static struct bridge *bridge_lookup(const char *name); static unixctl_cb_func bridge_unixctl_dump_flows; static unixctl_cb_func bridge_unixctl_reconnect; -static int bridge_run_one(struct bridge *); static size_t bridge_get_controllers(const struct bridge *br, struct ovsrec_controller ***controllersp); -static void bridge_reconfigure_one(struct bridge *); -static void bridge_reconfigure_remotes(struct bridge *, - const struct sockaddr_in *managers, - size_t n_managers); -static void bridge_get_all_ifaces(const struct bridge *, struct shash *ifaces); -static void bridge_fetch_dp_ifaces(struct bridge *); -static void bridge_flush(struct bridge *); +static void bridge_add_del_ports(struct bridge *); +static void bridge_add_ofproto_ports(struct bridge *); +static void bridge_del_ofproto_ports(struct bridge *); +static void bridge_refresh_ofp_port(struct bridge *); +static void bridge_configure_datapath_id(struct bridge *); +static void bridge_configure_netflow(struct bridge *); +static void bridge_configure_sflow(struct bridge *, int *sflow_bridge_number); +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], struct iface **hw_addr_iface); @@ -231,42 +160,41 @@ static uint64_t bridge_pick_datapath_id(struct bridge *, const uint8_t bridge_ea[ETH_ADDR_LEN], 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 bridge_unixctl_fdb_show; static unixctl_cb_func cfm_unixctl_show; static unixctl_cb_func qos_unixctl_show; -static void port_run(struct port *); -static void port_wait(struct port *); -static struct port *port_create(struct bridge *, const char *name); -static void port_reconfigure(struct port *, const struct ovsrec_port *); -static void port_del_ifaces(struct port *, const struct ovsrec_port *); +static struct port *port_create(struct bridge *, const struct ovsrec_port *); +static void port_add_ifaces(struct port *); +static void port_del_ifaces(struct port *); static void port_destroy(struct port *); static struct port *port_lookup(const struct bridge *, const char *name); -static struct iface *port_get_an_iface(const struct port *); -static struct port *port_from_dp_ifidx(const struct bridge *, - uint16_t dp_ifidx); -static void port_reconfigure_lacp(struct port *); -static void port_reconfigure_bond(struct port *); -static void port_send_learning_packets(struct port *); - -static void mirror_create(struct bridge *, struct ovsrec_mirror *); +static void port_configure(struct port *); +static struct lacp_settings *port_configure_lacp(struct port *, + struct lacp_settings *); +static void port_configure_bond(struct port *, struct bond_settings *); + +static void bridge_configure_mirrors(struct bridge *); +static struct mirror *mirror_create(struct bridge *, + const struct ovsrec_mirror *); static void mirror_destroy(struct mirror *); -static void mirror_reconfigure(struct bridge *); -static void mirror_reconfigure_one(struct mirror *, struct ovsrec_mirror *); -static bool vlan_is_mirrored(const struct mirror *, int vlan); +static bool mirror_configure(struct mirror *, const struct ovsrec_mirror *); +static void iface_configure_lacp(struct iface *, struct lacp_slave_settings *); static struct iface *iface_create(struct port *port, const struct ovsrec_interface *if_cfg); static void iface_destroy(struct iface *); static struct iface *iface_lookup(const struct bridge *, const char *name); static struct iface *iface_find(const char *name); -static struct iface *iface_from_dp_ifidx(const struct bridge *, - uint16_t dp_ifidx); +static struct iface *iface_from_ofp_port(const struct bridge *, + uint16_t ofp_port); static void iface_set_mac(struct iface *); static void iface_set_ofport(const struct ovsrec_interface *, int64_t ofport); -static void iface_update_qos(struct iface *, const struct ovsrec_qos *); -static void iface_update_cfm(struct iface *); +static void iface_configure_qos(struct iface *, const struct ovsrec_qos *); +static void iface_configure_cfm(struct iface *); static bool iface_refresh_cfm_stats(struct iface *iface); static bool iface_get_carrier(const struct iface *); static bool iface_is_synthetic(const struct iface *); @@ -275,9 +203,6 @@ static void shash_from_ovs_idl_map(char **keys, char **values, size_t n, struct shash *); static void shash_to_ovs_idl_map(struct shash *, char ***keys, char ***values, size_t *n); - -/* Hooks into ofproto processing. */ -static struct ofhooks bridge_ofhooks; /* Public functions. */ @@ -342,7 +267,6 @@ bridge_init(const char *remote) ovsdb_idl_omit(idl, &ovsrec_ssl_col_external_ids); /* Register unixctl commands. */ - unixctl_command_register("fdb/show", bridge_unixctl_fdb_show, NULL); unixctl_command_register("cfm/show", cfm_unixctl_show, NULL); unixctl_command_register("qos/show", qos_unixctl_show, NULL); unixctl_command_register("bridge/dump-flows", bridge_unixctl_dump_flows, @@ -358,131 +282,12 @@ bridge_exit(void) { struct bridge *br, *next_br; - LIST_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { + HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { bridge_destroy(br); } ovsdb_idl_destroy(idl); } -/* Performs configuration that is only necessary once at ovs-vswitchd startup, - * but for which the ovs-vswitchd configuration 'cfg' is required. */ -static void -bridge_configure_once(const struct ovsrec_open_vswitch *cfg) -{ - static bool already_configured_once; - struct sset bridge_names; - struct sset dpif_names, dpif_types; - const char *type; - size_t i; - - /* Only do this once per ovs-vswitchd run. */ - if (already_configured_once) { - return; - } - already_configured_once = true; - - stats_timer = time_msec() + STATS_INTERVAL; - - /* Get all the configured bridges' names from 'cfg' into 'bridge_names'. */ - sset_init(&bridge_names); - for (i = 0; i < cfg->n_bridges; i++) { - sset_add(&bridge_names, cfg->bridges[i]->name); - } - - /* Iterate over all system dpifs and delete any of them that do not appear - * in 'cfg'. */ - sset_init(&dpif_names); - sset_init(&dpif_types); - dp_enumerate_types(&dpif_types); - SSET_FOR_EACH (type, &dpif_types) { - const char *name; - - dp_enumerate_names(type, &dpif_names); - - /* Delete each dpif whose name is not in 'bridge_names'. */ - SSET_FOR_EACH (name, &dpif_names) { - if (!sset_contains(&bridge_names, name)) { - struct dpif *dpif; - int retval; - - retval = dpif_open(name, type, &dpif); - if (!retval) { - dpif_delete(dpif); - dpif_close(dpif); - } - } - } - } - sset_destroy(&bridge_names); - sset_destroy(&dpif_names); - sset_destroy(&dpif_types); -} - -/* Callback for iterate_and_prune_ifaces(). */ -static bool -check_iface(struct bridge *br, struct iface *iface, void *aux OVS_UNUSED) -{ - if (!iface->netdev) { - /* We already reported a related error, don't bother duplicating it. */ - return false; - } - - if (iface->dp_ifidx < 0) { - VLOG_ERR("%s interface not in %s, dropping", - iface->name, dpif_name(br->dpif)); - return false; - } - - VLOG_DBG("%s has interface %s on port %d", dpif_name(br->dpif), - iface->name, iface->dp_ifidx); - return true; -} - -/* Callback for iterate_and_prune_ifaces(). */ -static bool -set_iface_properties(struct bridge *br OVS_UNUSED, struct iface *iface, - void *aux OVS_UNUSED) -{ - /* Set policing attributes. */ - netdev_set_policing(iface->netdev, - iface->cfg->ingress_policing_rate, - iface->cfg->ingress_policing_burst); - - /* Set MAC address of internal interfaces other than the local - * interface. */ - iface_set_mac(iface); - - return true; -} - -/* Calls 'cb' for each interfaces in 'br', passing along the 'aux' argument. - * Deletes from 'br' all the interfaces for which 'cb' returns false, and then - * deletes from 'br' any ports that no longer have any interfaces. */ -static void -iterate_and_prune_ifaces(struct bridge *br, - bool (*cb)(struct bridge *, struct iface *, - void *aux), - void *aux) -{ - struct port *port, *next_port; - - HMAP_FOR_EACH_SAFE (port, next_port, hmap_node, &br->ports) { - struct iface *iface, *next_iface; - - LIST_FOR_EACH_SAFE (iface, next_iface, port_elem, &port->ifaces) { - if (!cb(br, iface, aux)) { - iface_set_ofport(iface->cfg, -1); - iface_destroy(iface); - } - } - - if (list_is_empty(&port->ifaces)) { - VLOG_WARN("%s port has no interfaces, dropping", port->name); - port_destroy(port); - } - } -} - /* 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()). @@ -542,403 +347,597 @@ collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg, static void bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) { - struct shash old_br, new_br; - struct shash_node *node; - struct bridge *br, *next; struct sockaddr_in *managers; - size_t n_managers; - size_t i; + struct bridge *br, *next; int sflow_bridge_number; + size_t n_managers; COVERAGE_INC(bridge_reconfigure); - collect_in_band_managers(ovs_cfg, &managers, &n_managers); - - /* Collect old and new bridges. */ - shash_init(&old_br); - shash_init(&new_br); - LIST_FOR_EACH (br, node, &all_bridges) { - shash_add(&old_br, br->name, br); + /* Create and destroy "struct bridge"s, "struct port"s, and "struct + * iface"s according to 'ovs_cfg', with only very minimal configuration + * otherwise. + * + * This is purely an update to bridge data structures. Nothing is pushed + * down to ofproto or lower layers. */ + add_del_bridges(ovs_cfg); + HMAP_FOR_EACH (br, node, &all_bridges) { + bridge_add_del_ports(br); } - for (i = 0; i < ovs_cfg->n_bridges; i++) { - const struct ovsrec_bridge *br_cfg = ovs_cfg->bridges[i]; - if (!shash_add_once(&new_br, br_cfg->name, br_cfg)) { - VLOG_WARN("more than one bridge named %s", br_cfg->name); + + /* Delete all datapaths and datapath ports that are no longer configured. + * + * 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. A datapath always has a + * "local port" so we must delete not-configured datapaths too. */ + bridge_del_ofprotos(); + HMAP_FOR_EACH (br, node, &all_bridges) { + if (br->ofproto) { + bridge_del_ofproto_ports(br); } } - /* Get rid of deleted bridges and add new bridges. */ - LIST_FOR_EACH_SAFE (br, next, node, &all_bridges) { - struct ovsrec_bridge *br_cfg = shash_find_data(&new_br, br->name); - if (br_cfg) { - br->cfg = br_cfg; - } else { + /* Create datapaths and datapath ports that are missing. + * + * After this is done, we have our final set of bridges, ports, and + * interfaces. Every "struct bridge" has an ofproto, every "struct port" + * has at least one iface, every "struct iface" has a valid ofp_port and + * netdev. */ + HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { + if (!br->ofproto && !bridge_add_ofprotos(br)) { bridge_destroy(br); } } - SHASH_FOR_EACH (node, &new_br) { - const char *br_name = node->name; - const struct ovsrec_bridge *br_cfg = node->data; - br = shash_find_data(&old_br, br_name); - if (br) { - /* If the bridge datapath type has changed, we need to tear it - * down and recreate. */ - if (strcmp(br->cfg->datapath_type, br_cfg->datapath_type)) { - bridge_destroy(br); - bridge_create(br_cfg); - } - } else { - bridge_create(br_cfg); - } + HMAP_FOR_EACH (br, node, &all_bridges) { + bridge_refresh_ofp_port(br); + bridge_add_ofproto_ports(br); } - shash_destroy(&old_br); - shash_destroy(&new_br); - /* Reconfigure all bridges. */ - LIST_FOR_EACH (br, node, &all_bridges) { - bridge_reconfigure_one(br); - } + /* Complete the configuration. */ + sflow_bridge_number = 0; + collect_in_band_managers(ovs_cfg, &managers, &n_managers); + HMAP_FOR_EACH (br, node, &all_bridges) { + struct port *port; - /* Add and delete ports on all datapaths. - * - * 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. */ - LIST_FOR_EACH (br, node, &all_bridges) { - struct dpif_port_dump dump; - struct shash want_ifaces; - struct dpif_port dpif_port; - - bridge_get_all_ifaces(br, &want_ifaces); - DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { - if (!shash_find(&want_ifaces, dpif_port.name) - && strcmp(dpif_port.name, br->name)) { - int retval = dpif_port_del(br->dpif, dpif_port.port_no); - if (retval) { - VLOG_WARN("failed to remove %s interface from %s: %s", - dpif_port.name, dpif_name(br->dpif), - strerror(retval)); - } + HMAP_FOR_EACH (port, hmap_node, &br->ports) { + struct iface *iface; + + port_configure(port); + + HMAP_FOR_EACH (iface, ofp_port_node, &br->ifaces) { + iface_configure_cfm(iface); + iface_configure_qos(iface, port->cfg->qos); + iface_set_mac(iface); } } - shash_destroy(&want_ifaces); + bridge_configure_mirrors(br); + bridge_configure_datapath_id(br); + bridge_configure_remotes(br, managers, n_managers); + bridge_configure_netflow(br); + bridge_configure_sflow(br, &sflow_bridge_number); } - LIST_FOR_EACH (br, node, &all_bridges) { - struct shash cur_ifaces, want_ifaces; - struct dpif_port_dump dump; - struct dpif_port dpif_port; + free(managers); - /* Get the set of interfaces currently in this datapath. */ - shash_init(&cur_ifaces); - DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { - struct dpif_port *port_info = xmalloc(sizeof *port_info); - dpif_port_clone(port_info, &dpif_port); - shash_add(&cur_ifaces, dpif_port.name, port_info); - } + /* ovs-vswitchd has completed initialization, so allow the process that + * forked us to exit successfully. */ + daemonize_complete(); +} - /* Get the set of interfaces we want on this datapath. */ - bridge_get_all_ifaces(br, &want_ifaces); +/* Iterate over all ofprotos and delete any of them that do not have a + * configured bridge or that are the wrong type. */ +static void +bridge_del_ofprotos(void) +{ + struct sset names; + struct sset types; + const char *type; - hmap_clear(&br->ifaces); - SHASH_FOR_EACH (node, &want_ifaces) { - const char *if_name = node->name; - struct iface *iface = node->data; - struct dpif_port *dpif_port; - const char *type; - int error; + sset_init(&names); + sset_init(&types); + ofproto_enumerate_types(&types); + SSET_FOR_EACH (type, &types) { + const char *name; - type = iface ? iface->type : "internal"; - dpif_port = shash_find_data(&cur_ifaces, if_name); - - /* If we have a port or a netdev already, and it's not the type we - * want, then delete the port (if any) and close the netdev (if - * any). */ - if ((dpif_port && strcmp(dpif_port->type, type)) - || (iface && iface->netdev - && strcmp(type, netdev_get_type(iface->netdev)))) { - if (dpif_port) { - error = ofproto_port_del(br->ofproto, dpif_port->port_no); - if (error) { - continue; - } - dpif_port = NULL; - } - if (iface) { - if (iface->port->bond) { - /* The bond has a pointer to the netdev, so remove it - * from the bond before closing the netdev. The slave - * will get added back to the bond later, after a new - * netdev is available. */ - bond_slave_unregister(iface->port->bond, iface); - } - netdev_close(iface->netdev); - iface->netdev = NULL; - } + ofproto_enumerate_names(type, &names); + SSET_FOR_EACH (name, &names) { + struct bridge *br = bridge_lookup(name); + if (!br || strcmp(type, br->type)) { + ofproto_delete(name, type); } + } + } + sset_destroy(&names); + sset_destroy(&types); +} - /* If the port doesn't exist or we don't have the netdev open, - * we need to do more work. */ - if (!dpif_port || (iface && !iface->netdev)) { - struct netdev_options options; - struct netdev *netdev; - struct shash args; - - /* First open the network device. */ - options.name = if_name; - options.type = type; - options.args = &args; - options.ethertype = NETDEV_ETH_TYPE_NONE; +static bool +bridge_add_ofprotos(struct bridge *br) +{ + int error = ofproto_create(br->name, br->type, &br->ofproto); + if (error) { + VLOG_ERR("failed to create bridge %s: %s", br->name, strerror(error)); + return false; + } + return true; +} - shash_init(&args); - if (iface) { - shash_from_ovs_idl_map(iface->cfg->key_options, - iface->cfg->value_options, - iface->cfg->n_options, &args); - } - error = netdev_open(&options, &netdev); - shash_destroy(&args); +static void +port_configure(struct port *port) +{ + const struct ovsrec_port *cfg = port->cfg; + struct bond_settings bond_settings; + struct lacp_settings lacp_settings; + struct ofproto_bundle_settings s; + struct iface *iface; - if (error) { - VLOG_WARN("could not open network device %s (%s)", - if_name, strerror(error)); - continue; - } + /* Get name. */ + s.name = port->name; - /* Then add the port if we haven't already. */ - if (!dpif_port) { - error = dpif_port_add(br->dpif, netdev, NULL); - if (error) { - netdev_close(netdev); - if (error == EFBIG) { - VLOG_ERR("ran out of valid port numbers on %s", - dpif_name(br->dpif)); - break; - } else { - VLOG_WARN("failed to add %s interface to %s: %s", - if_name, dpif_name(br->dpif), - strerror(error)); - continue; - } - } - } + /* Get slaves. */ + s.n_slaves = 0; + s.slaves = xmalloc(list_size(&port->ifaces) * sizeof *s.slaves); + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { + s.slaves[s.n_slaves++] = iface->ofp_port; + } - /* Update 'iface'. */ - if (iface) { - iface->netdev = netdev; - } - } else if (iface && iface->netdev) { - struct shash args; - - shash_init(&args); - shash_from_ovs_idl_map(iface->cfg->key_options, - iface->cfg->value_options, - iface->cfg->n_options, &args); - netdev_set_config(iface->netdev, &args); - shash_destroy(&args); + /* Get VLAN tag. */ + s.vlan = -1; + if (cfg->tag) { + if (list_is_short(&port->ifaces)) { + if (*cfg->tag >= 0 && *cfg->tag <= 4095) { + s.vlan = *cfg->tag; + VLOG_DBG("port %s: assigning VLAN tag %d", port->name, s.vlan); } + } else { + /* It's possible that bonded, VLAN-tagged ports make sense. Maybe + * they even work as-is. But they have not been tested. */ + VLOG_WARN("port %s: VLAN tags not supported on bonded ports", + port->name); } - shash_destroy(&want_ifaces); + } - SHASH_FOR_EACH (node, &cur_ifaces) { - struct dpif_port *port_info = node->data; - dpif_port_destroy(port_info); - free(port_info); - } - shash_destroy(&cur_ifaces); + /* Get VLAN trunks. */ + s.trunks = NULL; + if (s.vlan < 0 && cfg->n_trunks) { + s.trunks = vlan_bitmap_from_array(cfg->trunks, cfg->n_trunks); + } else if (s.vlan >= 0 && cfg->n_trunks) { + VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", + port->name); } - sflow_bridge_number = 0; - LIST_FOR_EACH (br, node, &all_bridges) { - uint8_t ea[ETH_ADDR_LEN]; - uint64_t dpid; - struct iface *local_iface; - struct iface *hw_addr_iface; - char *dpid_string; - bridge_fetch_dp_ifaces(br); + /* Get LACP settings. */ + s.lacp = port_configure_lacp(port, &lacp_settings); + if (s.lacp) { + size_t i = 0; - /* Delete interfaces that cannot be opened. - * - * From this point forward we are guaranteed that every "struct iface" - * has nonnull 'netdev' and correct 'dp_ifidx'. */ - iterate_and_prune_ifaces(br, check_iface, NULL); - - /* Pick local port hardware address, datapath ID. */ - bridge_pick_local_hw_addr(br, ea, &hw_addr_iface); - local_iface = iface_from_dp_ifidx(br, ODPP_LOCAL); - if (local_iface) { - int error = netdev_set_etheraddr(local_iface->netdev, ea); - if (error) { - 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)); - } + s.lacp_slaves = xmalloc(s.n_slaves * sizeof *s.lacp_slaves); + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { + iface_configure_lacp(iface, &s.lacp_slaves[i++]); } - memcpy(br->ea, ea, ETH_ADDR_LEN); - - dpid = bridge_pick_datapath_id(br, ea, hw_addr_iface); - ofproto_set_datapath_id(br->ofproto, dpid); + } else { + s.lacp_slaves = NULL; + } - dpid_string = xasprintf("%016"PRIx64, dpid); - ovsrec_bridge_set_datapath_id(br->cfg, dpid_string); - free(dpid_string); + /* Get bond settings. */ + if (s.n_slaves > 1) { + port_configure_bond(port, &bond_settings); + s.bond = &bond_settings; + } else { + s.bond = NULL; + } - /* Set NetFlow configuration on this bridge. */ - if (br->cfg->netflow) { - struct ovsrec_netflow *nf_cfg = br->cfg->netflow; - struct netflow_options opts; + /* Register. */ + ofproto_bundle_register(port->bridge->ofproto, port, &s); - memset(&opts, 0, sizeof opts); + /* Clean up. */ + free(s.trunks); + free(s.lacp_slaves); +} - dpif_get_netflow_ids(br->dpif, &opts.engine_type, &opts.engine_id); - if (nf_cfg->engine_type) { - opts.engine_type = *nf_cfg->engine_type; - } - if (nf_cfg->engine_id) { - opts.engine_id = *nf_cfg->engine_id; - } +/* Pick local port hardware address and datapath ID for 'br'. */ +static void +bridge_configure_datapath_id(struct bridge *br) +{ + uint8_t ea[ETH_ADDR_LEN]; + uint64_t dpid; + struct iface *local_iface; + struct iface *hw_addr_iface; + char *dpid_string; - opts.active_timeout = nf_cfg->active_timeout; - if (!opts.active_timeout) { - opts.active_timeout = -1; - } else if (opts.active_timeout < 0) { - VLOG_WARN("bridge %s: active timeout interval set to negative " - "value, using default instead (%d seconds)", br->name, - NF_ACTIVE_TIMEOUT_DEFAULT); - opts.active_timeout = -1; - } + 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); + if (error) { + 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)); + } + } + memcpy(br->ea, ea, ETH_ADDR_LEN); - opts.add_id_to_iface = nf_cfg->add_id_to_interface; - if (opts.add_id_to_iface) { - if (opts.engine_id > 0x7f) { - VLOG_WARN("bridge %s: netflow port mangling may conflict " - "with another vswitch, choose an engine id less " - "than 128", br->name); - } - if (hmap_count(&br->ports) > 508) { - VLOG_WARN("bridge %s: netflow port mangling will conflict " - "with another port when more than 508 ports are " - "used", br->name); - } - } + dpid = bridge_pick_datapath_id(br, ea, hw_addr_iface); + ofproto_set_datapath_id(br->ofproto, dpid); - sset_init(&opts.collectors); - sset_add_array(&opts.collectors, - nf_cfg->targets, nf_cfg->n_targets); - if (ofproto_set_netflow(br->ofproto, &opts)) { - VLOG_ERR("bridge %s: problem setting netflow collectors", - br->name); - } - sset_destroy(&opts.collectors); - } else { - ofproto_set_netflow(br->ofproto, NULL); - } + dpid_string = xasprintf("%016"PRIx64, dpid); + ovsrec_bridge_set_datapath_id(br->cfg, dpid_string); + free(dpid_string); +} - /* Set sFlow configuration on this bridge. */ - if (br->cfg->sflow) { - const struct ovsrec_sflow *sflow_cfg = br->cfg->sflow; - struct ovsrec_controller **controllers; - struct ofproto_sflow_options oso; - size_t n_controllers; +/* Set NetFlow configuration on 'br'. */ +static void +bridge_configure_netflow(struct bridge *br) +{ + struct ovsrec_netflow *cfg = br->cfg->netflow; + struct netflow_options opts; - memset(&oso, 0, sizeof oso); + if (!cfg) { + ofproto_set_netflow(br->ofproto, NULL); + return; + } - sset_init(&oso.targets); - sset_add_array(&oso.targets, - sflow_cfg->targets, sflow_cfg->n_targets); + memset(&opts, 0, sizeof opts); - oso.sampling_rate = SFL_DEFAULT_SAMPLING_RATE; - if (sflow_cfg->sampling) { - oso.sampling_rate = *sflow_cfg->sampling; - } + /* Get default NetFlow configuration from datapath. + * Apply overrides from 'cfg'. */ + ofproto_get_netflow_ids(br->ofproto, &opts.engine_type, &opts.engine_id); + if (cfg->engine_type) { + opts.engine_type = *cfg->engine_type; + } + if (cfg->engine_id) { + opts.engine_id = *cfg->engine_id; + } - oso.polling_interval = SFL_DEFAULT_POLLING_INTERVAL; - if (sflow_cfg->polling) { - oso.polling_interval = *sflow_cfg->polling; - } + /* Configure active timeout interval. */ + opts.active_timeout = cfg->active_timeout; + if (!opts.active_timeout) { + opts.active_timeout = -1; + } else if (opts.active_timeout < 0) { + VLOG_WARN("bridge %s: active timeout interval set to negative " + "value, using default instead (%d seconds)", br->name, + NF_ACTIVE_TIMEOUT_DEFAULT); + opts.active_timeout = -1; + } - oso.header_len = SFL_DEFAULT_HEADER_SIZE; - if (sflow_cfg->header) { - oso.header_len = *sflow_cfg->header; - } + /* Add engine ID to interface number to disambiguate bridgs? */ + opts.add_id_to_iface = cfg->add_id_to_interface; + if (opts.add_id_to_iface) { + if (opts.engine_id > 0x7f) { + VLOG_WARN("bridge %s: NetFlow port mangling may conflict with " + "another vswitch, choose an engine id less than 128", + br->name); + } + if (hmap_count(&br->ports) > 508) { + VLOG_WARN("bridge %s: NetFlow port mangling will conflict with " + "another port when more than 508 ports are used", + br->name); + } + } - oso.sub_id = sflow_bridge_number++; - oso.agent_device = sflow_cfg->agent; + /* Collectors. */ + sset_init(&opts.collectors); + sset_add_array(&opts.collectors, cfg->targets, cfg->n_targets); - oso.control_ip = NULL; - n_controllers = bridge_get_controllers(br, &controllers); - for (i = 0; i < n_controllers; i++) { - if (controllers[i]->local_ip) { - oso.control_ip = controllers[i]->local_ip; - break; - } - } - ofproto_set_sflow(br->ofproto, &oso); + /* Configure. */ + if (ofproto_set_netflow(br->ofproto, &opts)) { + VLOG_ERR("bridge %s: problem setting netflow collectors", br->name); + } + sset_destroy(&opts.collectors); +} - sset_destroy(&oso.targets); - } else { - ofproto_set_sflow(br->ofproto, NULL); - } +/* Set sFlow configuration on 'br'. */ +static void +bridge_configure_sflow(struct bridge *br, int *sflow_bridge_number) +{ + const struct ovsrec_sflow *cfg = br->cfg->sflow; + struct ovsrec_controller **controllers; + struct ofproto_sflow_options oso; + size_t n_controllers; + size_t i; - /* Update the controller and related settings. It would be more - * straightforward to call this from bridge_reconfigure_one(), but we - * can't do it there for two reasons. First, and most importantly, at - * that point we don't know the dp_ifidx of any interfaces that have - * been added to the bridge (because we haven't actually added them to - * the datapath). Second, at that point we haven't set the datapath ID - * yet; when a controller is configured, resetting the datapath ID will - * immediately disconnect from the controller, so it's better to set - * the datapath ID before the controller. */ - bridge_reconfigure_remotes(br, managers, n_managers); + if (!cfg) { + ofproto_set_sflow(br->ofproto, NULL); + return; } - LIST_FOR_EACH (br, node, &all_bridges) { - struct port *port; - br->has_bonded_ports = false; - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - struct iface *iface; + memset(&oso, 0, sizeof oso); - port_reconfigure_lacp(port); - port_reconfigure_bond(port); + sset_init(&oso.targets); + sset_add_array(&oso.targets, cfg->targets, cfg->n_targets); - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - iface_update_qos(iface, port->cfg->qos); - } - } + oso.sampling_rate = SFL_DEFAULT_SAMPLING_RATE; + if (cfg->sampling) { + oso.sampling_rate = *cfg->sampling; } - LIST_FOR_EACH (br, node, &all_bridges) { - iterate_and_prune_ifaces(br, set_iface_properties, NULL); + + oso.polling_interval = SFL_DEFAULT_POLLING_INTERVAL; + if (cfg->polling) { + oso.polling_interval = *cfg->polling; } - /* Some reconfiguration operations require the bridge to have been run at - * least once. */ - LIST_FOR_EACH (br, node, &all_bridges) { - struct iface *iface; + oso.header_len = SFL_DEFAULT_HEADER_SIZE; + if (cfg->header) { + oso.header_len = *cfg->header; + } - bridge_run_one(br); + oso.sub_id = (*sflow_bridge_number)++; + oso.agent_device = cfg->agent; - HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) { - iface_update_cfm(iface); + oso.control_ip = NULL; + n_controllers = bridge_get_controllers(br, &controllers); + for (i = 0; i < n_controllers; i++) { + if (controllers[i]->local_ip) { + oso.control_ip = controllers[i]->local_ip; + break; } } + ofproto_set_sflow(br->ofproto, &oso); - free(managers); + sset_destroy(&oso.targets); +} - /* ovs-vswitchd has completed initialization, so allow the process that - * forked us to exit successfully. */ - daemonize_complete(); +static bool +bridge_has_bond_fake_iface(const struct bridge *br, const char *name) +{ + const struct port *port = port_lookup(br, name); + return port && port_is_bond_fake_iface(port); } -static const char * -get_ovsrec_key_value(const struct ovsdb_idl_row *row, - const struct ovsdb_idl_column *column, - const char *key) +static bool +port_is_bond_fake_iface(const struct port *port) { - const struct ovsdb_datum *datum; - union ovsdb_atom atom; - unsigned int idx; + return port->cfg->bond_fake_iface && !list_is_short(&port->ifaces); +} - datum = ovsdb_idl_get(row, column, OVSDB_TYPE_STRING, OVSDB_TYPE_STRING); +static void +add_del_bridges(const struct ovsrec_open_vswitch *cfg) +{ + struct bridge *br, *next; + struct shash new_br; + size_t i; + + /* Collect new bridges' names and types. */ + shash_init(&new_br); + for (i = 0; i < cfg->n_bridges; i++) { + const struct ovsrec_bridge *br_cfg = cfg->bridges[i]; + if (!shash_add_once(&new_br, br_cfg->name, br_cfg)) { + VLOG_WARN("bridge %s specified twice", br_cfg->name); + } + } + + /* Get rid of deleted bridges or those whose types have changed. + * Update 'cfg' of bridges that still exist. */ + HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { + 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); + } + } + + /* Add new bridges. */ + for (i = 0; i < cfg->n_bridges; i++) { + const struct ovsrec_bridge *br_cfg = cfg->bridges[i]; + struct bridge *br = bridge_lookup(br_cfg->name); + if (!br) { + bridge_create(br_cfg); + } + } + + shash_destroy(&new_br); +} + +/* Delete each ofproto port on 'br' that doesn't have a corresponding "struct + * iface". + * + * 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. */ +static void +bridge_del_ofproto_ports(struct bridge *br) +{ + struct ofproto_port_dump dump; + struct ofproto_port ofproto_port; + + OFPROTO_PORT_FOR_EACH (&ofproto_port, &dump, br->ofproto) { + const char *name = ofproto_port.name; + struct iface *iface; + const char *type; + int error; + + /* Ignore the local port. We can't change it anyhow. */ + if (!strcmp(name, br->name)) { + continue; + } + + /* Get the type that 'ofproto_port' should have (ordinarily the + * type of its corresponding iface) or NULL if it should be + * deleted. */ + iface = iface_lookup(br, name); + type = (iface ? iface->type + : bridge_has_bond_fake_iface(br, name) ? "internal" + : NULL); + + /* If it's the wrong type then delete the ofproto port. */ + if (type + && !strcmp(ofproto_port.type, type) + && (!iface || !iface->netdev + || !strcmp(netdev_get_type(iface->netdev), type))) { + continue; + } + error = ofproto_port_del(br->ofproto, ofproto_port.ofp_port); + if (error) { + VLOG_WARN("bridge %s: failed to remove %s interface (%s)", + br->name, name, strerror(error)); + } + if (iface) { + netdev_close(iface->netdev); + iface->netdev = NULL; + } + } +} + +static void +iface_set_ofp_port(struct iface *iface, int ofp_port) +{ + struct bridge *br = iface->port->bridge; + + assert(iface->ofp_port < 0 && ofp_port >= 0); + iface->ofp_port = ofp_port; + hmap_insert(&br->ifaces, &iface->ofp_port_node, hash_int(ofp_port, 0)); + +} + +static void +bridge_refresh_ofp_port(struct bridge *br) +{ + struct ofproto_port_dump dump; + struct ofproto_port ofproto_port; + struct port *port; + + /* Clear all the "ofp_port"es. */ + 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 = -1; + } + } + + /* Obtain the correct "ofp_port"s from ofproto. */ + OFPROTO_PORT_FOR_EACH (&ofproto_port, &dump, br->ofproto) { + struct iface *iface = iface_lookup(br, ofproto_port.name); + if (iface) { + if (iface->ofp_port >= 0) { + VLOG_WARN("bridge %s: interface %s reported twice", + br->name, ofproto_port.name); + } else if (iface_from_ofp_port(br, ofproto_port.ofp_port)) { + VLOG_WARN("bridge %s: interface %"PRIu16" reported twice", + br->name, ofproto_port.ofp_port); + } else { + iface_set_ofp_port(iface, ofproto_port.ofp_port); + } + } + } +} + +/* Add an ofproto port for any "struct iface" that doesn't have one. + * Delete any "struct iface" for which this fails. + * Delete any "struct port" that thereby ends up with no ifaces. */ +static void +bridge_add_ofproto_ports(struct bridge *br) +{ + struct port *port, *next_port; + + HMAP_FOR_EACH_SAFE (port, next_port, hmap_node, &br->ports) { + struct iface *iface, *next_iface; + struct ofproto_port ofproto_port; + + LIST_FOR_EACH_SAFE (iface, next_iface, port_elem, &port->ifaces) { + struct shash args; + int error; + + /* Open the netdev or reconfigure it. */ + shash_init(&args); + shash_from_ovs_idl_map(iface->cfg->key_options, + iface->cfg->value_options, + iface->cfg->n_options, &args); + if (!iface->netdev) { + struct netdev_options options; + options.name = iface->name; + options.type = iface->type; + options.args = &args; + options.ethertype = NETDEV_ETH_TYPE_NONE; + error = netdev_open(&options, &iface->netdev); + } else { + error = netdev_set_config(iface->netdev, &args); + } + shash_destroy(&args); + if (error) { + VLOG_WARN("could not %s network device %s (%s)", + iface->netdev ? "reconfigure" : "open", + iface->name, strerror(error)); + } + + /* Add the port, if necessary. */ + if (iface->netdev && iface->ofp_port < 0) { + uint16_t ofp_port; + int error; + + error = ofproto_port_add(br->ofproto, iface->netdev, + &ofp_port); + if (!error) { + iface_set_ofp_port(iface, ofp_port); + } else { + netdev_close(iface->netdev); + iface->netdev = NULL; + } + } + + /* Delete the iface if */ + if (iface->netdev && iface->ofp_port >= 0) { + VLOG_DBG("bridge %s: interface %s is on port %d", + br->name, iface->name, iface->ofp_port); + } else { + if (iface->netdev) { + VLOG_ERR("bridge %s: missing %s interface, dropping", + br->name, iface->name); + } else { + /* We already reported a related error, don't bother + * duplicating it. */ + } + iface_set_ofport(iface->cfg, -1); + iface_destroy(iface); + } + } + if (list_is_empty(&port->ifaces)) { + VLOG_WARN("%s port has no interfaces, dropping", port->name); + port_destroy(port); + continue; + } + + /* Add bond fake iface if necessary. */ + if (port_is_bond_fake_iface(port)) { + if (ofproto_port_query_by_name(br->ofproto, port->name, + &ofproto_port)) { + struct netdev_options options; + struct netdev *netdev; + int error; + + options.name = port->name; + options.type = "internal"; + options.args = NULL; + options.ethertype = NETDEV_ETH_TYPE_NONE; + error = netdev_open(&options, &netdev); + if (!error) { + ofproto_port_add(br->ofproto, netdev, NULL); + netdev_close(netdev); + } else { + VLOG_WARN("could not open network device %s (%s)", + port->name, strerror(error)); + } + } else { + /* Already exists, nothing to do. */ + ofproto_port_destroy(&ofproto_port); + } + ofproto_port_destroy(&ofproto_port); + } + } +} + +static const char * +get_ovsrec_key_value(const struct ovsdb_idl_row *row, + const struct ovsdb_idl_column *column, + const char *key) +{ + const struct ovsdb_datum *datum; + union ovsdb_atom atom; + unsigned int idx; + + datum = ovsdb_idl_get(row, column, OVSDB_TYPE_STRING, OVSDB_TYPE_STRING); atom.string = (char *) key; idx = ovsdb_datum_find_key(datum, &atom, OVSDB_TYPE_STRING); return idx == UINT_MAX ? NULL : datum->values[idx].string; @@ -983,7 +982,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], struct iface *iface; /* Mirror output ports don't participate. */ - if (port->is_mirror_output_port) { + if (ofproto_is_mirror_output_bundle(br->ofproto, port)) { continue; } @@ -1014,7 +1013,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], /* The local port doesn't count (since we're trying to choose its * MAC address anyway). */ - if (iface->dp_ifidx == ODPP_LOCAL) { + if (iface->ofp_port == OFPP_LOCAL) { continue; } @@ -1196,7 +1195,6 @@ iface_refresh_status(struct iface *iface) ovsrec_interface_set_link_speed(iface->cfg, NULL, 0); } - ovsrec_interface_set_link_state(iface->cfg, iface_get_carrier(iface) ? "up" : "down"); @@ -1221,7 +1219,7 @@ iface_refresh_cfm_stats(struct iface *iface) size_t i; mon = iface->cfg->monitor; - cfm = ofproto_iface_get_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); + cfm = ofproto_port_get_cfm(iface->port->bridge->ofproto, iface->ofp_port); if (!cfm || !mon) { return false; @@ -1251,22 +1249,15 @@ iface_refresh_cfm_stats(struct iface *iface) static bool iface_refresh_lacp_stats(struct iface *iface) { - bool *db_current = iface->cfg->lacp_current; - bool changed = false; - - if (iface->port->lacp) { - bool current = lacp_slave_is_current(iface->port->lacp, iface); + struct ofproto *ofproto = iface->port->bridge->ofproto; + int old = iface->cfg->lacp_current ? *iface->cfg->lacp_current : -1; + int new = ofproto_port_is_lacp_current(ofproto, iface->ofp_port); - if (!db_current || *db_current != current) { - changed = true; - ovsrec_interface_set_lacp_current(iface->cfg, ¤t, 1); - } - } else if (db_current) { - changed = true; - ovsrec_interface_set_lacp_current(iface->cfg, NULL, 0); + if (old != new) { + bool current = new; + ovsrec_interface_set_lacp_current(iface->cfg, ¤t, new >= 0); } - - return changed; + return old != new; } static void @@ -1388,8 +1379,8 @@ bridge_run(void) /* Let each bridge do the work that it needs to do. */ datapath_destroyed = false; - LIST_FOR_EACH (br, node, &all_bridges) { - int error = bridge_run_one(br); + HMAP_FOR_EACH (br, node, &all_bridges) { + int error = ofproto_run(br->ofproto); if (error) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "bridge %s: datapath was destroyed externally, " @@ -1419,7 +1410,6 @@ bridge_run(void) if (cfg) { struct ovsdb_idl_txn *txn = ovsdb_idl_txn_create(idl); - bridge_configure_once(cfg); bridge_reconfigure(cfg); ovsrec_open_vswitch_set_cur_cfg(cfg, cfg->next_cfg); @@ -1440,7 +1430,7 @@ bridge_run(void) struct ovsdb_idl_txn *txn; txn = ovsdb_idl_txn_create(idl); - LIST_FOR_EACH (br, node, &all_bridges) { + HMAP_FOR_EACH (br, node, &all_bridges) { struct port *port; HMAP_FOR_EACH (port, hmap_node, &br->ports) { @@ -1466,7 +1456,7 @@ bridge_run(void) bool changed = false; txn = ovsdb_idl_txn_create(idl); - LIST_FOR_EACH (br, node, &all_bridges) { + HMAP_FOR_EACH (br, node, &all_bridges) { struct port *port; HMAP_FOR_EACH (port, hmap_node, &br->ports) { @@ -1493,14 +1483,8 @@ bridge_wait(void) { struct bridge *br; - LIST_FOR_EACH (br, node, &all_bridges) { - struct port *port; - + HMAP_FOR_EACH (br, node, &all_bridges) { ofproto_wait(br->ofproto); - mac_learning_wait(br->ml); - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - port_wait(port); - } } ovsdb_idl_wait(idl); poll_timer_wait_until(stats_timer); @@ -1509,41 +1493,6 @@ bridge_wait(void) poll_timer_wait_until(db_limiter); } } - -/* Forces 'br' to revalidate all of its flows. This is appropriate when 'br''s - * configuration changes. */ -static void -bridge_flush(struct bridge *br) -{ - COVERAGE_INC(bridge_flush); - br->flush = true; -} - -/* Bridge unixctl user interface functions. */ -static void -bridge_unixctl_fdb_show(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) -{ - struct ds ds = DS_EMPTY_INITIALIZER; - const struct bridge *br; - const struct mac_entry *e; - - br = bridge_lookup(args); - if (!br) { - unixctl_command_reply(conn, 501, "no such bridge"); - return; - } - - ds_put_cstr(&ds, " port VLAN MAC Age\n"); - LIST_FOR_EACH (e, lru_node, &br->ml->lrus) { - struct port *port = e->port.p; - ds_put_format(&ds, "%5d %4d "ETH_ADDR_FMT" %3d\n", - port_get_an_iface(port)->dp_ifidx, - e->vlan, ETH_ADDR_ARGS(e->mac), mac_entry_age(e)); - } - unixctl_command_reply(conn, 200, ds_cstr(&ds)); - ds_destroy(&ds); -} /* CFM unixctl user interface functions. */ static void @@ -1560,7 +1509,7 @@ cfm_unixctl_show(struct unixctl_conn *conn, return; } - cfm = ofproto_iface_get_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); + cfm = ofproto_port_get_cfm(iface->port->bridge->ofproto, iface->ofp_port); if (!cfm) { unixctl_command_reply(conn, 501, "CFM not enabled"); @@ -1666,79 +1615,48 @@ qos_unixctl_show(struct unixctl_conn *conn, } /* Bridge reconfiguration functions. */ -static struct bridge * +static void bridge_create(const struct ovsrec_bridge *br_cfg) { struct bridge *br; - int error; assert(!bridge_lookup(br_cfg->name)); br = xzalloc(sizeof *br); - error = dpif_create_and_open(br_cfg->name, br_cfg->datapath_type, - &br->dpif); - if (error) { - free(br); - return NULL; - } - - error = ofproto_create(br_cfg->name, br_cfg->datapath_type, &bridge_ofhooks, - br, &br->ofproto); - if (error) { - VLOG_ERR("failed to create switch %s: %s", br_cfg->name, - strerror(error)); - dpif_delete(br->dpif); - dpif_close(br->dpif); - free(br); - return NULL; - } - br->name = xstrdup(br_cfg->name); + br->type = xstrdup(ofproto_normalize_type(br_cfg->datapath_type)); br->cfg = br_cfg; - br->ml = mac_learning_create(); eth_addr_nicira_random(br->default_ea); hmap_init(&br->ports); hmap_init(&br->ifaces); - shash_init(&br->iface_by_name); - - br->flush = false; - - list_push_back(&all_bridges, &br->node); - - VLOG_INFO("created bridge %s on %s", br->name, dpif_name(br->dpif)); + hmap_init(&br->iface_by_name); + hmap_init(&br->mirrors); - return br; + hmap_insert(&all_bridges, &br->node, hash_string(br->name, 0)); } static void bridge_destroy(struct bridge *br) { if (br) { - struct port *port, *next; - int error; - int i; + struct mirror *mirror, *next_mirror; + struct port *port, *next_port; - HMAP_FOR_EACH_SAFE (port, next, hmap_node, &br->ports) { + HMAP_FOR_EACH_SAFE (port, next_port, hmap_node, &br->ports) { port_destroy(port); } - for (i = 0; i < MAX_MIRRORS; i++) { - mirror_destroy(br->mirrors[i]); + HMAP_FOR_EACH_SAFE (mirror, next_mirror, hmap_node, &br->mirrors) { + mirror_destroy(mirror); } - list_remove(&br->node); + hmap_remove(&all_bridges, &br->node); ofproto_destroy(br->ofproto); - error = dpif_delete(br->dpif); - if (error && error != ENOENT) { - VLOG_ERR("failed to delete %s: %s", - dpif_name(br->dpif), strerror(error)); - } - dpif_close(br->dpif); - mac_learning_destroy(br->ml); hmap_destroy(&br->ifaces); hmap_destroy(&br->ports); - shash_destroy(&br->iface_by_name); - free(br->synth_local_iface.type); + hmap_destroy(&br->iface_by_name); + hmap_destroy(&br->mirrors); free(br->name); + free(br->type); free(br); } } @@ -1748,7 +1666,7 @@ bridge_lookup(const char *name) { struct bridge *br; - LIST_FOR_EACH (br, node, &all_bridges) { + HMAP_FOR_EACH_WITH_HASH (br, node, hash_string(name, 0), &all_bridges) { if (!strcmp(br->name, name)) { return br; } @@ -1794,36 +1712,13 @@ bridge_unixctl_reconnect(struct unixctl_conn *conn, } ofproto_reconnect_controllers(br->ofproto); } else { - LIST_FOR_EACH (br, node, &all_bridges) { + HMAP_FOR_EACH (br, node, &all_bridges) { ofproto_reconnect_controllers(br->ofproto); } } unixctl_command_reply(conn, 200, NULL); } -static int -bridge_run_one(struct bridge *br) -{ - struct port *port; - int error; - - error = ofproto_run1(br->ofproto); - if (error) { - return error; - } - - mac_learning_run(br->ml, ofproto_get_revalidate_set(br->ofproto)); - - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - port_run(port); - } - - error = ofproto_run2(br->ofproto, br->flush); - br->flush = false; - - return error; -} - static size_t bridge_get_controllers(const struct bridge *br, struct ovsrec_controller ***controllersp) @@ -1845,10 +1740,11 @@ bridge_get_controllers(const struct bridge *br, return n_controllers; } +/* Adds and deletes "struct port"s and "struct iface"s under 'br' to match + * those configured in 'br->cfg'. */ static void -bridge_reconfigure_one(struct bridge *br) +bridge_add_del_ports(struct bridge *br) { - enum ofproto_fail_mode fail_mode; struct port *port, *next; struct shash_node *node; struct shash new_ports; @@ -1863,24 +1759,17 @@ bridge_reconfigure_one(struct bridge *br) br->name, name); } } - if (!shash_find(&new_ports, br->name)) { - struct dpif_port dpif_port; - char *type; - + if (bridge_get_controllers(br, NULL) + && !shash_find(&new_ports, br->name)) { VLOG_WARN("bridge %s: no port named %s, synthesizing one", br->name, br->name); - dpif_port_query_by_number(br->dpif, ODPP_LOCAL, &dpif_port); - type = xstrdup(dpif_port.type ? dpif_port.type : "internal"); - dpif_port_destroy(&dpif_port); - br->synth_local_port.interfaces = &br->synth_local_ifacep; br->synth_local_port.n_interfaces = 1; br->synth_local_port.name = br->name; br->synth_local_iface.name = br->name; - free(br->synth_local_iface.type); - br->synth_local_iface.type = type; + br->synth_local_iface.type = "internal"; br->synth_local_ifacep = &br->synth_local_iface; @@ -1888,28 +1777,26 @@ bridge_reconfigure_one(struct bridge *br) } /* Get rid of deleted ports. - * Get rid of deleted interfaces on ports that still exist. */ + * Get rid of deleted interfaces on ports that still exist. + * Update 'cfg' of ports that still exist. */ HMAP_FOR_EACH_SAFE (port, next, hmap_node, &br->ports) { - const struct ovsrec_port *port_cfg; - - port_cfg = shash_find_data(&new_ports, port->name); - if (!port_cfg) { + port->cfg = shash_find_data(&new_ports, port->name); + if (!port->cfg) { port_destroy(port); } else { - port_del_ifaces(port, port_cfg); + port_del_ifaces(port); } } /* Create new ports. - * Add new interfaces to existing ports. - * Reconfigure existing ports. */ + * Add new interfaces to existing ports. */ SHASH_FOR_EACH (node, &new_ports) { struct port *port = port_lookup(br, node->name); if (!port) { - port = port_create(br, node->name); + struct ovsrec_port *cfg = node->data; + port = port_create(br, cfg); } - - port_reconfigure(port, node->data); + port_add_ifaces(port); if (list_is_empty(&port->ifaces)) { VLOG_WARN("bridge %s: port %s has no interfaces, dropping", br->name, port->name); @@ -1917,34 +1804,6 @@ bridge_reconfigure_one(struct bridge *br) } } shash_destroy(&new_ports); - - /* Set the fail-mode */ - fail_mode = !br->cfg->fail_mode - || !strcmp(br->cfg->fail_mode, "standalone") - ? OFPROTO_FAIL_STANDALONE - : OFPROTO_FAIL_SECURE; - if (ofproto_get_fail_mode(br->ofproto) != fail_mode - && !ofproto_has_primary_controller(br->ofproto)) { - ofproto_flush_flows(br->ofproto); - } - ofproto_set_fail_mode(br->ofproto, fail_mode); - - /* Delete all flows if we're switching from connected to standalone or vice - * versa. (XXX Should we delete all flows if we are switching from one - * controller to another?) */ - - /* Configure OpenFlow controller connection snooping. */ - if (!ofproto_has_snoops(br->ofproto)) { - struct sset snoops; - - sset_init(&snoops); - sset_add_and_free(&snoops, xasprintf("punix:%s/%s.snoop", - ovs_rundir(), br->name)); - ofproto_set_snoops(br->ofproto, &snoops); - sset_destroy(&snoops); - } - - mirror_reconfigure(br); } /* Initializes 'oc' appropriately as a management service controller for @@ -1991,7 +1850,7 @@ bridge_configure_local_iface_netdev(struct bridge *br, struct in_addr ip; /* If there's no local interface or no IP address, give up. */ - local_iface = iface_from_dp_ifidx(br, ODPP_LOCAL); + local_iface = iface_from_ofp_port(br, OFPP_LOCAL); if (!local_iface || !c->local_ip || !inet_aton(c->local_ip, &ip)) { return; } @@ -2023,9 +1882,8 @@ bridge_configure_local_iface_netdev(struct bridge *br, } static void -bridge_reconfigure_remotes(struct bridge *br, - const struct sockaddr_in *managers, - size_t n_managers) +bridge_configure_remotes(struct bridge *br, + const struct sockaddr_in *managers, size_t n_managers) { const char *disable_ib_str, *queue_id_str; bool disable_in_band = false; @@ -2033,7 +1891,8 @@ bridge_reconfigure_remotes(struct bridge *br, struct ovsrec_controller **controllers; size_t n_controllers; - bool had_primary; + + enum ofproto_fail_mode fail_mode; struct ofproto_controller *ocs; size_t n_ocs; @@ -2055,7 +1914,6 @@ bridge_reconfigure_remotes(struct bridge *br, } else { ofproto_set_extra_in_band_remotes(br->ofproto, managers, n_managers); } - had_primary = ofproto_has_primary_controller(br->ofproto); n_controllers = bridge_get_controllers(br, &controllers); @@ -2072,807 +1930,59 @@ bridge_reconfigure_remotes(struct bridge *br, /* Prevent remote ovsdb-server users from accessing arbitrary Unix * domain sockets and overwriting arbitrary local files. */ - VLOG_ERR_RL(&rl, "%s: not adding Unix domain socket controller " - "\"%s\" due to possibility for remote exploit", - dpif_name(br->dpif), c->target); - continue; - } - - bridge_configure_local_iface_netdev(br, c); - bridge_ofproto_controller_from_ovsrec(c, &ocs[n_ocs]); - if (disable_in_band) { - ocs[n_ocs].band = OFPROTO_OUT_OF_BAND; - } - n_ocs++; - } - - ofproto_set_controllers(br->ofproto, ocs, n_ocs); - free(ocs[0].target); /* From bridge_ofproto_controller_for_mgmt(). */ - free(ocs); - - if (had_primary != ofproto_has_primary_controller(br->ofproto)) { - ofproto_flush_flows(br->ofproto); - } - - /* If there are no controllers and the bridge is in standalone - * mode, set up a flow that matches every packet and directs - * them to OFPP_NORMAL (which goes to us). Otherwise, the - * switch is in secure mode and we won't pass any traffic until - * a controller has been defined and it tells us to do so. */ - if (!n_controllers - && ofproto_get_fail_mode(br->ofproto) == OFPROTO_FAIL_STANDALONE) { - union ofp_action action; - struct cls_rule rule; - - memset(&action, 0, sizeof action); - action.type = htons(OFPAT_OUTPUT); - action.output.len = htons(sizeof action); - action.output.port = htons(OFPP_NORMAL); - cls_rule_init_catchall(&rule, 0); - ofproto_add_flow(br->ofproto, &rule, &action, 1); - } -} - -static void -bridge_get_all_ifaces(const struct bridge *br, struct shash *ifaces) -{ - struct port *port; - - shash_init(ifaces); - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - struct iface *iface; - - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - shash_add_once(ifaces, iface->name, iface); - } - if (!list_is_short(&port->ifaces) && port->cfg->bond_fake_iface) { - shash_add_once(ifaces, port->name, NULL); - } - } -} - -/* For robustness, in case the administrator moves around datapath ports behind - * our back, we re-check all the datapath port numbers here. - * - * This function will set the 'dp_ifidx' members of interfaces that have - * disappeared to -1, so only call this function from a context where those - * 'struct iface's will be removed from the bridge. Otherwise, the -1 - * 'dp_ifidx'es will cause trouble later when we try to send them to the - * datapath, which doesn't support UINT16_MAX+1 ports. */ -static void -bridge_fetch_dp_ifaces(struct bridge *br) -{ - struct dpif_port_dump dump; - struct dpif_port dpif_port; - struct port *port; - - /* Reset all interface numbers. */ - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - struct iface *iface; - - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - iface->dp_ifidx = -1; - } - } - hmap_clear(&br->ifaces); - - DPIF_PORT_FOR_EACH (&dpif_port, &dump, br->dpif) { - struct iface *iface = iface_lookup(br, dpif_port.name); - if (iface) { - if (iface->dp_ifidx >= 0) { - VLOG_WARN("%s reported interface %s twice", - dpif_name(br->dpif), dpif_port.name); - } else if (iface_from_dp_ifidx(br, dpif_port.port_no)) { - VLOG_WARN("%s reported interface %"PRIu16" twice", - dpif_name(br->dpif), dpif_port.port_no); - } else { - iface->dp_ifidx = dpif_port.port_no; - hmap_insert(&br->ifaces, &iface->dp_ifidx_node, - hash_int(iface->dp_ifidx, 0)); - } - - iface_set_ofport(iface->cfg, - (iface->dp_ifidx >= 0 - ? odp_port_to_ofp_port(iface->dp_ifidx) - : -1)); - } - } -} - -/* Bridge packet processing functions. */ - -static bool -set_dst(struct dst *dst, const struct flow *flow, - const struct port *in_port, const struct port *out_port, - tag_type *tags) -{ - dst->vlan = (out_port->vlan >= 0 ? OFP_VLAN_NONE - : in_port->vlan >= 0 ? in_port->vlan - : flow->vlan_tci == 0 ? OFP_VLAN_NONE - : vlan_tci_to_vid(flow->vlan_tci)); - - dst->iface = (!out_port->bond - ? port_get_an_iface(out_port) - : bond_choose_output_slave(out_port->bond, flow, - dst->vlan, tags)); - - return dst->iface != NULL; -} - -static int -mirror_mask_ffs(mirror_mask_t mask) -{ - BUILD_ASSERT_DECL(sizeof(unsigned int) >= sizeof(mask)); - return ffs(mask); -} - -static void -dst_set_init(struct dst_set *set) -{ - set->dsts = set->builtin; - set->n = 0; - set->allocated = ARRAY_SIZE(set->builtin); -} - -static void -dst_set_add(struct dst_set *set, const struct dst *dst) -{ - if (set->n >= set->allocated) { - size_t new_allocated; - struct dst *new_dsts; - - new_allocated = set->allocated * 2; - new_dsts = xmalloc(new_allocated * sizeof *new_dsts); - memcpy(new_dsts, set->dsts, set->n * sizeof *new_dsts); - - dst_set_free(set); - - set->dsts = new_dsts; - set->allocated = new_allocated; - } - set->dsts[set->n++] = *dst; -} - -static void -dst_set_free(struct dst_set *set) -{ - if (set->dsts != set->builtin) { - free(set->dsts); - } -} - -static bool -dst_is_duplicate(const struct dst_set *set, const struct dst *test) -{ - size_t i; - for (i = 0; i < set->n; i++) { - if (set->dsts[i].vlan == test->vlan - && set->dsts[i].iface == test->iface) { - return true; - } - } - return false; -} - -static bool -port_trunks_vlan(const struct port *port, uint16_t vlan) -{ - return (port->vlan < 0 - && (!port->trunks || bitmap_is_set(port->trunks, vlan))); -} - -static bool -port_includes_vlan(const struct port *port, uint16_t vlan) -{ - return vlan == port->vlan || port_trunks_vlan(port, vlan); -} - -static bool -port_is_floodable(const struct port *port) -{ - struct iface *iface; - - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - if (!ofproto_port_is_floodable(port->bridge->ofproto, - iface->dp_ifidx)) { - return false; - } - } - return true; -} - -/* Returns an arbitrary interface within 'port'. */ -static struct iface * -port_get_an_iface(const struct port *port) -{ - return CONTAINER_OF(list_front(&port->ifaces), struct iface, port_elem); -} - -static void -compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan, - const struct port *in_port, const struct port *out_port, - struct dst_set *set, tag_type *tags, uint16_t *nf_output_iface) -{ - struct dst dst; - - if (out_port == FLOOD_PORT) { - struct port *port; - - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - if (port != in_port - && port_is_floodable(port) - && port_includes_vlan(port, vlan) - && !port->is_mirror_output_port - && set_dst(&dst, flow, in_port, port, tags)) { - dst_set_add(set, &dst); - } - } - *nf_output_iface = NF_OUT_FLOOD; - } else if (out_port && set_dst(&dst, flow, in_port, out_port, tags)) { - dst_set_add(set, &dst); - *nf_output_iface = dst.iface->dp_ifidx; - } -} - -static void -compose_mirror_dsts(const struct bridge *br, const struct flow *flow, - uint16_t vlan, const struct port *in_port, - struct dst_set *set, tag_type *tags) -{ - mirror_mask_t mirrors; - int flow_vlan; - size_t i; - - mirrors = in_port->src_mirrors; - for (i = 0; i < set->n; i++) { - mirrors |= set->dsts[i].iface->port->dst_mirrors; - } - - if (!mirrors) { - return; - } - - flow_vlan = vlan_tci_to_vid(flow->vlan_tci); - if (flow_vlan == 0) { - flow_vlan = OFP_VLAN_NONE; - } - - while (mirrors) { - struct mirror *m = br->mirrors[mirror_mask_ffs(mirrors) - 1]; - if (!m->n_vlans || vlan_is_mirrored(m, vlan)) { - struct dst dst; - - if (m->out_port) { - if (set_dst(&dst, flow, in_port, m->out_port, tags) - && !dst_is_duplicate(set, &dst)) { - dst_set_add(set, &dst); - } - } else { - struct port *port; - - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - if (port_includes_vlan(port, m->out_vlan) - && set_dst(&dst, flow, in_port, port, tags)) - { - if (port->vlan < 0) { - dst.vlan = m->out_vlan; - } - if (dst_is_duplicate(set, &dst)) { - continue; - } - - /* Use the vlan tag on the original flow instead of - * the one passed in the vlan parameter. This ensures - * that we compare the vlan from before any implicit - * tagging tags place. This is necessary because - * dst->vlan is the final vlan, after removing implicit - * tags. */ - if (port == in_port && dst.vlan == flow_vlan) { - /* Don't send out input port on same VLAN. */ - continue; - } - dst_set_add(set, &dst); - } - } - } - } - mirrors &= mirrors - 1; - } -} - -static void -compose_actions(struct bridge *br, const struct flow *flow, uint16_t vlan, - const struct port *in_port, const struct port *out_port, - tag_type *tags, struct ofpbuf *actions, - uint16_t *nf_output_iface) -{ - uint16_t initial_vlan, cur_vlan; - const struct dst *dst; - struct dst_set set; - - dst_set_init(&set); - compose_dsts(br, flow, vlan, in_port, out_port, &set, tags, - nf_output_iface); - compose_mirror_dsts(br, flow, vlan, in_port, &set, tags); - - /* Output all the packets we can without having to change the VLAN. */ - initial_vlan = vlan_tci_to_vid(flow->vlan_tci); - if (initial_vlan == 0) { - initial_vlan = OFP_VLAN_NONE; - } - for (dst = set.dsts; dst < &set.dsts[set.n]; dst++) { - if (dst->vlan != initial_vlan) { - continue; - } - nl_msg_put_u32(actions, ODP_ACTION_ATTR_OUTPUT, dst->iface->dp_ifidx); - } - - /* Then output the rest. */ - cur_vlan = initial_vlan; - for (dst = set.dsts; dst < &set.dsts[set.n]; dst++) { - if (dst->vlan == initial_vlan) { - continue; - } - if (dst->vlan != cur_vlan) { - if (dst->vlan == OFP_VLAN_NONE) { - nl_msg_put_flag(actions, ODP_ACTION_ATTR_STRIP_VLAN); - } else { - ovs_be16 tci; - tci = htons(dst->vlan & VLAN_VID_MASK); - tci |= flow->vlan_tci & htons(VLAN_PCP_MASK); - nl_msg_put_be16(actions, ODP_ACTION_ATTR_SET_DL_TCI, tci); - } - cur_vlan = dst->vlan; - } - nl_msg_put_u32(actions, ODP_ACTION_ATTR_OUTPUT, dst->iface->dp_ifidx); - } - - dst_set_free(&set); -} - -/* Returns the effective vlan of a packet, taking into account both the - * 802.1Q header and implicitly tagged ports. A value of 0 indicates that - * the packet is untagged and -1 indicates it has an invalid header and - * should be dropped. */ -static int flow_get_vlan(struct bridge *br, const struct flow *flow, - struct port *in_port, bool have_packet) -{ - int vlan = vlan_tci_to_vid(flow->vlan_tci); - if (in_port->vlan >= 0) { - if (vlan) { - if (have_packet) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping VLAN %d tagged " - "packet received on port %s configured with " - "implicit VLAN %"PRIu16, - br->name, vlan, in_port->name, in_port->vlan); - } - return -1; - } - vlan = in_port->vlan; - } else { - if (!port_includes_vlan(in_port, vlan)) { - if (have_packet) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping VLAN %d tagged " - "packet received on port %s not configured for " - "trunking VLAN %d", - br->name, vlan, in_port->name, vlan); - } - return -1; - } - } - - return vlan; -} - -/* A VM broadcasts a gratuitous ARP to indicate that it has resumed after - * migration. Older Citrix-patched Linux DomU used gratuitous ARP replies to - * indicate this; newer upstream kernels use gratuitous ARP requests. */ -static bool -is_gratuitous_arp(const struct flow *flow) -{ - return (flow->dl_type == htons(ETH_TYPE_ARP) - && eth_addr_is_broadcast(flow->dl_dst) - && (flow->nw_proto == ARP_OP_REPLY - || (flow->nw_proto == ARP_OP_REQUEST - && flow->nw_src == flow->nw_dst))); -} - -static void -update_learning_table(struct bridge *br, const struct flow *flow, int vlan, - struct port *in_port) -{ - struct mac_entry *mac; - - if (!mac_learning_may_learn(br->ml, flow->dl_src, vlan)) { - return; - } - - mac = mac_learning_insert(br->ml, flow->dl_src, vlan); - if (is_gratuitous_arp(flow)) { - /* We don't want to learn from gratuitous ARP packets that are - * reflected back over bond slaves so we lock the learning table. */ - if (!in_port->bond) { - mac_entry_set_grat_arp_lock(mac); - } else if (mac_entry_is_grat_arp_locked(mac)) { - return; - } - } - - if (mac_entry_is_new(mac) || mac->port.p != in_port) { - /* The log messages here could actually be useful in debugging, - * so keep the rate limit relatively high. */ - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(30, 300); - VLOG_DBG_RL(&rl, "bridge %s: learned that "ETH_ADDR_FMT" is " - "on port %s in VLAN %d", - br->name, ETH_ADDR_ARGS(flow->dl_src), - in_port->name, vlan); - - mac->port.p = in_port; - ofproto_revalidate(br->ofproto, mac_learning_changed(br->ml, mac)); - } -} - -/* Determines whether packets in 'flow' within 'br' should be forwarded or - * dropped. Returns true if they may be forwarded, false if they should be - * dropped. - * - * If 'have_packet' is true, it indicates that the caller is processing a - * received packet. If 'have_packet' is false, then the caller is just - * revalidating an existing flow because configuration has changed. Either - * way, 'have_packet' only affects logging (there is no point in logging errors - * during revalidation). - * - * Sets '*in_portp' to the input port. This will be a null pointer if - * flow->in_port does not designate a known input port (in which case - * is_admissible() returns false). - * - * When returning true, sets '*vlanp' to the effective VLAN of the input - * packet, as returned by flow_get_vlan(). - * - * May also add tags to '*tags', although the current implementation only does - * so in one special case. - */ -static bool -is_admissible(struct bridge *br, const struct flow *flow, bool have_packet, - tag_type *tags, int *vlanp, struct port **in_portp) -{ - struct iface *in_iface; - struct port *in_port; - int vlan; - - /* Find the interface and port structure for the received packet. */ - in_iface = iface_from_dp_ifidx(br, flow->in_port); - if (!in_iface) { - /* No interface? Something fishy... */ - if (have_packet) { - /* Odd. A few possible reasons here: - * - * - We deleted an interface but there are still a few packets - * queued up from it. - * - * - Someone externally added an interface (e.g. with "ovs-dpctl - * add-if") that we don't know about. - * - * - Packet arrived on the local port but the local port is not - * one of our bridge ports. - */ - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - - VLOG_WARN_RL(&rl, "bridge %s: received packet on unknown " - "interface %"PRIu16, br->name, flow->in_port); - } - - *in_portp = NULL; - return false; - } - *in_portp = in_port = in_iface->port; - *vlanp = vlan = flow_get_vlan(br, flow, in_port, have_packet); - if (vlan < 0) { - return false; - } - - /* Drop frames for reserved multicast addresses. */ - if (eth_addr_is_reserved(flow->dl_dst)) { - return false; - } - - /* Drop frames on ports reserved for mirroring. */ - if (in_port->is_mirror_output_port) { - if (have_packet) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping packet received on port " - "%s, which is reserved exclusively for mirroring", - br->name, in_port->name); - } - return false; - } - - if (in_port->bond) { - struct mac_entry *mac; - - switch (bond_check_admissibility(in_port->bond, in_iface, - flow->dl_dst, tags)) { - case BV_ACCEPT: - break; - - case BV_DROP: - return false; - - case BV_DROP_IF_MOVED: - mac = mac_learning_lookup(br->ml, flow->dl_src, vlan, NULL); - if (mac && mac->port.p != in_port && - (!is_gratuitous_arp(flow) - || mac_entry_is_grat_arp_locked(mac))) { - return false; - } - break; - } - } - - return true; -} - -/* If the composed actions may be applied to any packet in the given 'flow', - * returns true. Otherwise, the actions should only be applied to 'packet', or - * not at all, if 'packet' was NULL. */ -static bool -process_flow(struct bridge *br, const struct flow *flow, - const struct ofpbuf *packet, struct ofpbuf *actions, - tag_type *tags, uint16_t *nf_output_iface) -{ - struct port *in_port; - struct port *out_port; - struct mac_entry *mac; - int vlan; - - /* Check whether we should drop packets in this flow. */ - if (!is_admissible(br, flow, packet != NULL, tags, &vlan, &in_port)) { - out_port = NULL; - goto done; - } - - /* Learn source MAC (but don't try to learn from revalidation). */ - if (packet) { - update_learning_table(br, flow, vlan, in_port); - } - - /* Determine output port. */ - mac = mac_learning_lookup(br->ml, flow->dl_dst, vlan, tags); - if (mac) { - out_port = mac->port.p; - } else if (!packet && !eth_addr_is_multicast(flow->dl_dst)) { - /* If we are revalidating but don't have a learning entry then - * eject the flow. Installing a flow that floods packets opens - * up a window of time where we could learn from a packet reflected - * on a bond and blackhole packets before the learning table is - * updated to reflect the correct port. */ - return false; - } else { - out_port = FLOOD_PORT; - } - - /* Don't send packets out their input ports. */ - if (in_port == out_port) { - out_port = NULL; - } - -done: - if (in_port) { - compose_actions(br, flow, vlan, in_port, out_port, tags, actions, - nf_output_iface); - } - - return true; -} - -static bool -bridge_normal_ofhook_cb(const struct flow *flow, const struct ofpbuf *packet, - struct ofpbuf *actions, tag_type *tags, - uint16_t *nf_output_iface, void *br_) -{ - struct bridge *br = br_; - - COVERAGE_INC(bridge_process_flow); - return process_flow(br, flow, packet, actions, tags, nf_output_iface); -} - -static bool -bridge_special_ofhook_cb(const struct flow *flow, - const struct ofpbuf *packet, void *br_) -{ - struct iface *iface; - struct bridge *br = br_; - - iface = iface_from_dp_ifidx(br, flow->in_port); - - if (flow->dl_type == htons(ETH_TYPE_LACP)) { - if (iface && iface->port->lacp && packet) { - const struct lacp_pdu *pdu = parse_lacp_packet(packet); - if (pdu) { - lacp_process_pdu(iface->port->lacp, iface, pdu); - } - } - return false; - } - - return true; -} - -static void -bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, - const struct nlattr *actions, - size_t actions_len, - uint64_t n_bytes, void *br_) -{ - struct bridge *br = br_; - const struct nlattr *a; - struct port *in_port; - tag_type dummy = 0; - unsigned int left; - int vlan; - - /* Feed information from the active flows back into the learning table to - * ensure that table is always in sync with what is actually flowing - * through the datapath. - * - * We test that 'tags' is nonzero to ensure that only flows that include an - * OFPP_NORMAL action are used for learning. This works because - * bridge_normal_ofhook_cb() always sets a nonzero tag value. */ - if (tags && is_admissible(br, flow, false, &dummy, &vlan, &in_port)) { - update_learning_table(br, flow, vlan, in_port); - } - - /* Account for bond slave utilization. */ - if (!br->has_bonded_ports) { - return; - } - NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { - if (nl_attr_type(a) == ODP_ACTION_ATTR_OUTPUT) { - struct port *out_port = port_from_dp_ifidx(br, nl_attr_get_u32(a)); - if (out_port && out_port->bond) { - uint16_t vlan = (flow->vlan_tci - ? vlan_tci_to_vid(flow->vlan_tci) - : OFP_VLAN_NONE); - bond_account(out_port->bond, flow, vlan, n_bytes); - } - } - } -} - -static void -bridge_account_checkpoint_ofhook_cb(void *br_) -{ - struct bridge *br = br_; - struct port *port; - - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - if (port->bond) { - bond_rebalance(port->bond, - ofproto_get_revalidate_set(br->ofproto)); - } - } -} - -static uint16_t -bridge_autopath_ofhook_cb(const struct flow *flow, uint32_t ofp_port, - tag_type *tags, void *br_) -{ - struct bridge *br = br_; - uint16_t odp_port = ofp_port_to_odp_port(ofp_port); - struct port *port = port_from_dp_ifidx(br, odp_port); - uint16_t ret; - - if (!port) { - ret = ODPP_NONE; - } else if (list_is_short(&port->ifaces)) { - ret = odp_port; - } else { - struct iface *iface; - - /* Autopath does not support VLAN hashing. */ - iface = bond_choose_output_slave(port->bond, flow, - OFP_VLAN_NONE, tags); - ret = iface ? iface->dp_ifidx : ODPP_NONE; - } - - return odp_port_to_ofp_port(ret); -} - -static struct ofhooks bridge_ofhooks = { - bridge_normal_ofhook_cb, - bridge_special_ofhook_cb, - bridge_account_flow_ofhook_cb, - bridge_account_checkpoint_ofhook_cb, - bridge_autopath_ofhook_cb, -}; - -/* Port functions. */ - -static void -lacp_send_pdu_cb(void *iface_, const struct lacp_pdu *pdu) -{ - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 10); - struct iface *iface = iface_; - uint8_t ea[ETH_ADDR_LEN]; - int error; - - error = netdev_get_etheraddr(iface->netdev, ea); - if (!error) { - struct lacp_pdu *packet_pdu; - struct ofpbuf packet; - - ofpbuf_init(&packet, 0); - packet_pdu = eth_compose(&packet, eth_addr_lacp, ea, ETH_TYPE_LACP, - sizeof *packet_pdu); - *packet_pdu = *pdu; - error = netdev_send(iface->netdev, &packet); - if (error) { - VLOG_WARN_RL(&rl, "port %s: sending LACP PDU on iface %s failed " - "(%s)", iface->port->name, iface->name, - strerror(error)); - } - ofpbuf_uninit(&packet); - } else { - VLOG_ERR_RL(&rl, "port %s: cannot obtain Ethernet address of iface " - "%s (%s)", iface->port->name, iface->name, - strerror(error)); - } -} - -static void -port_run(struct port *port) -{ - if (port->lacp) { - lacp_run(port->lacp, lacp_send_pdu_cb); - } - - if (port->bond) { - struct iface *iface; - - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - bool may_enable = lacp_slave_may_enable(port->lacp, iface); - bond_slave_set_lacp_may_enable(port->bond, iface, may_enable); + VLOG_ERR_RL(&rl, "bridge %s: not adding Unix domain socket " + "controller \"%s\" due to possibility for remote " + "exploit", br->name, c->target); + continue; } - bond_run(port->bond, - ofproto_get_revalidate_set(port->bridge->ofproto), - lacp_negotiated(port->lacp)); - if (bond_should_send_learning_packets(port->bond)) { - port_send_learning_packets(port); + bridge_configure_local_iface_netdev(br, c); + bridge_ofproto_controller_from_ovsrec(c, &ocs[n_ocs]); + if (disable_in_band) { + ocs[n_ocs].band = OFPROTO_OUT_OF_BAND; } + n_ocs++; } -} -static void -port_wait(struct port *port) -{ - if (port->lacp) { - lacp_wait(port->lacp); - } + ofproto_set_controllers(br->ofproto, ocs, n_ocs); + free(ocs[0].target); /* From bridge_ofproto_controller_for_mgmt(). */ + free(ocs); + + /* Set the fail-mode. */ + fail_mode = !br->cfg->fail_mode + || !strcmp(br->cfg->fail_mode, "standalone") + ? OFPROTO_FAIL_STANDALONE + : OFPROTO_FAIL_SECURE; + ofproto_set_fail_mode(br->ofproto, fail_mode); + + /* Configure OpenFlow controller connection snooping. */ + if (!ofproto_has_snoops(br->ofproto)) { + struct sset snoops; - if (port->bond) { - bond_wait(port->bond); + sset_init(&snoops); + sset_add_and_free(&snoops, xasprintf("punix:%s/%s.snoop", + ovs_rundir(), br->name)); + ofproto_set_snoops(br->ofproto, &snoops); + sset_destroy(&snoops); } } + +/* Port functions. */ static struct port * -port_create(struct bridge *br, const char *name) +port_create(struct bridge *br, const struct ovsrec_port *cfg) { struct port *port; port = xzalloc(sizeof *port); port->bridge = br; - port->vlan = -1; - port->trunks = NULL; - port->name = xstrdup(name); + port->name = xstrdup(cfg->name); + port->cfg = cfg; list_init(&port->ifaces); hmap_insert(&br->ports, &port->hmap_node, hash_string(port->name, 0)); VLOG_INFO("created port %s on bridge %s", port->name, br->name); - bridge_flush(br); return port; } @@ -2899,8 +2009,9 @@ get_interface_other_config(const struct ovsrec_interface *iface, return value ? value : default_value; } +/* Deletes interfaces from 'port' that are no longer configured for it. */ static void -port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) +port_del_ifaces(struct port *port) { struct iface *iface, *next; struct sset new_ifaces; @@ -2908,9 +2019,12 @@ port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) /* Collect list of new interfaces. */ sset_init(&new_ifaces); - for (i = 0; i < cfg->n_interfaces; i++) { - const char *name = cfg->interfaces[i]->name; - sset_add(&new_ifaces, name); + for (i = 0; i < port->cfg->n_interfaces; i++) { + const char *name = port->cfg->interfaces[i]->name; + const char *type = port->cfg->interfaces[i]->name; + if (strcmp(type, "null")) { + sset_add(&new_ifaces, name); + } } /* Get rid of deleted interfaces. */ @@ -2923,137 +2037,49 @@ port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) sset_destroy(&new_ifaces); } -/* Expires all MAC learning entries associated with 'port' and forces ofproto - * to revalidate every flow. */ +/* Adds new interfaces to 'port' and updates 'type' and 'cfg' members of + * existing ones. */ static void -port_flush_macs(struct port *port) +port_add_ifaces(struct port *port) { - struct bridge *br = port->bridge; - struct mac_learning *ml = br->ml; - struct mac_entry *mac, *next_mac; + struct shash new_ifaces; + struct shash_node *node; + size_t i; - bridge_flush(br); - LIST_FOR_EACH_SAFE (mac, next_mac, lru_node, &ml->lrus) { - if (mac->port.p == port) { - mac_learning_expire(ml, mac); + /* Collect new ifaces. */ + shash_init(&new_ifaces); + for (i = 0; i < port->cfg->n_interfaces; i++) { + const struct ovsrec_interface *cfg = port->cfg->interfaces[i]; + if (strcmp(cfg->type, "null") + && !shash_add_once(&new_ifaces, cfg->name, cfg)) { + VLOG_WARN("port %s: %s specified twice as port interface", + port->name, cfg->name); + iface_set_ofport(cfg, -1); } } -} - -static void -port_reconfigure(struct port *port, const struct ovsrec_port *cfg) -{ - struct sset new_ifaces; - bool need_flush = false; - unsigned long *trunks; - int vlan; - size_t i; - - port->cfg = cfg; - /* Add new interfaces and update 'cfg' member of existing ones. */ - sset_init(&new_ifaces); - for (i = 0; i < cfg->n_interfaces; i++) { - const struct ovsrec_interface *if_cfg = cfg->interfaces[i]; + /* Create new interfaces. + * Update interface types and 'cfg' members. */ + SHASH_FOR_EACH (node, &new_ifaces) { + const struct ovsrec_interface *cfg = node->data; + const char *iface_name = node->name; struct iface *iface; - const char *type; - if (!sset_add(&new_ifaces, if_cfg->name)) { - VLOG_WARN("port %s: %s specified twice as port interface", - port->name, if_cfg->name); - iface_set_ofport(if_cfg, -1); - continue; + iface = iface_lookup(port->bridge, iface_name); + if (!iface) { + iface = iface_create(port, cfg); + } else { + iface->cfg = cfg; } /* Determine interface type. The local port always has type * "internal". Other ports take their type from the database and * default to "system" if none is specified. */ - type = (!strcmp(if_cfg->name, port->bridge->name) ? "internal" - : if_cfg->type[0] ? if_cfg->type - : "system"); - - iface = iface_lookup(port->bridge, if_cfg->name); - if (!strcmp(type, "null")) { - iface_destroy(iface); - continue; - } else if (iface) { - if (iface->port != port) { - VLOG_ERR("bridge %s: %s interface is on multiple ports, " - "removing from %s", - port->bridge->name, if_cfg->name, iface->port->name); - continue; - } - iface->cfg = if_cfg; - } else { - iface = iface_create(port, if_cfg); - } - - iface->type = type; - } - sset_destroy(&new_ifaces); - - /* Get VLAN tag. */ - vlan = -1; - if (cfg->tag) { - if (list_is_short(&port->ifaces)) { - vlan = *cfg->tag; - if (vlan >= 0 && vlan <= 4095) { - VLOG_DBG("port %s: assigning VLAN tag %d", port->name, vlan); - } else { - vlan = -1; - } - } else { - /* It's possible that bonded, VLAN-tagged ports make sense. Maybe - * they even work as-is. But they have not been tested. */ - VLOG_WARN("port %s: VLAN tags not supported on bonded ports", - port->name); - } - } - if (port->vlan != vlan) { - port->vlan = vlan; - need_flush = true; - } - - /* Get trunked VLANs. */ - trunks = NULL; - if (vlan < 0 && cfg->n_trunks) { - size_t n_errors; - - trunks = bitmap_allocate(4096); - n_errors = 0; - for (i = 0; i < cfg->n_trunks; i++) { - int trunk = cfg->trunks[i]; - if (trunk >= 0) { - bitmap_set1(trunks, trunk); - } else { - n_errors++; - } - } - if (n_errors) { - VLOG_ERR("port %s: invalid values for %zu trunk VLANs", - port->name, cfg->n_trunks); - } - if (n_errors == cfg->n_trunks) { - VLOG_ERR("port %s: no valid trunks, trunking all VLANs", - port->name); - bitmap_free(trunks); - trunks = NULL; - } - } else if (vlan >= 0 && cfg->n_trunks) { - VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", - port->name); - } - if (trunks == NULL - ? port->trunks != NULL - : port->trunks == NULL || !bitmap_equal(trunks, port->trunks, 4096)) { - need_flush = true; - } - bitmap_free(port->trunks); - port->trunks = trunks; - - if (need_flush) { - port_flush_macs(port); + iface->type = (!strcmp(iface_name, port->bridge->name) ? "internal" + : cfg->type[0] ? cfg->type + : "system"); } + shash_destroy(&new_ifaces); } static void @@ -3062,13 +2088,9 @@ port_destroy(struct port *port) if (port) { struct bridge *br = port->bridge; struct iface *iface, *next; - int i; - for (i = 0; i < MAX_MIRRORS; i++) { - struct mirror *m = br->mirrors[i]; - if (m && m->out_port == port) { - mirror_destroy(m); - } + if (br->ofproto) { + ofproto_bundle_unregister(br->ofproto, port); } LIST_FOR_EACH_SAFE (iface, next, port_elem, &port->ifaces) { @@ -3079,23 +2101,11 @@ port_destroy(struct port *port) VLOG_INFO("destroyed port %s on bridge %s", port->name, br->name); - bond_destroy(port->bond); - lacp_destroy(port->lacp); - port_flush_macs(port); - - bitmap_free(port->trunks); free(port->name); free(port); } } -static struct port * -port_from_dp_ifidx(const struct bridge *br, uint16_t dp_ifidx) -{ - struct iface *iface = iface_from_dp_ifidx(br, dp_ifidx); - return iface ? iface->port : NULL; -} - static struct port * port_lookup(const struct bridge *br, const char *name) { @@ -3132,200 +2142,115 @@ enable_lacp(struct port *port, bool *activep) } } -static void -iface_reconfigure_lacp(struct iface *iface) -{ - struct lacp_slave_settings s; - int priority, portid, key; - - portid = atoi(get_interface_other_config(iface->cfg, "lacp-port-id", "0")); - priority = atoi(get_interface_other_config(iface->cfg, - "lacp-port-priority", "0")); - key = atoi(get_interface_other_config(iface->cfg, "lacp-aggregation-key", - "0")); - - if (portid <= 0 || portid > UINT16_MAX) { - portid = iface->dp_ifidx; - } - - if (priority <= 0 || priority > UINT16_MAX) { - priority = UINT16_MAX; - } - - if (key < 0 || key > UINT16_MAX) { - key = 0; - } - - s.name = iface->name; - s.id = portid; - s.priority = priority; - s.key = key; - lacp_slave_register(iface->port->lacp, iface, &s); -} - -static void -port_reconfigure_lacp(struct port *port) +static struct lacp_settings * +port_configure_lacp(struct port *port, struct lacp_settings *s) { - static struct lacp_settings s; - struct iface *iface; - uint8_t sysid[ETH_ADDR_LEN]; - const char *sysid_str; const char *lacp_time; long long int custom_time; int priority; - if (!enable_lacp(port, &s.active)) { - lacp_destroy(port->lacp); - port->lacp = NULL; - return; - } - - sysid_str = get_port_other_config(port->cfg, "lacp-system-id", NULL); - if (sysid_str && eth_addr_from_string(sysid_str, sysid)) { - memcpy(s.id, sysid, ETH_ADDR_LEN); - } else { - memcpy(s.id, port->bridge->ea, ETH_ADDR_LEN); + if (!enable_lacp(port, &s->active)) { + return NULL; } - s.name = port->name; + s->name = port->name; + memcpy(s->id, port->bridge->ea, ETH_ADDR_LEN); /* Prefer bondable links if unspecified. */ priority = atoi(get_port_other_config(port->cfg, "lacp-system-priority", "0")); - s.priority = (priority > 0 && priority <= UINT16_MAX - ? priority - : UINT16_MAX - !list_is_short(&port->ifaces)); + s->priority = (priority > 0 && priority <= UINT16_MAX + ? priority + : UINT16_MAX - !list_is_short(&port->ifaces)); + + s->heartbeat = !strcmp(get_port_other_config(port->cfg, + "lacp-heartbeat", + "false"), "true"); - s.heartbeat = !strcmp(get_port_other_config(port->cfg, - "lacp-heartbeat", - "false"), "true"); lacp_time = get_port_other_config(port->cfg, "lacp-time", "slow"); custom_time = atoi(lacp_time); if (!strcmp(lacp_time, "fast")) { - s.lacp_time = LACP_TIME_FAST; + s->lacp_time = LACP_TIME_FAST; } else if (!strcmp(lacp_time, "slow")) { - s.lacp_time = LACP_TIME_SLOW; + s->lacp_time = LACP_TIME_SLOW; } else if (custom_time > 0) { - s.lacp_time = LACP_TIME_CUSTOM; - s.custom_time = custom_time; + s->lacp_time = LACP_TIME_CUSTOM; + s->custom_time = custom_time; } else { - s.lacp_time = LACP_TIME_SLOW; + s->lacp_time = LACP_TIME_SLOW; } - if (!port->lacp) { - port->lacp = lacp_create(); + return s; +} + +static void +iface_configure_lacp(struct iface *iface, struct lacp_slave_settings *s) +{ + int priority, portid, key; + + portid = atoi(get_interface_other_config(iface->cfg, "lacp-port-id", "0")); + priority = atoi(get_interface_other_config(iface->cfg, + "lacp-port-priority", "0")); + key = atoi(get_interface_other_config(iface->cfg, "lacp-aggregation-key", + "0")); + + if (portid <= 0 || portid > UINT16_MAX) { + portid = iface->ofp_port; } - lacp_configure(port->lacp, &s); + if (priority <= 0 || priority > UINT16_MAX) { + priority = UINT16_MAX; + } - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - iface_reconfigure_lacp(iface); + if (key < 0 || key > UINT16_MAX) { + key = 0; } + + s->name = iface->name; + s->id = portid; + s->priority = priority; + s->key = key; } static void -port_reconfigure_bond(struct port *port) +port_configure_bond(struct port *port, struct bond_settings *s) { - struct bond_settings s; const char *detect_s; - struct iface *iface; - if (list_is_short(&port->ifaces)) { - /* Not a bonded port. */ - bond_destroy(port->bond); - port->bond = NULL; - return; - } - - port->bridge->has_bonded_ports = true; - - s.name = port->name; - s.balance = BM_SLB; + s->name = port->name; + s->balance = BM_SLB; if (port->cfg->bond_mode - && !bond_mode_from_string(&s.balance, port->cfg->bond_mode)) { + && !bond_mode_from_string(&s->balance, port->cfg->bond_mode)) { VLOG_WARN("port %s: unknown bond_mode %s, defaulting to %s", port->name, port->cfg->bond_mode, - bond_mode_to_string(s.balance)); + bond_mode_to_string(s->balance)); } - s.detect = BLSM_CARRIER; + s->detect = BLSM_CARRIER; detect_s = get_port_other_config(port->cfg, "bond-detect-mode", NULL); - if (detect_s && !bond_detect_mode_from_string(&s.detect, detect_s)) { + if (detect_s && !bond_detect_mode_from_string(&s->detect, detect_s)) { VLOG_WARN("port %s: unsupported bond-detect-mode %s, " "defaulting to %s", - port->name, detect_s, bond_detect_mode_to_string(s.detect)); + port->name, detect_s, bond_detect_mode_to_string(s->detect)); } - s.miimon_interval = atoi( + s->miimon_interval = atoi( get_port_other_config(port->cfg, "bond-miimon-interval", "200")); - if (s.miimon_interval < 100) { - s.miimon_interval = 100; + if (s->miimon_interval < 100) { + s->miimon_interval = 100; } - s.up_delay = MAX(0, port->cfg->bond_updelay); - s.down_delay = MAX(0, port->cfg->bond_downdelay); - s.basis = atoi(get_port_other_config(port->cfg, "bond-hash-basis", "0")); - - s.rebalance_interval = atoi( + s->up_delay = MAX(0, port->cfg->bond_updelay); + s->down_delay = MAX(0, port->cfg->bond_downdelay); + s->basis = atoi(get_port_other_config(port->cfg, "bond-hash-basis", "0")); + s->rebalance_interval = atoi( get_port_other_config(port->cfg, "bond-rebalance-interval", "10000")); - if (s.rebalance_interval < 1000) { - s.rebalance_interval = 1000; - } - - s.fake_iface = port->cfg->bond_fake_iface; - - if (!port->bond) { - port->bond = bond_create(&s); - } else { - if (bond_reconfigure(port->bond, &s)) { - bridge_flush(port->bridge); - } - } - - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - long long stable_id; - - stable_id = atoll(get_interface_other_config(iface->cfg, - "bond-stable-id", "0")); - - if (stable_id <= 0 || stable_id >= UINT32_MAX) { - stable_id = odp_port_to_ofp_port(iface->dp_ifidx); - } - - bond_slave_register(iface->port->bond, iface, stable_id, - iface->netdev); - } -} - -static void -port_send_learning_packets(struct port *port) -{ - struct bridge *br = port->bridge; - int error, n_packets, n_errors; - struct mac_entry *e; - - error = n_packets = n_errors = 0; - LIST_FOR_EACH (e, lru_node, &br->ml->lrus) { - if (e->port.p != port) { - int ret = bond_send_learning_packet(port->bond, e->mac, e->vlan); - if (ret) { - error = ret; - n_errors++; - } - n_packets++; - } + if (s->rebalance_interval < 1000) { + s->rebalance_interval = 1000; } - if (n_errors) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bond %s: %d errors sending %d gratuitous learning " - "packets, last error was: %s", - port->name, n_errors, n_packets, strerror(error)); - } else { - VLOG_DBG("bond %s: sent %d gratuitous learning packets", - port->name, n_packets); - } + s->fake_iface = port->cfg->bond_fake_iface; } /* Interface functions. */ @@ -3340,19 +2265,17 @@ iface_create(struct port *port, const struct ovsrec_interface *if_cfg) iface = xzalloc(sizeof *iface); iface->port = port; iface->name = xstrdup(name); - iface->dp_ifidx = -1; + iface->ofp_port = -1; iface->tag = tag_create_random(); iface->netdev = NULL; iface->cfg = if_cfg; - shash_add_assert(&br->iface_by_name, iface->name, iface); + hmap_insert(&br->iface_by_name, &iface->name_node, hash_string(name, 0)); list_push_back(&port->ifaces, &iface->port_elem); VLOG_DBG("attached network device %s to port %s", iface->name, port->name); - bridge_flush(br); - return iface; } @@ -3363,35 +2286,37 @@ iface_destroy(struct iface *iface) struct port *port = iface->port; struct bridge *br = port->bridge; - if (port->bond) { - bond_slave_unregister(port->bond, iface); - } - - if (port->lacp) { - lacp_slave_unregister(port->lacp, iface); + if (br->ofproto && iface->ofp_port >= 0) { + ofproto_port_unregister(br->ofproto, iface->ofp_port); } - shash_find_and_delete_assert(&br->iface_by_name, iface->name); - - if (iface->dp_ifidx >= 0) { - hmap_remove(&br->ifaces, &iface->dp_ifidx_node); + if (iface->ofp_port >= 0) { + hmap_remove(&br->ifaces, &iface->ofp_port_node); } list_remove(&iface->port_elem); + hmap_remove(&br->iface_by_name, &iface->name_node); netdev_close(iface->netdev); free(iface->name); free(iface); - - bridge_flush(port->bridge); } } static struct iface * iface_lookup(const struct bridge *br, const char *name) { - return shash_find_data(&br->iface_by_name, name); + struct iface *iface; + + HMAP_FOR_EACH_WITH_HASH (iface, name_node, hash_string(name, 0), + &br->iface_by_name) { + if (!strcmp(iface->name, name)) { + return iface; + } + } + + return NULL; } static struct iface * @@ -3399,7 +2324,7 @@ iface_find(const char *name) { const struct bridge *br; - LIST_FOR_EACH (br, node, &all_bridges) { + HMAP_FOR_EACH (br, node, &all_bridges) { struct iface *iface = iface_lookup(br, name); if (iface) { @@ -3410,13 +2335,13 @@ iface_find(const char *name) } static struct iface * -iface_from_dp_ifidx(const struct bridge *br, uint16_t dp_ifidx) +iface_from_ofp_port(const struct bridge *br, uint16_t ofp_port) { struct iface *iface; - HMAP_FOR_EACH_IN_BUCKET (iface, dp_ifidx_node, - hash_int(dp_ifidx, 0), &br->ifaces) { - if (iface->dp_ifidx == dp_ifidx) { + HMAP_FOR_EACH_IN_BUCKET (iface, ofp_port_node, + hash_int(ofp_port, 0), &br->ifaces) { + if (iface->ofp_port == ofp_port) { return iface; } } @@ -3432,7 +2357,7 @@ iface_set_mac(struct iface *iface) if (!strcmp(iface->type, "internal") && iface->cfg->mac && eth_addr_from_string(iface->cfg->mac, ea)) { - if (iface->dp_ifidx == ODPP_LOCAL) { + 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); @@ -3532,7 +2457,7 @@ iface_delete_queues(unsigned int queue_id, } static void -iface_update_qos(struct iface *iface, const struct ovsrec_qos *qos) +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); @@ -3565,10 +2490,14 @@ iface_update_qos(struct iface *iface, const struct ovsrec_qos *qos) shash_destroy(&details); } } + + netdev_set_policing(iface->netdev, + iface->cfg->ingress_policing_rate, + iface->cfg->ingress_policing_burst); } static void -iface_update_cfm(struct iface *iface) +iface_configure_cfm(struct iface *iface) { size_t i; struct cfm cfm; @@ -3579,7 +2508,7 @@ iface_update_cfm(struct iface *iface) mon = iface->cfg->monitor; if (!mon) { - ofproto_iface_clear_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); + ofproto_port_clear_cfm(iface->port->bridge->ofproto, iface->ofp_port); return; } @@ -3598,8 +2527,8 @@ iface_update_cfm(struct iface *iface) remote_mps[i] = mon->remote_mps[i]->mpid; } - ofproto_iface_set_cfm(iface->port->bridge->ofproto, iface->dp_ifidx, - &cfm, remote_mps, mon->n_remote_mps); + ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, + &cfm, remote_mps, mon->n_remote_mps); free(remote_mps); } @@ -3627,11 +2556,10 @@ iface_is_synthetic(const struct iface *iface) static struct mirror * mirror_find_by_uuid(struct bridge *br, const struct uuid *uuid) { - int i; + struct mirror *m; - for (i = 0; i < MAX_MIRRORS; i++) { - struct mirror *m = br->mirrors[i]; - if (m && uuid_equals(uuid, &m->uuid)) { + HMAP_FOR_EACH_IN_BUCKET (m, hmap_node, uuid_hash(uuid), &br->mirrors) { + if (uuid_equals(uuid, &m->uuid)) { return m; } } @@ -3639,106 +2567,55 @@ mirror_find_by_uuid(struct bridge *br, const struct uuid *uuid) } static void -mirror_reconfigure(struct bridge *br) +bridge_configure_mirrors(struct bridge *br) { - unsigned long *rspan_vlans; - struct port *port; - int i; + const struct ovsdb_datum *mc; + unsigned long *flood_vlans; + struct mirror *m, *next; + size_t i; /* Get rid of deleted mirrors. */ - for (i = 0; i < MAX_MIRRORS; i++) { - struct mirror *m = br->mirrors[i]; - if (m) { - const struct ovsdb_datum *mc; - union ovsdb_atom atom; - - mc = ovsrec_bridge_get_mirrors(br->cfg, OVSDB_TYPE_UUID); - atom.uuid = br->mirrors[i]->uuid; - if (ovsdb_datum_find_key(mc, &atom, OVSDB_TYPE_UUID) == UINT_MAX) { - mirror_destroy(m); - } + mc = ovsrec_bridge_get_mirrors(br->cfg, OVSDB_TYPE_UUID); + HMAP_FOR_EACH_SAFE (m, next, hmap_node, &br->mirrors) { + union ovsdb_atom atom; + + atom.uuid = m->uuid; + if (ovsdb_datum_find_key(mc, &atom, OVSDB_TYPE_UUID) == UINT_MAX) { + mirror_destroy(m); } } /* Add new mirrors and reconfigure existing ones. */ for (i = 0; i < br->cfg->n_mirrors; i++) { - struct ovsrec_mirror *cfg = br->cfg->mirrors[i]; + const struct ovsrec_mirror *cfg = br->cfg->mirrors[i]; struct mirror *m = mirror_find_by_uuid(br, &cfg->header_.uuid); - if (m) { - mirror_reconfigure_one(m, cfg); - } else { - mirror_create(br, cfg); + if (!m) { + m = mirror_create(br, cfg); } - } - - /* Update port reserved status. */ - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - port->is_mirror_output_port = false; - } - for (i = 0; i < MAX_MIRRORS; i++) { - struct mirror *m = br->mirrors[i]; - if (m && m->out_port) { - m->out_port->is_mirror_output_port = true; + if (!mirror_configure(m, cfg)) { + mirror_destroy(m); } } /* Update flooded vlans (for RSPAN). */ - rspan_vlans = NULL; - if (br->cfg->n_flood_vlans) { - rspan_vlans = bitmap_allocate(4096); - - for (i = 0; i < br->cfg->n_flood_vlans; i++) { - int64_t vlan = br->cfg->flood_vlans[i]; - if (vlan >= 0 && vlan < 4096) { - bitmap_set1(rspan_vlans, vlan); - VLOG_INFO("bridge %s: disabling learning on vlan %"PRId64, - br->name, vlan); - } else { - VLOG_ERR("bridge %s: invalid value %"PRId64 "for flood VLAN", - br->name, vlan); - } - } - } - if (mac_learning_set_flood_vlans(br->ml, rspan_vlans)) { - bridge_flush(br); - mac_learning_flush(br->ml); - } + flood_vlans = vlan_bitmap_from_array(br->cfg->flood_vlans, + br->cfg->n_flood_vlans); + ofproto_set_flood_vlans(br->ofproto, flood_vlans); + bitmap_free(flood_vlans); } -static void -mirror_create(struct bridge *br, struct ovsrec_mirror *cfg) +static struct mirror * +mirror_create(struct bridge *br, const struct ovsrec_mirror *cfg) { struct mirror *m; - size_t i; - for (i = 0; ; i++) { - if (i >= MAX_MIRRORS) { - VLOG_WARN("bridge %s: maximum of %d port mirrors reached, " - "cannot create %s", br->name, MAX_MIRRORS, cfg->name); - return; - } - if (!br->mirrors[i]) { - break; - } - } - - VLOG_INFO("created port mirror %s on bridge %s", cfg->name, br->name); - bridge_flush(br); - mac_learning_flush(br->ml); - - br->mirrors[i] = m = xzalloc(sizeof *m); + m = xzalloc(sizeof *m); m->uuid = cfg->header_.uuid; + hmap_insert(&br->mirrors, &m->hmap_node, uuid_hash(&m->uuid)); m->bridge = br; - m->idx = i; m->name = xstrdup(cfg->name); - sset_init(&m->src_ports); - sset_init(&m->dst_ports); - m->vlans = NULL; - m->n_vlans = 0; - m->out_vlan = -1; - m->out_port = NULL; - mirror_reconfigure_one(m, cfg); + return m; } static void @@ -3746,104 +2623,61 @@ mirror_destroy(struct mirror *m) { if (m) { struct bridge *br = m->bridge; - struct port *port; - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - port->src_mirrors &= ~(MIRROR_MASK_C(1) << m->idx); - port->dst_mirrors &= ~(MIRROR_MASK_C(1) << m->idx); + if (br->ofproto) { + ofproto_mirror_unregister(br->ofproto, m); } - sset_destroy(&m->src_ports); - sset_destroy(&m->dst_ports); - free(m->vlans); - - m->bridge->mirrors[m->idx] = NULL; + hmap_remove(&br->mirrors, &m->hmap_node); free(m->name); free(m); - - bridge_flush(br); - mac_learning_flush(br->ml); } } static void -mirror_collect_ports(struct mirror *m, struct ovsrec_port **ports, int n_ports, - struct sset *names) +mirror_collect_ports(struct mirror *m, + struct ovsrec_port **in_ports, int n_in_ports, + void ***out_portsp, size_t *n_out_portsp) { + void **out_ports = xmalloc(n_in_ports * sizeof *out_ports); + size_t n_out_ports = 0; size_t i; - for (i = 0; i < n_ports; i++) { - const char *name = ports[i]->name; - if (port_lookup(m->bridge, name)) { - sset_add(names, name); + for (i = 0; i < n_in_ports; i++) { + const char *name = in_ports[i]->name; + struct port *port = port_lookup(m->bridge, name); + if (port) { + out_ports[n_out_ports++] = port; } else { VLOG_WARN("bridge %s: mirror %s cannot match on nonexistent " "port %s", m->bridge->name, m->name, name); } } -} - -static size_t -mirror_collect_vlans(struct mirror *m, const struct ovsrec_mirror *cfg, - int **vlans) -{ - size_t n_vlans; - size_t i; - - *vlans = xmalloc(sizeof **vlans * cfg->n_select_vlan); - n_vlans = 0; - for (i = 0; i < cfg->n_select_vlan; i++) { - int64_t vlan = cfg->select_vlan[i]; - if (vlan < 0 || vlan > 4095) { - VLOG_WARN("bridge %s: mirror %s selects invalid VLAN %"PRId64, - m->bridge->name, m->name, vlan); - } else { - (*vlans)[n_vlans++] = vlan; - } - } - return n_vlans; + *out_portsp = out_ports; + *n_out_portsp = n_out_ports; } static bool -vlan_is_mirrored(const struct mirror *m, int vlan) -{ - size_t i; - - for (i = 0; i < m->n_vlans; i++) { - if (m->vlans[i] == vlan) { - return true; - } - } - return false; -} - -static void -mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) +mirror_configure(struct mirror *m, const struct ovsrec_mirror *cfg) { - struct sset src_ports, dst_ports; - mirror_mask_t mirror_bit; - struct port *out_port; - struct port *port; - int out_vlan; - size_t n_vlans; - int *vlans; + struct ofproto_mirror_settings s; /* Set name. */ if (strcmp(cfg->name, m->name)) { free(m->name); m->name = xstrdup(cfg->name); } + s.name = m->name; - /* Get output port. */ + /* Get output port or VLAN. */ if (cfg->output_port) { - out_port = port_lookup(m->bridge, cfg->output_port->name); - if (!out_port) { + s.out_bundle = port_lookup(m->bridge, cfg->output_port->name); + if (!s.out_bundle) { VLOG_ERR("bridge %s: mirror %s outputs to port not on bridge", m->bridge->name, m->name); - mirror_destroy(m); - return; + return false; } - out_vlan = -1; + s.out_vlan = UINT16_MAX; if (cfg->output_vlan) { VLOG_ERR("bridge %s: mirror %s specifies both output port and " @@ -3851,70 +2685,54 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) m->bridge->name, m->name); } } else if (cfg->output_vlan) { - out_port = NULL; - out_vlan = *cfg->output_vlan; + /* The database should prevent invalid VLAN values. */ + s.out_bundle = NULL; + s.out_vlan = *cfg->output_vlan; } else { VLOG_ERR("bridge %s: mirror %s does not specify output; ignoring", m->bridge->name, m->name); - mirror_destroy(m); - return; + return false; } - sset_init(&src_ports); - sset_init(&dst_ports); + /* Get port selection. */ if (cfg->select_all) { + size_t n_ports = hmap_count(&m->bridge->ports); + void **ports = xmalloc(n_ports * sizeof *ports); + struct port *port; + size_t i; + + i = 0; HMAP_FOR_EACH (port, hmap_node, &m->bridge->ports) { - sset_add(&src_ports, port->name); - sset_add(&dst_ports, port->name); + ports[i++] = port; } - vlans = NULL; - n_vlans = 0; + + s.srcs = ports; + s.n_srcs = n_ports; + + s.dsts = ports; + s.n_dsts = n_ports; } else { - /* Get ports, and drop duplicates and ports that don't exist. */ + /* Get ports, dropping ports that don't exist. + * The IDL ensures that there are no duplicates. */ mirror_collect_ports(m, cfg->select_src_port, cfg->n_select_src_port, - &src_ports); + &s.srcs, &s.n_srcs); mirror_collect_ports(m, cfg->select_dst_port, cfg->n_select_dst_port, - &dst_ports); - - /* Get all the vlans, and drop duplicate and invalid vlans. */ - n_vlans = mirror_collect_vlans(m, cfg, &vlans); - } - - /* Update mirror data. */ - if (!sset_equals(&m->src_ports, &src_ports) - || !sset_equals(&m->dst_ports, &dst_ports) - || m->n_vlans != n_vlans - || memcmp(m->vlans, vlans, sizeof *vlans * n_vlans) - || m->out_port != out_port - || m->out_vlan != out_vlan) { - bridge_flush(m->bridge); - mac_learning_flush(m->bridge->ml); - } - sset_swap(&m->src_ports, &src_ports); - sset_swap(&m->dst_ports, &dst_ports); - free(m->vlans); - m->vlans = vlans; - m->n_vlans = n_vlans; - m->out_port = out_port; - m->out_vlan = out_vlan; - - /* Update ports. */ - mirror_bit = MIRROR_MASK_C(1) << m->idx; - HMAP_FOR_EACH (port, hmap_node, &m->bridge->ports) { - if (sset_contains(&m->src_ports, port->name)) { - port->src_mirrors |= mirror_bit; - } else { - port->src_mirrors &= ~mirror_bit; - } + &s.dsts, &s.n_dsts); - if (sset_contains(&m->dst_ports, port->name)) { - port->dst_mirrors |= mirror_bit; - } else { - port->dst_mirrors &= ~mirror_bit; - } } + /* Get VLAN selection. */ + s.src_vlans = vlan_bitmap_from_array(cfg->select_vlan, cfg->n_select_vlan); + + /* Configure. */ + ofproto_mirror_register(m->bridge->ofproto, m, &s); + /* Clean up. */ - sset_destroy(&src_ports); - sset_destroy(&dst_ports); + if (s.srcs != s.dsts) { + free(s.dsts); + } + free(s.srcs); + free(s.src_vlans); + + return true; }