X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=d505b533c9ecc8e774962740454fa61c7758dfcc;hb=a0d8d6973b514143c41c202327f80a8bf27aee11;hp=13e897fd5586061987b9e38b1417f9de1651c976;hpb=ef73f86cd4f7ec0cd2d3f9526167a0d0f6be4f63;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 13e897fd..d505b533 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -32,6 +32,7 @@ #include #include #include "bitmap.h" +#include "cfm.h" #include "classifier.h" #include "coverage.h" #include "dirs.h" @@ -44,6 +45,7 @@ #include "list.h" #include "mac-learning.h" #include "netdev.h" +#include "netlink.h" #include "odp-util.h" #include "ofp-print.h" #include "ofpbuf.h" @@ -71,11 +73,25 @@ VLOG_DEFINE_THIS_MODULE(bridge); +COVERAGE_DEFINE(bridge_flush); +COVERAGE_DEFINE(bridge_process_flow); +COVERAGE_DEFINE(bridge_reconfigure); + struct dst { uint16_t vlan; uint16_t dp_ifidx; }; +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 port *port; /* Containing port. */ @@ -91,6 +107,7 @@ struct iface { struct netdev *netdev; /* Network device. */ bool enabled; /* May be chosen for flows? */ const char *type; /* Usually same as cfg->type. */ + struct cfm *cfm; /* Connectivity Fault Management */ const struct ovsrec_interface *cfg; }; @@ -156,7 +173,6 @@ struct port { bool is_mirror_output_port; /* Does port mirroring send frames here? */ }; -#define DP_MAX_PORTS 255 struct bridge { struct list node; /* Node in global list of bridges. */ char *name; /* User-specified arbitrary name. */ @@ -258,6 +274,9 @@ static struct iface *iface_from_dp_ifidx(const struct bridge *, 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_refresh_cfm_stats(struct iface *iface); +static void iface_send_packet(struct iface *, struct ofpbuf *packet); static void shash_from_ovs_idl_map(char **keys, char **values, size_t n, struct shash *); @@ -298,6 +317,17 @@ bridge_init(const char *remote) bond_init(); } +void +bridge_exit(void) +{ + struct bridge *br, *next_br; + + LIST_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 @@ -365,95 +395,6 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) svec_destroy(&dpif_types); } -/* Initializes 'options' and fills it with the options for 'if_cfg'. Merges - * keys from "options" and "other_config", preferring "options" keys over - * "other_config" keys. - * - * The value strings in '*options' are taken directly from if_cfg, not copied, - * so the caller should not modify or free them. */ -static void -iface_get_options(const struct ovsrec_interface *if_cfg, struct shash *options) -{ - size_t i; - - shash_from_ovs_idl_map(if_cfg->key_options, if_cfg->value_options, - if_cfg->n_options, options); - - for (i = 0; i < if_cfg->n_other_config; i++) { - char *key = if_cfg->key_other_config[i]; - char *value = if_cfg->value_other_config[i]; - - if (!shash_find_data(options, key)) { - shash_add(options, key, value); - } else { - VLOG_WARN("%s: ignoring \"other_config\" key %s that conflicts " - "with \"options\" key %s", if_cfg->name, key, key); - } - } -} - -/* Returns the type of network device that 'iface' should have. (This is - * ordinarily the same type as the interface, but the network devices for - * "internal" ports have type "system".) */ -static const char * -iface_get_netdev_type(const struct iface *iface) -{ - return !strcmp(iface->type, "internal") ? "system" : iface->type; -} - -/* Attempt to create the network device for 'iface' through the netdev - * library. */ -static int -create_iface_netdev(struct iface *iface) -{ - struct netdev_options netdev_options; - struct shash options; - int error; - - memset(&netdev_options, 0, sizeof netdev_options); - netdev_options.name = iface->cfg->name; - netdev_options.type = iface_get_netdev_type(iface); - netdev_options.args = &options; - netdev_options.ethertype = NETDEV_ETH_TYPE_NONE; - - iface_get_options(iface->cfg, &options); - - error = netdev_open(&netdev_options, &iface->netdev); - - if (iface->netdev) { - iface->enabled = netdev_get_carrier(iface->netdev); - } - - shash_destroy(&options); - - return error; -} - -static int -reconfigure_iface_netdev(struct iface *iface) -{ - const char *netdev_type, *iface_type; - struct shash options; - int error; - - /* Skip reconfiguration if the device has the wrong type. This shouldn't - * happen, but... */ - iface_type = iface_get_netdev_type(iface); - netdev_type = netdev_get_type(iface->netdev); - if (iface_type && strcmp(netdev_type, iface_type)) { - VLOG_WARN("%s: attempting change device type from %s to %s", - iface->cfg->name, netdev_type, iface_type); - return EINVAL; - } - - /* Reconfigure device. */ - iface_get_options(iface->cfg, &options); - error = netdev_reconfigure(iface->netdev, &options); - shash_destroy(&options); - - return error; -} - /* Callback for iterate_and_prune_ifaces(). */ static bool check_iface(struct bridge *br, struct iface *iface, void *aux OVS_UNUSED) @@ -692,18 +633,16 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) SHASH_FOR_EACH (node, &want_ifaces) { const char *if_name = node->name; struct iface *iface = node->data; - bool internal = !iface || !strcmp(iface->type, "internal"); struct odp_port *dpif_port = shash_find_data(&cur_ifaces, if_name); + const char *type = iface ? iface->type : "internal"; int error; /* 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 (internal - ? dpif_port && !(dpif_port->flags & ODP_PORT_INTERNAL) - : (iface->netdev - && strcmp(iface->type, netdev_get_type(iface->netdev)))) - { + 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); if (error) { @@ -717,48 +656,66 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) } } - /* If it's not an internal port, open (possibly create) the - * netdev. */ - if (!internal) { - if (!iface->netdev) { - error = create_iface_netdev(iface); - if (error) { - VLOG_WARN("could not create iface %s: %s", iface->name, - strerror(error)); - continue; - } - } else { - reconfigure_iface_netdev(iface); + /* 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; + + 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); - /* If it's not part of the datapath, add it. */ - if (!dpif_port) { - error = dpif_port_add(br->dpif, if_name, - internal ? ODP_PORT_INTERNAL : 0, NULL); - if (error == EFBIG) { - VLOG_ERR("ran out of valid port numbers on %s", - dpif_name(br->dpif)); - break; - } else if (error) { - VLOG_ERR("failed to add %s interface to %s: %s", - if_name, dpif_name(br->dpif), strerror(error)); + if (error) { + VLOG_WARN("could not open network device %s (%s)", + if_name, strerror(error)); continue; } - } - /* If it's an internal port, open the netdev. */ - if (internal) { - if (iface && !iface->netdev) { - error = create_iface_netdev(iface); + /* Then add the port if we haven't already. */ + if (!dpif_port) { + error = dpif_port_add(br->dpif, netdev, NULL); if (error) { - VLOG_WARN("could not create iface %s: %s", iface->name, - strerror(error)); - continue; + netdev_close(netdev); + if (error == EFBIG) { + VLOG_ERR("ran out of valid port numbers on %s", + dpif_name(br->dpif)); + break; + } else { + VLOG_ERR("failed to add %s interface to %s: %s", + if_name, dpif_name(br->dpif), + strerror(error)); + continue; + } } } - } else { - assert(iface->netdev != NULL); + + /* Update 'iface'. */ + if (iface) { + iface->netdev = netdev; + iface->enabled = netdev_get_carrier(iface->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_reconfigure(iface->netdev, &args); + shash_destroy(&args); } } free(dpif_ports); @@ -919,6 +876,13 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) iterate_and_prune_ifaces(br, set_iface_properties, NULL); } + LIST_FOR_EACH (br, node, &all_bridges) { + struct iface *iface; + HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) { + iface_update_cfm(iface); + } + } + free(managers); } @@ -1137,6 +1101,90 @@ dpid_from_hash(const void *data, size_t n) return eth_addr_to_uint64(hash); } +static void +iface_refresh_tunnel_egress(struct iface *iface) +{ + const char *name = netdev_get_tnl_iface(iface->netdev); + + ovsrec_interface_set_tunnel_egress_iface(iface->cfg, name); +} + +static void +iface_refresh_cfm_stats(struct iface *iface) +{ + size_t i; + struct cfm *cfm; + const struct ovsrec_monitor *mon; + + mon = iface->cfg->monitor; + cfm = iface->cfm; + + if (!cfm || !mon) { + 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); + + ovsrec_maintenance_point_set_fault(mp, &rmp->fault, 1); + } + + if (hmap_is_empty(&cfm->x_remote_mps)) { + ovsrec_monitor_set_unexpected_remote_mpids(mon, NULL, 0); + } else { + size_t length; + struct remote_mp *rmp; + int64_t *x_remote_mps; + + length = hmap_count(&cfm->x_remote_mps); + x_remote_mps = xzalloc(length * sizeof *x_remote_mps); + + i = 0; + HMAP_FOR_EACH (rmp, node, &cfm->x_remote_mps) { + x_remote_mps[i++] = rmp->mpid; + } + + ovsrec_monitor_set_unexpected_remote_mpids(mon, x_remote_mps, length); + free(x_remote_mps); + } + + if (hmap_is_empty(&cfm->x_remote_maids)) { + ovsrec_monitor_set_unexpected_remote_maids(mon, NULL, 0); + } else { + size_t length; + char **x_remote_maids; + struct remote_maid *rmaid; + + length = hmap_count(&cfm->x_remote_maids); + x_remote_maids = xzalloc(length * sizeof *x_remote_maids); + + i = 0; + HMAP_FOR_EACH (rmaid, node, &cfm->x_remote_maids) { + size_t j; + + x_remote_maids[i] = xzalloc(CCM_MAID_LEN * 2 + 1); + + for (j = 0; j < CCM_MAID_LEN; j++) { + snprintf(&x_remote_maids[i][j * 2], 3, "%02hhx", + rmaid->maid[j]); + } + i++; + } + ovsrec_monitor_set_unexpected_remote_maids(mon, x_remote_maids, length); + + for (i = 0; i < length; i++) { + free(x_remote_maids[i]); + } + free(x_remote_maids); + } + + ovsrec_monitor_set_fault(mon, &cfm->fault, 1); +} + static void iface_refresh_stats(struct iface *iface) { @@ -1269,6 +1317,8 @@ bridge_run(void) for (j = 0; j < port->n_ifaces; j++) { struct iface *iface = port->ifaces[j]; iface_refresh_stats(iface); + iface_refresh_cfm_stats(iface); + iface_refresh_tunnel_egress(iface); } } } @@ -1285,6 +1335,7 @@ void bridge_wait(void) { struct bridge *br; + struct iface *iface; LIST_FOR_EACH (br, node, &all_bridges) { ofproto_wait(br->ofproto); @@ -1294,6 +1345,12 @@ bridge_wait(void) mac_learning_wait(br->ml); bond_wait(br); + + HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) { + if (iface->cfm) { + cfm_wait(iface->cfm); + } + } } ovsdb_idl_wait(idl); poll_timer_wait_until(stats_timer); @@ -1494,6 +1551,7 @@ static int bridge_run_one(struct bridge *br) { int error; + struct iface *iface; error = ofproto_run1(br->ofproto); if (error) { @@ -1506,6 +1564,21 @@ bridge_run_one(struct bridge *br) error = ofproto_run2(br->ofproto, br->flush); br->flush = false; + HMAP_FOR_EACH (iface, dp_ifidx_node, &br->ifaces) { + struct ofpbuf *packet; + + if (!iface->cfm) { + continue; + } + + packet = cfm_run(iface->cfm); + if (packet) { + iface_send_packet(iface, packet); + ofpbuf_uninit(packet); + free(packet); + } + } + return error; } @@ -1623,7 +1696,7 @@ bridge_reconfigure_one(struct bridge *br) /* Configure OpenFlow controller connection snooping. */ svec_init(&snoops); svec_add_nocopy(&snoops, xasprintf("punix:%s/%s.snoop", - ovs_rundir, br->name)); + ovs_rundir(), br->name)); svec_init(&old_snoops); ofproto_get_snoops(br->ofproto, &old_snoops); if (!svec_equal(&snoops, &old_snoops)) { @@ -1643,7 +1716,7 @@ static void bridge_ofproto_controller_for_mgmt(const struct bridge *br, struct ofproto_controller *oc) { - oc->target = xasprintf("punix:%s/%s.mgmt", ovs_rundir, br->name); + oc->target = xasprintf("punix:%s/%s.mgmt", ovs_rundir(), br->name); oc->max_backoff = 0; oc->probe_interval = 60; oc->band = OFPROTO_OUT_OF_BAND; @@ -1882,15 +1955,16 @@ bridge_fetch_dp_ifaces(struct bridge *br) /* Bridge packet processing functions. */ static int -bond_hash(const uint8_t mac[ETH_ADDR_LEN]) +bond_hash(const uint8_t mac[ETH_ADDR_LEN], uint16_t vlan) { - return hash_bytes(mac, ETH_ADDR_LEN, 0) & BOND_MASK; + return hash_bytes(mac, ETH_ADDR_LEN, vlan) & BOND_MASK; } static struct bond_entry * -lookup_bond_entry(const struct port *port, const uint8_t mac[ETH_ADDR_LEN]) +lookup_bond_entry(const struct port *port, const uint8_t mac[ETH_ADDR_LEN], + uint16_t vlan) { - return &port->bond_hash[bond_hash(mac)]; + return &port->bond_hash[bond_hash(mac, vlan)]; } static int @@ -1925,7 +1999,7 @@ bond_choose_iface(const struct port *port) static bool choose_output_iface(const struct port *port, const uint8_t *dl_src, - uint16_t *dp_ifidx, tag_type *tags) + uint16_t vlan, uint16_t *dp_ifidx, tag_type *tags) { struct iface *iface; @@ -1933,7 +2007,7 @@ choose_output_iface(const struct port *port, const uint8_t *dl_src, if (port->n_ifaces == 1) { iface = port->ifaces[0]; } else { - struct bond_entry *e = lookup_bond_entry(port, dl_src); + struct bond_entry *e = lookup_bond_entry(port, dl_src, vlan); if (e->iface_idx < 0 || e->iface_idx >= port->n_ifaces || !port->ifaces[e->iface_idx]->enabled) { /* XXX select interface properly. The current interface selection @@ -2162,14 +2236,16 @@ bond_wait(struct bridge *br) } static bool -set_dst(struct dst *p, const struct flow *flow, +set_dst(struct dst *dst, const struct flow *flow, const struct port *in_port, const struct port *out_port, tag_type *tags) { - p->vlan = (out_port->vlan >= 0 ? OFP_VLAN_NONE + dst->vlan = (out_port->vlan >= 0 ? OFP_VLAN_NONE : in_port->vlan >= 0 ? in_port->vlan - : ntohs(flow->dl_vlan)); - return choose_output_iface(out_port, flow->dl_src, &p->dp_ifidx, tags); + : flow->vlan_tci == 0 ? OFP_VLAN_NONE + : vlan_tci_to_vid(flow->vlan_tci)); + return choose_output_iface(out_port, flow->dl_src, dst->vlan, + &dst->dp_ifidx, tags); } static void @@ -2186,10 +2262,10 @@ swap_dst(struct dst *p, struct dst *q) * vlan, but in most cases there are at most two different vlan tags so that's * possibly overkill.) */ static void -partition_dsts(struct dst *dsts, size_t n_dsts, int vlan) +partition_dsts(struct dst_set *set, int vlan) { - struct dst *first = dsts; - struct dst *last = dsts + n_dsts; + struct dst *first = set->dsts; + struct dst *last = set->dsts + set->n; while (first != last) { /* Invariants: @@ -2224,13 +2300,48 @@ mirror_mask_ffs(mirror_mask_t 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 *dsts, size_t n_dsts, - const struct dst *test) +dst_is_duplicate(const struct dst_set *set, const struct dst *test) { size_t i; - for (i = 0; i < n_dsts; i++) { - if (dsts[i].vlan == test->vlan && dsts[i].dp_ifidx == test->dp_ifidx) { + for (i = 0; i < set->n; i++) { + if (set->dsts[i].vlan == test->vlan + && set->dsts[i].dp_ifidx == test->dp_ifidx) { return true; } } @@ -2264,56 +2375,58 @@ port_is_floodable(const struct port *port) return true; } -static size_t +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 dsts[], tag_type *tags, uint16_t *nf_output_iface) + struct dst_set *set, tag_type *tags, uint16_t *nf_output_iface) { mirror_mask_t mirrors = in_port->src_mirrors; - struct dst *dst = dsts; + struct dst dst; + int flow_vlan; size_t i; + flow_vlan = vlan_tci_to_vid(flow->vlan_tci); + if (flow_vlan == 0) { + flow_vlan = OFP_VLAN_NONE; + } + if (out_port == FLOOD_PORT) { - /* XXX use ODP_FLOOD if no vlans or bonding. */ - /* XXX even better, define each VLAN as a datapath port group */ for (i = 0; i < br->n_ports; i++) { struct port *port = br->ports[i]; 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)) { + && set_dst(&dst, flow, in_port, port, tags)) { mirrors |= port->dst_mirrors; - dst++; + dst_set_add(set, &dst); } } *nf_output_iface = NF_OUT_FLOOD; - } else if (out_port && set_dst(dst, flow, in_port, out_port, tags)) { - *nf_output_iface = dst->dp_ifidx; + } else if (out_port && set_dst(&dst, flow, in_port, out_port, tags)) { + dst_set_add(set, &dst); + *nf_output_iface = dst.dp_ifidx; mirrors |= out_port->dst_mirrors; - dst++; } while (mirrors) { struct mirror *m = br->mirrors[mirror_mask_ffs(mirrors) - 1]; if (!m->n_vlans || vlan_is_mirrored(m, vlan)) { if (m->out_port) { - if (set_dst(dst, flow, in_port, m->out_port, tags) - && !dst_is_duplicate(dsts, dst - dsts, dst)) { - dst++; + if (set_dst(&dst, flow, in_port, m->out_port, tags) + && !dst_is_duplicate(set, &dst)) { + dst_set_add(set, &dst); } } else { for (i = 0; i < br->n_ports; i++) { struct port *port = br->ports[i]; if (port_includes_vlan(port, m->out_vlan) - && set_dst(dst, flow, in_port, port, tags)) + && set_dst(&dst, flow, in_port, port, tags)) { - int flow_vlan; - if (port->vlan < 0) { - dst->vlan = m->out_vlan; + dst.vlan = m->out_vlan; } - if (dst_is_duplicate(dsts, dst - dsts, dst)) { + if (dst_is_duplicate(set, &dst)) { continue; } @@ -2323,15 +2436,11 @@ compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan, * tagging tags place. This is necessary because * dst->vlan is the final vlan, after removing implicit * tags. */ - flow_vlan = ntohs(flow->dl_vlan); - if (flow_vlan == 0) { - flow_vlan = OFP_VLAN_NONE; - } - if (port == in_port && dst->vlan == flow_vlan) { + if (port == in_port && dst.vlan == flow_vlan) { /* Don't send out input port on same VLAN. */ continue; } - dst++; + dst_set_add(set, &dst); } } } @@ -2339,17 +2448,20 @@ compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan, mirrors &= mirrors - 1; } - partition_dsts(dsts, dst - dsts, ntohs(flow->dl_vlan)); - return dst - dsts; + partition_dsts(set, flow_vlan); } static void OVS_UNUSED -print_dsts(const struct dst *dsts, size_t n) +print_dsts(const struct dst_set *set) { - for (; n--; dsts++) { - printf(">p%"PRIu16, dsts->dp_ifidx); - if (dsts->vlan != OFP_VLAN_NONE) { - printf("v%"PRIu16, dsts->vlan); + size_t i; + + for (i = 0; i < set->n; i++) { + const struct dst *dst = &set->dsts[i]; + + printf(">p%"PRIu16, dst->dp_ifidx); + if (dst->vlan != OFP_VLAN_NONE) { + printf("v%"PRIu16, dst->vlan); } } } @@ -2357,33 +2469,37 @@ print_dsts(const struct dst *dsts, size_t n) 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 odp_actions *actions, + tag_type *tags, struct ofpbuf *actions, uint16_t *nf_output_iface) { - struct dst dsts[DP_MAX_PORTS * (MAX_MIRRORS + 1)]; - size_t n_dsts; - const struct dst *p; + struct dst_set set; uint16_t cur_vlan; + size_t i; - n_dsts = compose_dsts(br, flow, vlan, in_port, out_port, dsts, tags, - nf_output_iface); + dst_set_init(&set); + compose_dsts(br, flow, vlan, in_port, out_port, &set, tags, + nf_output_iface); - cur_vlan = ntohs(flow->dl_vlan); - for (p = dsts; p < &dsts[n_dsts]; p++) { - union odp_action *a; - if (p->vlan != cur_vlan) { - if (p->vlan == OFP_VLAN_NONE) { - odp_actions_add(actions, ODPAT_STRIP_VLAN); + cur_vlan = vlan_tci_to_vid(flow->vlan_tci); + if (cur_vlan == 0) { + cur_vlan = OFP_VLAN_NONE; + } + for (i = 0; i < set.n; i++) { + const struct dst *dst = &set.dsts[i]; + if (dst->vlan != cur_vlan) { + if (dst->vlan == OFP_VLAN_NONE) { + nl_msg_put_flag(actions, ODPAT_STRIP_VLAN); } else { - a = odp_actions_add(actions, ODPAT_SET_DL_TCI); - a->dl_tci.tci = htons(p->vlan & VLAN_VID_MASK); - a->dl_tci.tci |= htons(flow->dl_vlan_pcp << VLAN_PCP_SHIFT); + ovs_be16 tci; + tci = htons(dst->vlan & VLAN_VID_MASK); + tci |= flow->vlan_tci & htons(VLAN_PCP_MASK); + nl_msg_put_be16(actions, ODPAT_SET_DL_TCI, tci); } - cur_vlan = p->vlan; + cur_vlan = dst->vlan; } - a = odp_actions_add(actions, ODPAT_OUTPUT); - a->output.port = p->dp_ifidx; + nl_msg_put_u32(actions, ODPAT_OUTPUT, dst->dp_ifidx); } + dst_set_free(&set); } /* Returns the effective vlan of a packet, taking into account both the @@ -2393,25 +2509,16 @@ compose_actions(struct bridge *br, const struct flow *flow, uint16_t vlan, static int flow_get_vlan(struct bridge *br, const struct flow *flow, struct port *in_port, bool have_packet) { - /* Note that dl_vlan of 0 and of OFP_VLAN_NONE both mean that the packet - * belongs to VLAN 0, so we should treat both cases identically. (In the - * former case, the packet has an 802.1Q header that specifies VLAN 0, - * presumably to allow a priority to be specified. In the latter case, the - * packet does not have any 802.1Q header.) */ - int vlan = ntohs(flow->dl_vlan); - if (vlan == OFP_VLAN_NONE) { - vlan = 0; - } + int vlan = vlan_tci_to_vid(flow->vlan_tci); if (in_port->vlan >= 0) { if (vlan) { /* XXX support double tagging? */ if (have_packet) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping VLAN %"PRIu16" tagged " + VLOG_WARN_RL(&rl, "bridge %s: dropping VLAN %d tagged " "packet received on port %s configured with " "implicit VLAN %"PRIu16, - br->name, ntohs(flow->dl_vlan), - in_port->name, in_port->vlan); + br->name, vlan, in_port->name, in_port->vlan); } return -1; } @@ -2584,7 +2691,7 @@ is_admissible(struct bridge *br, const struct flow *flow, bool have_packet, * not at all, if 'packet' was NULL. */ static bool process_flow(struct bridge *br, const struct flow *flow, - const struct ofpbuf *packet, struct odp_actions *actions, + const struct ofpbuf *packet, struct ofpbuf *actions, tag_type *tags, uint16_t *nf_output_iface) { struct port *in_port; @@ -2635,26 +2742,37 @@ done: static bool bridge_normal_ofhook_cb(const struct flow *flow, const struct ofpbuf *packet, - struct odp_actions *actions, tag_type *tags, + struct ofpbuf *actions, tag_type *tags, uint16_t *nf_output_iface, void *br_) { + struct iface *iface; struct bridge *br = br_; COVERAGE_INC(bridge_process_flow); + iface = iface_from_dp_ifidx(br, flow->in_port); + + if (cfm_should_process_flow(flow)) { + if (packet && iface->cfm) { + cfm_process_heartbeat(iface->cfm, packet); + } + return false; + } + return process_flow(br, flow, packet, actions, tags, nf_output_iface); } static void bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, - const union odp_action *actions, - size_t n_actions, unsigned long long int n_bytes, - void *br_) + const struct nlattr *actions, + size_t actions_len, + unsigned long long int n_bytes, void *br_) { struct bridge *br = br_; - const union odp_action *a; + 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 @@ -2672,12 +2790,15 @@ bridge_account_flow_ofhook_cb(const struct flow *flow, tag_type tags, if (!br->has_bonded_ports) { return; } - for (a = actions; a < &actions[n_actions]; a++) { - if (a->type == ODPAT_OUTPUT) { - struct port *out_port = port_from_dp_ifidx(br, a->output.port); + NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { + if (nl_attr_type(a) == ODPAT_OUTPUT) { + struct port *out_port = port_from_dp_ifidx(br, nl_attr_get_u32(a)); if (out_port && out_port->n_ifaces >= 2) { + uint16_t vlan = (flow->vlan_tci + ? vlan_tci_to_vid(flow->vlan_tci) + : OFP_VLAN_NONE); struct bond_entry *e = lookup_bond_entry(out_port, - flow->dl_src); + flow->dl_src, vlan); e->tx_bytes += n_bytes; } } @@ -2868,7 +2989,7 @@ bond_shift_load(struct slave_balance *from, struct slave_balance *to, static void bond_rebalance_port(struct port *port) { - struct slave_balance bals[DP_MAX_PORTS]; + struct slave_balance *bals; size_t n_bals; struct bond_entry *hashes[BOND_MASK + 1]; struct slave_balance *b, *from, *to; @@ -2886,6 +3007,7 @@ bond_rebalance_port(struct port *port) * become contiguous in memory, and then we point each 'hashes' members of * a slave_balance structure to the start of a contiguous group. */ n_bals = port->n_ifaces; + bals = xmalloc(n_bals * sizeof *bals); for (b = bals; b < &bals[n_bals]; b++) { b->iface = port->ifaces[b - bals]; b->tx_bytes = 0; @@ -2915,7 +3037,7 @@ bond_rebalance_port(struct port *port) while (!bals[n_bals - 1].iface->enabled) { n_bals--; if (!n_bals) { - return; + goto exit; } } @@ -3007,6 +3129,9 @@ bond_rebalance_port(struct port *port) for (e = &port->bond_hash[0]; e <= &port->bond_hash[BOND_MASK]; e++) { e->tx_bytes /= 2; } + +exit: + free(bals); } static void @@ -3031,7 +3156,7 @@ bond_send_learning_packets(struct port *port) int retval; if (e->port == port->port_idx - || !choose_output_iface(port, e->mac, &dp_ifidx, &tags)) { + || !choose_output_iface(port, e->mac, e->vlan, &dp_ifidx, &tags)) { continue; } @@ -3177,9 +3302,10 @@ bond_unixctl_show(struct unixctl_conn *conn, LIST_FOR_EACH (me, lru_node, &port->bridge->ml->lrus) { uint16_t dp_ifidx; tag_type tags = 0; - if (bond_hash(me->mac) == hash + if (bond_hash(me->mac, me->vlan) == hash && me->port != port->port_idx - && choose_output_iface(port, me->mac, &dp_ifidx, &tags) + && choose_output_iface(port, me->mac, me->vlan, + &dp_ifidx, &tags) && dp_ifidx == iface->dp_ifidx) { ds_put_format(&ds, "\t\t"ETH_ADDR_FMT"\n", @@ -3199,7 +3325,6 @@ bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_, char *args = (char *) args_; char *save_ptr = NULL; char *bond_s, *hash_s, *slave_s; - uint8_t mac[ETH_ADDR_LEN]; struct port *port; struct iface *iface; struct bond_entry *entry; @@ -3220,10 +3345,7 @@ bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_, return; } - if (sscanf(hash_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) - == ETH_ADDR_SCAN_COUNT) { - hash = bond_hash(mac); - } else if (strspn(hash_s, "0123456789") == strlen(hash_s)) { + if (strspn(hash_s, "0123456789") == strlen(hash_s)) { hash = atoi(hash_s) & BOND_MASK; } else { unixctl_command_reply(conn, 501, "bad hash"); @@ -3345,23 +3467,39 @@ bond_unixctl_disable_slave(struct unixctl_conn *conn, const char *args, } static void -bond_unixctl_hash(struct unixctl_conn *conn, const char *args, +bond_unixctl_hash(struct unixctl_conn *conn, const char *args_, void *aux OVS_UNUSED) { - uint8_t mac[ETH_ADDR_LEN]; - uint8_t hash; - char *hash_cstr; - - if (sscanf(args, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) - == ETH_ADDR_SCAN_COUNT) { - hash = bond_hash(mac); - - hash_cstr = xasprintf("%u", hash); - unixctl_command_reply(conn, 200, hash_cstr); - free(hash_cstr); - } else { - unixctl_command_reply(conn, 501, "invalid mac"); - } + char *args = (char *) args_; + uint8_t mac[ETH_ADDR_LEN]; + uint8_t hash; + char *hash_cstr; + unsigned int vlan; + char *mac_s, *vlan_s; + char *save_ptr = NULL; + + mac_s = strtok_r(args, " ", &save_ptr); + vlan_s = strtok_r(NULL, " ", &save_ptr); + + if (vlan_s) { + if (sscanf(vlan_s, "%u", &vlan) != 1) { + unixctl_command_reply(conn, 501, "invalid vlan"); + return; + } + } else { + vlan = OFP_VLAN_NONE; + } + + if (sscanf(mac_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) + == ETH_ADDR_SCAN_COUNT) { + hash = bond_hash(mac, vlan); + + hash_cstr = xasprintf("%u", hash); + unixctl_command_reply(conn, 200, hash_cstr); + free(hash_cstr); + } else { + unixctl_command_reply(conn, 501, "invalid mac"); + } } static void @@ -3782,6 +3920,26 @@ port_update_vlan_compat(struct port *port) /* Interface functions. */ +static void +iface_send_packet(struct iface *iface, struct ofpbuf *packet) +{ + struct flow flow; + union ofp_action action; + + memset(&action, 0, sizeof action); + action.output.type = htons(OFPAT_OUTPUT); + action.output.len = htons(sizeof action); + action.output.port = htons(odp_port_to_ofp_port(iface->dp_ifidx)); + + flow_extract(packet, 0, ODPP_NONE, &flow); + + if (ofproto_send_packet(iface->port->bridge->ofproto, &flow, &action, 1, + packet)) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + VLOG_WARN_RL(&rl, "interface %s: Failed to send packet.", iface->name); + } +} + static struct iface * iface_create(struct port *port, const struct ovsrec_interface *if_cfg) { @@ -3843,6 +4001,8 @@ iface_destroy(struct iface *iface) bond_send_learning_packets(port); } + cfm_destroy(iface->cfm); + free(iface->name); free(iface); @@ -3979,6 +4139,56 @@ iface_update_qos(struct iface *iface, const struct ovsrec_qos *qos) } } } + +static void +iface_update_cfm(struct iface *iface) +{ + size_t i; + struct cfm *cfm; + uint16_t *remote_mps; + struct ovsrec_monitor *mon; + uint8_t ea[ETH_ADDR_LEN], maid[CCM_MAID_LEN]; + + mon = iface->cfg->monitor; + + if (!mon) { + return; + } + + if (netdev_get_etheraddr(iface->netdev, ea)) { + VLOG_WARN("interface %s: Failed to get ethernet address. " + "Skipping Monitor.", iface->name); + return; + } + + if (!cfm_generate_maid(mon->md_name, mon->ma_name, maid)) { + VLOG_WARN("interface %s: Failed to generate MAID.", iface->name); + return; + } + + if (!iface->cfm) { + iface->cfm = cfm_create(); + } + + cfm = iface->cfm; + cfm->mpid = mon->mpid; + cfm->interval = mon->interval ? *mon->interval : 1000; + + memcpy(cfm->eth_src, ea, sizeof cfm->eth_src); + memcpy(cfm->maid, maid, sizeof cfm->maid); + + 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; + } + cfm_update_remote_mps(cfm, remote_mps, mon->n_remote_mps); + free(remote_mps); + + if (!cfm_configure(iface->cfm)) { + cfm_destroy(iface->cfm); + iface->cfm = NULL; + } +} /* Port mirroring. */