X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=4e2833e0be70b2c0b65754bfd762d9817ede4498;hb=5af5b5324cfc096ff80e96b06b3eb4d6f03307a3;hp=83e35376ae65ba4c48263100e4d4e81178a6f629;hpb=66da9beffd4a20a334833ea765b8ab0260a28a92;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 83e35376..4e2833e0 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -15,60 +15,36 @@ #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" @@ -77,25 +53,8 @@ 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. */ @@ -106,65 +65,36 @@ struct iface { /* 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 hmap_node node; /* In 'all_bridges'. */ char *name; /* User-specified arbitrary name. */ char *type; /* Datapath type. */ - struct mac_learning *ml; /* MAC learning table. */ uint8_t ea[ETH_ADDR_LEN]; /* Bridge Ethernet Address. */ uint8_t default_ea[ETH_ADDR_LEN]; /* Default MAC. */ const struct ovsrec_bridge *cfg; @@ -174,17 +104,11 @@ struct bridge { /* Bridge ports. */ struct hmap ports; /* "struct port"s indexed by name. */ - struct hmap ifaces; /* "struct iface"s indexed by dp_ifidx. */ + struct hmap ifaces; /* "struct iface"s indexed by ofp_port. */ struct hmap iface_by_name; /* "struct iface"s indexed by name. */ - /* Bonding. */ - bool has_bonded_ports; - - /* Flow tracking. */ - bool flush; - /* 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; @@ -210,27 +134,27 @@ static long long int stats_timer = LLONG_MIN; static long long int db_limiter = LLONG_MIN; static void add_del_bridges(const struct ovsrec_open_vswitch *); -static void bridge_del_dps(void); -static bool bridge_add_dp(struct bridge *); +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_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_dp_ifidx(struct bridge *); +static void bridge_refresh_ofp_port(struct bridge *); static void bridge_configure_datapath_id(struct bridge *); +static void bridge_configure_flow_eviction_threshold(struct bridge *); static void bridge_configure_netflow(struct bridge *); +static void bridge_configure_forward_bpdu(struct bridge *); static void bridge_configure_sflow(struct bridge *, int *sflow_bridge_number); -static void bridge_reconfigure_remotes(struct bridge *, - const struct sockaddr_in *managers, - size_t n_managers); -static void bridge_flush(struct bridge *); +static void bridge_configure_remotes(struct bridge *, + const struct sockaddr_in *managers, + size_t n_managers); static void bridge_pick_local_hw_addr(struct bridge *, uint8_t ea[ETH_ADDR_LEN], struct iface **hw_addr_iface); @@ -242,43 +166,41 @@ 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 void port_reconfigure(struct 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 *, + uint32_t *bond_stable_ids); + +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_clear_db_record(const struct ovsrec_interface *if_cfg); static void iface_configure_qos(struct iface *, const struct ovsrec_qos *); static void iface_configure_cfm(struct iface *); -static bool iface_refresh_cfm_stats(struct iface *iface); +static void iface_refresh_cfm_stats(struct iface *); +static void iface_refresh_stats(struct iface *); +static void iface_refresh_status(struct iface *); static bool iface_get_carrier(const struct iface *); static bool iface_is_synthetic(const struct iface *); @@ -286,9 +208,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. */ @@ -300,6 +219,7 @@ bridge_init(const char *remote) { /* Create connection to database. */ idl = ovsdb_idl_create(remote, &ovsrec_idl_class, true); + ovsdb_idl_set_lock(idl, "ovs_vswitchd"); ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_cur_cfg); ovsdb_idl_omit_alert(idl, &ovsrec_open_vswitch_col_statistics); @@ -323,6 +243,9 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_ofport); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_statistics); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_status); + ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_fault); + ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_cfm_remote_mpids); + ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_lacp_current); ovsdb_idl_omit(idl, &ovsrec_interface_col_external_ids); ovsdb_idl_omit_alert(idl, &ovsrec_controller_col_is_connected); @@ -330,10 +253,6 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_controller_col_status); ovsdb_idl_omit(idl, &ovsrec_controller_col_external_ids); - ovsdb_idl_omit_alert(idl, &ovsrec_maintenance_point_col_fault); - - ovsdb_idl_omit_alert(idl, &ovsrec_monitor_col_fault); - ovsdb_idl_omit(idl, &ovsrec_qos_col_external_ids); ovsdb_idl_omit(idl, &ovsrec_queue_col_external_ids); @@ -353,15 +272,14 @@ 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, - NULL); - unixctl_command_register("bridge/reconnect", bridge_unixctl_reconnect, - NULL); + unixctl_command_register("qos/show", "interface", qos_unixctl_show, NULL); + unixctl_command_register("bridge/dump-flows", "bridge", + bridge_unixctl_dump_flows, NULL); + unixctl_command_register("bridge/reconnect", "[bridge]", + bridge_unixctl_reconnect, NULL); lacp_init(); bond_init(); + cfm_init(); } void @@ -458,7 +376,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) * 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_dps(); + bridge_del_ofprotos(); HMAP_FOR_EACH (br, node, &all_bridges) { if (br->ofproto) { bridge_del_ofproto_ports(br); @@ -469,15 +387,15 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) * * 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 dp_ifidx and + * 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_dp(br)) { + if (!br->ofproto && !bridge_add_ofprotos(br)) { bridge_destroy(br); } } HMAP_FOR_EACH (br, node, &all_bridges) { - bridge_refresh_dp_ifidx(br); + bridge_refresh_ofp_port(br); bridge_add_ofproto_ports(br); } @@ -487,24 +405,22 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) HMAP_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; - port_reconfigure(port); - port_reconfigure_lacp(port); - port_reconfigure_bond(port); + port_configure(port); - HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) { + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { iface_configure_cfm(iface); iface_configure_qos(iface, port->cfg->qos); iface_set_mac(iface); } } - mirror_reconfigure(br); - + bridge_configure_mirrors(br); bridge_configure_datapath_id(br); - bridge_reconfigure_remotes(br, managers, n_managers); + bridge_configure_flow_eviction_threshold(br); + bridge_configure_forward_bpdu(br); + bridge_configure_remotes(br, managers, n_managers); bridge_configure_netflow(br); bridge_configure_sflow(br, &sflow_bridge_number); } @@ -515,53 +431,148 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) daemonize_complete(); } -/* Iterate over all system dpifs and delete any of them that do not have a +/* 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_dps(void) +bridge_del_ofprotos(void) { - struct sset dpif_names; - struct sset dpif_types; + struct sset names; + struct sset types; const char *type; - sset_init(&dpif_names); - sset_init(&dpif_types); - dp_enumerate_types(&dpif_types); - SSET_FOR_EACH (type, &dpif_types) { + sset_init(&names); + sset_init(&types); + ofproto_enumerate_types(&types); + SSET_FOR_EACH (type, &types) { const char *name; - dp_enumerate_names(type, &dpif_names); - SSET_FOR_EACH (name, &dpif_names) { + ofproto_enumerate_names(type, &names); + SSET_FOR_EACH (name, &names) { struct bridge *br = bridge_lookup(name); if (!br || strcmp(type, br->type)) { - struct dpif *dpif; - - if (!dpif_open(name, type, &dpif)) { - dpif_delete(dpif); - dpif_close(dpif); - } + ofproto_delete(name, type); } } } - sset_destroy(&dpif_names); - sset_destroy(&dpif_types); + sset_destroy(&names); + sset_destroy(&types); } static bool -bridge_add_dp(struct bridge *br) +bridge_add_ofprotos(struct bridge *br) { - int error; - - error = ofproto_create(br->name, br->type, &bridge_ofhooks, br, - &br->ofproto); + int error = ofproto_create(br->name, br->type, &br->ofproto); if (error) { - VLOG_ERR("failed to create bridge %s: %s", - br->name, strerror(error)); + VLOG_ERR("failed to create bridge %s: %s", br->name, strerror(error)); return false; } return true; } +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; + + /* Get name. */ + s.name = port->name; + + /* 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; + } + + /* 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; + } + } 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); + } + } + + /* Get VLAN trunks. */ + s.trunks = NULL; + if (cfg->n_trunks) { + s.trunks = vlan_bitmap_from_array(cfg->trunks, cfg->n_trunks); + } + + /* Get VLAN mode. */ + if (cfg->vlan_mode) { + if (!strcmp(cfg->vlan_mode, "access")) { + s.vlan_mode = PORT_VLAN_ACCESS; + } else if (!strcmp(cfg->vlan_mode, "trunk")) { + s.vlan_mode = PORT_VLAN_TRUNK; + } else if (!strcmp(cfg->vlan_mode, "native-tagged")) { + s.vlan_mode = PORT_VLAN_NATIVE_TAGGED; + } else if (!strcmp(cfg->vlan_mode, "native-untagged")) { + s.vlan_mode = PORT_VLAN_NATIVE_UNTAGGED; + } else { + /* This "can't happen" because ovsdb-server should prevent it. */ + VLOG_ERR("unknown VLAN mode %s", cfg->vlan_mode); + s.vlan_mode = PORT_VLAN_TRUNK; + } + } else { + if (s.vlan >= 0) { + s.vlan_mode = PORT_VLAN_ACCESS; + if (cfg->n_trunks) { + VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", + port->name); + } + } else { + s.vlan_mode = PORT_VLAN_TRUNK; + } + } + + /* Get LACP settings. */ + s.lacp = port_configure_lacp(port, &lacp_settings); + if (s.lacp) { + size_t i = 0; + + 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++]); + } + } else { + s.lacp_slaves = NULL; + } + + /* Get bond settings. */ + if (s.n_slaves > 1) { + s.bond = &bond_settings; + s.bond_stable_ids = xmalloc(s.n_slaves * sizeof *s.bond_stable_ids); + port_configure_bond(port, &bond_settings, s.bond_stable_ids); + } else { + s.bond = NULL; + s.bond_stable_ids = NULL; + + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { + netdev_set_miimon_interval(iface->netdev, 0); + } + } + + /* Register. */ + ofproto_bundle_register(port->bridge->ofproto, port, &s); + + /* Clean up. */ + free(s.slaves); + free(s.trunks); + free(s.lacp_slaves); + free(s.bond_stable_ids); +} + /* Pick local port hardware address and datapath ID for 'br'. */ static void bridge_configure_datapath_id(struct bridge *br) @@ -573,7 +584,7 @@ bridge_configure_datapath_id(struct bridge *br) char *dpid_string; bridge_pick_local_hw_addr(br, ea, &hw_addr_iface); - local_iface = iface_from_dp_ifidx(br, ODPP_LOCAL); + local_iface = iface_from_ofp_port(br, OFPP_LOCAL); if (local_iface) { int error = netdev_set_etheraddr(local_iface->netdev, ea); if (error) { @@ -728,9 +739,16 @@ add_del_bridges(const struct ovsrec_open_vswitch *cfg) /* Collect new bridges' names and types. */ shash_init(&new_br); for (i = 0; i < cfg->n_bridges; i++) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); 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); + + if (strchr(br_cfg->name, '/')) { + /* Prevent remote ovsdb-server users from accessing arbitrary + * directories, e.g. consider a bridge named "../../../etc/". */ + VLOG_WARN_RL(&rl, "ignoring bridge with invalid name \"%s\"", + br_cfg->name); + } else if (!shash_add_once(&new_br, br_cfg->name, br_cfg)) { + VLOG_WARN_RL(&rl, "bridge %s specified twice", br_cfg->name); } } @@ -738,8 +756,8 @@ add_del_bridges(const struct ovsrec_open_vswitch *cfg) * 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, - dpif_normalize_type(br->cfg->datapath_type))) { + if (!br->cfg || strcmp(br->type, ofproto_normalize_type( + br->cfg->datapath_type))) { bridge_destroy(br); } } @@ -800,13 +818,6 @@ bridge_del_ofproto_ports(struct bridge *br) br->name, name, strerror(error)); } 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; } @@ -814,108 +825,120 @@ bridge_del_ofproto_ports(struct bridge *br) } static void -iface_set_dp_ifidx(struct iface *iface, int dp_ifidx) +iface_set_ofp_port(struct iface *iface, int ofp_port) { struct bridge *br = iface->port->bridge; - assert(iface->dp_ifidx < 0 && dp_ifidx >= 0); - iface->dp_ifidx = dp_ifidx; - hmap_insert(&br->ifaces, &iface->dp_ifidx_node, hash_int(dp_ifidx, 0)); - + 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)); + iface_set_ofport(iface->cfg, ofp_port); } static void -bridge_refresh_dp_ifidx(struct bridge *br) +bridge_refresh_ofp_port(struct bridge *br) { struct ofproto_port_dump dump; struct ofproto_port ofproto_port; struct port *port; - /* Clear all the "dp_ifidx"es. */ + /* 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->dp_ifidx = -1; + iface->ofp_port = -1; } } - /* Obtain the correct "dp_ifidx"es from ofproto. */ + /* Obtain the correct "ofp_port"s from ofproto. */ OFPROTO_PORT_FOR_EACH (&ofproto_port, &dump, br->ofproto) { - uint32_t odp_port = ofp_port_to_odp_port(ofproto_port.ofp_port); struct iface *iface = iface_lookup(br, ofproto_port.name); if (iface) { - if (iface->dp_ifidx >= 0) { + if (iface->ofp_port >= 0) { VLOG_WARN("bridge %s: interface %s reported twice", br->name, ofproto_port.name); - } else if (iface_from_dp_ifidx(br, odp_port)) { + } else if (iface_from_ofp_port(br, ofproto_port.ofp_port)) { VLOG_WARN("bridge %s: interface %"PRIu16" reported twice", - br->name, odp_port); + br->name, ofproto_port.ofp_port); } else { - iface_set_dp_ifidx(iface, odp_port); + iface_set_ofp_port(iface, ofproto_port.ofp_port); } } } } -/* Add a dpif port for any "struct iface" that doesn't have one. +/* 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; - struct ofproto_port ofproto_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); + /* Open the netdev. */ 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); + error = netdev_open(iface->name, iface->type, &iface->netdev); + if (error) { + VLOG_WARN("could not open network device %s (%s)", + iface->name, strerror(error)); + } } else { - error = netdev_set_config(iface->netdev, &args); + error = 0; } - shash_destroy(&args); - if (error) { - VLOG_WARN("could not %s network device %s (%s)", - iface->netdev ? "reconfigure" : "open", - iface->name, strerror(error)); + + /* Configure the netdev. */ + if (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); + error = netdev_set_config(iface->netdev, &args); + shash_destroy(&args); + + if (error) { + VLOG_WARN("could not configure network device %s (%s)", + iface->name, strerror(error)); + netdev_close(iface->netdev); + iface->netdev = NULL; + } } /* Add the port, if necessary. */ - if (iface->netdev && iface->dp_ifidx < 0) { + 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_dp_ifidx(iface, ofp_port_to_odp_port(ofp_port)); + iface_set_ofp_port(iface, ofp_port); } else { netdev_close(iface->netdev); iface->netdev = NULL; } } - /* Delete the iface if */ - if (iface->netdev && iface->dp_ifidx >= 0) { + /* Populate stats columns in new Interface rows. */ + if (iface->netdev && !iface->cfg->mtu) { + iface_refresh_stats(iface); + iface_refresh_status(iface); + } + + /* Delete the iface if we failed. */ + if (iface->netdev && iface->ofp_port >= 0) { VLOG_DBG("bridge %s: interface %s is on port %d", - br->name, iface->name, iface->dp_ifidx); + br->name, iface->name, iface->ofp_port); } else { if (iface->netdev) { VLOG_ERR("bridge %s: missing %s interface, dropping", @@ -924,7 +947,7 @@ bridge_add_ofproto_ports(struct bridge *br) /* We already reported a related error, don't bother * duplicating it. */ } - iface_set_ofport(iface->cfg, -1); + iface_clear_db_record(iface->cfg); iface_destroy(iface); } } @@ -938,15 +961,10 @@ bridge_add_ofproto_ports(struct bridge *br) 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); + error = netdev_open(port->name, "internal", &netdev); if (!error) { ofproto_port_add(br->ofproto, netdev, NULL); netdev_close(netdev); @@ -984,12 +1002,43 @@ bridge_get_other_config(const struct ovsrec_bridge *br_cfg, const char *key) &ovsrec_bridge_col_other_config, key); } +/* Set Flow eviction threshold */ +static void +bridge_configure_flow_eviction_threshold(struct bridge *br) +{ + const char *threshold_str; + unsigned threshold; + + threshold_str = bridge_get_other_config(br->cfg, "flow-eviction-threshold"); + if (threshold_str) { + threshold = strtoul(threshold_str, NULL, 10); + } else { + threshold = OFPROTO_FLOW_EVICTON_THRESHOLD_DEFAULT; + } + ofproto_set_flow_eviction_threshold(br->ofproto, threshold); +} + +/* Set forward BPDU option. */ +static void +bridge_configure_forward_bpdu(struct bridge *br) +{ + const char *forward_bpdu_str; + bool forward_bpdu = false; + + forward_bpdu_str = bridge_get_other_config(br->cfg, "forward-bpdu"); + if (forward_bpdu_str && !strcmp(forward_bpdu_str, "true")) { + forward_bpdu = true; + } + ofproto_set_forward_bpdu(br->ofproto, forward_bpdu); +} + static void bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], struct iface **hw_addr_iface) { const char *hwaddr; struct port *port; + bool found_addr = false; int error; *hw_addr_iface = NULL; @@ -1009,14 +1058,13 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], /* Otherwise choose the minimum non-local MAC address among all of the * interfaces. */ - memset(ea, 0xff, ETH_ADDR_LEN); HMAP_FOR_EACH (port, hmap_node, &br->ports) { uint8_t iface_ea[ETH_ADDR_LEN]; struct iface *candidate; 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; } @@ -1047,16 +1095,13 @@ 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; } /* Grab MAC. */ error = netdev_get_etheraddr(iface->netdev, iface_ea); if (error) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_ERR_RL(&rl, "failed to obtain Ethernet address of %s: %s", - iface->name, strerror(error)); continue; } } @@ -1066,20 +1111,21 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], !eth_addr_is_local(iface_ea) && !eth_addr_is_reserved(iface_ea) && !eth_addr_is_zero(iface_ea) && - eth_addr_compare_3way(iface_ea, ea) < 0) + (!found_addr || eth_addr_compare_3way(iface_ea, ea) < 0)) { memcpy(ea, iface_ea, ETH_ADDR_LEN); *hw_addr_iface = iface; + found_addr = true; } } - if (eth_addr_is_multicast(ea)) { + if (found_addr) { + VLOG_DBG("bridge %s: using bridge Ethernet address "ETH_ADDR_FMT, + br->name, ETH_ADDR_ARGS(ea)); + } else { memcpy(ea, br->default_ea, ETH_ADDR_LEN); *hw_addr_iface = NULL; VLOG_WARN("bridge %s: using default bridge Ethernet " "address "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(ea)); - } else { - VLOG_DBG("bridge %s: using bridge Ethernet address "ETH_ADDR_FMT, - br->name, ETH_ADDR_ARGS(ea)); } } @@ -1233,7 +1279,7 @@ iface_refresh_status(struct iface *iface) iface_get_carrier(iface) ? "up" : "down"); error = netdev_get_mtu(iface->netdev, &mtu); - if (!error && mtu != INT_MAX) { + if (!error) { mtu_64 = mtu; ovsrec_interface_set_mtu(iface->cfg, &mtu_64, 1); } @@ -1242,92 +1288,74 @@ iface_refresh_status(struct iface *iface) } } -/* Writes 'iface''s CFM statistics to the database. Returns true if anything - * changed, false otherwise. */ -static bool +/* Writes 'iface''s CFM statistics to the database. */ +static void iface_refresh_cfm_stats(struct iface *iface) { - const struct ovsrec_monitor *mon; - const struct cfm *cfm; - bool changed = false; - size_t i; + const struct ovsrec_interface *cfg = iface->cfg; + int fault, error; + const uint64_t *rmps; + size_t n_rmps; - mon = iface->cfg->monitor; - cfm = ofproto_iface_get_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); - - if (!cfm || !mon) { - return false; + if (iface_is_synthetic(iface)) { + return; } - for (i = 0; i < mon->n_remote_mps; i++) { - const struct ovsrec_maintenance_point *mp; - const struct remote_mp *rmp; - - mp = mon->remote_mps[i]; - rmp = cfm_get_remote_mp(cfm, mp->mpid); - - if (mp->n_fault != 1 || mp->fault[0] != rmp->fault) { - ovsrec_maintenance_point_set_fault(mp, &rmp->fault, 1); - changed = true; - } + fault = ofproto_port_get_cfm_fault(iface->port->bridge->ofproto, + iface->ofp_port); + if (fault >= 0) { + bool fault_bool = fault; + ovsrec_interface_set_cfm_fault(cfg, &fault_bool, 1); + } else { + ovsrec_interface_set_cfm_fault(cfg, NULL, 0); } - if (mon->n_fault != 1 || mon->fault[0] != cfm->fault) { - ovsrec_monitor_set_fault(mon, &cfm->fault, 1); - changed = true; + error = ofproto_port_get_cfm_remote_mpids(iface->port->bridge->ofproto, + iface->ofp_port, &rmps, &n_rmps); + if (error >= 0) { + ovsrec_interface_set_cfm_remote_mpids(cfg, (const int64_t *)rmps, + n_rmps); + } else { + ovsrec_interface_set_cfm_remote_mpids(cfg, NULL, 0); } - - return changed; } static bool iface_refresh_lacp_stats(struct iface *iface) { - bool *db_current = iface->cfg->lacp_current; - bool changed = false; + 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 (iface->port->lacp) { - bool current = lacp_slave_is_current(iface->port->lacp, iface); - - 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 iface_refresh_stats(struct iface *iface) { - struct iface_stat { - char *name; - int offset; - }; - static const struct iface_stat iface_stats[] = { - { "rx_packets", offsetof(struct netdev_stats, rx_packets) }, - { "tx_packets", offsetof(struct netdev_stats, tx_packets) }, - { "rx_bytes", offsetof(struct netdev_stats, rx_bytes) }, - { "tx_bytes", offsetof(struct netdev_stats, tx_bytes) }, - { "rx_dropped", offsetof(struct netdev_stats, rx_dropped) }, - { "tx_dropped", offsetof(struct netdev_stats, tx_dropped) }, - { "rx_errors", offsetof(struct netdev_stats, rx_errors) }, - { "tx_errors", offsetof(struct netdev_stats, tx_errors) }, - { "rx_frame_err", offsetof(struct netdev_stats, rx_frame_errors) }, - { "rx_over_err", offsetof(struct netdev_stats, rx_over_errors) }, - { "rx_crc_err", offsetof(struct netdev_stats, rx_crc_errors) }, - { "collisions", offsetof(struct netdev_stats, collisions) }, - }; - enum { N_STATS = ARRAY_SIZE(iface_stats) }; - const struct iface_stat *s; - - char *keys[N_STATS]; - int64_t values[N_STATS]; - int n; +#define IFACE_STATS \ + IFACE_STAT(rx_packets, "rx_packets") \ + IFACE_STAT(tx_packets, "tx_packets") \ + IFACE_STAT(rx_bytes, "rx_bytes") \ + IFACE_STAT(tx_bytes, "tx_bytes") \ + IFACE_STAT(rx_dropped, "rx_dropped") \ + IFACE_STAT(tx_dropped, "tx_dropped") \ + IFACE_STAT(rx_errors, "rx_errors") \ + IFACE_STAT(tx_errors, "tx_errors") \ + IFACE_STAT(rx_frame_errors, "rx_frame_err") \ + IFACE_STAT(rx_over_errors, "rx_over_err") \ + IFACE_STAT(rx_crc_errors, "rx_crc_err") \ + IFACE_STAT(collisions, "collisions") + +#define IFACE_STAT(MEMBER, NAME) NAME, + static char *keys[] = { IFACE_STATS }; +#undef IFACE_STAT + int64_t values[ARRAY_SIZE(keys)]; + int i; struct netdev_stats stats; @@ -1339,17 +1367,32 @@ iface_refresh_stats(struct iface *iface) * all-1s, and we will deal with that correctly below. */ netdev_get_stats(iface->netdev, &stats); - n = 0; - for (s = iface_stats; s < &iface_stats[N_STATS]; s++) { - uint64_t value = *(uint64_t *) (((char *) &stats) + s->offset); - if (value != UINT64_MAX) { - keys[n] = s->name; - values[n] = value; - n++; - } + /* Copy statistics into values[] array. */ + i = 0; +#define IFACE_STAT(MEMBER, NAME) values[i++] = stats.MEMBER; + IFACE_STATS; +#undef IFACE_STAT + assert(i == ARRAY_SIZE(keys)); + + ovsrec_interface_set_statistics(iface->cfg, keys, values, ARRAY_SIZE(keys)); +#undef IFACE_STATS +} + +static bool +enable_system_stats(const struct ovsrec_open_vswitch *cfg) +{ + const char *enable; + + /* Use other-config:enable-system-stats by preference. */ + enable = get_ovsrec_key_value(&cfg->header_, + &ovsrec_open_vswitch_col_other_config, + "enable-statistics"); + if (enable) { + return !strcmp(enable, "true"); } - ovsrec_interface_set_statistics(iface->cfg, keys, values, n); + /* Disable by default. */ + return false; } static void @@ -1359,7 +1402,9 @@ refresh_system_stats(const struct ovsrec_open_vswitch *cfg) struct shash stats; shash_init(&stats); - get_system_stats(&stats); + if (enable_system_stats(cfg)) { + get_system_stats(&stats); + } ovsdb_datum_from_shash(&datum, &stats); ovsdb_idl_txn_write(&cfg->header_, &ovsrec_open_vswitch_col_statistics, @@ -1382,13 +1427,20 @@ nx_role_to_str(enum nx_role role) } static void -bridge_refresh_controller_status(const struct bridge *br) +refresh_controller_status(void) { + struct bridge *br; struct shash info; const struct ovsrec_controller *cfg; - ofproto_get_ofproto_controller_info(br->ofproto, &info); + shash_init(&info); + + /* Accumulate status for controllers on all bridges. */ + HMAP_FOR_EACH (br, node, &all_bridges) { + ofproto_get_ofproto_controller_info(br->ofproto, &info); + } + /* Update each controller in the database with current status. */ OVSREC_CONTROLLER_FOR_EACH(cfg, idl) { struct ofproto_controller_info *cinfo = shash_find_data(&info, cfg->target); @@ -1409,6 +1461,31 @@ bridge_refresh_controller_status(const struct bridge *br) ofproto_free_ofproto_controller_info(&info); } +static void +refresh_cfm_stats(void) +{ + static struct ovsdb_idl_txn *txn = NULL; + + if (!txn) { + struct bridge *br; + + txn = ovsdb_idl_txn_create(idl); + + HMAP_FOR_EACH (br, node, &all_bridges) { + struct iface *iface; + + HMAP_FOR_EACH (iface, name_node, &br->iface_by_name) { + iface_refresh_cfm_stats(iface); + } + } + } + + if (ovsdb_idl_txn_commit(txn) != TXN_INCOMPLETE) { + ovsdb_idl_txn_destroy(txn); + txn = NULL; + } +} + void bridge_run(void) { @@ -1418,10 +1495,28 @@ bridge_run(void) bool database_changed; struct bridge *br; + /* (Re)configure if necessary. */ + database_changed = ovsdb_idl_run(idl); + if (ovsdb_idl_is_lock_contended(idl)) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + struct bridge *br, *next_br; + + VLOG_ERR_RL(&rl, "another ovs-vswitchd process is running, " + "disabling this process until it goes away"); + + HMAP_FOR_EACH_SAFE (br, next_br, node, &all_bridges) { + bridge_destroy(br); + } + return; + } else if (!ovsdb_idl_has_lock(idl)) { + return; + } + cfg = ovsrec_open_vswitch_first(idl); + /* Let each bridge do the work that it needs to do. */ datapath_destroyed = false; HMAP_FOR_EACH (br, node, &all_bridges) { - int error = bridge_run_one(br); + 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, " @@ -1430,10 +1525,6 @@ bridge_run(void) } } - /* (Re)configure if necessary. */ - database_changed = ovsdb_idl_run(idl); - cfg = ovsrec_open_vswitch_first(idl); -#ifdef HAVE_OPENSSL /* Re-configure SSL. We do this on every trip through the main loop, * instead of just when the database changes, because the contents of the * key and certificate files can change without the database changing. @@ -1446,7 +1537,7 @@ bridge_run(void) stream_ssl_set_key_and_cert(ssl->private_key, ssl->certificate); stream_ssl_set_ca_cert_file(ssl->ca_cert, ssl->bootstrap_ca_cert); } -#endif + if (database_changed || datapath_destroyed) { if (cfg) { struct ovsdb_idl_txn *txn = ovsdb_idl_txn_create(idl); @@ -1482,9 +1573,9 @@ bridge_run(void) iface_refresh_status(iface); } } - bridge_refresh_controller_status(br); } refresh_system_stats(cfg); + refresh_controller_status(); ovsdb_idl_txn_commit(txn); ovsdb_idl_txn_destroy(txn); /* XXX */ } @@ -1504,7 +1595,9 @@ bridge_run(void) struct iface *iface; LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - changed = iface_refresh_cfm_stats(iface) || changed; + /* XXX: Eventually we need to remove the lacp_current flag + * from the database so that we can completely get rid of + * this rate limiter code. */ changed = iface_refresh_lacp_stats(iface) || changed; } } @@ -1517,90 +1610,26 @@ bridge_run(void) ovsdb_idl_txn_commit(txn); ovsdb_idl_txn_destroy(txn); } + + refresh_cfm_stats(); } void bridge_wait(void) { - struct bridge *br; - - HMAP_FOR_EACH (br, node, &all_bridges) { - struct port *port; - - 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); - - if (db_limiter > time_msec()) { - 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 -cfm_unixctl_show(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) -{ - struct ds ds = DS_EMPTY_INITIALIZER; - struct iface *iface; - const struct cfm *cfm; + if (!hmap_is_empty(&all_bridges)) { + struct bridge *br; - iface = iface_find(args); - if (!iface) { - unixctl_command_reply(conn, 501, "no such interface"); - return; - } - - cfm = ofproto_iface_get_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); + HMAP_FOR_EACH (br, node, &all_bridges) { + ofproto_wait(br->ofproto); + } + poll_timer_wait_until(stats_timer); - if (!cfm) { - unixctl_command_reply(conn, 501, "CFM not enabled"); - return; + if (db_limiter > time_msec()) { + poll_timer_wait_until(db_limiter); + } } - - cfm_dump_ds(cfm, &ds); - unixctl_command_reply(conn, 200, ds_cstr(&ds)); - ds_destroy(&ds); } /* QoS unixctl user interface functions. */ @@ -1706,16 +1735,18 @@ bridge_create(const struct ovsrec_bridge *br_cfg) br = xzalloc(sizeof *br); br->name = xstrdup(br_cfg->name); - br->type = xstrdup(dpif_normalize_type(br_cfg->datapath_type)); + 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); + + /* Derive the default Ethernet address from the bridge's UUID. This should + * be unique and it will be stable between ovs-vswitchd runs. */ + memcpy(br->default_ea, &br_cfg->header_.uuid, ETH_ADDR_LEN); + eth_addr_mark_random(br->default_ea); hmap_init(&br->ports); hmap_init(&br->ifaces); hmap_init(&br->iface_by_name); - - br->flush = false; + hmap_init(&br->mirrors); hmap_insert(&all_bridges, &br->node, hash_string(br->name, 0)); } @@ -1724,21 +1755,21 @@ static void bridge_destroy(struct bridge *br) { if (br) { - struct port *port, *next; - 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); } hmap_remove(&all_bridges, &br->node); ofproto_destroy(br->ofproto); - mac_learning_destroy(br->ml); hmap_destroy(&br->ifaces); hmap_destroy(&br->ports); hmap_destroy(&br->iface_by_name); + hmap_destroy(&br->mirrors); free(br->name); free(br->type); free(br); @@ -1803,29 +1834,6 @@ bridge_unixctl_reconnect(struct unixctl_conn *conn, 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) @@ -1957,7 +1965,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; } @@ -1989,9 +1997,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; @@ -2075,699 +2082,24 @@ bridge_reconfigure_remotes(struct bridge *br, } } -/* Bridge packet processing functions. */ +/* Port 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) +static struct port * +port_create(struct bridge *br, const struct ovsrec_port *cfg) { - 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)); + struct port *port; - dst->iface = (!out_port->bond - ? port_get_an_iface(out_port) - : bond_choose_output_slave(out_port->bond, flow, - dst->vlan, tags)); + port = xzalloc(sizeof *port); + port->bridge = br; + port->name = xstrdup(cfg->name); + port->cfg = cfg; + list_init(&port->ifaces); - return dst->iface != NULL; -} + hmap_insert(&br->ports, &port->hmap_node, hash_string(port->name, 0)); -static int -mirror_mask_ffs(mirror_mask_t mask) -{ - BUILD_ASSERT_DECL(sizeof(unsigned int) >= sizeof(mask)); - return ffs(mask); -} + VLOG_INFO("created port %s on bridge %s", port->name, br->name); -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 || vlan_bitmap_contains(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); - } - - 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); - } - } -} - -static void -port_wait(struct port *port) -{ - if (port->lacp) { - lacp_wait(port->lacp); - } - - if (port->bond) { - bond_wait(port->bond); - } -} - -static struct port * -port_create(struct bridge *br, const struct ovsrec_port *cfg) -{ - struct port *port; - - port = xzalloc(sizeof *port); - port->bridge = br; - 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); - - return port; + return port; } static const char * @@ -2804,7 +2136,10 @@ port_del_ifaces(struct port *port) sset_init(&new_ifaces); for (i = 0; i < port->cfg->n_interfaces; i++) { const char *name = port->cfg->interfaces[i]->name; - sset_add(&new_ifaces, name); + const char *type = port->cfg->interfaces[i]->name; + if (strcmp(type, "null")) { + sset_add(&new_ifaces, name); + } } /* Get rid of deleted interfaces. */ @@ -2830,10 +2165,11 @@ port_add_ifaces(struct port *port) shash_init(&new_ifaces); for (i = 0; i < port->cfg->n_interfaces; i++) { const struct ovsrec_interface *cfg = port->cfg->interfaces[i]; - if (!shash_add_once(&new_ifaces, cfg->name, cfg)) { + 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); + iface_clear_db_record(cfg); } } @@ -2861,89 +2197,15 @@ port_add_ifaces(struct port *port) shash_destroy(&new_ifaces); } -/* Expires all MAC learning entries associated with 'port' and forces ofproto - * to revalidate every flow. */ -static void -port_flush_macs(struct port *port) -{ - struct bridge *br = port->bridge; - struct mac_learning *ml = br->ml; - struct mac_entry *mac, *next_mac; - - bridge_flush(br); - LIST_FOR_EACH_SAFE (mac, next_mac, lru_node, &ml->lrus) { - if (mac->port.p == port) { - mac_learning_expire(ml, mac); - } - } -} - -static void -port_reconfigure(struct port *port) -{ - const struct ovsrec_port *cfg = port->cfg; - bool need_flush = false; - unsigned long *trunks; - int vlan; - - /* 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) { - trunks = vlan_bitmap_from_array(cfg->trunks, cfg->n_trunks); - if (!trunks) { - VLOG_ERR("port %s: no valid trunks, trunking all VLANs", - port->name); - } - } else if (vlan >= 0 && cfg->n_trunks) { - VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", - port->name); - } - if (!vlan_bitmap_equal(trunks, port->trunks)) { - need_flush = true; - } - bitmap_free(port->trunks); - port->trunks = trunks; - - if (need_flush) { - port_flush_macs(port); - } -} - static void 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) { @@ -2954,23 +2216,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) { @@ -3007,184 +2257,138 @@ enable_lacp(struct port *port, bool *activep) } } -static void -iface_reconfigure_lacp(struct iface *iface) -{ - struct lacp_slave_settings s; - int priority, portid; - - portid = atoi(get_interface_other_config(iface->cfg, "lacp-port-id", "0")); - priority = atoi(get_interface_other_config(iface->cfg, - "lacp-port-priority", "0")); - - if (portid <= 0 || portid > UINT16_MAX) { - portid = iface->dp_ifidx; - } - - if (priority <= 0 || priority > UINT16_MAX) { - priority = UINT16_MAX; - } - - s.name = iface->name; - s.id = portid; - s.priority = priority; - 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; + if (!enable_lacp(port, &s->active)) { + return NULL; } - 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); - } - - 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.strict = !strcmp(get_port_other_config(port->cfg, "lacp-strict", - "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, + uint32_t *bond_stable_ids) { - struct bond_settings s; const char *detect_s; struct iface *iface; + int miimon_interval; + size_t i; - 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)); + } + if (s->balance == BM_SLB && port->bridge->cfg->n_flood_vlans) { + VLOG_WARN("port %s: SLB bonds are incompatible with flood_vlans, " + "please use another bond type or disable flood_vlans", + port->name); } - 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)) { - VLOG_WARN("port %s: unsupported bond-detect-mode %s, " - "defaulting to %s", - port->name, detect_s, bond_detect_mode_to_string(s.detect)); + miimon_interval = atoi(get_port_other_config(port->cfg, + "bond-miimon-interval", "0")); + if (miimon_interval <= 0) { + miimon_interval = 200; } - s.miimon_interval = atoi( - get_port_other_config(port->cfg, "bond-miimon-interval", "200")); - if (s.miimon_interval < 100) { - s.miimon_interval = 100; + detect_s = get_port_other_config(port->cfg, "bond-detect-mode", "carrier"); + if (!strcmp(detect_s, "carrier")) { + miimon_interval = 0; + } else if (strcmp(detect_s, "miimon")) { + VLOG_WARN("port %s: unsupported bond-detect-mode %s, " + "defaulting to carrier", port->name, detect_s); + miimon_interval = 0; } - s.up_delay = MAX(0, port->cfg->bond_updelay); - s.down_delay = MAX(0, port->cfg->bond_downdelay); - 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; + 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); - } - } + s->fake_iface = port->cfg->bond_fake_iface; + i = 0; LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - uint16_t stable_id = (port->lacp - ? lacp_slave_get_port_id(port->lacp, iface) - : iface->dp_ifidx); - bond_slave_register(iface->port->bond, iface, stable_id, - iface->netdev); - } -} + long long stable_id; -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++; + stable_id = atoll(get_interface_other_config(iface->cfg, + "bond-stable-id", "0")); + if (stable_id <= 0 || stable_id >= UINT32_MAX) { + stable_id = iface->ofp_port; } - } + bond_stable_ids[i++] = stable_id; - 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); + netdev_set_miimon_interval(iface->netdev, miimon_interval); } } @@ -3200,7 +2404,7 @@ 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; @@ -3211,8 +2415,6 @@ iface_create(struct port *port, const struct ovsrec_interface *if_cfg) VLOG_DBG("attached network device %s to port %s", iface->name, port->name); - bridge_flush(br); - return iface; } @@ -3223,16 +2425,12 @@ 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); } - 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); @@ -3242,8 +2440,6 @@ iface_destroy(struct iface *iface) free(iface->name); free(iface); - - bridge_flush(port->bridge); } } @@ -3278,13 +2474,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; } } @@ -3300,7 +2496,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); @@ -3326,6 +2522,29 @@ iface_set_ofport(const struct ovsrec_interface *if_cfg, int64_t ofport) } } +/* Clears all of the fields in 'if_cfg' that indicate interface status, and + * sets the "ofport" field to -1. + * + * This is appropriate when 'if_cfg''s interface cannot be created or is + * otherwise invalid. */ +static void +iface_clear_db_record(const struct ovsrec_interface *if_cfg) +{ + if (!ovsdb_idl_row_is_synthetic(&if_cfg->header_)) { + iface_set_ofport(if_cfg, -1); + ovsrec_interface_set_status(if_cfg, NULL, NULL, 0); + ovsrec_interface_set_admin_state(if_cfg, NULL); + ovsrec_interface_set_duplex(if_cfg, NULL); + ovsrec_interface_set_link_speed(if_cfg, NULL, 0); + ovsrec_interface_set_link_state(if_cfg, NULL); + ovsrec_interface_set_mtu(if_cfg, NULL, 0); + ovsrec_interface_set_cfm_fault(if_cfg, NULL, 0); + ovsrec_interface_set_cfm_remote_mpids(if_cfg, NULL, 0); + ovsrec_interface_set_lacp_current(if_cfg, NULL, 0); + ovsrec_interface_set_statistics(if_cfg, NULL, NULL, 0); + } +} + /* Adds the 'n' key-value pairs in 'keys' in 'values' to 'shash'. * * The value strings in '*shash' are taken directly from values[], not copied, @@ -3402,11 +2621,12 @@ iface_delete_queues(unsigned int queue_id, static void iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) { - if (!qos || qos->type[0] == '\0') { + if (!qos || qos->type[0] == '\0' || qos->n_queues < 1) { netdev_set_qos(iface->netdev, NULL, NULL); } else { struct iface_delete_queues_cbdata cbdata; struct shash details; + bool queue_zero; size_t i; /* Configure top-level Qos for 'iface'. */ @@ -3422,53 +2642,62 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) netdev_dump_queues(iface->netdev, iface_delete_queues, &cbdata); /* Configure queues for 'iface'. */ + queue_zero = false; for (i = 0; i < qos->n_queues; i++) { const struct ovsrec_queue *queue = qos->value_queues[i]; unsigned int queue_id = qos->key_queues[i]; + if (queue_id == 0) { + queue_zero = true; + } + shash_from_ovs_idl_map(queue->key_other_config, queue->value_other_config, queue->n_other_config, &details); netdev_set_queue(iface->netdev, queue_id, &details); shash_destroy(&details); } + if (!queue_zero) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + VLOG_WARN_RL(&rl, "interface %s: QoS configured without a default " + "queue (queue 0). Packets not directed to a " + "correctly configured queue may be dropped.", + iface->name); + } } + + netdev_set_policing(iface->netdev, + iface->cfg->ingress_policing_rate, + iface->cfg->ingress_policing_burst); } static void iface_configure_cfm(struct iface *iface) { - size_t i; - struct cfm cfm; - uint16_t *remote_mps; - struct ovsrec_monitor *mon; - uint8_t maid[CCM_MAID_LEN]; + const struct ovsrec_interface *cfg = iface->cfg; + const char *extended_str, *opstate_str; + struct cfm_settings s; - mon = iface->cfg->monitor; - - if (!mon) { - ofproto_iface_clear_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); + if (!cfg->n_cfm_mpid) { + ofproto_port_clear_cfm(iface->port->bridge->ofproto, iface->ofp_port); return; } - if (!cfm_generate_maid(mon->md_name, mon->ma_name, maid)) { - VLOG_WARN("interface %s: Failed to generate MAID.", iface->name); - return; + s.mpid = *cfg->cfm_mpid; + s.interval = atoi(get_interface_other_config(iface->cfg, "cfm_interval", + "0")); + if (s.interval <= 0) { + s.interval = 1000; } - cfm.mpid = mon->mpid; - cfm.interval = mon->interval ? *mon->interval : 1000; + extended_str = get_interface_other_config(iface->cfg, "cfm_extended", + "false"); + s.extended = !strcasecmp("true", extended_str); - memcpy(cfm.maid, maid, sizeof cfm.maid); + opstate_str = get_interface_other_config(iface->cfg, "cfm_opstate", "up"); + s.opup = !strcasecmp("up", opstate_str); - remote_mps = xzalloc(mon->n_remote_mps * sizeof *remote_mps); - for(i = 0; i < mon->n_remote_mps; i++) { - 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); - free(remote_mps); + ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, &s); } /* Read carrier or miimon status directly from 'iface''s netdev, according to @@ -3495,11 +2724,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; } } @@ -3507,96 +2735,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 = vlan_bitmap_from_array(br->cfg->flood_vlans, - br->cfg->n_flood_vlans); - } - if (mac_learning_set_flood_vlans(br->ml, rspan_vlans)) { - bridge_flush(br); - mac_learning_flush(br->ml); - } - free(rspan_vlans); + 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 @@ -3604,104 +2791,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 " @@ -3709,70 +2853,53 @@ 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; - } - - if (sset_contains(&m->dst_ports, port->name)) { - port->dst_mirrors |= mirror_bit; - } else { - port->dst_mirrors &= ~mirror_bit; - } + &s.dsts, &s.n_dsts); } + /* 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; }