X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif.c;h=a4d7e59ef860222ad6844ceffd650a335fff99d5;hb=a614d823ae5d753297a8d0c63c703338a7ac0653;hp=d1e4fafcadbb9f8b7b5292a46a9ef42b9ee5c597;hpb=2cc3c58ee8db0dba3f01ba39f573b6e62b883247;p=sliver-openvswitch.git diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index d1e4fafca..a4d7e59ef 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -20,7 +20,6 @@ #include -#include "autopath.h" #include "bond.h" #include "bundle.h" #include "byte-order.h" @@ -36,6 +35,7 @@ #include "mac-learning.h" #include "meta-flow.h" #include "multipath.h" +#include "netdev-vport.h" #include "netdev.h" #include "netlink.h" #include "nx-match.h" @@ -51,6 +51,7 @@ #include "simap.h" #include "smap.h" #include "timer.h" +#include "tunnel.h" #include "unaligned.h" #include "unixctl.h" #include "vlan-bitmap.h" @@ -282,7 +283,6 @@ struct action_xlate_ctx { uint32_t sflow_odp_port; /* Output port for composing sFlow action. */ uint16_t user_cookie_offset;/* Used for user_action_cookie fixup. */ bool exit; /* No further actions should be processed. */ - struct flow orig_flow; /* Copy of original flow. */ }; static void action_xlate_ctx_init(struct action_xlate_ctx *, @@ -295,6 +295,8 @@ static void xlate_actions(struct action_xlate_ctx *, static void xlate_actions_for_side_effects(struct action_xlate_ctx *, const struct ofpact *ofpacts, size_t ofpacts_len); +static void xlate_table_action(struct action_xlate_ctx *, uint16_t in_port, + uint8_t table_id, bool may_packet_in); static size_t put_userspace_action(const struct ofproto_dpif *, struct ofpbuf *odp_actions, @@ -506,9 +508,9 @@ struct ofport_dpif { struct list bundle_node; /* In struct ofbundle's "ports" list. */ struct cfm *cfm; /* Connectivity Fault Management, if any. */ tag_type tag; /* Tag associated with this port. */ - uint32_t bond_stable_id; /* stable_id to use as bond slave, or 0. */ bool may_enable; /* May be enabled in bonds. */ long long int carrier_seq; /* Carrier status changes. */ + struct tnl_port *tnl_port; /* Tunnel handle, or null. */ /* Spanning tree. */ struct stp_port *stp_port; /* Spanning Tree Protocol, if any. */ @@ -612,6 +614,15 @@ COVERAGE_DEFINE(rev_port_toggled); COVERAGE_DEFINE(rev_flow_table); COVERAGE_DEFINE(rev_inconsistency); +/* Drop keys are odp flow keys which have drop flows installed in the kernel. + * These are datapath flows which have no associated ofproto, if they did we + * would use facets. */ +struct drop_key { + struct hmap_node hmap_node; + struct nlattr *key; + size_t key_len; +}; + /* All datapaths of a given type share a single dpif backer instance. */ struct dpif_backer { char *type; @@ -620,14 +631,19 @@ struct dpif_backer { struct timer next_expiration; struct hmap odp_to_ofport_map; /* ODP port to ofport mapping. */ + struct simap tnl_backers; /* Set of dpif ports backing tunnels. */ + /* Facet revalidation flags applying to facets which use this backer. */ enum revalidate_reason need_revalidate; /* Revalidate every facet. */ struct tag_set revalidate_set; /* Revalidate only matching facets. */ + + struct hmap drop_keys; /* Set of dropped odp keys. */ }; /* All existing ofproto_backer instances, indexed by ofproto->up.type. */ static struct shash all_dpif_backers = SHASH_INITIALIZER(&all_dpif_backers); +static void drop_key_clear(struct dpif_backer *); static struct ofport_dpif * odp_port_to_ofport(const struct dpif_backer *, uint32_t odp_port); @@ -676,7 +692,8 @@ struct ofproto_dpif { struct hmap vlandev_map; /* vlandev -> (realdev,vid). */ /* Ports. */ - struct sset ports; /* Set of port names. */ + struct sset ports; /* Set of standard port names. */ + struct sset ghost_ports; /* Ports with no datapath port. */ struct sset port_poll_set; /* Queued names for port_poll() reply. */ int port_poll_errno; /* Last errno for port_poll() reply. */ }; @@ -831,6 +848,58 @@ type_run(const char *type) struct tag_set revalidate_set = backer->revalidate_set; bool need_revalidate = backer->need_revalidate; struct ofproto_dpif *ofproto; + struct simap_node *node; + struct simap tmp_backers; + + /* Handle tunnel garbage collection. */ + simap_init(&tmp_backers); + simap_swap(&backer->tnl_backers, &tmp_backers); + + HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, &all_ofproto_dpifs) { + struct ofport_dpif *iter; + + if (backer != ofproto->backer) { + continue; + } + + HMAP_FOR_EACH (iter, up.hmap_node, &ofproto->up.ports) { + const char *dp_port; + + if (!iter->tnl_port) { + continue; + } + + dp_port = netdev_vport_get_dpif_port(iter->up.netdev); + node = simap_find(&tmp_backers, dp_port); + if (node) { + simap_put(&backer->tnl_backers, dp_port, node->data); + simap_delete(&tmp_backers, node); + node = simap_find(&backer->tnl_backers, dp_port); + } else { + node = simap_find(&backer->tnl_backers, dp_port); + if (!node) { + uint32_t odp_port = UINT32_MAX; + + if (!dpif_port_add(backer->dpif, iter->up.netdev, + &odp_port)) { + simap_put(&backer->tnl_backers, dp_port, odp_port); + node = simap_find(&backer->tnl_backers, dp_port); + } + } + } + + iter->odp_port = node ? node->data : OVSP_NONE; + if (tnl_port_reconfigure(&iter->up, iter->odp_port, + &iter->tnl_port)) { + backer->need_revalidate = REV_RECONFIGURE; + } + } + } + + SIMAP_FOR_EACH (node, &tmp_backers) { + dpif_port_del(backer->dpif, node->data); + } + simap_destroy(&tmp_backers); switch (backer->need_revalidate) { case REV_RECONFIGURE: COVERAGE_INC(rev_reconfigure); break; @@ -840,6 +909,16 @@ type_run(const char *type) case REV_INCONSISTENCY: COVERAGE_INC(rev_inconsistency); break; } + if (backer->need_revalidate) { + /* Clear the drop_keys in case we should now be accepting some + * formerly dropped flows. */ + drop_key_clear(backer); + } + + /* Clear the revalidation flags. */ + tag_set_init(&backer->revalidate_set); + backer->need_revalidate = 0; + HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, &all_ofproto_dpifs) { struct facet *facet; @@ -847,10 +926,6 @@ type_run(const char *type) continue; } - /* Clear the revalidation flags. */ - tag_set_init(&backer->revalidate_set); - backer->need_revalidate = 0; - HMAP_FOR_EACH (facet, hmap_node, &ofproto->facets) { if (need_revalidate || tag_set_intersects(&revalidate_set, facet->tags)) { @@ -858,7 +933,6 @@ type_run(const char *type) } } } - } if (timer_expired(&backer->next_expiration)) { @@ -876,6 +950,13 @@ type_run(const char *type) goto next; } + HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, + &all_ofproto_dpifs) { + if (simap_contains(&ofproto->backer->tnl_backers, devname)) { + goto next; + } + } + ofproto = lookup_ofproto_dpif_by_port_name(devname); if (dpif_port_query_by_name(backer->dpif, devname, &port)) { /* The port was removed. If we know the datapath, @@ -993,6 +1074,10 @@ close_dpif_backer(struct dpif_backer *backer) return; } + drop_key_clear(backer); + hmap_destroy(&backer->drop_keys); + + simap_destroy(&backer->tnl_backers); hmap_destroy(&backer->odp_to_ofport_map); node = shash_find(&all_dpif_backers, backer->type); free(backer->type); @@ -1066,8 +1151,10 @@ open_dpif_backer(const char *type, struct dpif_backer **backerp) backer->type = xstrdup(type); backer->refcount = 1; hmap_init(&backer->odp_to_ofport_map); + hmap_init(&backer->drop_keys); timer_set_duration(&backer->next_expiration, 1000); backer->need_revalidate = 0; + simap_init(&backer->tnl_backers); tag_set_init(&backer->revalidate_set); *backerp = backer; @@ -1158,6 +1245,7 @@ construct(struct ofproto *ofproto_) hmap_init(&ofproto->realdev_vid_map); sset_init(&ofproto->ports); + sset_init(&ofproto->ghost_ports); sset_init(&ofproto->port_poll_set); ofproto->port_poll_errno = 0; @@ -1302,6 +1390,7 @@ destruct(struct ofproto *ofproto_) hmap_destroy(&ofproto->realdev_vid_map); sset_destroy(&ofproto->ports); + sset_destroy(&ofproto->ghost_ports); sset_destroy(&ofproto->port_poll_set); close_dpif_backer(ofproto->backer); @@ -1520,6 +1609,7 @@ port_construct(struct ofport *port_) { struct ofport_dpif *port = ofport_dpif_cast(port_); struct ofproto_dpif *ofproto = ofproto_dpif_cast(port->up.ofproto); + const struct netdev *netdev = port->up.netdev; struct dpif_port dpif_port; int error; @@ -1530,13 +1620,20 @@ port_construct(struct ofport *port_) port->may_enable = true; port->stp_port = NULL; port->stp_state = STP_DISABLED; + port->tnl_port = NULL; hmap_init(&port->priorities); port->realdev_ofp_port = 0; port->vlandev_vid = 0; - port->carrier_seq = netdev_get_carrier_resets(port->up.netdev); + port->carrier_seq = netdev_get_carrier_resets(netdev); + + if (netdev_vport_is_patch(netdev)) { + /* XXX By bailing out here, we don't do required sFlow work. */ + port->odp_port = OVSP_NONE; + return 0; + } error = dpif_port_query_by_name(ofproto->backer->dpif, - netdev_get_name(port->up.netdev), + netdev_vport_get_dpif_port(netdev), &dpif_port); if (error) { return error; @@ -1544,16 +1641,22 @@ port_construct(struct ofport *port_) port->odp_port = dpif_port.port_no; - /* Sanity-check that a mapping doesn't already exist. This - * shouldn't happen. */ - if (odp_port_to_ofp_port(ofproto, port->odp_port) != OFPP_NONE) { - VLOG_ERR("port %s already has an OpenFlow port number\n", - dpif_port.name); - return EBUSY; - } + if (netdev_get_tunnel_config(netdev)) { + port->tnl_port = tnl_port_add(&port->up, port->odp_port); + } else { + /* Sanity-check that a mapping doesn't already exist. This + * shouldn't happen for non-tunnel ports. */ + if (odp_port_to_ofp_port(ofproto, port->odp_port) != OFPP_NONE) { + VLOG_ERR("port %s already has an OpenFlow port number", + dpif_port.name); + dpif_port_destroy(&dpif_port); + return EBUSY; + } - hmap_insert(&ofproto->backer->odp_to_ofport_map, &port->odp_port_node, - hash_int(port->odp_port, 0)); + hmap_insert(&ofproto->backer->odp_to_ofport_map, &port->odp_port_node, + hash_int(port->odp_port, 0)); + } + dpif_port_destroy(&dpif_port); if (ofproto->sflow) { dpif_sflow_add_port(ofproto->sflow, port_, port->odp_port); @@ -1567,18 +1670,27 @@ port_destruct(struct ofport *port_) { struct ofport_dpif *port = ofport_dpif_cast(port_); struct ofproto_dpif *ofproto = ofproto_dpif_cast(port->up.ofproto); + const char *dp_port_name = netdev_vport_get_dpif_port(port->up.netdev); const char *devname = netdev_get_name(port->up.netdev); - if (dpif_port_exists(ofproto->backer->dpif, devname)) { + if (dpif_port_exists(ofproto->backer->dpif, dp_port_name)) { /* The underlying device is still there, so delete it. This * happens when the ofproto is being destroyed, since the caller * assumes that removal of attached ports will happen as part of * destruction. */ - dpif_port_del(ofproto->backer->dpif, port->odp_port); + if (!port->tnl_port) { + dpif_port_del(ofproto->backer->dpif, port->odp_port); + } + ofproto->backer->need_revalidate = REV_RECONFIGURE; + } + + if (port->odp_port != OVSP_NONE && !port->tnl_port) { + hmap_remove(&ofproto->backer->odp_to_ofport_map, &port->odp_port_node); } + tnl_port_del(port->tnl_port); sset_find_and_delete(&ofproto->ports, devname); - hmap_remove(&ofproto->backer->odp_to_ofport_map, &port->odp_port_node); + sset_find_and_delete(&ofproto->ghost_ports, devname); ofproto->backer->need_revalidate = REV_RECONFIGURE; bundle_remove(port_); set_cfm(port_, NULL); @@ -2152,8 +2264,7 @@ bundle_del_port(struct ofport_dpif *port) static bool bundle_add_port(struct ofbundle *bundle, uint32_t ofp_port, - struct lacp_slave_settings *lacp, - uint32_t bond_stable_id) + struct lacp_slave_settings *lacp) { struct ofport_dpif *port; @@ -2180,8 +2291,6 @@ bundle_add_port(struct ofbundle *bundle, uint32_t ofp_port, lacp_slave_register(bundle->lacp, port, lacp); } - port->bond_stable_id = bond_stable_id; - return true; } @@ -2289,8 +2398,7 @@ bundle_set(struct ofproto *ofproto_, void *aux, ok = true; for (i = 0; i < s->n_slaves; i++) { if (!bundle_add_port(bundle, s->slaves[i], - s->lacp ? &s->lacp_slaves[i] : NULL, - s->bond_stable_ids ? s->bond_stable_ids[i] : 0)) { + s->lacp ? &s->lacp_slaves[i] : NULL)) { ok = false; } } @@ -2390,8 +2498,7 @@ bundle_set(struct ofproto *ofproto_, void *aux, } LIST_FOR_EACH (port, bundle_node, &bundle->ports) { - bond_slave_register(bundle->bond, port, port->bond_stable_id, - port->up.netdev); + bond_slave_register(bundle->bond, port, port->up.netdev); } } else { bond_destroy(bundle->bond); @@ -2820,6 +2927,28 @@ ofproto_port_from_dpif_port(struct ofproto_dpif *ofproto, ofproto_port->ofp_port = odp_port_to_ofp_port(ofproto, dpif_port->port_no); } +static struct ofport_dpif * +ofport_get_peer(const struct ofport_dpif *ofport_dpif) +{ + const struct ofproto_dpif *ofproto; + const char *peer; + + peer = netdev_vport_patch_peer(ofport_dpif->up.netdev); + if (!peer) { + return NULL; + } + + HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, &all_ofproto_dpifs) { + struct ofport *ofport; + + ofport = shash_find_data(&ofproto->up.port_by_name, peer); + if (ofport && ofport->ofproto->ofproto_class == &ofproto_dpif_class) { + return ofport_dpif_cast(ofport); + } + } + return NULL; +} + static void port_run_fast(struct ofport_dpif *ofport) { @@ -2843,6 +2972,13 @@ port_run(struct ofport_dpif *ofport) ofport->carrier_seq = carrier_seq; port_run_fast(ofport); + + if (ofport->tnl_port + && tnl_port_reconfigure(&ofport->up, ofport->odp_port, + &ofport->tnl_port)) { + ofproto_dpif_cast(ofport->up.ofproto)->backer->need_revalidate = true; + } + if (ofport->cfm) { int cfm_opup = cfm_get_opup(ofport->cfm); @@ -2888,6 +3024,24 @@ port_query_by_name(const struct ofproto *ofproto_, const char *devname, struct dpif_port dpif_port; int error; + if (sset_contains(&ofproto->ghost_ports, devname)) { + const char *type = netdev_get_type_from_name(devname); + + /* We may be called before ofproto->up.port_by_name is populated with + * the appropriate ofport. For this reason, we must get the name and + * type from the netdev layer directly. */ + if (type) { + const struct ofport *ofport; + + ofport = shash_find_data(&ofproto->up.port_by_name, devname); + ofproto_port->ofp_port = ofport ? ofport->ofp_port : OFPP_NONE; + ofproto_port->name = xstrdup(devname); + ofproto_port->type = xstrdup(type); + return 0; + } + return ENODEV; + } + if (!sset_contains(&ofproto->ports, devname)) { return ENODEV; } @@ -2903,29 +3057,52 @@ static int port_add(struct ofproto *ofproto_, struct netdev *netdev) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); - uint32_t odp_port = UINT32_MAX; - int error; + const char *dp_port_name = netdev_vport_get_dpif_port(netdev); + const char *devname = netdev_get_name(netdev); - error = dpif_port_add(ofproto->backer->dpif, netdev, &odp_port); - if (!error) { - sset_add(&ofproto->ports, netdev_get_name(netdev)); + if (netdev_vport_is_patch(netdev)) { + sset_add(&ofproto->ghost_ports, netdev_get_name(netdev)); + return 0; } - return error; + + if (!dpif_port_exists(ofproto->backer->dpif, dp_port_name)) { + uint32_t port_no = UINT32_MAX; + int error; + + error = dpif_port_add(ofproto->backer->dpif, netdev, &port_no); + if (error) { + return error; + } + if (netdev_get_tunnel_config(netdev)) { + simap_put(&ofproto->backer->tnl_backers, dp_port_name, port_no); + } + } + + if (netdev_get_tunnel_config(netdev)) { + sset_add(&ofproto->ghost_ports, devname); + } else { + sset_add(&ofproto->ports, devname); + } + return 0; } static int port_del(struct ofproto *ofproto_, uint16_t ofp_port) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); - uint32_t odp_port = ofp_port_to_odp_port(ofproto, ofp_port); + struct ofport_dpif *ofport = get_ofp_port(ofproto, ofp_port); int error = 0; - if (odp_port != OFPP_NONE) { - error = dpif_port_del(ofproto->backer->dpif, odp_port); + if (!ofport) { + return 0; } - if (!error) { - struct ofport_dpif *ofport = get_ofp_port(ofproto, ofp_port); - if (ofport) { + + sset_find_and_delete(&ofproto->ghost_ports, + netdev_get_name(ofport->up.netdev)); + ofproto->backer->need_revalidate = REV_RECONFIGURE; + if (!ofport->tnl_port) { + error = dpif_port_del(ofproto->backer->dpif, ofport->odp_port); + if (!error) { /* The caller is going to close ofport->up.netdev. If this is a * bonded port, then the bond is using that netdev, so remove it * from the bond. The client will need to reconfigure everything @@ -2996,37 +3173,53 @@ ofproto_update_local_port_stats(const struct ofproto *ofproto_, struct port_dump_state { uint32_t bucket; uint32_t offset; + bool ghost; + + struct ofproto_port port; + bool has_port; }; static int port_dump_start(const struct ofproto *ofproto_ OVS_UNUSED, void **statep) { - struct port_dump_state *state; - - *statep = state = xmalloc(sizeof *state); - state->bucket = 0; - state->offset = 0; + *statep = xzalloc(sizeof(struct port_dump_state)); return 0; } static int -port_dump_next(const struct ofproto *ofproto_ OVS_UNUSED, void *state_, +port_dump_next(const struct ofproto *ofproto_, void *state_, struct ofproto_port *port) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); struct port_dump_state *state = state_; + const struct sset *sset; struct sset_node *node; - while ((node = sset_at_position(&ofproto->ports, &state->bucket, - &state->offset))) { + if (state->has_port) { + ofproto_port_destroy(&state->port); + state->has_port = false; + } + sset = state->ghost ? &ofproto->ghost_ports : &ofproto->ports; + while ((node = sset_at_position(sset, &state->bucket, &state->offset))) { int error; - error = port_query_by_name(ofproto_, node->name, port); - if (error != ENODEV) { + error = port_query_by_name(ofproto_, node->name, &state->port); + if (!error) { + *port = state->port; + state->has_port = true; + return 0; + } else if (error != ENODEV) { return error; } } + if (!state->ghost) { + state->ghost = true; + state->bucket = 0; + state->offset = 0; + return port_dump_next(ofproto_, state_, port); + } + return EOF; } @@ -3035,6 +3228,9 @@ port_dump_done(const struct ofproto *ofproto_ OVS_UNUSED, void *state_) { struct port_dump_state *state = state_; + if (state->has_port) { + ofproto_port_destroy(&state->port); + } free(state); return 0; } @@ -3131,15 +3327,11 @@ send_packet_in_miss(struct ofproto_dpif *ofproto, const struct ofpbuf *packet, static enum slow_path_reason process_special(struct ofproto_dpif *ofproto, const struct flow *flow, - const struct ofpbuf *packet) + const struct ofport_dpif *ofport, const struct ofpbuf *packet) { - struct ofport_dpif *ofport = get_ofp_port(ofproto, flow->in_port); - if (!ofport) { return 0; - } - - if (ofport->cfm && cfm_should_process_flow(ofport->cfm, flow)) { + } else if (ofport->cfm && cfm_should_process_flow(ofport->cfm, flow)) { if (packet) { cfm_process_heartbeat(ofport->cfm, packet); } @@ -3155,17 +3347,19 @@ process_special(struct ofproto_dpif *ofproto, const struct flow *flow, stp_process_packet(ofport, packet); } return SLOW_STP; + } else { + return 0; } - return 0; } static struct flow_miss * -flow_miss_find(struct hmap *todo, const struct flow *flow, uint32_t hash) +flow_miss_find(struct hmap *todo, const struct ofproto_dpif *ofproto, + const struct flow *flow, uint32_t hash) { struct flow_miss *miss; HMAP_FOR_EACH_WITH_HASH (miss, hmap_node, hash, todo) { - if (flow_equal(&miss->flow, flow)) { + if (miss->ofproto == ofproto && flow_equal(&miss->flow, flow)) { return miss; } } @@ -3408,6 +3602,47 @@ handle_flow_miss(struct flow_miss *miss, struct flow_miss_op *ops, handle_flow_miss_with_facet(miss, facet, now, ops, n_ops); } +static struct drop_key * +drop_key_lookup(const struct dpif_backer *backer, const struct nlattr *key, + size_t key_len) +{ + struct drop_key *drop_key; + + HMAP_FOR_EACH_WITH_HASH (drop_key, hmap_node, hash_bytes(key, key_len, 0), + &backer->drop_keys) { + if (drop_key->key_len == key_len + && !memcmp(drop_key->key, key, key_len)) { + return drop_key; + } + } + return NULL; +} + +static void +drop_key_clear(struct dpif_backer *backer) +{ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 15); + struct drop_key *drop_key, *next; + + HMAP_FOR_EACH_SAFE (drop_key, next, hmap_node, &backer->drop_keys) { + int error; + + error = dpif_flow_del(backer->dpif, drop_key->key, drop_key->key_len, + NULL); + if (error && !VLOG_DROP_WARN(&rl)) { + struct ds ds = DS_EMPTY_INITIALIZER; + odp_flow_key_format(drop_key->key, drop_key->key_len, &ds); + VLOG_WARN("Failed to delete drop key (%s) (%s)", strerror(error), + ds_cstr(&ds)); + ds_destroy(&ds); + } + + hmap_remove(&backer->drop_keys, &drop_key->hmap_node); + free(drop_key->key); + free(drop_key); + } +} + /* Given a datpath, packet, and flow metadata ('backer', 'packet', and 'key' * respectively), populates 'flow' with the result of odp_flow_key_to_flow(). * Optionally, if nonnull, populates 'fitnessp' with the fitness of 'flow' as @@ -3430,6 +3665,10 @@ handle_flow_miss(struct flow_miss *miss, struct flow_miss_op *ops, * odp_flow_key_to_flow(). (This differs from the value returned in * flow->vlan_tci only for packets received on VLAN splinters.) * + * Similarly, this function also includes some logic to help with tunnels. It + * may modify 'flow' as necessary to make the tunneling implementation + * transparent to the upcall processing logic. + * * Returns 0 if successful, ENODEV if the parsed flow has no associated ofport, * or some other positive errno if there are other problems. */ static int @@ -3441,7 +3680,7 @@ ofproto_receive(const struct dpif_backer *backer, struct ofpbuf *packet, { const struct ofport_dpif *port; enum odp_key_fitness fitness; - int error; + int error = ENODEV; fitness = odp_flow_key_to_flow(key, key_len, flow); if (fitness == ODP_FIT_ERROR) { @@ -3457,44 +3696,60 @@ ofproto_receive(const struct dpif_backer *backer, struct ofpbuf *packet, *odp_in_port = flow->in_port; } - port = odp_port_to_ofport(backer, flow->in_port); - if (!port) { - flow->in_port = OFPP_NONE; - error = ofproto ? ENODEV : 0; - goto exit; - } + if (tnl_port_should_receive(flow)) { + const struct ofport *ofport = tnl_port_receive(flow); + if (!ofport) { + flow->in_port = OFPP_NONE; + goto exit; + } + port = ofport_dpif_cast(ofport); - if (ofproto) { - *ofproto = ofproto_dpif_cast(port->up.ofproto); - } + /* We can't reproduce 'key' from 'flow'. */ + fitness = fitness == ODP_FIT_PERFECT ? ODP_FIT_TOO_MUCH : fitness; - flow->in_port = port->up.ofp_port; - if (vsp_adjust_flow(ofproto_dpif_cast(port->up.ofproto), flow)) { - if (packet) { - /* Make the packet resemble the flow, so that it gets sent to an - * OpenFlow controller properly, so that it looks correct for - * sFlow, and so that flow_extract() will get the correct vlan_tci - * if it is called on 'packet'. - * - * The allocated space inside 'packet' probably also contains - * 'key', that is, both 'packet' and 'key' are probably part of a - * struct dpif_upcall (see the large comment on that structure - * definition), so pushing data on 'packet' is in general not a - * good idea since it could overwrite 'key' or free it as a side - * effect. However, it's OK in this special case because we know - * that 'packet' is inside a Netlink attribute: pushing 4 bytes - * will just overwrite the 4-byte "struct nlattr", which is fine - * since we don't need that header anymore. */ - eth_push_vlan(packet, flow->vlan_tci); - } - - /* Let the caller know that we can't reproduce 'key' from 'flow'. */ - if (fitness == ODP_FIT_PERFECT) { - fitness = ODP_FIT_TOO_MUCH; + /* XXX: Since the tunnel module is not scoped per backer, it's + * theoretically possible that we'll receive an ofport belonging to an + * entirely different datapath. In practice, this can't happen because + * no platforms has two separate datapaths which each support + * tunneling. */ + ovs_assert(ofproto_dpif_cast(port->up.ofproto)->backer == backer); + } else { + port = odp_port_to_ofport(backer, flow->in_port); + if (!port) { + flow->in_port = OFPP_NONE; + goto exit; + } + + flow->in_port = port->up.ofp_port; + if (vsp_adjust_flow(ofproto_dpif_cast(port->up.ofproto), flow)) { + if (packet) { + /* Make the packet resemble the flow, so that it gets sent to + * an OpenFlow controller properly, so that it looks correct + * for sFlow, and so that flow_extract() will get the correct + * vlan_tci if it is called on 'packet'. + * + * The allocated space inside 'packet' probably also contains + * 'key', that is, both 'packet' and 'key' are probably part of + * a struct dpif_upcall (see the large comment on that + * structure definition), so pushing data on 'packet' is in + * general not a good idea since it could overwrite 'key' or + * free it as a side effect. However, it's OK in this special + * case because we know that 'packet' is inside a Netlink + * attribute: pushing 4 bytes will just overwrite the 4-byte + * "struct nlattr", which is fine since we don't need that + * header anymore. */ + eth_push_vlan(packet, flow->vlan_tci); + } + /* We can't reproduce 'key' from 'flow'. */ + fitness = fitness == ODP_FIT_PERFECT ? ODP_FIT_TOO_MUCH : fitness; } } error = 0; + if (ofproto) { + *ofproto = ofproto_dpif_cast(port->up.ofproto); + } + exit: if (fitnessp) { *fitnessp = fitness; @@ -3540,12 +3795,29 @@ handle_miss_upcalls(struct dpif_backer *backer, struct dpif_upcall *upcalls, upcall->key_len, &flow, &miss->key_fitness, &ofproto, &odp_in_port, &miss->initial_tci); if (error == ENODEV) { + struct drop_key *drop_key; + /* Received packet on port for which we couldn't associate * an ofproto. This can happen if a port is removed while * traffic is being received. Print a rate-limited message - * in case it happens frequently. */ + * in case it happens frequently. Install a drop flow so + * that future packets of the flow are inexpensively dropped + * in the kernel. */ VLOG_INFO_RL(&rl, "received packet on unassociated port %"PRIu32, flow.in_port); + + drop_key = drop_key_lookup(backer, upcall->key, upcall->key_len); + if (!drop_key) { + drop_key = xmalloc(sizeof *drop_key); + drop_key->key = xmemdup(upcall->key, upcall->key_len); + drop_key->key_len = upcall->key_len; + + hmap_insert(&backer->drop_keys, &drop_key->hmap_node, + hash_bytes(drop_key->key, drop_key->key_len, 0)); + dpif_flow_put(backer->dpif, DPIF_FP_CREATE | DPIF_FP_MODIFY, + drop_key->key, drop_key->key_len, NULL, 0, NULL); + } + continue; } if (error) { continue; @@ -3555,7 +3827,7 @@ handle_miss_upcalls(struct dpif_backer *backer, struct dpif_upcall *upcalls, /* Add other packets to a to-do list. */ hash = flow_hash(&miss->flow, 0); - existing_miss = flow_miss_find(&todo, &miss->flow, hash); + existing_miss = flow_miss_find(&todo, ofproto, &miss->flow, hash); if (!existing_miss) { hmap_insert(&todo, &miss->hmap_node, hash); miss->ofproto = ofproto; @@ -3629,7 +3901,16 @@ classify_upcall(const struct dpif_upcall *upcall) } /* "action" upcalls need a closer look. */ - memcpy(&cookie, &upcall->userdata, sizeof(cookie)); + if (!upcall->userdata) { + VLOG_WARN_RL(&rl, "action upcall missing cookie"); + return BAD_UPCALL; + } + if (nl_attr_get_size(upcall->userdata) != sizeof(cookie)) { + VLOG_WARN_RL(&rl, "action upcall cookie has unexpected size %zu", + nl_attr_get_size(upcall->userdata)); + return BAD_UPCALL; + } + memcpy(&cookie, nl_attr_get(upcall->userdata), sizeof(cookie)); switch (cookie.type) { case USER_ACTION_COOKIE_SFLOW: return SFLOW_UPCALL; @@ -3639,7 +3920,8 @@ classify_upcall(const struct dpif_upcall *upcall) case USER_ACTION_COOKIE_UNSPEC: default: - VLOG_WARN_RL(&rl, "invalid user cookie : 0x%"PRIx64, upcall->userdata); + VLOG_WARN_RL(&rl, "invalid user cookie : 0x%"PRIx64, + nl_attr_get_u64(upcall->userdata)); return BAD_UPCALL; } } @@ -3659,7 +3941,7 @@ handle_sflow_upcall(struct dpif_backer *backer, return; } - memcpy(&cookie, &upcall->userdata, sizeof(cookie)); + memcpy(&cookie, nl_attr_get(upcall->userdata), sizeof(cookie)); dpif_sflow_received(ofproto->sflow, upcall->packet, &flow, odp_in_port, &cookie); } @@ -3735,12 +4017,15 @@ expire(struct dpif_backer *backer) struct ofproto_dpif *ofproto; int max_idle = INT32_MAX; + /* Periodically clear out the drop keys in an effort to keep them + * relatively few. */ + drop_key_clear(backer); + /* Update stats for each flow in the backer. */ update_stats(backer); HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, &all_ofproto_dpifs) { - struct rule_dpif *rule, *next_rule; - struct oftable *table; + struct rule *rule, *next_rule; int dp_max_idle; if (ofproto->backer != backer) { @@ -3755,13 +4040,9 @@ expire(struct dpif_backer *backer) /* Expire OpenFlow flows whose idle_timeout or hard_timeout * has passed. */ - OFPROTO_FOR_EACH_TABLE (table, &ofproto->up) { - struct cls_cursor cursor; - - cls_cursor_init(&cursor, &table->cls, NULL); - CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, up.cr, &cursor) { - rule_expire(rule); - } + LIST_FOR_EACH_SAFE (rule, next_rule, expirable, + &ofproto->up.expirable) { + rule_expire(rule_dpif_cast(rule)); } /* All outstanding data in existing flows has been accounted, so it's a @@ -3857,29 +4138,21 @@ update_stats(struct dpif_backer *backer) while (dpif_flow_dump_next(&dump, &key, &key_len, NULL, NULL, &stats)) { struct flow flow; struct subfacet *subfacet; - enum odp_key_fitness fitness; struct ofproto_dpif *ofproto; - struct ofport_dpif *port; + struct ofport_dpif *ofport; uint32_t key_hash; - fitness = odp_flow_key_to_flow(key, key_len, &flow); - if (fitness == ODP_FIT_ERROR) { + if (ofproto_receive(backer, NULL, key, key_len, &flow, NULL, &ofproto, + NULL, NULL)) { continue; } - port = odp_port_to_ofport(backer, flow.in_port); - if (!port) { - /* This flow is for a port for which we couldn't associate an - * ofproto. This can happen if a port is removed while - * traffic is being received. Ignore this flow, since it - * will get timed out. */ - continue; + ofport = get_ofp_port(ofproto, flow.in_port); + if (ofport && ofport->tnl_port) { + netdev_vport_inc_rx(ofport->up.netdev, stats); } - ofproto = ofproto_dpif_cast(port->up.ofproto); - flow.in_port = port->up.ofp_port; key_hash = odp_flow_key_hash(key, key_len); - subfacet = subfacet_find(ofproto, key, key_len, key_hash, &flow); switch (subfacet ? subfacet->path : SF_NOT_INSTALLED) { case SF_FAST_PATH: @@ -4103,9 +4376,7 @@ facet_free(struct facet *facet) } /* Executes, within 'ofproto', the 'n_actions' actions in 'actions' on - * 'packet', which arrived on 'in_port'. - * - * Takes ownership of 'packet'. */ + * 'packet', which arrived on 'in_port'. */ static bool execute_odp_actions(struct ofproto_dpif *ofproto, const struct flow *flow, const struct nlattr *odp_actions, size_t actions_len, @@ -4121,8 +4392,6 @@ execute_odp_actions(struct ofproto_dpif *ofproto, const struct flow *flow, error = dpif_execute(ofproto->backer->dpif, key.data, key.size, odp_actions, actions_len, packet); - - ofpbuf_delete(packet); return !error; } @@ -5174,11 +5443,10 @@ rule_get_stats(struct rule *rule_, uint64_t *packets, uint64_t *bytes) } } -static enum ofperr -rule_execute(struct rule *rule_, const struct flow *flow, - struct ofpbuf *packet) +static void +rule_dpif_execute(struct rule_dpif *rule, const struct flow *flow, + struct ofpbuf *packet) { - struct rule_dpif *rule = rule_dpif_cast(rule_); struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct dpif_flow_stats stats; @@ -5200,7 +5468,14 @@ rule_execute(struct rule *rule_, const struct flow *flow, odp_actions.size, packet); ofpbuf_uninit(&odp_actions); +} +static enum ofperr +rule_execute(struct rule *rule, const struct flow *flow, + struct ofpbuf *packet) +{ + rule_dpif_execute(rule_dpif_cast(rule), flow, packet); + ofpbuf_delete(packet); return 0; } @@ -5219,6 +5494,7 @@ static int send_packet(const struct ofport_dpif *ofport, struct ofpbuf *packet) { const struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofport->up.ofproto); + uint64_t odp_actions_stub[1024 / 8]; struct ofpbuf key, odp_actions; struct odputil_keybuf keybuf; uint32_t odp_port; @@ -5226,18 +5502,56 @@ send_packet(const struct ofport_dpif *ofport, struct ofpbuf *packet) int error; flow_extract(packet, 0, 0, NULL, OFPP_LOCAL, &flow); - odp_port = vsp_realdev_to_vlandev(ofproto, ofport->odp_port, - flow.vlan_tci); - if (odp_port != ofport->odp_port) { - eth_pop_vlan(packet); - flow.vlan_tci = htons(0); + if (netdev_vport_is_patch(ofport->up.netdev)) { + struct ofproto_dpif *peer_ofproto; + struct dpif_flow_stats stats; + struct ofport_dpif *peer; + struct rule_dpif *rule; + + peer = ofport_get_peer(ofport); + if (!peer) { + return ENODEV; + } + + dpif_flow_stats_extract(&flow, packet, time_msec(), &stats); + netdev_vport_inc_tx(ofport->up.netdev, &stats); + netdev_vport_inc_rx(peer->up.netdev, &stats); + + flow.in_port = peer->up.ofp_port; + peer_ofproto = ofproto_dpif_cast(peer->up.ofproto); + rule = rule_dpif_lookup(peer_ofproto, &flow); + rule_dpif_execute(rule, &flow, packet); + + return 0; + } + + ofpbuf_use_stub(&odp_actions, odp_actions_stub, sizeof odp_actions_stub); + + if (ofport->tnl_port) { + struct dpif_flow_stats stats; + + odp_port = tnl_port_send(ofport->tnl_port, &flow); + if (odp_port == OVSP_NONE) { + return ENODEV; + } + + dpif_flow_stats_extract(&flow, packet, time_msec(), &stats); + netdev_vport_inc_tx(ofport->up.netdev, &stats); + odp_put_tunnel_action(&flow.tunnel, &odp_actions); + odp_put_skb_mark_action(flow.skb_mark, &odp_actions); + } else { + odp_port = vsp_realdev_to_vlandev(ofproto, ofport->odp_port, + flow.vlan_tci); + if (odp_port != ofport->odp_port) { + eth_pop_vlan(packet); + flow.vlan_tci = htons(0); + } } ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); odp_flow_key_from_flow(&key, &flow, ofp_port_to_odp_port(ofproto, flow.in_port)); - ofpbuf_init(&odp_actions, 32); compose_sflow_action(ofproto, &odp_actions, &flow, odp_port); nl_msg_put_u32(&odp_actions, OVS_ACTION_ATTR_OUTPUT, odp_port); @@ -5257,6 +5571,7 @@ send_packet(const struct ofport_dpif *ofport, struct ofpbuf *packet) /* OpenFlow to datapath action translation. */ +static bool may_receive(const struct ofport_dpif *, struct action_xlate_ctx *); static void do_xlate_actions(const struct ofpact *, size_t ofpacts_len, struct action_xlate_ctx *); static void xlate_normal(struct action_xlate_ctx *); @@ -5287,7 +5602,7 @@ compose_slow_path(const struct ofproto_dpif *ofproto, const struct flow *flow, ofpbuf_use_stack(&buf, stub, stub_size); if (slow & (SLOW_CFM | SLOW_LACP | SLOW_STP)) { uint32_t pid = dpif_port_get_pid(ofproto->backer->dpif, UINT32_MAX); - odp_put_userspace_action(pid, &cookie, &buf); + odp_put_userspace_action(pid, &cookie, sizeof cookie, &buf); } else { put_userspace_action(ofproto, &buf, flow, &cookie); } @@ -5306,7 +5621,7 @@ put_userspace_action(const struct ofproto_dpif *ofproto, pid = dpif_port_get_pid(ofproto->backer->dpif, ofp_port_to_odp_port(ofproto, flow->in_port)); - return odp_put_userspace_action(pid, cookie, odp_actions); + return odp_put_userspace_action(pid, cookie, sizeof *cookie, odp_actions); } static void @@ -5412,11 +5727,15 @@ compose_output_action__(struct action_xlate_ctx *ctx, uint16_t ofp_port, bool check_stp) { const struct ofport_dpif *ofport = get_ofp_port(ctx->ofproto, ofp_port); - uint32_t odp_port = ofp_port_to_odp_port(ctx->ofproto, ofp_port); ovs_be16 flow_vlan_tci = ctx->flow.vlan_tci; + ovs_be64 flow_tun_id = ctx->flow.tunnel.tun_id; uint8_t flow_nw_tos = ctx->flow.nw_tos; struct priority_to_dscp *pdscp; - uint32_t out_port; + uint32_t out_port, odp_port; + + /* If 'struct flow' gets additional metadata, we'll need to zero it out + * before traversing a patch port. */ + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 19); if (!ofport) { xlate_report(ctx, "Nonexistent output port"); @@ -5429,16 +5748,86 @@ compose_output_action__(struct action_xlate_ctx *ctx, uint16_t ofp_port, return; } + if (netdev_vport_is_patch(ofport->up.netdev)) { + struct ofport_dpif *peer = ofport_get_peer(ofport); + struct flow old_flow = ctx->flow; + const struct ofproto_dpif *peer_ofproto; + enum slow_path_reason special; + struct ofport_dpif *in_port; + + if (!peer) { + xlate_report(ctx, "Nonexistent patch port peer"); + return; + } + + peer_ofproto = ofproto_dpif_cast(peer->up.ofproto); + if (peer_ofproto->backer != ctx->ofproto->backer) { + xlate_report(ctx, "Patch port peer on a different datapath"); + return; + } + + ctx->ofproto = ofproto_dpif_cast(peer->up.ofproto); + ctx->flow.in_port = peer->up.ofp_port; + ctx->flow.metadata = htonll(0); + memset(&ctx->flow.tunnel, 0, sizeof ctx->flow.tunnel); + memset(ctx->flow.regs, 0, sizeof ctx->flow.regs); + + in_port = get_ofp_port(ctx->ofproto, ctx->flow.in_port); + special = process_special(ctx->ofproto, &ctx->flow, in_port, + ctx->packet); + if (special) { + ctx->slow |= special; + } else if (!in_port || may_receive(in_port, ctx)) { + if (!in_port || stp_forward_in_state(in_port->stp_state)) { + xlate_table_action(ctx, ctx->flow.in_port, 0, true); + } else { + /* Forwarding is disabled by STP. Let OFPP_NORMAL and the + * learning action look at the packet, then drop it. */ + struct flow old_base_flow = ctx->base_flow; + size_t old_size = ctx->odp_actions->size; + xlate_table_action(ctx, ctx->flow.in_port, 0, true); + ctx->base_flow = old_base_flow; + ctx->odp_actions->size = old_size; + } + } + + ctx->flow = old_flow; + ctx->ofproto = ofproto_dpif_cast(ofport->up.ofproto); + + if (ctx->resubmit_stats) { + netdev_vport_inc_tx(ofport->up.netdev, ctx->resubmit_stats); + netdev_vport_inc_rx(peer->up.netdev, ctx->resubmit_stats); + } + + return; + } + pdscp = get_priority(ofport, ctx->flow.skb_priority); if (pdscp) { ctx->flow.nw_tos &= ~IP_DSCP_MASK; ctx->flow.nw_tos |= pdscp->dscp; } - out_port = vsp_realdev_to_vlandev(ctx->ofproto, odp_port, - ctx->flow.vlan_tci); - if (out_port != odp_port) { - ctx->flow.vlan_tci = htons(0); + odp_port = ofp_port_to_odp_port(ctx->ofproto, ofp_port); + if (ofport->tnl_port) { + odp_port = tnl_port_send(ofport->tnl_port, &ctx->flow); + if (odp_port == OVSP_NONE) { + xlate_report(ctx, "Tunneling decided against output"); + return; + } + + if (ctx->resubmit_stats) { + netdev_vport_inc_tx(ofport->up.netdev, ctx->resubmit_stats); + } + out_port = odp_port; + commit_odp_tunnel_action(&ctx->flow, &ctx->base_flow, + ctx->odp_actions); + } else { + out_port = vsp_realdev_to_vlandev(ctx->ofproto, odp_port, + ctx->flow.vlan_tci); + if (out_port != odp_port) { + ctx->flow.vlan_tci = htons(0); + } } commit_odp_actions(&ctx->flow, &ctx->base_flow, ctx->odp_actions); nl_msg_put_u32(ctx->odp_actions, OVS_ACTION_ATTR_OUTPUT, out_port); @@ -5446,6 +5835,7 @@ compose_output_action__(struct action_xlate_ctx *ctx, uint16_t ofp_port, ctx->sflow_odp_port = odp_port; ctx->sflow_n_outputs++; ctx->nf_output_iface = ofp_port; + ctx->flow.tunnel.tun_id = flow_tun_id; ctx->flow.vlan_tci = flow_vlan_tci; ctx->flow.nw_tos = flow_nw_tos; } @@ -5588,16 +5978,11 @@ execute_controller_action(struct action_xlate_ctx *ctx, int len, if (packet->l2 && packet->l3) { struct eth_header *eh; + uint16_t mpls_depth; eth_pop_vlan(packet); eh = packet->l2; - /* If the Ethernet type is less than ETH_TYPE_MIN, it's likely an 802.2 - * LLC frame. Calculating the Ethernet type of these frames is more - * trouble than seems appropriate for a simple assertion. */ - ovs_assert(ntohs(eh->eth_type) < ETH_TYPE_MIN - || eh->eth_type == ctx->flow.dl_type); - memcpy(eh->eth_src, ctx->flow.dl_src, sizeof eh->eth_src); memcpy(eh->eth_dst, ctx->flow.dl_dst, sizeof eh->eth_dst); @@ -5605,6 +5990,16 @@ execute_controller_action(struct action_xlate_ctx *ctx, int len, eth_push_vlan(packet, ctx->flow.vlan_tci); } + mpls_depth = eth_mpls_depth(packet); + + if (mpls_depth < ctx->flow.mpls_depth) { + push_mpls(packet, ctx->flow.dl_type, ctx->flow.mpls_lse); + } else if (mpls_depth > ctx->flow.mpls_depth) { + pop_mpls(packet, ctx->flow.dl_type); + } else if (mpls_depth) { + set_mpls_lse(packet, ctx->flow.mpls_lse); + } + if (packet->l4) { if (ctx->flow.dl_type == htons(ETH_TYPE_IP)) { packet_set_ipv4(packet, ctx->flow.nw_src, ctx->flow.nw_dst, @@ -5637,6 +6032,48 @@ execute_controller_action(struct action_xlate_ctx *ctx, int len, ofpbuf_delete(packet); } +static void +execute_mpls_push_action(struct action_xlate_ctx *ctx, ovs_be16 eth_type) +{ + ovs_assert(eth_type_mpls(eth_type)); + + if (ctx->base_flow.mpls_depth) { + ctx->flow.mpls_lse &= ~htonl(MPLS_BOS_MASK); + ctx->flow.mpls_depth++; + } else { + ovs_be32 label; + uint8_t tc, ttl; + + if (ctx->flow.dl_type == htons(ETH_TYPE_IPV6)) { + label = htonl(0x2); /* IPV6 Explicit Null. */ + } else { + label = htonl(0x0); /* IPV4 Explicit Null. */ + } + tc = (ctx->flow.nw_tos & IP_DSCP_MASK) >> 2; + ttl = ctx->flow.nw_ttl ? ctx->flow.nw_ttl : 0x40; + ctx->flow.mpls_lse = set_mpls_lse_values(ttl, tc, 1, label); + ctx->flow.encap_dl_type = ctx->flow.dl_type; + ctx->flow.mpls_depth = 1; + } + ctx->flow.dl_type = eth_type; +} + +static void +execute_mpls_pop_action(struct action_xlate_ctx *ctx, ovs_be16 eth_type) +{ + ovs_assert(eth_type_mpls(ctx->flow.dl_type)); + ovs_assert(!eth_type_mpls(eth_type)); + + if (ctx->flow.mpls_depth) { + ctx->flow.mpls_depth--; + ctx->flow.mpls_lse = htonl(0); + if (!ctx->flow.mpls_depth) { + ctx->flow.dl_type = eth_type; + ctx->flow.encap_dl_type = htons(0); + } + } +} + static bool compose_dec_ttl(struct action_xlate_ctx *ctx, struct ofpact_cnt_ids *ids) { @@ -5778,26 +6215,6 @@ struct xlate_reg_state { ovs_be64 tun_id; }; -static void -xlate_autopath(struct action_xlate_ctx *ctx, - const struct ofpact_autopath *ap) -{ - uint16_t ofp_port = ap->port; - struct ofport_dpif *port = get_ofp_port(ctx->ofproto, ofp_port); - - if (!port || !port->bundle) { - ofp_port = OFPP_NONE; - } else if (port->bundle->bond) { - /* Autopath does not support VLAN hashing. */ - struct ofport_dpif *slave = bond_choose_output_slave( - port->bundle->bond, &ctx->flow, 0, &ctx->tags); - if (slave) { - ofp_port = slave->up.ofp_port; - } - } - nxm_reg_load(&ap->dst, ofp_port, &ctx->flow); -} - static bool slave_enabled_cb(uint16_t ofp_port, void *ofproto_) { @@ -5903,16 +6320,9 @@ static void do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, struct action_xlate_ctx *ctx) { - const struct ofport_dpif *port; bool was_evictable = true; const struct ofpact *a; - port = get_ofp_port(ctx->ofproto, ctx->flow.in_port); - if (port && !may_receive(port, ctx)) { - /* Drop this flow. */ - return; - } - if (ctx->rule) { /* Don't let the rule we're working on get evicted underneath us. */ was_evictable = ctx->rule->up.evictable; @@ -6023,6 +6433,14 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, nxm_execute_reg_load(ofpact_get_REG_LOAD(a), &ctx->flow); break; + case OFPACT_PUSH_MPLS: + execute_mpls_push_action(ctx, ofpact_get_PUSH_MPLS(a)->ethertype); + break; + + case OFPACT_POP_MPLS: + execute_mpls_pop_action(ctx, ofpact_get_POP_MPLS(a)->ethertype); + break; + case OFPACT_DEC_TTL: if (compose_dec_ttl(ctx, ofpact_get_DEC_TTL(a))) { goto out; @@ -6037,10 +6455,6 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, multipath_execute(ofpact_get_MULTIPATH(a), &ctx->flow); break; - case OFPACT_AUTOPATH: - xlate_autopath(ctx, ofpact_get_AUTOPATH(a)); - break; - case OFPACT_BUNDLE: ctx->ofproto->has_bundle_action = true; xlate_bundle_action(ctx, ofpact_get_BUNDLE(a)); @@ -6092,12 +6506,6 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, } out: - /* We've let OFPP_NORMAL and the learning action look at the packet, - * so drop it now if forwarding is disabled. */ - if (port && !stp_forward_in_state(port->stp_state)) { - ofpbuf_clear(ctx->odp_actions); - add_sflow_action(ctx); - } if (ctx->rule) { ctx->rule->up.evictable = was_evictable; } @@ -6160,6 +6568,8 @@ xlate_actions(struct action_xlate_ctx *ctx, static bool hit_resubmit_limit; enum slow_path_reason special; + struct ofport_dpif *in_port; + struct flow orig_flow; COVERAGE_INC(ofproto_dpif_xlate); @@ -6182,12 +6592,8 @@ xlate_actions(struct action_xlate_ctx *ctx, if (ctx->ofproto->has_mirrors || hit_resubmit_limit) { /* Do this conditionally because the copy is expensive enough that it - * shows up in profiles. - * - * We keep orig_flow in 'ctx' only because I couldn't make GCC 4.4 - * believe that I wasn't using it without initializing it if I kept it - * in a local variable. */ - ctx->orig_flow = ctx->flow; + * shows up in profiles. */ + orig_flow = ctx->flow; } if (ctx->flow.nw_frag & FLOW_NW_FRAG_ANY) { @@ -6213,7 +6619,8 @@ xlate_actions(struct action_xlate_ctx *ctx, } } - special = process_special(ctx->ofproto, &ctx->flow, ctx->packet); + in_port = get_ofp_port(ctx->ofproto, ctx->flow.in_port); + special = process_special(ctx->ofproto, &ctx->flow, in_port, ctx->packet); if (special) { ctx->slow |= special; } else { @@ -6222,7 +6629,17 @@ xlate_actions(struct action_xlate_ctx *ctx, uint32_t local_odp_port; add_sflow_action(ctx); - do_xlate_actions(ofpacts, ofpacts_len, ctx); + + if (!in_port || may_receive(in_port, ctx)) { + do_xlate_actions(ofpacts, ofpacts_len, ctx); + + /* We've let OFPP_NORMAL and the learning action look at the + * packet, so drop it now if forwarding is disabled. */ + if (in_port && !stp_forward_in_state(in_port->stp_state)) { + ofpbuf_clear(ctx->odp_actions); + add_sflow_action(ctx); + } + } if (ctx->max_resubmit_trigger && !ctx->resubmit_hook) { if (!hit_resubmit_limit) { @@ -6232,7 +6649,7 @@ xlate_actions(struct action_xlate_ctx *ctx, } else if (!VLOG_DROP_ERR(&trace_rl)) { struct ds ds = DS_EMPTY_INITIALIZER; - ofproto_trace(ctx->ofproto, &ctx->orig_flow, ctx->packet, + ofproto_trace(ctx->ofproto, &orig_flow, ctx->packet, initial_tci, &ds); VLOG_ERR("Trace triggered by excessive resubmit " "recursion:\n%s", ds_cstr(&ds)); @@ -6253,7 +6670,7 @@ xlate_actions(struct action_xlate_ctx *ctx, } } if (ctx->ofproto->has_mirrors) { - add_mirror_actions(ctx, &ctx->orig_flow); + add_mirror_actions(ctx, &orig_flow); } fix_sflow_action(ctx); } @@ -7544,9 +7961,17 @@ show_dp_format(const struct ofproto_dpif *ofproto, struct ds *ds) struct ofport *ofport = node->data; const char *name = netdev_get_name(ofport->netdev); const char *type = netdev_get_type(ofport->netdev); + uint32_t odp_port; + + ds_put_format(ds, "\t%s %u/", name, ofport->ofp_port); + + odp_port = ofp_port_to_odp_port(ofproto, ofport->ofp_port); + if (odp_port != OVSP_NONE) { + ds_put_format(ds, "%"PRIu32":", odp_port); + } else { + ds_put_cstr(ds, "none:"); + } - ds_put_format(ds, "\t%s %u/%u:", name, ofport->ofp_port, - ofp_port_to_odp_port(ofproto, ofport->ofp_port)); if (strcmp(type, "system")) { struct netdev *netdev; int error; @@ -7636,6 +8061,8 @@ ofproto_unixctl_dpif_dump_flows(struct unixctl_conn *conn, return; } + update_stats(ofproto->backer); + HMAP_FOR_EACH (subfacet, hmap_node, &ofproto->subfacets) { struct odputil_keybuf keybuf; struct ofpbuf key;