X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=72091a29aeb8ece223ad79049f83a5acb80f31bb;hb=6d6ab93e9dcd91119ea9a1a843c1bb35e6754706;hp=27d836921443f2c20b7759fdfc8d90a709b72170;hpb=d534627818f126982e1d1aadf8919762de14d409;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 27d83692..72091a29 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -155,12 +155,13 @@ struct mirror { #define FLOOD_PORT ((struct port *) 1) /* The 'flood' output port. */ struct port { struct bridge *bridge; - size_t port_idx; + 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; - char *name; /* Monitoring. */ struct netdev_monitor *monitor; /* Tracks carrier. NULL if miimon. */ @@ -213,10 +214,8 @@ struct bridge { struct hmap ifaces; /* Contains "struct iface"s. */ /* Bridge ports. */ - struct port **ports; - size_t n_ports, allocated_ports; + struct hmap ports; /* "struct port"s indexed by name. */ struct shash iface_by_name; /* "struct iface"s indexed by name. */ - struct shash port_by_name; /* "struct port"s indexed by name. */ /* Bonding. */ bool has_bonded_ports; @@ -239,6 +238,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); @@ -263,6 +267,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); @@ -303,7 +308,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 *); @@ -341,6 +346,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); @@ -464,22 +470,19 @@ iterate_and_prune_ifaces(struct bridge *br, void *aux), void *aux) { - size_t i; + struct port *port, *next_port; - for (i = 0; i < br->n_ports; ) { - struct port *port = br->ports[i]; - struct iface *iface, *next; + HMAP_FOR_EACH_SAFE (port, next_port, hmap_node, &br->ports) { + struct iface *iface, *next_iface; - LIST_FOR_EACH_SAFE (iface, next, port_elem, &port->ifaces) { + LIST_FOR_EACH_SAFE (iface, next_iface, port_elem, &port->ifaces) { if (!cb(br, iface, aux)) { iface_set_ofport(iface->cfg, -1); iface_destroy(iface); } } - if (port->n_ifaces) { - i++; - } else { + if (!port->n_ifaces) { VLOG_WARN("%s port has no interfaces, dropping", port->name); port_destroy(port); } @@ -810,7 +813,7 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) "with another vswitch, choose an engine id less " "than 128", br->name); } - if (br->n_ports > 508) { + if (hmap_count(&br->ports) > 508) { VLOG_WARN("bridge %s: netflow port mangling will conflict " "with another port when more than 508 ports are " "used", br->name); @@ -884,8 +887,9 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) bridge_reconfigure_remotes(br, managers, n_managers); } LIST_FOR_EACH (br, node, &all_bridges) { - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + struct port *port; + + HMAP_FOR_EACH (port, hmap_node, &br->ports) { struct iface *iface; if (port->monitor) { @@ -949,7 +953,7 @@ bridge_pick_local_hw_addr(struct bridge *br, uint8_t ea[ETH_ADDR_LEN], struct iface **hw_addr_iface) { const char *hwaddr; - size_t i; + struct port *port; int error; *hw_addr_iface = NULL; @@ -970,8 +974,7 @@ 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); - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { uint8_t iface_ea[ETH_ADDR_LEN]; struct iface *candidate; struct iface *iface; @@ -1200,18 +1203,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++) { @@ -1221,59 +1227,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 (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; + if (mp->n_fault != 1 || mp->fault[0] != rmp->fault) { + ovsrec_maintenance_point_set_fault(mp, &rmp->fault, 1); + changed = true; } - - 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); + 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 @@ -1444,15 +1409,13 @@ bridge_run(void) txn = ovsdb_idl_txn_create(idl); LIST_FOR_EACH (br, node, &all_bridges) { - size_t i; + struct port *port; - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { struct iface *iface; LIST_FOR_EACH (iface, port_elem, &port->ifaces) { iface_refresh_stats(iface); - iface_refresh_cfm_stats(iface); iface_refresh_status(iface); } } @@ -1465,6 +1428,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 @@ -1473,21 +1461,20 @@ bridge_wait(void) struct bridge *br; LIST_FOR_EACH (br, node, &all_bridges) { - size_t i; + struct port *port; ofproto_wait(br->ofproto); - if (ofproto_has_primary_controller(br->ofproto)) { - continue; - } - mac_learning_wait(br->ml); - - for (i = 0; i < br->n_ports; i++) { - port_wait(br->ports[i]); + 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 @@ -1525,6 +1512,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 { @@ -1652,9 +1666,8 @@ bridge_create(const struct ovsrec_bridge *br_cfg) br->ml = mac_learning_create(); eth_addr_nicira_random(br->default_ea); + hmap_init(&br->ports); hmap_init(&br->ifaces); - - shash_init(&br->port_by_name); shash_init(&br->iface_by_name); br->flush = false; @@ -1670,24 +1683,24 @@ static void bridge_destroy(struct bridge *br) { if (br) { + struct port *port, *next; int error; - while (br->n_ports > 0) { - port_destroy(br->ports[br->n_ports - 1]); + HMAP_FOR_EACH_SAFE (port, next, hmap_node, &br->ports) { + 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); - shash_destroy(&br->port_by_name); + hmap_destroy(&br->ports); shash_destroy(&br->iface_by_name); - free(br->ports); free(br->name); free(br); } @@ -1754,7 +1767,7 @@ bridge_unixctl_reconnect(struct unixctl_conn *conn, static int bridge_run_one(struct bridge *br) { - size_t i; + struct port *port; int error; error = ofproto_run1(br->ofproto); @@ -1764,8 +1777,8 @@ bridge_run_one(struct bridge *br) mac_learning_run(br->ml, ofproto_get_revalidate_set(br->ofproto)); - for (i = 0; i < br->n_ports; i++) { - port_run(br->ports[i]); + HMAP_FOR_EACH (port, hmap_node, &br->ports) { + port_run(port); } error = ofproto_run2(br->ofproto, br->flush); @@ -1798,18 +1811,13 @@ bridge_get_controllers(const struct bridge *br, static void bridge_reconfigure_one(struct bridge *br) { - struct shash old_ports, new_ports; + enum ofproto_fail_mode fail_mode; struct svec snoops, old_snoops; + struct port *port, *next; struct shash_node *node; - enum ofproto_fail_mode fail_mode; + struct shash new_ports; size_t i; - /* Collect old ports. */ - shash_init(&old_ports); - for (i = 0; i < br->n_ports; i++) { - shash_add(&old_ports, br->ports[i]->name, br->ports[i]); - } - /* Collect new ports. */ shash_init(&new_ports); for (i = 0; i < br->cfg->n_ports; i++) { @@ -1839,11 +1847,10 @@ bridge_reconfigure_one(struct bridge *br) /* Get rid of deleted ports. * Get rid of deleted interfaces on ports that still exist. */ - SHASH_FOR_EACH (node, &old_ports) { - struct port *port = node->data; + HMAP_FOR_EACH_SAFE (port, next, hmap_node, &br->ports) { const struct ovsrec_port *port_cfg; - port_cfg = shash_find_data(&new_ports, node->name); + port_cfg = shash_find_data(&new_ports, port->name); if (!port_cfg) { port_destroy(port); } else { @@ -1855,7 +1862,7 @@ bridge_reconfigure_one(struct bridge *br) * Add new interfaces to existing ports. * Reconfigure existing ports. */ SHASH_FOR_EACH (node, &new_ports) { - struct port *port = shash_find_data(&old_ports, node->name); + struct port *port = port_lookup(br, node->name); if (!port) { port = port_create(br, node->name); } @@ -1867,7 +1874,6 @@ bridge_reconfigure_one(struct bridge *br) port_destroy(port); } } - shash_destroy(&old_ports); shash_destroy(&new_ports); /* Set the fail-mode */ @@ -2069,11 +2075,10 @@ bridge_reconfigure_remotes(struct bridge *br, static void bridge_get_all_ifaces(const struct bridge *br, struct shash *ifaces) { - size_t i; + struct port *port; shash_init(ifaces); - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { struct iface *iface; LIST_FOR_EACH (iface, port_elem, &port->ifaces) { @@ -2098,11 +2103,10 @@ bridge_fetch_dp_ifaces(struct bridge *br) { struct dpif_port_dump dump; struct dpif_port dpif_port; - size_t i; + struct port *port; /* Reset all interface numbers. */ - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { struct iface *iface; LIST_FOR_EACH (iface, port_elem, &port->ifaces) { @@ -2594,7 +2598,6 @@ compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan, mirror_mask_t mirrors = in_port->src_mirrors; struct dst dst; int flow_vlan; - size_t i; flow_vlan = vlan_tci_to_vid(flow->vlan_tci); if (flow_vlan == 0) { @@ -2602,8 +2605,9 @@ compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan, } if (out_port == FLOOD_PORT) { - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + struct port *port; + + HMAP_FOR_EACH (port, hmap_node, &br->ports) { if (port != in_port && port_is_floodable(port) && port_includes_vlan(port, vlan) @@ -2629,8 +2633,9 @@ compose_dsts(const struct bridge *br, const struct flow *flow, uint16_t vlan, dst_set_add(set, &dst); } } else { - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + 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)) { @@ -2935,7 +2940,7 @@ process_flow(struct bridge *br, const struct flow *flow, /* Determine output port. */ mac = mac_learning_lookup(br->ml, flow->dl_dst, vlan, tags); if (mac) { - mac = mac->port.p; + 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 @@ -3044,16 +3049,15 @@ static void bridge_account_checkpoint_ofhook_cb(void *br_) { struct bridge *br = br_; + struct port *port; long long int now; - size_t i; if (!br->has_bonded_ports) { return; } now = time_msec(); - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { if (port->n_ifaces > 1 && port->bond_mode != BM_AB && now >= port->bond_next_rebalance) { port->bond_next_rebalance = now + port->bond_rebalance_interval; @@ -3467,10 +3471,9 @@ bond_unixctl_list(struct unixctl_conn *conn, ds_put_cstr(&ds, "bridge\tbond\ttype\tslaves\n"); LIST_FOR_EACH (br, node, &all_bridges) { - size_t i; + struct port *port; - for (i = 0; i < br->n_ports; i++) { - const struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { if (port->n_ifaces > 1) { struct iface *iface; @@ -3496,10 +3499,9 @@ bond_find(const char *name) const struct bridge *br; LIST_FOR_EACH (br, node, &all_bridges) { - size_t i; + struct port *port; - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; + HMAP_FOR_EACH (port, hmap_node, &br->ports) { if (!strcmp(port->name, name) && port->n_ifaces > 1) { return port; } @@ -3828,9 +3830,12 @@ lacp_send_pdu_cb(void *aux, const struct lacp_pdu *pdu) error = netdev_get_etheraddr(iface->netdev, ea); if (!error) { struct ofpbuf packet; + struct lacp_pdu *packet_pdu; - ofpbuf_init(&packet, ETH_HEADER_LEN + LACP_PDU_LEN); - compose_lacp_packet(&packet, ea, pdu); + ofpbuf_init(&packet, 0); + packet_pdu = compose_packet(&packet, eth_addr_lacp, ea, ETH_TYPE_LACP, + sizeof *packet_pdu); + memcpy(packet_pdu, pdu, sizeof *packet_pdu); ofproto_send_packet(iface->port->bridge->ofproto, iface->dp_ifidx, 0, &packet); ofpbuf_uninit(&packet); @@ -3902,19 +3907,13 @@ port_create(struct bridge *br, const char *name) port = xzalloc(sizeof *port); port->bridge = br; - port->port_idx = br->n_ports; port->vlan = -1; port->trunks = NULL; port->name = xstrdup(name); port->active_iface = NULL; list_init(&port->ifaces); - if (br->n_ports >= br->allocated_ports) { - br->ports = x2nrealloc(br->ports, &br->allocated_ports, - sizeof *br->ports); - } - br->ports[br->n_ports++] = port; - shash_add_assert(&br->port_by_name, port->name, port); + hmap_insert(&br->ports, &port->hmap_node, hash_string(port->name, 0)); VLOG_INFO("created port %s on bridge %s", port->name, br->name); bridge_flush(br); @@ -4209,7 +4208,6 @@ port_destroy(struct port *port) if (port) { struct bridge *br = port->bridge; struct iface *iface, *next; - struct port *del; int i; for (i = 0; i < MAX_MIRRORS; i++) { @@ -4223,17 +4221,16 @@ port_destroy(struct port *port) iface_destroy(iface); } - shash_find_and_delete_assert(&br->port_by_name, port->name); - - del = br->ports[port->port_idx] = br->ports[--br->n_ports]; - del->port_idx = port->port_idx; + hmap_remove(&br->ports, &port->hmap_node); VLOG_INFO("destroyed port %s on bridge %s", port->name, br->name); port_flush_macs(port); + lacp_destroy(port->lacp); netdev_monitor_destroy(port->monitor); bitmap_free(port->trunks); + free(port->bond_hash); free(port->name); free(port); } @@ -4249,7 +4246,15 @@ port_from_dp_ifidx(const struct bridge *br, uint16_t dp_ifidx) static struct port * port_lookup(const struct bridge *br, const char *name) { - return shash_find_data(&br->port_by_name, name); + struct port *port; + + HMAP_FOR_EACH_WITH_HASH (port, hmap_node, hash_string(name, 0), + &br->ports) { + if (!strcmp(port->name, name)) { + return port; + } + } + return NULL; } static struct iface * @@ -4599,7 +4604,7 @@ iface_update_cfm(struct iface *iface) struct cfm cfm; uint16_t *remote_mps; struct ovsrec_monitor *mon; - uint8_t ea[ETH_ADDR_LEN], maid[CCM_MAID_LEN]; + uint8_t maid[CCM_MAID_LEN]; mon = iface->cfg->monitor; @@ -4608,12 +4613,6 @@ iface_update_cfm(struct iface *iface) 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; @@ -4622,7 +4621,6 @@ iface_update_cfm(struct iface *iface) 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); @@ -4667,6 +4665,7 @@ static void mirror_reconfigure(struct bridge *br) { unsigned long *rspan_vlans; + struct port *port; int i; /* Get rid of deleted mirrors. */ @@ -4696,8 +4695,8 @@ mirror_reconfigure(struct bridge *br) } /* Update port reserved status. */ - for (i = 0; i < br->n_ports; i++) { - br->ports[i]->is_mirror_output_port = false; + 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]; @@ -4769,11 +4768,11 @@ mirror_destroy(struct mirror *m) { if (m) { struct bridge *br = m->bridge; - size_t i; + struct port *port; - for (i = 0; i < br->n_ports; i++) { - br->ports[i]->src_mirrors &= ~(MIRROR_MASK_C(1) << m->idx); - br->ports[i]->dst_mirrors &= ~(MIRROR_MASK_C(1) << m->idx); + 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); } shash_destroy(&m->src_ports); @@ -4859,10 +4858,10 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) struct shash 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; - size_t i; /* Set name. */ if (strcmp(cfg->name, m->name)) { @@ -4899,10 +4898,9 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) shash_init(&src_ports); shash_init(&dst_ports); if (cfg->select_all) { - for (i = 0; i < m->bridge->n_ports; i++) { - const char *name = m->bridge->ports[i]->name; - shash_add_once(&src_ports, name, NULL); - shash_add_once(&dst_ports, name, NULL); + 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); } vlans = NULL; n_vlans = 0; @@ -4937,9 +4935,7 @@ mirror_reconfigure_one(struct mirror *m, struct ovsrec_mirror *cfg) /* Update ports. */ mirror_bit = MIRROR_MASK_C(1) << m->idx; - for (i = 0; i < m->bridge->n_ports; i++) { - struct port *port = m->bridge->ports[i]; - + HMAP_FOR_EACH (port, hmap_node, &m->bridge->ports) { if (shash_find(&m->src_ports, port->name) || (m->n_vlans && (!port->vlan