X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=e09b552ad95d952bf37b1f1f09c170ab5ee53e83;hb=cd786de2018b72b1aa8e8435dd2db50665dab5ad;hp=d2dcd02732940fbf8e345c78d9e6d9bd9ede9371;hpb=5fcc0d004ae0aa080deed51c842d074a83ec1f67;p=sliver-openvswitch.git diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index d2dcd0273..e09b552ad 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks +/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,9 +28,11 @@ #include "dynamic-string.h" #include "hash.h" #include "hmap.h" +#include "hmapx.h" #include "jsonrpc.h" #include "lacp.h" #include "list.h" +#include "mac-learning.h" #include "netdev.h" #include "ofp-print.h" #include "ofpbuf.h" @@ -39,6 +41,7 @@ #include "sha1.h" #include "shash.h" #include "socket-util.h" +#include "stream.h" #include "stream-ssl.h" #include "sset.h" #include "system-stats.h" @@ -154,6 +157,7 @@ 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_mac_idle_time(struct bridge *); static void bridge_configure_sflow(struct bridge *, int *sflow_bridge_number); static void bridge_configure_stp(struct bridge *); static void bridge_configure_remotes(struct bridge *, @@ -308,10 +312,11 @@ bridge_init(const char *remote) ovsdb_idl_omit(idl, &ovsrec_ssl_col_external_ids); /* Register unixctl commands. */ - unixctl_command_register("qos/show", "interface", qos_unixctl_show, NULL); - unixctl_command_register("bridge/dump-flows", "bridge", + unixctl_command_register("qos/show", "interface", 1, 1, + qos_unixctl_show, NULL); + unixctl_command_register("bridge/dump-flows", "bridge", 1, 1, bridge_unixctl_dump_flows, NULL); - unixctl_command_register("bridge/reconnect", "[bridge]", + unixctl_command_register("bridge/reconnect", "[bridge]", 0, 1, bridge_unixctl_reconnect, NULL); lacp_init(); bond_init(); @@ -371,10 +376,10 @@ collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg, SSET_FOR_EACH (target, &targets) { struct sockaddr_in *sin = &managers[n_managers]; - if ((!strncmp(target, "tcp:", 4) - && inet_parse_active(target + 4, JSONRPC_TCP_PORT, sin)) || - (!strncmp(target, "ssl:", 4) - && inet_parse_active(target + 4, JSONRPC_SSL_PORT, sin))) { + if (stream_parse_target_with_default_ports(target, + JSONRPC_TCP_PORT, + JSONRPC_SSL_PORT, + sin)) { n_managers++; } } @@ -429,8 +434,12 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) * has at least one iface, every "struct iface" has a valid ofp_port and * netdev. */ HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { - if (!br->ofproto && !bridge_add_ofprotos(br)) { - bridge_destroy(br); + if (!br->ofproto) { + if (bridge_add_ofprotos(br)) { + bridge_del_ofproto_ports(br); + } else { + bridge_destroy(br); + } } } HMAP_FOR_EACH (br, node, &all_bridges) { @@ -444,6 +453,10 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) HMAP_FOR_EACH (br, node, &all_bridges) { struct port *port; + /* We need the datapath ID early to allow LACP ports to use it as the + * default system ID. */ + bridge_configure_datapath_id(br); + HMAP_FOR_EACH (port, hmap_node, &br->ports) { struct iface *iface; @@ -456,9 +469,9 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) } } bridge_configure_mirrors(br); - bridge_configure_datapath_id(br); bridge_configure_flow_eviction_threshold(br); bridge_configure_forward_bpdu(br); + bridge_configure_mac_idle_time(br); bridge_configure_remotes(br, managers, n_managers); bridge_configure_netflow(br); bridge_configure_sflow(br, &sflow_bridge_number); @@ -535,17 +548,8 @@ port_configure(struct port *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); - } + if (cfg->tag && *cfg->tag >= 0 && *cfg->tag <= 4095) { + s.vlan = *cfg->tag; } /* Get VLAN trunks. */ @@ -1274,14 +1278,30 @@ bridge_configure_forward_bpdu(struct bridge *br) ofproto_set_forward_bpdu(br->ofproto, forward_bpdu); } +/* Set MAC aging time for 'br'. */ +static void +bridge_configure_mac_idle_time(struct bridge *br) +{ + const char *idle_time_str; + int idle_time; + + idle_time_str = bridge_get_other_config(br->cfg, "mac-aging-time"); + idle_time = (idle_time_str && atoi(idle_time_str) + ? atoi(idle_time_str) + : MAC_ENTRY_DEFAULT_IDLE_TIME); + ofproto_set_mac_idle_time(br->ofproto, idle_time); +} + static void bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], struct iface **hw_addr_iface) { + struct hmapx mirror_output_ports; const char *hwaddr; struct port *port; bool found_addr = false; int error; + int i; *hw_addr_iface = NULL; @@ -1298,6 +1318,18 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], } } + /* Mirror output ports don't participate in picking the local hardware + * address. ofproto can't help us find out whether a given port is a + * mirror output because we haven't configured mirrors yet, so we need to + * accumulate them ourselves. */ + hmapx_init(&mirror_output_ports); + for (i = 0; i < br->cfg->n_mirrors; i++) { + struct ovsrec_mirror *m = br->cfg->mirrors[i]; + if (m->output_port) { + hmapx_add(&mirror_output_ports, m->output_port); + } + } + /* Otherwise choose the minimum non-local MAC address among all of the * interfaces. */ HMAP_FOR_EACH (port, hmap_node, &br->ports) { @@ -1306,7 +1338,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], struct iface *iface; /* Mirror output ports don't participate. */ - if (ofproto_is_mirror_output_bundle(br->ofproto, port)) { + if (hmapx_contains(&mirror_output_ports, port->cfg)) { continue; } @@ -1369,6 +1401,8 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], VLOG_WARN("bridge %s: using default bridge Ethernet " "address "ETH_ADDR_FMT, br->name, ETH_ADDR_ARGS(ea)); } + + hmapx_destroy(&mirror_output_ports); } /* Choose and returns the datapath ID for bridge 'br' given that the bridge @@ -2023,8 +2057,8 @@ qos_unixctl_show_cb(unsigned int queue_id, } static void -qos_unixctl_show(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +qos_unixctl_show(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[], void *aux OVS_UNUSED) { struct ds ds = DS_EMPTY_INITIALIZER; struct shash sh = SHASH_INITIALIZER(&sh); @@ -2034,7 +2068,7 @@ qos_unixctl_show(struct unixctl_conn *conn, struct qos_unixctl_show_cbdata data; int error; - iface = iface_find(args); + iface = iface_find(argv[1]); if (!iface) { unixctl_command_reply(conn, 501, "no such interface"); return; @@ -2133,13 +2167,13 @@ bridge_lookup(const char *name) /* Handle requests for a listing of all flows known by the OpenFlow * stack, including those normally hidden. */ static void -bridge_unixctl_dump_flows(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +bridge_unixctl_dump_flows(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[], void *aux OVS_UNUSED) { struct bridge *br; struct ds results; - br = bridge_lookup(args); + br = bridge_lookup(argv[1]); if (!br) { unixctl_command_reply(conn, 501, "Unknown bridge"); return; @@ -2156,12 +2190,12 @@ bridge_unixctl_dump_flows(struct unixctl_conn *conn, * connections and reconnect. If BRIDGE is not specified, then all bridges * drop their controller connections and reconnect. */ static void -bridge_unixctl_reconnect(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +bridge_unixctl_reconnect(struct unixctl_conn *conn, int argc, + const char *argv[], void *aux OVS_UNUSED) { struct bridge *br; - if (args[0] != '\0') { - br = bridge_lookup(args); + if (argc > 1) { + br = bridge_lookup(argv[1]); if (!br) { unixctl_command_reply(conn, 501, "Unknown bridge"); return; @@ -2640,7 +2674,7 @@ enable_lacp(struct port *port, bool *activep) static struct lacp_settings * port_configure_lacp(struct port *port, struct lacp_settings *s) { - const char *lacp_time; + const char *lacp_time, *system_id; long long int custom_time; int priority; @@ -2649,7 +2683,18 @@ port_configure_lacp(struct port *port, struct lacp_settings *s) } s->name = port->name; - memcpy(s->id, port->bridge->ea, ETH_ADDR_LEN); + + system_id = get_port_other_config(port->cfg, "lacp-system-id", NULL); + if (!system_id + || sscanf(system_id, ETH_ADDR_SCAN_FMT, + ETH_ADDR_SCAN_ARGS(s->id)) != ETH_ADDR_SCAN_COUNT) { + memcpy(s->id, port->bridge->ea, ETH_ADDR_LEN); + } + + if (eth_addr_is_zero(s->id)) { + VLOG_WARN("port %s: Invalid zero LACP system ID.", port->name); + return NULL; + } /* Prefer bondable links if unspecified. */ priority = atoi(get_port_other_config(port->cfg, "lacp-system-priority", @@ -2662,7 +2707,6 @@ port_configure_lacp(struct port *port, struct lacp_settings *s) "lacp-heartbeat", "false"), "true"); - lacp_time = get_port_other_config(port->cfg, "lacp-time", "slow"); custom_time = atoi(lacp_time); if (!strcmp(lacp_time, "fast")) { @@ -2719,11 +2763,21 @@ port_configure_bond(struct port *port, struct bond_settings *s, s->name = port->name; s->balance = BM_SLB; - if (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)); + if (port->cfg->bond_mode) { + if (!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)); + } + } else { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + + /* XXX: Post version 1.4.*, change the default bond_mode to + * active-backup. Until then, warn that the change is imminent. */ + VLOG_WARN_RL(&rl, "port %s: Using the default bond_mode %s. Note that" + " in future versions, the default bond_mode is expected" + " to change to active-backup", port->name, + 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, " @@ -3061,9 +3115,12 @@ iface_configure_qos(struct iface *iface, const struct ovsrec_qos *qos) 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.", + "queue (queue 0). Using default configuration.", iface->name); + + shash_init(&details); + netdev_set_queue(iface->netdev, 0, &details); + shash_destroy(&details); } } @@ -3375,8 +3432,13 @@ collect_splinter_vlans(const struct ovsrec_open_vswitch *ovs_cfg) struct bridge *br; size_t i; - splinter_vlans = NULL; + /* Free space allocated for synthesized ports and interfaces, since we're + * in the process of reconstructing all of them. */ + free_registered_blocks(); + + splinter_vlans = bitmap_allocate(4096); sset_init(&splinter_ifaces); + vlan_splinters_enabled_anywhere = false; for (i = 0; i < ovs_cfg->n_bridges; i++) { struct ovsrec_bridge *br_cfg = ovs_cfg->bridges[i]; size_t j; @@ -3389,21 +3451,22 @@ collect_splinter_vlans(const struct ovsrec_open_vswitch *ovs_cfg) struct ovsrec_interface *iface_cfg = port_cfg->interfaces[k]; if (vlan_splinters_is_enabled(iface_cfg)) { + vlan_splinters_enabled_anywhere = true; sset_add(&splinter_ifaces, iface_cfg->name); - - if (!splinter_vlans) { - splinter_vlans = bitmap_allocate(4096); - } vlan_bitmap_from_array__(port_cfg->trunks, port_cfg->n_trunks, splinter_vlans); } } + + if (port_cfg->tag && *port_cfg->tag > 0 && *port_cfg->tag < 4095) { + bitmap_set1(splinter_vlans, *port_cfg->tag); + } } } - vlan_splinters_enabled_anywhere = splinter_vlans != NULL; - if (!splinter_vlans) { + if (!vlan_splinters_enabled_anywhere) { + free(splinter_vlans); sset_destroy(&splinter_ifaces); return NULL; } @@ -3542,8 +3605,6 @@ add_vlan_splinter_ports(struct bridge *br, { size_t i; - free_registered_blocks(); - /* We iterate through 'br->cfg->ports' instead of 'ports' here because * we're modifying 'ports'. */ for (i = 0; i < br->cfg->n_ports; i++) {