X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=001f9f68dcd3c71321d46a138119802fabac7f06;hb=9aa952b2dd7c091c63dbfc7becb3b3dcc9f7bfce;hp=96e4cf1a47db4ceabeac5bfabf100e61b8997bf2;hpb=1c2e2d2fc87c9435b6fe33112b0ddaab59f507c5;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 96e4cf1a..001f9f68 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -61,6 +61,7 @@ #include "shash.h" #include "socket-util.h" #include "stream-ssl.h" +#include "sset.h" #include "svec.h" #include "system-stats.h" #include "timeval.h" @@ -142,8 +143,8 @@ struct mirror { struct uuid uuid; /* UUID of this "mirror" record in database. */ /* Selection criteria. */ - struct shash src_ports; /* Name is port name; data is always NULL. */ - struct shash dst_ports; /* Name is port name; data is always NULL. */ + struct sset src_ports; /* Source port names. */ + struct sset dst_ports; /* Destination port names. */ int *vlans; size_t n_vlans; @@ -238,6 +239,11 @@ static struct ovsdb_idl *idl; #define STATS_INTERVAL (5 * 1000) /* In milliseconds. */ static long long int stats_timer = LLONG_MIN; +/* Stores the time after which CFM statistics may be written to the database. + * Only updated when changes to the database require rate limiting. */ +#define CFM_LIMIT_INTERVAL (1 * 1000) /* In milliseconds. */ +static long long int cfm_limiter = LLONG_MIN; + static struct bridge *bridge_create(const struct ovsrec_bridge *br_cfg); static void bridge_destroy(struct bridge *); static struct bridge *bridge_lookup(const char *name); @@ -262,6 +268,7 @@ static uint64_t bridge_pick_datapath_id(struct bridge *, static uint64_t dpid_from_hash(const void *, size_t nbytes); static unixctl_cb_func bridge_unixctl_fdb_show; +static unixctl_cb_func cfm_unixctl_show; static unixctl_cb_func qos_unixctl_show; static void bond_init(void); @@ -302,7 +309,7 @@ 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 bool iface_refresh_cfm_stats(struct iface *iface); static void iface_update_carrier(struct iface *); static bool iface_get_carrier(const struct iface *); @@ -340,6 +347,7 @@ bridge_init(const char *remote) /* 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); @@ -366,8 +374,9 @@ static void bridge_configure_once(const struct ovsrec_open_vswitch *cfg) { static bool already_configured_once; - struct svec bridge_names; - struct svec dpif_names, dpif_types; + struct sset bridge_names; + struct sset dpif_names, dpif_types; + const char *type; size_t i; /* Only do this once per ovs-vswitchd run. */ @@ -379,30 +388,28 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) stats_timer = time_msec() + STATS_INTERVAL; /* Get all the configured bridges' names from 'cfg' into 'bridge_names'. */ - svec_init(&bridge_names); + sset_init(&bridge_names); for (i = 0; i < cfg->n_bridges; i++) { - svec_add(&bridge_names, cfg->bridges[i]->name); + sset_add(&bridge_names, cfg->bridges[i]->name); } - svec_sort(&bridge_names); /* Iterate over all system dpifs and delete any of them that do not appear * in 'cfg'. */ - svec_init(&dpif_names); - svec_init(&dpif_types); + sset_init(&dpif_names); + sset_init(&dpif_types); dp_enumerate_types(&dpif_types); - for (i = 0; i < dpif_types.n; i++) { - size_t j; + SSET_FOR_EACH (type, &dpif_types) { + const char *name; - dp_enumerate_names(dpif_types.names[i], &dpif_names); + dp_enumerate_names(type, &dpif_names); /* Delete each dpif whose name is not in 'bridge_names'. */ - for (j = 0; j < dpif_names.n; j++) { - if (!svec_contains(&bridge_names, dpif_names.names[j])) { + SSET_FOR_EACH (name, &dpif_names) { + if (!sset_contains(&bridge_names, name)) { struct dpif *dpif; int retval; - retval = dpif_open(dpif_names.names[j], dpif_types.names[i], - &dpif); + retval = dpif_open(name, type, &dpif); if (!retval) { dpif_delete(dpif); dpif_close(dpif); @@ -410,9 +417,9 @@ bridge_configure_once(const struct ovsrec_open_vswitch *cfg) } } } - svec_destroy(&bridge_names); - svec_destroy(&dpif_names); - svec_destroy(&dpif_types); + sset_destroy(&bridge_names); + sset_destroy(&dpif_names); + sset_destroy(&dpif_types); } /* Callback for iterate_and_prune_ifaces(). */ @@ -499,30 +506,29 @@ collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg, { struct sockaddr_in *managers = NULL; size_t n_managers = 0; - struct shash targets; + struct sset targets; size_t i; /* Collect all of the potential targets from the "targets" columns of the * rows pointed to by "manager_options", excluding any that are * out-of-band. */ - shash_init(&targets); + sset_init(&targets); for (i = 0; i < ovs_cfg->n_manager_options; i++) { struct ovsrec_manager *m = ovs_cfg->manager_options[i]; if (m->connection_mode && !strcmp(m->connection_mode, "out-of-band")) { - shash_find_and_delete(&targets, m->target); + sset_find_and_delete(&targets, m->target); } else { - shash_add_once(&targets, m->target, NULL); + sset_add(&targets, m->target); } } /* Now extract the targets' IP addresses. */ - if (!shash_is_empty(&targets)) { - struct shash_node *node; + if (!sset_is_empty(&targets)) { + const char *target; - managers = xmalloc(shash_count(&targets) * sizeof *managers); - SHASH_FOR_EACH (node, &targets) { - const char *target = node->name; + managers = xmalloc(sset_count(&targets) * sizeof *managers); + SSET_FOR_EACH (target, &targets) { struct sockaddr_in *sin = &managers[n_managers]; if ((!strncmp(target, "tcp:", 4) @@ -533,7 +539,7 @@ collect_in_band_managers(const struct ovsrec_open_vswitch *ovs_cfg, } } } - shash_destroy(&targets); + sset_destroy(&targets); *managersp = managers; *n_managersp = n_managers; @@ -813,12 +819,14 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) } } - opts.collectors.n = nf_cfg->n_targets; - opts.collectors.names = nf_cfg->targets; + sset_init(&opts.collectors); + sset_add_array(&opts.collectors, + nf_cfg->targets, nf_cfg->n_targets); if (ofproto_set_netflow(br->ofproto, &opts)) { VLOG_ERR("bridge %s: problem setting netflow collectors", br->name); } + sset_destroy(&opts.collectors); } else { ofproto_set_netflow(br->ofproto, NULL); } @@ -832,8 +840,9 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) memset(&oso, 0, sizeof oso); - oso.targets.n = sflow_cfg->n_targets; - oso.targets.names = sflow_cfg->targets; + sset_init(&oso.targets); + sset_add_array(&oso.targets, + sflow_cfg->targets, sflow_cfg->n_targets); oso.sampling_rate = SFL_DEFAULT_SAMPLING_RATE; if (sflow_cfg->sampling) { @@ -863,7 +872,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) } ofproto_set_sflow(br->ofproto, &oso); - /* Do not destroy oso.targets because it is owned by sflow_cfg. */ + sset_destroy(&oso.targets); } else { ofproto_set_sflow(br->ofproto, NULL); } @@ -1196,18 +1205,21 @@ iface_refresh_status(struct iface *iface) } } -static void +/* Writes 'iface''s CFM statistics to the database. Returns true if anything + * changed, false otherwise. */ +static bool iface_refresh_cfm_stats(struct iface *iface) { const struct ovsrec_monitor *mon; const struct cfm *cfm; + bool changed = false; size_t i; mon = iface->cfg->monitor; cfm = ofproto_iface_get_cfm(iface->port->bridge->ofproto, iface->dp_ifidx); if (!cfm || !mon) { - return; + return false; } for (i = 0; i < mon->n_remote_mps; i++) { @@ -1217,10 +1229,18 @@ iface_refresh_cfm_stats(struct iface *iface) mp = mon->remote_mps[i]; rmp = cfm_get_remote_mp(cfm, mp->mpid); - ovsrec_maintenance_point_set_fault(mp, &rmp->fault, 1); + if (mp->n_fault != 1 || mp->fault[0] != rmp->fault) { + ovsrec_maintenance_point_set_fault(mp, &rmp->fault, 1); + changed = true; + } + } + + if (mon->n_fault != 1 || mon->fault[0] != cfm->fault) { + ovsrec_monitor_set_fault(mon, &cfm->fault, 1); + changed = true; } - ovsrec_monitor_set_fault(mon, &cfm->fault, 1); + return changed; } static void @@ -1398,7 +1418,6 @@ bridge_run(void) LIST_FOR_EACH (iface, port_elem, &port->ifaces) { iface_refresh_stats(iface); - iface_refresh_cfm_stats(iface); iface_refresh_status(iface); } } @@ -1411,6 +1430,31 @@ bridge_run(void) stats_timer = time_msec() + STATS_INTERVAL; } + + if (time_msec() >= cfm_limiter) { + struct ovsdb_idl_txn *txn; + bool changed = false; + + txn = ovsdb_idl_txn_create(idl); + LIST_FOR_EACH (br, node, &all_bridges) { + struct port *port; + + HMAP_FOR_EACH (port, hmap_node, &br->ports) { + struct iface *iface; + + LIST_FOR_EACH (iface, port_elem, &port->ifaces) { + changed = iface_refresh_cfm_stats(iface) || changed; + } + } + } + + if (changed) { + cfm_limiter = time_msec() + CFM_LIMIT_INTERVAL; + } + + ovsdb_idl_txn_commit(txn); + ovsdb_idl_txn_destroy(txn); + } } void @@ -1422,18 +1466,17 @@ bridge_wait(void) struct port *port; ofproto_wait(br->ofproto); - if (ofproto_has_primary_controller(br->ofproto)) { - continue; - } - 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 (cfm_limiter > time_msec()) { + poll_timer_wait_until(cfm_limiter); + } } /* Forces 'br' to revalidate all of its flows. This is appropriate when 'br''s @@ -1471,6 +1514,33 @@ bridge_unixctl_fdb_show(struct unixctl_conn *conn, 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; + + 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); + + if (!cfm) { + unixctl_command_reply(conn, 501, "CFM not enabled"); + return; + } + + cfm_dump_ds(cfm, &ds); + unixctl_command_reply(conn, 200, ds_cstr(&ds)); + ds_destroy(&ds); +} + /* QoS unixctl user interface functions. */ struct qos_unixctl_show_cbdata { @@ -1622,13 +1692,13 @@ bridge_destroy(struct bridge *br) port_destroy(port); } list_remove(&br->node); + ofproto_destroy(br->ofproto); error = dpif_delete(br->dpif); if (error && error != ENOENT) { VLOG_ERR("failed to delete %s: %s", dpif_name(br->dpif), strerror(error)); } dpif_close(br->dpif); - ofproto_destroy(br->ofproto); mac_learning_destroy(br->ml); hmap_destroy(&br->ifaces); hmap_destroy(&br->ports); @@ -1744,7 +1814,6 @@ static void bridge_reconfigure_one(struct bridge *br) { enum ofproto_fail_mode fail_mode; - struct svec snoops, old_snoops; struct port *port, *next; struct shash_node *node; struct shash new_ports; @@ -1824,16 +1893,15 @@ bridge_reconfigure_one(struct bridge *br) * controller to another?) */ /* Configure OpenFlow controller connection snooping. */ - svec_init(&snoops); - svec_add_nocopy(&snoops, xasprintf("punix:%s/%s.snoop", - ovs_rundir(), br->name)); - svec_init(&old_snoops); - ofproto_get_snoops(br->ofproto, &old_snoops); - if (!svec_equal(&snoops, &old_snoops)) { + if (!ofproto_has_snoops(br->ofproto)) { + struct sset snoops; + + sset_init(&snoops); + sset_add_and_free(&snoops, xasprintf("punix:%s/%s.snoop", + ovs_rundir(), br->name)); ofproto_set_snoops(br->ofproto, &snoops); + sset_destroy(&snoops); } - svec_destroy(&snoops); - svec_destroy(&old_snoops); mirror_reconfigure(br); } @@ -3879,24 +3947,24 @@ static void port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) { struct iface *iface, *next; - struct shash new_ifaces; + struct sset new_ifaces; size_t i; /* Collect list of new interfaces. */ - shash_init(&new_ifaces); + sset_init(&new_ifaces); for (i = 0; i < cfg->n_interfaces; i++) { const char *name = cfg->interfaces[i]->name; - shash_add_once(&new_ifaces, name, NULL); + sset_add(&new_ifaces, name); } /* Get rid of deleted interfaces. */ LIST_FOR_EACH_SAFE (iface, next, port_elem, &port->ifaces) { - if (!shash_find(&new_ifaces, iface->name)) { + if (!sset_contains(&new_ifaces, iface->name)) { iface_destroy(iface); } } - shash_destroy(&new_ifaces); + sset_destroy(&new_ifaces); } /* Expires all MAC learning entries associated with 'port' and forces ofproto @@ -3920,7 +3988,7 @@ static void port_reconfigure(struct port *port, const struct ovsrec_port *cfg) { const char *detect_mode; - struct shash new_ifaces; + struct sset new_ifaces; long long int next_rebalance, miimon_next_update, lacp_priority; bool need_flush = false; unsigned long *trunks; @@ -3988,12 +4056,12 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) } /* Add new interfaces and update 'cfg' member of existing ones. */ - shash_init(&new_ifaces); + sset_init(&new_ifaces); for (i = 0; i < cfg->n_interfaces; i++) { const struct ovsrec_interface *if_cfg = cfg->interfaces[i]; struct iface *iface; - if (!shash_add_once(&new_ifaces, if_cfg->name, NULL)) { + if (!sset_add(&new_ifaces, if_cfg->name)) { VLOG_WARN("port %s: %s specified twice as port interface", port->name, if_cfg->name); iface_set_ofport(if_cfg, -1); @@ -4030,7 +4098,7 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) iface->lacp_priority = lacp_priority; } } - shash_destroy(&new_ifaces); + sset_destroy(&new_ifaces); port->lacp_fast = !strcmp(get_port_other_config(cfg, "lacp-time", "slow"), "fast"); @@ -4685,8 +4753,8 @@ mirror_create(struct bridge *br, struct ovsrec_mirror *cfg) m->bridge = br; m->idx = i; m->name = xstrdup(cfg->name); - shash_init(&m->src_ports); - shash_init(&m->dst_ports); + sset_init(&m->src_ports); + sset_init(&m->dst_ports); m->vlans = NULL; m->n_vlans = 0; m->out_vlan = -1; @@ -4707,8 +4775,8 @@ mirror_destroy(struct mirror *m) port->dst_mirrors &= ~(MIRROR_MASK_C(1) << m->idx); } - shash_destroy(&m->src_ports); - shash_destroy(&m->dst_ports); + sset_destroy(&m->src_ports); + sset_destroy(&m->dst_ports); free(m->vlans); m->bridge->mirrors[m->idx] = NULL; @@ -4722,14 +4790,14 @@ mirror_destroy(struct mirror *m) static void mirror_collect_ports(struct mirror *m, struct ovsrec_port **ports, int n_ports, - struct shash *names) + struct sset *names) { size_t i; for (i = 0; i < n_ports; i++) { const char *name = ports[i]->name; if (port_lookup(m->bridge, name)) { - shash_add_once(names, name, NULL); + sset_add(names, name); } else { VLOG_WARN("bridge %s: mirror %s cannot match on nonexistent " "port %s", m->bridge->name, m->name, name); @@ -4787,7 +4855,7 @@ port_trunks_any_mirrored_vlan(const struct mirror *m, const struct port *p) static void mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) { - struct shash src_ports, dst_ports; + struct sset src_ports, dst_ports; mirror_mask_t mirror_bit; struct port *out_port; struct port *port; @@ -4827,12 +4895,12 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) return; } - shash_init(&src_ports); - shash_init(&dst_ports); + sset_init(&src_ports); + sset_init(&dst_ports); if (cfg->select_all) { HMAP_FOR_EACH (port, hmap_node, &m->bridge->ports) { - shash_add_once(&src_ports, port->name, NULL); - shash_add_once(&dst_ports, port->name, NULL); + sset_add(&src_ports, port->name); + sset_add(&dst_ports, port->name); } vlans = NULL; n_vlans = 0; @@ -4848,8 +4916,8 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) } /* Update mirror data. */ - if (!shash_equal_keys(&m->src_ports, &src_ports) - || !shash_equal_keys(&m->dst_ports, &dst_ports) + 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 @@ -4857,8 +4925,8 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) bridge_flush(m->bridge); mac_learning_flush(m->bridge->ml); } - shash_swap(&m->src_ports, &src_ports); - shash_swap(&m->dst_ports, &dst_ports); + 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; @@ -4868,7 +4936,7 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) /* Update ports. */ mirror_bit = MIRROR_MASK_C(1) << m->idx; HMAP_FOR_EACH (port, hmap_node, &m->bridge->ports) { - if (shash_find(&m->src_ports, port->name) + if (sset_contains(&m->src_ports, port->name) || (m->n_vlans && (!port->vlan ? port_trunks_any_mirrored_vlan(m, port) @@ -4878,7 +4946,7 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) port->src_mirrors &= ~mirror_bit; } - if (shash_find(&m->dst_ports, port->name)) { + if (sset_contains(&m->dst_ports, port->name)) { port->dst_mirrors |= mirror_bit; } else { port->dst_mirrors &= ~mirror_bit; @@ -4886,6 +4954,6 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) } /* Clean up. */ - shash_destroy(&src_ports); - shash_destroy(&dst_ports); + sset_destroy(&src_ports); + sset_destroy(&dst_ports); }