X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=d4335c103a4963fdb6b239dbe0577f58bbca7ded;hb=65c3058c22803c7e8d8fd0bfbb84fe27456fb137;hp=6491590a9c3075fbf7b7475349f2c1dc0b2b038b;hpb=6c2d2a9f8318fea11250a7624144cb06436f91a4;p=sliver-openvswitch.git diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 6491590a9..d4335c103 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -150,6 +150,7 @@ 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_configure_remotes(struct bridge *, const struct sockaddr_in *managers, @@ -194,12 +195,12 @@ 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 *); +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 *); static void shash_from_ovs_idl_map(char **keys, char **values, size_t n, @@ -237,10 +238,14 @@ bridge_init(const char *remote) ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_duplex); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_link_speed); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_link_state); + ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_link_resets); ovsdb_idl_omit_alert(idl, &ovsrec_interface_col_mtu); 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); @@ -267,11 +272,11 @@ bridge_init(const char *remote) ovsdb_idl_omit(idl, &ovsrec_ssl_col_external_ids); /* Register unixctl commands. */ - 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(); @@ -414,6 +419,7 @@ 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_remotes(br, managers, n_managers); bridge_configure_netflow(br); bridge_configure_sflow(br, &sflow_bridge_number); @@ -488,7 +494,6 @@ port_configure(struct port *port) if (list_is_short(&port->ifaces)) { if (*cfg->tag >= 0 && *cfg->tag <= 4095) { s.vlan = *cfg->tag; - VLOG_DBG("port %s: assigning VLAN tag %d", port->name, s.vlan); } } else { /* It's possible that bonded, VLAN-tagged ports make sense. Maybe @@ -500,11 +505,35 @@ port_configure(struct port *port) /* Get VLAN trunks. */ s.trunks = NULL; - if (s.vlan < 0 && cfg->n_trunks) { + if (cfg->n_trunks) { s.trunks = vlan_bitmap_from_array(cfg->trunks, cfg->n_trunks); - } else if (s.vlan >= 0 && cfg->n_trunks) { - VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", - port->name); + } + + /* 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. */ @@ -710,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); } } @@ -846,35 +882,36 @@ bridge_add_ofproto_ports(struct bridge *br) 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); - } - shash_destroy(&args); - if (error) { - VLOG_WARN("could not %s network device %s (%s)", - iface->netdev ? "reconfigure" : "open", - iface->name, strerror(error)); + error = 0; } - /* Populate stats columns in new Interface rows. */ - if (iface->netdev && !iface->cfg->mtu) { - iface_refresh_stats(iface); - iface_refresh_status(iface); + /* 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. */ @@ -892,7 +929,13 @@ bridge_add_ofproto_ports(struct bridge *br) } } - /* Delete the iface if */ + /* 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->ofp_port); @@ -904,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); } } @@ -918,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); @@ -980,12 +1018,27 @@ bridge_configure_flow_eviction_threshold(struct bridge *br) 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; @@ -1005,7 +1058,6 @@ 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; @@ -1059,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)); } } @@ -1222,11 +1275,8 @@ iface_refresh_status(struct iface *iface) ovsrec_interface_set_link_speed(iface->cfg, NULL, 0); } - ovsrec_interface_set_link_state(iface->cfg, - iface_get_carrier(iface) ? "up" : "down"); - 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); } @@ -1235,43 +1285,36 @@ 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_interface *cfg = iface->cfg; - bool changed = false; - int fault; - - fault = ofproto_port_get_cfm_fault(iface->port->bridge->ofproto, - iface->ofp_port); + int fault, error; + const uint64_t *rmps; + size_t n_rmps; - if (fault < 0) { - return false; + if (iface_is_synthetic(iface)) { + return; } - if (cfg->n_cfm_fault != 1 || cfg->cfm_fault[0] != fault) { + 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); - changed = true; + } else { + ovsrec_interface_set_cfm_fault(cfg, NULL, 0); } - return changed; -} - -static bool -iface_refresh_lacp_stats(struct iface *iface) -{ - struct ofproto *ofproto = iface->port->bridge->ofproto; - int old = iface->cfg->lacp_current ? *iface->cfg->lacp_current : -1; - int new = ofproto_port_is_lacp_current(ofproto, iface->ofp_port); - - if (old != new) { - bool current = new; - ovsrec_interface_set_lacp_current(iface->cfg, ¤t, new >= 0); + 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 old != new; } static void @@ -1401,6 +1444,31 @@ refresh_controller_status(void) 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) { @@ -1500,29 +1568,44 @@ bridge_run(void) if (time_msec() >= db_limiter) { struct ovsdb_idl_txn *txn; - bool changed = false; txn = ovsdb_idl_txn_create(idl); HMAP_FOR_EACH (br, node, &all_bridges) { - struct port *port; + struct iface *iface; - HMAP_FOR_EACH (port, hmap_node, &br->ports) { - struct iface *iface; + HMAP_FOR_EACH (iface, name_node, &br->iface_by_name) { + const char *link_state; + int64_t link_resets; + int current; - LIST_FOR_EACH (iface, port_elem, &port->ifaces) { - changed = iface_refresh_cfm_stats(iface) || changed; - changed = iface_refresh_lacp_stats(iface) || changed; + if (iface_is_synthetic(iface)) { + continue; + } + + current = ofproto_port_is_lacp_current(br->ofproto, + iface->ofp_port); + if (current >= 0) { + bool bl = current; + ovsrec_interface_set_lacp_current(iface->cfg, &bl, 1); + } else { + ovsrec_interface_set_lacp_current(iface->cfg, NULL, 0); } + + link_state = netdev_get_carrier(iface->netdev) ? "up" : "down"; + ovsrec_interface_set_link_state(iface->cfg, link_state); + + link_resets = netdev_get_carrier_resets(iface->netdev); + ovsrec_interface_set_link_resets(iface->cfg, &link_resets, 1); } } - if (changed) { + if (ovsdb_idl_txn_commit(txn) != TXN_UNCHANGED) { db_limiter = time_msec() + DB_LIMIT_INTERVAL; } - - ovsdb_idl_txn_commit(txn); ovsdb_idl_txn_destroy(txn); } + + refresh_cfm_stats(); } void @@ -2080,7 +2163,7 @@ port_add_ifaces(struct port *port) && !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); } } @@ -2433,6 +2516,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, @@ -2563,37 +2669,29 @@ static void iface_configure_cfm(struct iface *iface) { const struct ovsrec_interface *cfg = iface->cfg; + const char *extended_str, *opstate_str; struct cfm_settings s; - uint16_t remote_mpid; - if (!cfg->n_cfm_mpid || !cfg->n_cfm_remote_mpid) { + if (!cfg->n_cfm_mpid) { ofproto_port_clear_cfm(iface->port->bridge->ofproto, iface->ofp_port); return; } s.mpid = *cfg->cfm_mpid; - remote_mpid = *cfg->cfm_remote_mpid; - s.remote_mpids = &remote_mpid; - s.n_remote_mpids = 1; - s.interval = atoi(get_interface_other_config(iface->cfg, "cfm_interval", "0")); if (s.interval <= 0) { s.interval = 1000; } - ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, &s); -} + extended_str = get_interface_other_config(iface->cfg, "cfm_extended", + "false"); + s.extended = !strcasecmp("true", extended_str); -/* Read carrier or miimon status directly from 'iface''s netdev, according to - * how 'iface''s port is configured. - * - * Returns true if 'iface' is up, false otherwise. */ -static bool -iface_get_carrier(const struct iface *iface) -{ - /* XXX */ - return netdev_get_carrier(iface->netdev); + opstate_str = get_interface_other_config(iface->cfg, "cfm_opstate", "up"); + s.opup = !strcasecmp("up", opstate_str); + + ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, &s); } /* Returns true if 'iface' is synthetic, that is, if we constructed it locally