X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=vswitchd%2Fbridge.c;h=354d4d89452a46adef4771dbbf478cb6a23d35de;hb=a6bc4a03a44ee8a4ab346f0c1a6e21d20a1d29bd;hp=35267a6c2adea3dd3282c714b27100c1194b3c15;hpb=7b99db051b2560290a6e1bc123f1b4e760226faa;p=openvswitch diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 35267a6c..354d4d89 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -122,7 +122,8 @@ struct port { struct bridge *bridge; size_t port_idx; int vlan; /* -1=trunk port, else a 12-bit VLAN ID. */ - unsigned long *trunks; /* Bitmap of trunked VLANs, if 'vlan' == -1. */ + unsigned long *trunks; /* Bitmap of trunked VLANs, if 'vlan' == -1. + * NULL if all VLANs are trunked. */ char *name; /* An ordinary bridge port has 1 interface. @@ -176,6 +177,8 @@ struct bridge { /* Bridge ports. */ struct port **ports; size_t n_ports, allocated_ports; + 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; @@ -236,6 +239,7 @@ static void bond_enable_slave(struct iface *iface, bool enable); static struct port *port_create(struct bridge *, const char *name); static void port_reconfigure(struct port *, const struct ovsrec_port *); +static void port_del_ifaces(struct port *, const struct ovsrec_port *); static void port_destroy(struct port *); static struct port *port_lookup(const struct bridge *, const char *name); static struct iface *port_lookup_iface(const struct port *, const char *name); @@ -1206,6 +1210,9 @@ bridge_create(const struct ovsrec_bridge *br_cfg) port_array_init(&br->ifaces); + shash_init(&br->port_by_name); + shash_init(&br->iface_by_name); + br->flush = false; list_push_back(&all_bridges, &br->node); @@ -1234,6 +1241,8 @@ bridge_destroy(struct bridge *br) ofproto_destroy(br->ofproto); mac_learning_destroy(br->ml); port_array_destroy(&br->ifaces); + shash_destroy(&br->port_by_name); + shash_destroy(&br->iface_by_name); free(br->ports); free(br->name); free(br); @@ -1334,22 +1343,6 @@ bridge_get_controllers(const struct ovsrec_open_vswitch *ovs_cfg, return n_controllers; } -static bool -check_duplicate_ifaces(struct bridge *br, struct iface *iface, void *ifaces_) -{ - struct svec *ifaces = ifaces_; - if (!svec_contains(ifaces, iface->name)) { - svec_add(ifaces, iface->name); - svec_sort(ifaces); - return true; - } else { - VLOG_ERR("bridge %s: %s interface is on multiple ports, " - "removing from %s", - br->name, iface->name, iface->port->name); - return false; - } -} - static void bridge_update_desc(struct bridge *br OVS_UNUSED) { @@ -1424,7 +1417,6 @@ bridge_reconfigure_one(const struct ovsrec_open_vswitch *ovs_cfg, struct bridge *br) { struct shash old_ports, new_ports; - struct svec ifaces; struct svec listeners, old_listeners; struct svec snoops, old_snoops; struct shash_node *node; @@ -1463,12 +1455,23 @@ bridge_reconfigure_one(const struct ovsrec_open_vswitch *ovs_cfg, } } - /* Get rid of deleted ports and add new ports. */ + /* Get rid of deleted ports. + * Get rid of deleted interfaces on ports that still exist. */ SHASH_FOR_EACH (node, &old_ports) { - if (!shash_find(&new_ports, node->name)) { - port_destroy(node->data); + struct port *port = node->data; + const struct ovsrec_port *port_cfg; + + port_cfg = shash_find_data(&new_ports, node->name); + if (!port_cfg) { + port_destroy(port); + } else { + port_del_ifaces(port, port_cfg); } } + + /* Create new ports. + * 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); if (!port) { @@ -1485,11 +1488,6 @@ bridge_reconfigure_one(const struct ovsrec_open_vswitch *ovs_cfg, shash_destroy(&old_ports); shash_destroy(&new_ports); - /* Check and delete duplicate interfaces. */ - svec_init(&ifaces); - iterate_and_prune_ifaces(br, check_duplicate_ifaces, &ifaces); - svec_destroy(&ifaces); - /* Delete all flows if we're switching from connected to standalone or vice * versa. (XXX Should we delete all flows if we are switching from one * controller to another?) */ @@ -2076,7 +2074,8 @@ dst_is_duplicate(const struct dst *dsts, size_t n_dsts, static bool port_trunks_vlan(const struct port *port, uint16_t vlan) { - return port->vlan < 0 && bitmap_is_set(port->trunks, vlan); + return (port->vlan < 0 + && (!port->trunks || bitmap_is_set(port->trunks, vlan))); } static bool @@ -3232,6 +3231,7 @@ port_create(struct bridge *br, const char *name) sizeof *br->ports); } br->ports[br->n_ports++] = port; + shash_add_assert(&br->port_by_name, port->name, port); VLOG_INFO("created port %s on bridge %s", port->name, br->name); bridge_flush(br); @@ -3250,31 +3250,43 @@ get_port_other_config(const struct ovsrec_port *port, const char *key, return value ? value : default_value; } +static void +port_del_ifaces(struct port *port, const struct ovsrec_port *cfg) +{ + struct shash new_ifaces; + size_t i; + + /* Collect list of new interfaces. */ + shash_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); + } + + /* Get rid of deleted interfaces. */ + for (i = 0; i < port->n_ifaces; ) { + if (!shash_find(&new_ifaces, cfg->interfaces[i]->name)) { + iface_destroy(port->ifaces[i]); + } else { + i++; + } + } + + shash_destroy(&new_ifaces); +} + static void port_reconfigure(struct port *port, const struct ovsrec_port *cfg) { - struct shash old_ifaces, new_ifaces; + struct shash new_ifaces; long long int next_rebalance; - struct shash_node *node; unsigned long *trunks; int vlan; size_t i; port->cfg = cfg; - /* Collect old and new interfaces. */ - shash_init(&old_ifaces); - shash_init(&new_ifaces); - for (i = 0; i < port->n_ifaces; i++) { - shash_add(&old_ifaces, port->ifaces[i]->name, port->ifaces[i]); - } - for (i = 0; i < cfg->n_interfaces; i++) { - const char *name = cfg->interfaces[i]->name; - if (!shash_add_once(&new_ifaces, name, cfg->interfaces[i])) { - VLOG_WARN("port %s: %s specified twice as port interface", - port->name, name); - } - } + /* Update settings. */ port->updelay = cfg->bond_updelay; if (port->updelay < 0) { port->updelay = 0; @@ -3293,23 +3305,32 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) port->bond_next_rebalance = next_rebalance; } - /* Get rid of deleted interfaces and add new interfaces. */ - SHASH_FOR_EACH (node, &old_ifaces) { - if (!shash_find(&new_ifaces, node->name)) { - iface_destroy(node->data); - } - } - SHASH_FOR_EACH (node, &new_ifaces) { - const struct ovsrec_interface *if_cfg = node->data; + /* Add new interfaces and update 'cfg' member of existing ones. */ + shash_init(&new_ifaces); + for (i = 0; i < cfg->n_interfaces; i++) { + const struct ovsrec_interface *if_cfg = cfg->interfaces[i]; struct iface *iface; - iface = shash_find_data(&old_ifaces, if_cfg->name); - if (!iface) { - iface_create(port, if_cfg); - } else { + if (!shash_add_once(&new_ifaces, if_cfg->name, NULL)) { + VLOG_WARN("port %s: %s specified twice as port interface", + port->name, if_cfg->name); + continue; + } + + iface = iface_lookup(port->bridge, if_cfg->name); + if (iface) { + if (iface->port != port) { + VLOG_ERR("bridge %s: %s interface is on multiple ports, " + "removing from %s", + port->bridge->name, if_cfg->name, iface->port->name); + continue; + } iface->cfg = if_cfg; + } else { + iface_create(port, if_cfg); } } + shash_destroy(&new_ifaces); /* Get VLAN tag. */ vlan = -1; @@ -3335,7 +3356,7 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) /* Get trunked VLANs. */ trunks = NULL; - if (vlan < 0) { + if (vlan < 0 && cfg->n_trunks) { size_t n_errors; size_t i; @@ -3354,17 +3375,14 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) port->name, cfg->n_trunks); } if (n_errors == cfg->n_trunks) { - if (n_errors) { - VLOG_ERR("port %s: no valid trunks, trunking all VLANs", - port->name); - } - bitmap_set_multiple(trunks, 0, 4096, 1); - } - } else { - if (cfg->n_trunks) { - VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", + VLOG_ERR("port %s: no valid trunks, trunking all VLANs", port->name); + bitmap_free(trunks); + trunks = NULL; } + } else if (vlan >= 0 && cfg->n_trunks) { + VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan", + port->name); } if (trunks == NULL ? port->trunks != NULL @@ -3373,9 +3391,6 @@ port_reconfigure(struct port *port, const struct ovsrec_port *cfg) } bitmap_free(port->trunks); port->trunks = trunks; - - shash_destroy(&old_ifaces); - shash_destroy(&new_ifaces); } static void @@ -3400,6 +3415,8 @@ port_destroy(struct port *port) iface_destroy(port->ifaces[port->n_ifaces - 1]); } + 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; @@ -3421,29 +3438,14 @@ port_from_dp_ifidx(const struct bridge *br, uint16_t dp_ifidx) static struct port * port_lookup(const struct bridge *br, const char *name) { - size_t i; - - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; - if (!strcmp(port->name, name)) { - return port; - } - } - return NULL; + return shash_find_data(&br->port_by_name, name); } static struct iface * port_lookup_iface(const struct port *port, const char *name) { - size_t j; - - for (j = 0; j < port->n_ifaces; j++) { - struct iface *iface = port->ifaces[j]; - if (!strcmp(iface->name, name)) { - return iface; - } - } - return NULL; + struct iface *iface = iface_lookup(port->bridge, name); + return iface && iface->port == port ? iface : NULL; } static void @@ -3596,6 +3598,7 @@ port_update_vlan_compat(struct port *port) static struct iface * iface_create(struct port *port, const struct ovsrec_interface *if_cfg) { + struct bridge *br = port->bridge; struct iface *iface; char *name = if_cfg->name; int error; @@ -3610,13 +3613,16 @@ iface_create(struct port *port, const struct ovsrec_interface *if_cfg) iface->netdev = NULL; iface->cfg = if_cfg; + shash_add_assert(&br->iface_by_name, iface->name, iface); + /* Attempt to create the network interface in case it doesn't exist yet. */ - if (!iface_is_internal(port->bridge, iface->name)) { + if (!iface_is_internal(br, iface->name)) { error = set_up_iface(if_cfg, iface, true); if (error) { VLOG_WARN("could not create iface %s: %s", iface->name, strerror(error)); + shash_find_and_delete_assert(&br->iface_by_name, iface->name); free(iface->name); free(iface); return NULL; @@ -3629,12 +3635,12 @@ iface_create(struct port *port, const struct ovsrec_interface *if_cfg) } port->ifaces[port->n_ifaces++] = iface; if (port->n_ifaces > 1) { - port->bridge->has_bonded_ports = true; + br->has_bonded_ports = true; } VLOG_DBG("attached network device %s to port %s", iface->name, port->name); - bridge_flush(port->bridge); + bridge_flush(br); return iface; } @@ -3648,6 +3654,8 @@ iface_destroy(struct iface *iface) bool del_active = port->active_iface == iface->port_ifidx; struct iface *del; + shash_find_and_delete_assert(&br->iface_by_name, iface->name); + if (iface->dp_ifidx >= 0) { port_array_set(&br->ifaces, iface->dp_ifidx, NULL); } @@ -3673,18 +3681,7 @@ iface_destroy(struct iface *iface) static struct iface * iface_lookup(const struct bridge *br, const char *name) { - size_t i, j; - - for (i = 0; i < br->n_ports; i++) { - struct port *port = br->ports[i]; - for (j = 0; j < port->n_ifaces; j++) { - struct iface *iface = port->ifaces[j]; - if (!strcmp(iface->name, name)) { - return iface; - } - } - } - return NULL; + return shash_find_data(&br->iface_by_name, name); } static struct iface * @@ -3706,7 +3703,6 @@ iface_from_dp_ifidx(const struct bridge *br, uint16_t dp_ifidx) static bool iface_is_internal(const struct bridge *br, const char *if_name) { - /* XXX wastes time */ struct iface *iface; struct port *port;