X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif.c;h=365be93b33a1e8cb2cfa823d007e0ebc6b38e2c8;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=e206f43168691851e360bbd3718c7445ebe437b5;hpb=2284188b69fc8d935ae1ecf9d1b939e3efbbe10b;p=sliver-openvswitch.git diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index e206f4316..365be93b3 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ #include "lacp.h" #include "learn.h" #include "mac-learning.h" +#include "meta-flow.h" #include "multipath.h" #include "netdev.h" #include "netlink.h" @@ -42,6 +43,7 @@ #include "ofp-util.h" #include "ofpbuf.h" #include "ofp-print.h" +#include "ofproto-dpif-governor.h" #include "ofproto-dpif-sflow.h" #include "poll-loop.h" #include "timer.h" @@ -60,6 +62,7 @@ COVERAGE_DEFINE(facet_changed_rule); COVERAGE_DEFINE(facet_invalidated); COVERAGE_DEFINE(facet_revalidate); COVERAGE_DEFINE(facet_unexpected); +COVERAGE_DEFINE(facet_suppress); /* Maximum depth of flow table recursion (due to resubmit actions) in a * flow translation. */ @@ -75,8 +78,6 @@ struct ofproto_dpif; struct rule_dpif { struct rule up; - long long int used; /* Time last used; time created if not used. */ - /* These statistics: * * - Do include packets and bytes from facets that have been deleted or @@ -106,11 +107,11 @@ static struct rule_dpif *rule_dpif_cast(const struct rule *rule) static struct rule_dpif *rule_dpif_lookup(struct ofproto_dpif *, const struct flow *, uint8_t table); -static void flow_push_stats(const struct rule_dpif *, const struct flow *, - uint64_t packets, uint64_t bytes, - long long int used); - -static uint32_t rule_calculate_tag(const struct flow *, +static void rule_credit_stats(struct rule_dpif *, + const struct dpif_flow_stats *); +static void flow_push_stats(struct rule_dpif *, const struct flow *, + const struct dpif_flow_stats *); +static tag_type rule_calculate_tag(const struct flow *, const struct flow_wildcards *, uint32_t basis); static void rule_invalidate(const struct rule_dpif *); @@ -146,8 +147,8 @@ static void update_mirror_stats(struct ofproto_dpif *ofproto, uint64_t packets, uint64_t bytes); struct ofbundle { - struct ofproto_dpif *ofproto; /* Owning ofproto. */ struct hmap_node hmap_node; /* In struct ofproto's "bundles" hmap. */ + struct ofproto_dpif *ofproto; /* Owning ofproto. */ void *aux; /* Key supplied by ofproto's client. */ char *name; /* Identifier for log messages. */ @@ -162,7 +163,7 @@ struct ofbundle { bool use_priority_tags; /* Use 802.1p tag for frames in VLAN 0? */ /* Status. */ - bool floodable; /* True if no port has OFPPC_NO_FLOOD set. */ + bool floodable; /* True if no port has OFPUTIL_PC_NO_FLOOD set. */ /* Port mirroring info. */ mirror_mask_t src_mirrors; /* Mirrors triggered when packet received. */ @@ -177,7 +178,8 @@ static void bundle_del_port(struct ofport_dpif *); static void bundle_run(struct ofbundle *); static void bundle_wait(struct ofbundle *); static struct ofbundle *lookup_input_bundle(struct ofproto_dpif *, - uint16_t in_port, bool warn); + uint16_t in_port, bool warn, + struct ofport_dpif **in_ofportp); /* A controller may use OFPP_NONE as the ingress port to indicate that * it did not arrive on a "real" port. 'ofpp_none_bundle' exists for @@ -191,6 +193,8 @@ static struct ofbundle ofpp_none_bundle = { static void stp_run(struct ofproto_dpif *ofproto); static void stp_wait(struct ofproto_dpif *ofproto); +static int set_stp_port(struct ofport *, + const struct ofproto_port_stp_settings *); static bool ofbundle_includes_vlan(const struct ofbundle *, uint16_t vlan); @@ -208,20 +212,39 @@ struct action_xlate_ctx { * revalidating without a packet to refer to. */ const struct ofpbuf *packet; - /* Should OFPP_NORMAL MAC learning and NXAST_LEARN actions execute? We - * want to execute them if we are actually processing a packet, or if we - * are accounting for packets that the datapath has processed, but not if - * we are just revalidating. */ + /* Should OFPP_NORMAL update the MAC learning table? Should "learn" + * actions update the flow table? + * + * We want to update these tables if we are actually processing a packet, + * or if we are accounting for packets that the datapath has processed, but + * not if we are just revalidating. */ bool may_learn; - /* Cookie of the currently matching rule, or 0. */ - ovs_be64 cookie; + /* The rule that we are currently translating, or NULL. */ + struct rule_dpif *rule; + + /* Union of the set of TCP flags seen so far in this flow. (Used only by + * NXAST_FIN_TIMEOUT. Set to zero to avoid updating updating rules' + * timeouts.) */ + uint8_t tcp_flags; - /* If nonnull, called just before executing a resubmit action. + /* If nonnull, flow translation calls this function just before executing a + * resubmit or OFPP_TABLE action. In addition, disables logging of traces + * when the recursion depth is exceeded. + * + * 'rule' is the rule being submitted into. It will be null if the + * resubmit or OFPP_TABLE action didn't find a matching rule. * * This is normally null so the client has to set it manually after * calling action_xlate_ctx_init(). */ - void (*resubmit_hook)(struct action_xlate_ctx *, struct rule_dpif *); + void (*resubmit_hook)(struct action_xlate_ctx *, struct rule_dpif *rule); + + /* If nonnull, flow translation credits the specified statistics to each + * rule reached through a resubmit or OFPP_TABLE action. + * + * This is normally null so the client has to set it manually after + * calling action_xlate_ctx_init(). */ + const struct dpif_flow_stats *resubmit_stats; /* xlate_actions() initializes and uses these members. The client might want * to look at them after it returns. */ @@ -232,6 +255,7 @@ struct action_xlate_ctx { * be reassessed for every packet. */ bool has_learn; /* Actions include NXAST_LEARN? */ bool has_normal; /* Actions output to OFPP_NORMAL? */ + bool has_fin_timeout; /* Actions include NXAST_FIN_TIMEOUT? */ uint16_t nf_output_iface; /* Output interface index for NetFlow. */ mirror_mask_t mirrors; /* Bitmap of associated mirrors. */ @@ -239,6 +263,7 @@ struct action_xlate_ctx { * reason to look at them. */ int recurse; /* Recursion level, via xlate_table_action. */ + bool max_resubmit_trigger; /* Recursed too deeply during translation. */ struct flow base_flow; /* Flow at the last commit. */ uint32_t orig_skb_priority; /* Priority when packet arrived. */ uint8_t table_id; /* OpenFlow table ID where flow was found. */ @@ -246,14 +271,79 @@ struct action_xlate_ctx { uint16_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 *, struct ofproto_dpif *, const struct flow *, - ovs_be16 initial_tci, ovs_be64 cookie, - const struct ofpbuf *); -static struct ofpbuf *xlate_actions(struct action_xlate_ctx *, - const union ofp_action *in, size_t n_in); + ovs_be16 initial_tci, struct rule_dpif *, + uint8_t tcp_flags, const struct ofpbuf *); +static void xlate_actions(struct action_xlate_ctx *, + const union ofp_action *in, size_t n_in, + struct ofpbuf *odp_actions); +static void xlate_actions_for_side_effects(struct action_xlate_ctx *, + const union ofp_action *in, + size_t n_in); + +/* A dpif flow and actions associated with a facet. + * + * See also the large comment on struct facet. */ +struct subfacet { + /* Owners. */ + struct hmap_node hmap_node; /* In struct ofproto_dpif 'subfacets' list. */ + struct list list_node; /* In struct facet's 'facets' list. */ + struct facet *facet; /* Owning facet. */ + + /* Key. + * + * To save memory in the common case, 'key' is NULL if 'key_fitness' is + * ODP_FIT_PERFECT, that is, odp_flow_key_from_flow() can accurately + * regenerate the ODP flow key from ->facet->flow. */ + enum odp_key_fitness key_fitness; + struct nlattr *key; + int key_len; + + long long int used; /* Time last used; time created if not used. */ + + uint64_t dp_packet_count; /* Last known packet count in the datapath. */ + uint64_t dp_byte_count; /* Last known byte count in the datapath. */ + + /* Datapath actions. + * + * These should be essentially identical for every subfacet in a facet, but + * may differ in trivial ways due to VLAN splinters. */ + size_t actions_len; /* Number of bytes in actions[]. */ + struct nlattr *actions; /* Datapath actions. */ + + bool installed; /* Installed in datapath? */ + + /* This value is normally the same as ->facet->flow.vlan_tci. Only VLAN + * splinters can cause it to differ. This value should be removed when + * the VLAN splinters feature is no longer needed. */ + ovs_be16 initial_tci; /* Initial VLAN TCI value. */ +}; + +static struct subfacet *subfacet_create(struct facet *, enum odp_key_fitness, + const struct nlattr *key, + size_t key_len, ovs_be16 initial_tci); +static struct subfacet *subfacet_find(struct ofproto_dpif *, + const struct nlattr *key, size_t key_len); +static void subfacet_destroy(struct subfacet *); +static void subfacet_destroy__(struct subfacet *); +static void subfacet_get_key(struct subfacet *, struct odputil_keybuf *, + struct ofpbuf *key); +static void subfacet_reset_dp_stats(struct subfacet *, + struct dpif_flow_stats *); +static void subfacet_update_time(struct subfacet *, long long int used); +static void subfacet_update_stats(struct subfacet *, + const struct dpif_flow_stats *); +static void subfacet_make_actions(struct subfacet *, + const struct ofpbuf *packet, + struct ofpbuf *odp_actions); +static int subfacet_install(struct subfacet *, + const struct nlattr *actions, size_t actions_len, + struct dpif_flow_stats *); +static void subfacet_uninstall(struct subfacet *); /* An exact-match instantiation of an OpenFlow flow. * @@ -305,6 +395,7 @@ struct facet { /* Accounting. */ uint64_t accounted_bytes; /* Bytes processed by facet_account(). */ struct netflow_flow nf_flow; /* Per-flow NetFlow tracking data. */ + uint8_t tcp_flags; /* TCP flags seen for this 'rule'. */ /* Properties of datapath actions. * @@ -315,88 +406,38 @@ struct facet { bool may_install; /* Reassess actions for every packet? */ bool has_learn; /* Actions include NXAST_LEARN? */ bool has_normal; /* Actions output to OFPP_NORMAL? */ + bool has_fin_timeout; /* Actions include NXAST_FIN_TIMEOUT? */ tag_type tags; /* Tags that would require revalidation. */ mirror_mask_t mirrors; /* Bitmap of dependent mirrors. */ + + /* Storage for a single subfacet, to reduce malloc() time and space + * overhead. (A facet always has at least one subfacet and in the common + * case has exactly one subfacet.) */ + struct subfacet one_subfacet; }; -static struct facet *facet_create(struct rule_dpif *, const struct flow *); -static void facet_remove(struct ofproto_dpif *, struct facet *); +static struct facet *facet_create(struct rule_dpif *, + const struct flow *, uint32_t hash); +static void facet_remove(struct facet *); static void facet_free(struct facet *); -static struct facet *facet_find(struct ofproto_dpif *, const struct flow *); +static struct facet *facet_find(struct ofproto_dpif *, + const struct flow *, uint32_t hash); static struct facet *facet_lookup_valid(struct ofproto_dpif *, - const struct flow *); -static bool facet_revalidate(struct ofproto_dpif *, struct facet *); + const struct flow *, uint32_t hash); +static bool facet_revalidate(struct facet *); +static bool facet_check_consistency(struct facet *); -static void facet_flush_stats(struct ofproto_dpif *, struct facet *); +static void facet_flush_stats(struct facet *); -static void facet_update_time(struct ofproto_dpif *, struct facet *, - long long int used); +static void facet_update_time(struct facet *, long long int used); static void facet_reset_counters(struct facet *); static void facet_push_stats(struct facet *); -static void facet_account(struct ofproto_dpif *, struct facet *); +static void facet_learn(struct facet *); +static void facet_account(struct facet *); static bool facet_is_controller_flow(struct facet *); -/* A dpif flow and actions associated with a facet. - * - * See also the large comment on struct facet. */ -struct subfacet { - /* Owners. */ - struct hmap_node hmap_node; /* In struct ofproto_dpif 'subfacets' list. */ - struct list list_node; /* In struct facet's 'facets' list. */ - struct facet *facet; /* Owning facet. */ - - /* Key. - * - * To save memory in the common case, 'key' is NULL if 'key_fitness' is - * ODP_FIT_PERFECT, that is, odp_flow_key_from_flow() can accurately - * regenerate the ODP flow key from ->facet->flow. */ - enum odp_key_fitness key_fitness; - struct nlattr *key; - int key_len; - - long long int used; /* Time last used; time created if not used. */ - - uint64_t dp_packet_count; /* Last known packet count in the datapath. */ - uint64_t dp_byte_count; /* Last known byte count in the datapath. */ - - /* Datapath actions. - * - * These should be essentially identical for every subfacet in a facet, but - * may differ in trivial ways due to VLAN splinters. */ - size_t actions_len; /* Number of bytes in actions[]. */ - struct nlattr *actions; /* Datapath actions. */ - - bool installed; /* Installed in datapath? */ - - /* This value is normally the same as ->facet->flow.vlan_tci. Only VLAN - * splinters can cause it to differ. This value should be removed when - * the VLAN splinters feature is no longer needed. */ - ovs_be16 initial_tci; /* Initial VLAN TCI value. */ -}; - -static struct subfacet *subfacet_create(struct ofproto_dpif *, struct facet *, - enum odp_key_fitness, - const struct nlattr *key, - size_t key_len, ovs_be16 initial_tci); -static struct subfacet *subfacet_find(struct ofproto_dpif *, - const struct nlattr *key, size_t key_len); -static void subfacet_destroy(struct ofproto_dpif *, struct subfacet *); -static void subfacet_destroy__(struct ofproto_dpif *, struct subfacet *); -static void subfacet_reset_dp_stats(struct subfacet *, - struct dpif_flow_stats *); -static void subfacet_update_time(struct ofproto_dpif *, struct subfacet *, - long long int used); -static void subfacet_update_stats(struct ofproto_dpif *, struct subfacet *, - const struct dpif_flow_stats *); -static void subfacet_make_actions(struct ofproto_dpif *, struct subfacet *, - const struct ofpbuf *packet); -static int subfacet_install(struct ofproto_dpif *, struct subfacet *, - const struct nlattr *actions, size_t actions_len, - struct dpif_flow_stats *); -static void subfacet_uninstall(struct ofproto_dpif *, struct subfacet *); - struct ofport_dpif { struct ofport up; @@ -407,6 +448,7 @@ struct ofport_dpif { 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. */ /* Spanning tree. */ struct stp_port *stp_port; /* Spanning Tree Protocol, if any. */ @@ -499,6 +541,7 @@ struct ofproto_dpif { struct hmap bundles; /* Contains "struct ofbundle"s. */ struct mac_learning *ml; struct ofmirror *mirrors[MAX_MIRRORS]; + bool has_mirrors; bool has_bonded_bundles; /* Expiration. */ @@ -507,6 +550,7 @@ struct ofproto_dpif { /* Facets. */ struct hmap facets; struct hmap subfacets; + struct governor *governor; /* Revalidation. */ struct table_dpif tables[N_TABLES]; @@ -549,6 +593,9 @@ static struct ofport_dpif *get_ofp_port(struct ofproto_dpif *, uint16_t ofp_port); static struct ofport_dpif *get_odp_port(struct ofproto_dpif *, uint32_t odp_port); +static void ofproto_trace(struct ofproto_dpif *, const struct flow *, + const struct ofpbuf *, ovs_be16 initial_tci, + struct ds *); /* Packet processing. */ static void update_learning_table(struct ofproto_dpif *, @@ -619,7 +666,7 @@ dealloc(struct ofproto *ofproto_) } static int -construct(struct ofproto *ofproto_, int *n_tablesp) +construct(struct ofproto *ofproto_) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); const char *name = ofproto->up.name; @@ -638,9 +685,7 @@ construct(struct ofproto *ofproto_, int *n_tablesp) dpif_flow_flush(ofproto->dpif); dpif_recv_purge(ofproto->dpif); - error = dpif_recv_set_mask(ofproto->dpif, - ((1u << DPIF_UC_MISS) | - (1u << DPIF_UC_ACTION))); + error = dpif_recv_set(ofproto->dpif, true); if (error) { VLOG_ERR("failed to listen on datapath %s: %s", name, strerror(error)); dpif_close(ofproto->dpif); @@ -651,7 +696,7 @@ construct(struct ofproto *ofproto_, int *n_tablesp) ofproto->sflow = NULL; ofproto->stp = NULL; hmap_init(&ofproto->bundles); - ofproto->ml = mac_learning_create(); + ofproto->ml = mac_learning_create(MAC_ENTRY_DEFAULT_IDLE_TIME); for (i = 0; i < MAX_MIRRORS; i++) { ofproto->mirrors[i] = NULL; } @@ -661,6 +706,7 @@ construct(struct ofproto *ofproto_, int *n_tablesp) hmap_init(&ofproto->facets); hmap_init(&ofproto->subfacets); + ofproto->governor = NULL; for (i = 0; i < N_TABLES; i++) { struct table_dpif *table = &ofproto->tables[i]; @@ -676,6 +722,7 @@ construct(struct ofproto *ofproto_, int *n_tablesp) ofproto_dpif_unixctl_init(); + ofproto->has_mirrors = false; ofproto->has_bundle_action = false; hmap_init(&ofproto->vlandev_map); @@ -683,9 +730,10 @@ construct(struct ofproto *ofproto_, int *n_tablesp) hmap_insert(&all_ofproto_dpifs, &ofproto->all_ofproto_dpifs_node, hash_string(ofproto->up.name, 0)); - - *n_tablesp = N_TABLES; memset(&ofproto->stats, 0, sizeof ofproto->stats); + + ofproto_init_tables(ofproto_, N_TABLES); + return 0; } @@ -706,7 +754,7 @@ destruct(struct ofproto *ofproto_) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); struct rule_dpif *rule, *next_rule; - struct classifier *table; + struct oftable *table; int i; hmap_remove(&all_ofproto_dpifs, &ofproto->all_ofproto_dpifs_node); @@ -715,7 +763,7 @@ destruct(struct ofproto *ofproto_) OFPROTO_FOR_EACH_TABLE (table, &ofproto->up) { struct cls_cursor cursor; - cls_cursor_init(&cursor, table, NULL); + cls_cursor_init(&cursor, &table->cls, NULL); CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, up.cr, &cursor) { ofproto_rule_destroy(&rule->up); } @@ -732,6 +780,7 @@ destruct(struct ofproto *ofproto_) hmap_destroy(&ofproto->facets); hmap_destroy(&ofproto->subfacets); + governor_destroy(ofproto->governor); hmap_destroy(&ofproto->vlandev_map); hmap_destroy(&ofproto->realdev_vid_map); @@ -821,11 +870,42 @@ run(struct ofproto *ofproto_) HMAP_FOR_EACH_SAFE (facet, next, hmap_node, &ofproto->facets) { if (revalidate_all || tag_set_intersects(&revalidate_set, facet->tags)) { - facet_revalidate(ofproto, facet); + facet_revalidate(facet); } } } + /* Check the consistency of a random facet, to aid debugging. */ + if (!hmap_is_empty(&ofproto->facets) && !ofproto->need_revalidate) { + struct facet *facet; + + facet = CONTAINER_OF(hmap_random_node(&ofproto->facets), + struct facet, hmap_node); + if (!tag_set_intersects(&ofproto->revalidate_set, facet->tags)) { + if (!facet_check_consistency(facet)) { + ofproto->need_revalidate = true; + } + } + } + + if (ofproto->governor) { + size_t n_subfacets; + + governor_run(ofproto->governor); + + /* If the governor has shrunk to its minimum size and the number of + * subfacets has dwindled, then drop the governor entirely. + * + * For hysteresis, the number of subfacets to drop the governor is + * smaller than the number needed to trigger its creation. */ + n_subfacets = hmap_count(&ofproto->subfacets); + if (n_subfacets * 4 < ofproto->up.flow_eviction_threshold + && governor_is_idle(ofproto->governor)) { + governor_destroy(ofproto->governor); + ofproto->governor = NULL; + } + } + return 0; } @@ -866,6 +946,9 @@ wait(struct ofproto *ofproto_) } else { timer_wait(&ofproto->next_expiration); } + if (ofproto->governor) { + governor_wait(ofproto->governor); + } } static void @@ -886,28 +969,28 @@ flush(struct ofproto *ofproto_) subfacet->dp_packet_count = 0; subfacet->dp_byte_count = 0; } - facet_remove(ofproto, facet); + facet_remove(facet); } dpif_flow_flush(ofproto->dpif); } static void get_features(struct ofproto *ofproto_ OVS_UNUSED, - bool *arp_match_ip, uint32_t *actions) + bool *arp_match_ip, enum ofputil_action_bitmap *actions) { *arp_match_ip = true; - *actions = ((1u << OFPAT_OUTPUT) | - (1u << OFPAT_SET_VLAN_VID) | - (1u << OFPAT_SET_VLAN_PCP) | - (1u << OFPAT_STRIP_VLAN) | - (1u << OFPAT_SET_DL_SRC) | - (1u << OFPAT_SET_DL_DST) | - (1u << OFPAT_SET_NW_SRC) | - (1u << OFPAT_SET_NW_DST) | - (1u << OFPAT_SET_NW_TOS) | - (1u << OFPAT_SET_TP_SRC) | - (1u << OFPAT_SET_TP_DST) | - (1u << OFPAT_ENQUEUE)); + *actions = (OFPUTIL_A_OUTPUT | + OFPUTIL_A_SET_VLAN_VID | + OFPUTIL_A_SET_VLAN_PCP | + OFPUTIL_A_STRIP_VLAN | + OFPUTIL_A_SET_DL_SRC | + OFPUTIL_A_SET_DL_DST | + OFPUTIL_A_SET_NW_SRC | + OFPUTIL_A_SET_NW_DST | + OFPUTIL_A_SET_NW_TOS | + OFPUTIL_A_SET_TP_SRC | + OFPUTIL_A_SET_TP_DST | + OFPUTIL_A_ENQUEUE); } static void @@ -955,6 +1038,7 @@ port_construct(struct ofport *port_) hmap_init(&port->priorities); port->realdev_ofp_port = 0; port->vlandev_vid = 0; + port->carrier_seq = netdev_get_carrier_resets(port->up.netdev); if (ofproto->sflow) { dpif_sflow_add_port(ofproto->sflow, port_); @@ -991,17 +1075,17 @@ port_modified(struct ofport *port_) } static void -port_reconfigured(struct ofport *port_, ovs_be32 old_config) +port_reconfigured(struct ofport *port_, enum ofputil_port_config old_config) { struct ofport_dpif *port = ofport_dpif_cast(port_); struct ofproto_dpif *ofproto = ofproto_dpif_cast(port->up.ofproto); - ovs_be32 changed = old_config ^ port->up.opp.config; + enum ofputil_port_config changed = old_config ^ port->up.pp.config; - if (changed & htonl(OFPPC_NO_RECV | OFPPC_NO_RECV_STP | - OFPPC_NO_FWD | OFPPC_NO_FLOOD)) { + if (changed & (OFPUTIL_PC_NO_RECV | OFPUTIL_PC_NO_RECV_STP | + OFPUTIL_PC_NO_FWD | OFPUTIL_PC_NO_FLOOD)) { ofproto->need_revalidate = true; - if (changed & htonl(OFPPC_NO_FLOOD) && port->bundle) { + if (changed & OFPUTIL_PC_NO_FLOOD && port->bundle) { bundle_update(port->bundle); } } @@ -1084,6 +1168,14 @@ get_cfm_remote_mpids(const struct ofport *ofport_, const uint64_t **rmps, return -1; } } + +static int +get_cfm_health(const struct ofport *ofport_) +{ + struct ofport_dpif *ofport = ofport_dpif_cast(ofport_); + + return ofport->cfm ? cfm_get_health(ofport->cfm) : -1; +} /* Spanning Tree. */ @@ -1136,6 +1228,12 @@ set_stp(struct ofproto *ofproto_, const struct ofproto_stp_settings *s) stp_set_max_age(ofproto->stp, s->max_age); stp_set_forward_delay(ofproto->stp, s->fwd_delay); } else { + struct ofport *ofport; + + HMAP_FOR_EACH (ofport, hmap_node, &ofproto->up.ports) { + set_stp_port(ofport, NULL); + } + stp_destroy(ofproto->stp); ofproto->stp = NULL; } @@ -1172,7 +1270,7 @@ update_stp_port_state(struct ofport_dpif *ofport) /* Update state. */ if (ofport->stp_state != state) { - ovs_be32 of_state; + enum ofputil_port_state of_state; bool fwd_change; VLOG_DBG_RL(&rl, "port %s: STP state changed from %s to %s", @@ -1182,7 +1280,7 @@ update_stp_port_state(struct ofport_dpif *ofport) if (stp_learn_in_state(ofport->stp_state) != stp_learn_in_state(state)) { /* xxx Learning action flows should also be flushed. */ - mac_learning_flush(ofproto->ml); + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); } fwd_change = stp_forward_in_state(ofport->stp_state) != stp_forward_in_state(state); @@ -1196,12 +1294,12 @@ update_stp_port_state(struct ofport_dpif *ofport) } /* Update the STP state bits in the OpenFlow port description. */ - of_state = (ofport->up.opp.state & htonl(~OFPPS_STP_MASK)) - | htonl(state == STP_LISTENING ? OFPPS_STP_LISTEN - : state == STP_LEARNING ? OFPPS_STP_LEARN - : state == STP_FORWARDING ? OFPPS_STP_FORWARD - : state == STP_BLOCKING ? OFPPS_STP_BLOCK - : 0); + of_state = ofport->up.pp.state & ~OFPUTIL_PS_STP_MASK; + of_state |= (state == STP_LISTENING ? OFPUTIL_PS_STP_LISTEN + : state == STP_LEARNING ? OFPUTIL_PS_STP_LEARN + : state == STP_FORWARDING ? OFPUTIL_PS_STP_FORWARD + : state == STP_BLOCKING ? OFPUTIL_PS_STP_BLOCK + : 0); ofproto_port_set_state(&ofport->up, of_state); } } @@ -1285,6 +1383,10 @@ stp_run(struct ofproto_dpif *ofproto) update_stp_port_state(ofport); } } + + if (stp_check_and_reset_fdb_flush(ofproto->stp)) { + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); + } } } @@ -1485,7 +1587,8 @@ bundle_update(struct ofbundle *bundle) bundle->floodable = true; LIST_FOR_EACH (port, bundle_node, &bundle->ports) { - if (port->up.opp.config & htonl(OFPPC_NO_FLOOD)) { + if (port->up.pp.config & OFPUTIL_PC_NO_FLOOD + || !stp_forward_in_state(port->stp_state)) { bundle->floodable = false; break; } @@ -1532,7 +1635,8 @@ bundle_add_port(struct ofbundle *bundle, uint32_t ofp_port, port->bundle = bundle; list_push_back(&bundle->ports, &port->bundle_node); - if (port->up.opp.config & htonl(OFPPC_NO_FLOOD)) { + if (port->up.pp.config & OFPUTIL_PC_NO_FLOOD + || !stp_forward_in_state(port->stp_state)) { bundle->floodable = false; } } @@ -1868,7 +1972,7 @@ bundle_run(struct ofbundle *bundle) } bond_run(bundle->bond, &bundle->ofproto->revalidate_set, - lacp_negotiated(bundle->lacp)); + lacp_status(bundle->lacp)); if (bond_should_send_learning_packets(bundle->bond)) { bundle_send_learning_packets(bundle); } @@ -2053,7 +2157,8 @@ mirror_set(struct ofproto *ofproto_, void *aux, } ofproto->need_revalidate = true; - mac_learning_flush(ofproto->ml); + ofproto->has_mirrors = true; + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); mirror_update_dups(ofproto); return 0; @@ -2065,6 +2170,7 @@ mirror_destroy(struct ofmirror *mirror) struct ofproto_dpif *ofproto; mirror_mask_t mirror_bit; struct ofbundle *bundle; + int i; if (!mirror) { return; @@ -2072,7 +2178,7 @@ mirror_destroy(struct ofmirror *mirror) ofproto = mirror->ofproto; ofproto->need_revalidate = true; - mac_learning_flush(ofproto->ml); + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); mirror_bit = MIRROR_MASK_C(1) << mirror->idx; HMAP_FOR_EACH (bundle, hmap_node, &ofproto->bundles) { @@ -2090,6 +2196,14 @@ mirror_destroy(struct ofmirror *mirror) free(mirror); mirror_update_dups(ofproto); + + ofproto->has_mirrors = false; + for (i = 0; i < MAX_MIRRORS; i++) { + if (ofproto->mirrors[i]) { + ofproto->has_mirrors = true; + break; + } + } } static int @@ -2115,8 +2229,7 @@ set_flood_vlans(struct ofproto *ofproto_, unsigned long *flood_vlans) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); if (mac_learning_set_flood_vlans(ofproto->ml, flood_vlans)) { - ofproto->need_revalidate = true; - mac_learning_flush(ofproto->ml); + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); } return 0; } @@ -2136,6 +2249,13 @@ forward_bpdu_changed(struct ofproto *ofproto_) /* Revalidate cached flows whenever forward_bpdu option changes. */ ofproto->need_revalidate = true; } + +static void +set_mac_idle_time(struct ofproto *ofproto_, unsigned int idle_time) +{ + struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); + mac_learning_set_idle_time(ofproto->ml, idle_time); +} /* Ports. */ @@ -2164,8 +2284,12 @@ ofproto_port_from_dpif_port(struct ofproto_port *ofproto_port, static void port_run(struct ofport_dpif *ofport) { + long long int carrier_seq = netdev_get_carrier_resets(ofport->up.netdev); + bool carrier_changed = carrier_seq != ofport->carrier_seq; bool enable = netdev_get_carrier(ofport->up.netdev); + ofport->carrier_seq = carrier_seq; + if (ofport->cfm) { cfm_run(ofport->cfm); @@ -2173,7 +2297,7 @@ port_run(struct ofport_dpif *ofport) struct ofpbuf packet; ofpbuf_init(&packet, 0); - cfm_compose_ccm(ofport->cfm, &packet, ofport->up.opp.hw_addr); + cfm_compose_ccm(ofport->cfm, &packet, ofport->up.pp.hw_addr); send_packet(ofport, &packet); ofpbuf_uninit(&packet); } @@ -2184,6 +2308,9 @@ port_run(struct ofport_dpif *ofport) if (ofport->bundle) { enable = enable && lacp_slave_may_enable(ofport->bundle->lacp, ofport); + if (carrier_changed) { + lacp_slave_carrier_changed(ofport->bundle->lacp, ofport); + } } if (ofport->may_enable != enable) { @@ -2402,28 +2529,29 @@ struct flow_miss { }; struct flow_miss_op { - union dpif_op dpif_op; - struct subfacet *subfacet; + struct dpif_op dpif_op; + struct subfacet *subfacet; /* Subfacet */ + void *garbage; /* Pointer to pass to free(), NULL if none. */ + uint64_t stub[1024 / 8]; /* Temporary buffer. */ }; /* Sends an OFPT_PACKET_IN message for 'packet' of type OFPR_NO_MATCH to each * OpenFlow controller as necessary according to their individual * configurations. */ static void -send_packet_in_miss(struct ofproto_dpif *ofproto, struct ofpbuf *packet, +send_packet_in_miss(struct ofproto_dpif *ofproto, const struct ofpbuf *packet, const struct flow *flow) { struct ofputil_packet_in pin; pin.packet = packet->data; pin.packet_len = packet->size; - pin.total_len = packet->size; pin.reason = OFPR_NO_MATCH; + pin.controller_id = 0; pin.table_id = 0; pin.cookie = 0; - pin.buffer_id = 0; /* not yet known */ pin.send_len = 0; /* not used for flow table misses */ flow_get_metadata(flow, &pin.fmd); @@ -2431,7 +2559,7 @@ send_packet_in_miss(struct ofproto_dpif *ofproto, struct ofpbuf *packet, /* Registers aren't meaningful on a miss. */ memset(pin.fmd.reg_masks, 0, sizeof pin.fmd.reg_masks); - connmgr_send_packet_in(ofproto->up.connmgr, &pin, flow); + connmgr_send_packet_in(ofproto->up.connmgr, &pin); } static bool @@ -2465,12 +2593,8 @@ process_special(struct ofproto_dpif *ofproto, const struct flow *flow, } static struct flow_miss * -flow_miss_create(struct hmap *todo, const struct flow *flow, - enum odp_key_fitness key_fitness, - const struct nlattr *key, size_t key_len, - ovs_be16 initial_tci) +flow_miss_find(struct hmap *todo, const struct flow *flow, uint32_t hash) { - uint32_t hash = flow_hash(flow, 0); struct flow_miss *miss; HMAP_FOR_EACH_WITH_HASH (miss, hmap_node, hash, todo) { @@ -2479,117 +2603,187 @@ flow_miss_create(struct hmap *todo, const struct flow *flow, } } - miss = xmalloc(sizeof *miss); - hmap_insert(todo, &miss->hmap_node, hash); - miss->flow = *flow; - miss->key_fitness = key_fitness; - miss->key = key; - miss->key_len = key_len; - miss->initial_tci = initial_tci; - list_init(&miss->packets); - return miss; + return NULL; } +/* Partially Initializes 'op' as an "execute" operation for 'miss' and + * 'packet'. The caller must initialize op->actions and op->actions_len. If + * 'miss' is associated with a subfacet the caller must also initialize the + * returned op->subfacet, and if anything needs to be freed after processing + * the op, the caller must initialize op->garbage also. */ static void -handle_flow_miss(struct ofproto_dpif *ofproto, struct flow_miss *miss, - struct flow_miss_op *ops, size_t *n_ops) -{ - const struct flow *flow = &miss->flow; - struct ofpbuf *packet, *next_packet; - struct subfacet *subfacet; - struct facet *facet; +init_flow_miss_execute_op(struct flow_miss *miss, struct ofpbuf *packet, + struct flow_miss_op *op) +{ + if (miss->flow.vlan_tci != miss->initial_tci) { + /* This packet was received on a VLAN splinter port. We + * added a VLAN to the packet to make the packet resemble + * the flow, but the actions were composed assuming that + * the packet contained no VLAN. So, we must remove the + * VLAN header from the packet before trying to execute the + * actions. */ + eth_pop_vlan(packet); + } - facet = facet_lookup_valid(ofproto, flow); - if (!facet) { - struct rule_dpif *rule; + op->subfacet = NULL; + op->garbage = NULL; + op->dpif_op.type = DPIF_OP_EXECUTE; + op->dpif_op.u.execute.key = miss->key; + op->dpif_op.u.execute.key_len = miss->key_len; + op->dpif_op.u.execute.packet = packet; +} - rule = rule_dpif_lookup(ofproto, flow, 0); - if (!rule) { - /* Don't send a packet-in if OFPPC_NO_PACKET_IN asserted. */ - struct ofport_dpif *port = get_ofp_port(ofproto, flow->in_port); - if (port) { - if (port->up.opp.config & htonl(OFPPC_NO_PACKET_IN)) { - COVERAGE_INC(ofproto_dpif_no_packet_in); - /* XXX install 'drop' flow entry */ - return; - } - } else { - VLOG_WARN_RL(&rl, "packet-in on unknown port %"PRIu16, - flow->in_port); - } +/* Helper for handle_flow_miss_without_facet() and + * handle_flow_miss_with_facet(). */ +static void +handle_flow_miss_common(struct rule_dpif *rule, + struct ofpbuf *packet, const struct flow *flow) +{ + struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); - LIST_FOR_EACH (packet, list_node, &miss->packets) { - send_packet_in_miss(ofproto, packet, flow); - } + ofproto->n_matches++; + + if (rule->up.cr.priority == FAIL_OPEN_PRIORITY) { + /* + * Extra-special case for fail-open mode. + * + * We are in fail-open mode and the packet matched the fail-open + * rule, but we are connected to a controller too. We should send + * the packet up to the controller in the hope that it will try to + * set up a flow and thereby allow us to exit fail-open. + * + * See the top-level comment in fail-open.c for more information. + */ + send_packet_in_miss(ofproto, packet, flow); + } +} + +/* Figures out whether a flow that missed in 'ofproto', whose details are in + * 'miss', is likely to be worth tracking in detail in userspace and (usually) + * installing a datapath flow. The answer is usually "yes" (a return value of + * true). However, for short flows the cost of bookkeeping is much higher than + * the benefits, so when the datapath holds a large number of flows we impose + * some heuristics to decide which flows are likely to be worth tracking. */ +static bool +flow_miss_should_make_facet(struct ofproto_dpif *ofproto, + struct flow_miss *miss, uint32_t hash) +{ + if (!ofproto->governor) { + size_t n_subfacets; - return; + n_subfacets = hmap_count(&ofproto->subfacets); + if (n_subfacets * 2 <= ofproto->up.flow_eviction_threshold) { + return true; } - facet = facet_create(rule, flow); + ofproto->governor = governor_create(ofproto->up.name); } - subfacet = subfacet_create(ofproto, facet, - miss->key_fitness, miss->key, miss->key_len, - miss->initial_tci); + return governor_should_install_flow(ofproto->governor, hash, + list_size(&miss->packets)); +} - LIST_FOR_EACH_SAFE (packet, next_packet, list_node, &miss->packets) { +/* Handles 'miss', which matches 'rule', without creating a facet or subfacet + * or creating any datapath flow. May add an "execute" operation to 'ops' and + * increment '*n_ops'. */ +static void +handle_flow_miss_without_facet(struct flow_miss *miss, + struct rule_dpif *rule, + struct flow_miss_op *ops, size_t *n_ops) +{ + struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); + struct action_xlate_ctx ctx; + struct ofpbuf *packet; + + LIST_FOR_EACH (packet, list_node, &miss->packets) { + struct flow_miss_op *op = &ops[*n_ops]; struct dpif_flow_stats stats; - struct flow_miss_op *op; - struct dpif_execute *execute; + struct ofpbuf odp_actions; - list_remove(&packet->list_node); - ofproto->n_matches++; + COVERAGE_INC(facet_suppress); - if (facet->rule->up.cr.priority == FAIL_OPEN_PRIORITY) { - /* - * Extra-special case for fail-open mode. - * - * We are in fail-open mode and the packet matched the fail-open - * rule, but we are connected to a controller too. We should send - * the packet up to the controller in the hope that it will try to - * set up a flow and thereby allow us to exit fail-open. - * - * See the top-level comment in fail-open.c for more information. - */ - send_packet_in_miss(ofproto, packet, flow); + ofpbuf_use_stub(&odp_actions, op->stub, sizeof op->stub); + + dpif_flow_stats_extract(&miss->flow, packet, &stats); + rule_credit_stats(rule, &stats); + + action_xlate_ctx_init(&ctx, ofproto, &miss->flow, miss->initial_tci, + rule, 0, packet); + ctx.resubmit_stats = &stats; + xlate_actions(&ctx, rule->up.actions, rule->up.n_actions, + &odp_actions); + + if (odp_actions.size) { + struct dpif_execute *execute = &op->dpif_op.u.execute; + + init_flow_miss_execute_op(miss, packet, op); + execute->actions = odp_actions.data; + execute->actions_len = odp_actions.size; + op->garbage = ofpbuf_get_uninit_pointer(&odp_actions); + + (*n_ops)++; + } else { + ofpbuf_uninit(&odp_actions); } + } +} + +/* Handles 'miss', which matches 'facet'. May add any required datapath + * operations to 'ops', incrementing '*n_ops' for each new op. */ +static void +handle_flow_miss_with_facet(struct flow_miss *miss, struct facet *facet, + struct flow_miss_op *ops, size_t *n_ops) +{ + struct subfacet *subfacet; + struct ofpbuf *packet; + subfacet = subfacet_create(facet, + miss->key_fitness, miss->key, miss->key_len, + miss->initial_tci); + + LIST_FOR_EACH (packet, list_node, &miss->packets) { + struct flow_miss_op *op = &ops[*n_ops]; + struct dpif_flow_stats stats; + struct ofpbuf odp_actions; + + handle_flow_miss_common(facet->rule, packet, &miss->flow); + + ofpbuf_use_stub(&odp_actions, op->stub, sizeof op->stub); if (!facet->may_install || !subfacet->actions) { - subfacet_make_actions(ofproto, subfacet, packet); + subfacet_make_actions(subfacet, packet, &odp_actions); } dpif_flow_stats_extract(&facet->flow, packet, &stats); - subfacet_update_stats(ofproto, subfacet, &stats); + subfacet_update_stats(subfacet, &stats); - if (flow->vlan_tci != subfacet->initial_tci) { - /* This packet was received on a VLAN splinter port. We added - * a VLAN to the packet to make the packet resemble the flow, - * but the actions were composed assuming that the packet - * contained no VLAN. So, we must remove the VLAN header from - * the packet before trying to execute the actions. */ - eth_pop_vlan(packet); - } + if (subfacet->actions_len) { + struct dpif_execute *execute = &op->dpif_op.u.execute; - op = &ops[(*n_ops)++]; - execute = &op->dpif_op.execute; - op->subfacet = subfacet; - execute->type = DPIF_OP_EXECUTE; - execute->key = miss->key; - execute->key_len = miss->key_len; - execute->actions = (facet->may_install - ? subfacet->actions - : xmemdup(subfacet->actions, - subfacet->actions_len)); - execute->actions_len = subfacet->actions_len; - execute->packet = packet; + init_flow_miss_execute_op(miss, packet, op); + op->subfacet = subfacet; + if (facet->may_install) { + execute->actions = subfacet->actions; + execute->actions_len = subfacet->actions_len; + ofpbuf_uninit(&odp_actions); + } else { + execute->actions = odp_actions.data; + execute->actions_len = odp_actions.size; + op->garbage = ofpbuf_get_uninit_pointer(&odp_actions); + } + + (*n_ops)++; + } else { + ofpbuf_uninit(&odp_actions); + } } if (facet->may_install && subfacet->key_fitness != ODP_FIT_TOO_LITTLE) { struct flow_miss_op *op = &ops[(*n_ops)++]; - struct dpif_flow_put *put = &op->dpif_op.flow_put; + struct dpif_flow_put *put = &op->dpif_op.u.flow_put; op->subfacet = subfacet; - put->type = DPIF_OP_FLOW_PUT; + op->garbage = NULL; + op->dpif_op.type = DPIF_OP_FLOW_PUT; put->flags = DPIF_FP_CREATE | DPIF_FP_MODIFY; put->key = miss->key; put->key_len = miss->key_len; @@ -2599,6 +2793,59 @@ handle_flow_miss(struct ofproto_dpif *ofproto, struct flow_miss *miss, } } +/* Handles flow miss 'miss' on 'ofproto'. The flow does not match any flow in + * the OpenFlow flow table. */ +static void +handle_flow_miss_no_rule(struct ofproto_dpif *ofproto, struct flow_miss *miss) +{ + uint16_t in_port = miss->flow.in_port; + struct ofport_dpif *port = get_ofp_port(ofproto, in_port); + + if (!port) { + VLOG_WARN_RL(&rl, "packet-in on unknown port %"PRIu16, in_port); + } + + if (port && port->up.pp.config & OFPUTIL_PC_NO_PACKET_IN) { + /* XXX install 'drop' flow entry */ + COVERAGE_INC(ofproto_dpif_no_packet_in); + } else { + const struct ofpbuf *packet; + + LIST_FOR_EACH (packet, list_node, &miss->packets) { + send_packet_in_miss(ofproto, packet, &miss->flow); + } + } +} + +/* Handles flow miss 'miss' on 'ofproto'. May add any required datapath + * operations to 'ops', incrementing '*n_ops' for each new op. */ +static void +handle_flow_miss(struct ofproto_dpif *ofproto, struct flow_miss *miss, + struct flow_miss_op *ops, size_t *n_ops) +{ + struct facet *facet; + uint32_t hash; + + /* The caller must ensure that miss->hmap_node.hash contains + * flow_hash(miss->flow, 0). */ + hash = miss->hmap_node.hash; + + facet = facet_lookup_valid(ofproto, &miss->flow, hash); + if (!facet) { + struct rule_dpif *rule = rule_dpif_lookup(ofproto, &miss->flow, 0); + if (!rule) { + handle_flow_miss_no_rule(ofproto, miss); + return; + } else if (!flow_miss_should_make_facet(ofproto, miss, hash)) { + handle_flow_miss_without_facet(miss, rule, ops, n_ops); + return; + } + + facet = facet_create(rule, &miss->flow, hash); + } + handle_flow_miss_with_facet(miss, facet, ops, n_ops); +} + /* Like odp_flow_key_to_flow(), this function converts the 'key_len' bytes of * OVS_KEY_ATTR_* attributes in 'key' to a flow structure in 'flow' and returns * an ODP_FIT_* value that indicates how well 'key' fits our expectations for @@ -2669,10 +2916,12 @@ handle_miss_upcalls(struct ofproto_dpif *ofproto, struct dpif_upcall *upcalls, size_t n_upcalls) { struct dpif_upcall *upcall; - struct flow_miss *miss, *next_miss; + struct flow_miss *miss; + struct flow_miss misses[FLOW_MISS_MAX_BATCH]; struct flow_miss_op flow_miss_ops[FLOW_MISS_MAX_BATCH * 2]; - union dpif_op *dpif_ops[FLOW_MISS_MAX_BATCH * 2]; + struct dpif_op *dpif_ops[FLOW_MISS_MAX_BATCH * 2]; struct hmap todo; + int n_misses; size_t n_ops; size_t i; @@ -2686,51 +2935,54 @@ handle_miss_upcalls(struct ofproto_dpif *ofproto, struct dpif_upcall *upcalls, * the packets that have the same flow in the same "flow_miss" structure so * that we can process them together. */ hmap_init(&todo); + n_misses = 0; for (upcall = upcalls; upcall < &upcalls[n_upcalls]; upcall++) { - enum odp_key_fitness fitness; - struct flow_miss *miss; - ovs_be16 initial_tci; - struct flow flow; + struct flow_miss *miss = &misses[n_misses]; + struct flow_miss *existing_miss; + uint32_t hash; /* Obtain metadata and check userspace/kernel agreement on flow match, * then set 'flow''s header pointers. */ - fitness = ofproto_dpif_extract_flow_key(ofproto, - upcall->key, upcall->key_len, - &flow, &initial_tci, - upcall->packet); - if (fitness == ODP_FIT_ERROR) { - ofpbuf_delete(upcall->packet); + miss->key_fitness = ofproto_dpif_extract_flow_key( + ofproto, upcall->key, upcall->key_len, + &miss->flow, &miss->initial_tci, upcall->packet); + if (miss->key_fitness == ODP_FIT_ERROR) { continue; } - flow_extract(upcall->packet, flow.skb_priority, flow.tun_id, - flow.in_port, &flow); + flow_extract(upcall->packet, miss->flow.skb_priority, + miss->flow.tun_id, miss->flow.in_port, &miss->flow); /* Handle 802.1ag, LACP, and STP specially. */ - if (process_special(ofproto, &flow, upcall->packet)) { + if (process_special(ofproto, &miss->flow, upcall->packet)) { ofproto_update_local_port_stats(&ofproto->up, 0, upcall->packet->size); - ofpbuf_delete(upcall->packet); ofproto->n_matches++; continue; } /* Add other packets to a to-do list. */ - miss = flow_miss_create(&todo, &flow, fitness, - upcall->key, upcall->key_len, initial_tci); + hash = flow_hash(&miss->flow, 0); + existing_miss = flow_miss_find(&todo, &miss->flow, hash); + if (!existing_miss) { + hmap_insert(&todo, &miss->hmap_node, hash); + miss->key = upcall->key; + miss->key_len = upcall->key_len; + list_init(&miss->packets); + + n_misses++; + } else { + miss = existing_miss; + } list_push_back(&miss->packets, &upcall->packet->list_node); } /* Process each element in the to-do list, constructing the set of * operations to batch. */ n_ops = 0; - HMAP_FOR_EACH_SAFE (miss, next_miss, hmap_node, &todo) { + HMAP_FOR_EACH (miss, hmap_node, &todo) { handle_flow_miss(ofproto, miss, flow_miss_ops, &n_ops); - ofpbuf_list_delete(&miss->packets); - hmap_remove(&todo, &miss->hmap_node); - free(miss); } assert(n_ops <= ARRAY_SIZE(flow_miss_ops)); - hmap_destroy(&todo); /* Execute batch. */ for (i = 0; i < n_ops; i++) { @@ -2741,26 +2993,24 @@ handle_miss_upcalls(struct ofproto_dpif *ofproto, struct dpif_upcall *upcalls, /* Free memory and update facets. */ for (i = 0; i < n_ops; i++) { struct flow_miss_op *op = &flow_miss_ops[i]; - struct dpif_execute *execute; - struct dpif_flow_put *put; switch (op->dpif_op.type) { case DPIF_OP_EXECUTE: - execute = &op->dpif_op.execute; - if (op->subfacet->actions != execute->actions) { - free((struct nlattr *) execute->actions); - } - ofpbuf_delete((struct ofpbuf *) execute->packet); break; case DPIF_OP_FLOW_PUT: - put = &op->dpif_op.flow_put; - if (!put->error) { + if (!op->dpif_op.error) { op->subfacet->installed = true; } break; + + case DPIF_OP_FLOW_DEL: + NOT_REACHED(); } + + free(op->garbage); } + hmap_destroy(&todo); } static void @@ -2778,7 +3028,6 @@ handle_userspace_upcall(struct ofproto_dpif *ofproto, upcall->key_len, &flow, &initial_tci, upcall->packet); if (fitness == ODP_FIT_ERROR) { - ofpbuf_delete(upcall->packet); return; } @@ -2790,31 +3039,39 @@ handle_userspace_upcall(struct ofproto_dpif *ofproto, } else { VLOG_WARN_RL(&rl, "invalid user cookie : 0x%"PRIx64, upcall->userdata); } - ofpbuf_delete(upcall->packet); } static int handle_upcalls(struct ofproto_dpif *ofproto, unsigned int max_batch) { struct dpif_upcall misses[FLOW_MISS_MAX_BATCH]; + struct ofpbuf miss_bufs[FLOW_MISS_MAX_BATCH]; + uint64_t miss_buf_stubs[FLOW_MISS_MAX_BATCH][4096 / 8]; + int n_processed; int n_misses; int i; - assert (max_batch <= FLOW_MISS_MAX_BATCH); + assert(max_batch <= FLOW_MISS_MAX_BATCH); + n_processed = 0; n_misses = 0; - for (i = 0; i < max_batch; i++) { + for (n_processed = 0; n_processed < max_batch; n_processed++) { struct dpif_upcall *upcall = &misses[n_misses]; + struct ofpbuf *buf = &miss_bufs[n_misses]; int error; - error = dpif_recv(ofproto->dpif, upcall); + ofpbuf_use_stub(buf, miss_buf_stubs[n_misses], + sizeof miss_buf_stubs[n_misses]); + error = dpif_recv(ofproto->dpif, upcall, buf); if (error) { + ofpbuf_uninit(buf); break; } switch (upcall->type) { case DPIF_UC_ACTION: handle_userspace_upcall(ofproto, upcall); + ofpbuf_uninit(buf); break; case DPIF_UC_MISS: @@ -2831,8 +3088,11 @@ handle_upcalls(struct ofproto_dpif *ofproto, unsigned int max_batch) } handle_miss_upcalls(ofproto, misses, n_misses); + for (i = 0; i < n_misses; i++) { + ofpbuf_uninit(&miss_bufs[i]); + } - return i; + return n_processed; } /* Flow expiration. */ @@ -2852,7 +3112,7 @@ static int expire(struct ofproto_dpif *ofproto) { struct rule_dpif *rule, *next_rule; - struct classifier *table; + struct oftable *table; int dp_max_idle; /* Update stats for each flow in the datapath. */ @@ -2866,7 +3126,7 @@ expire(struct ofproto_dpif *ofproto) OFPROTO_FOR_EACH_TABLE (table, &ofproto->up) { struct cls_cursor cursor; - cls_cursor_init(&cursor, table, NULL); + cls_cursor_init(&cursor, &table->cls, NULL); CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, up.cr, &cursor) { rule_expire(rule); } @@ -2930,8 +3190,14 @@ update_stats(struct ofproto_dpif *p) subfacet->dp_packet_count = stats->n_packets; subfacet->dp_byte_count = stats->n_bytes; - subfacet_update_time(p, subfacet, stats->used); - facet_account(p, facet); + facet->tcp_flags |= stats->tcp_flags; + + subfacet_update_time(subfacet, stats->used); + if (facet->accounted_bytes < facet->byte_count) { + facet_learn(facet); + facet_account(facet); + facet->accounted_bytes = facet->byte_count; + } facet_push_stats(facet); } else { if (!VLOG_DROP_WARN(&rl)) { @@ -3037,21 +3303,66 @@ subfacet_max_idle(const struct ofproto_dpif *ofproto) ds_destroy(&s); } - return bucket * BUCKET_WIDTH; + return bucket * BUCKET_WIDTH; +} + +enum { EXPIRE_MAX_BATCH = 50 }; + +static void +expire_batch(struct ofproto_dpif *ofproto, struct subfacet **subfacets, int n) +{ + struct odputil_keybuf keybufs[EXPIRE_MAX_BATCH]; + struct dpif_op ops[EXPIRE_MAX_BATCH]; + struct dpif_op *opsp[EXPIRE_MAX_BATCH]; + struct ofpbuf keys[EXPIRE_MAX_BATCH]; + struct dpif_flow_stats stats[EXPIRE_MAX_BATCH]; + int i; + + for (i = 0; i < n; i++) { + ops[i].type = DPIF_OP_FLOW_DEL; + subfacet_get_key(subfacets[i], &keybufs[i], &keys[i]); + ops[i].u.flow_del.key = keys[i].data; + ops[i].u.flow_del.key_len = keys[i].size; + ops[i].u.flow_del.stats = &stats[i]; + opsp[i] = &ops[i]; + } + + dpif_operate(ofproto->dpif, opsp, n); + for (i = 0; i < n; i++) { + subfacet_reset_dp_stats(subfacets[i], &stats[i]); + subfacets[i]->installed = false; + subfacet_destroy(subfacets[i]); + } } static void expire_subfacets(struct ofproto_dpif *ofproto, int dp_max_idle) { long long int cutoff = time_msec() - dp_max_idle; + struct subfacet *subfacet, *next_subfacet; + struct subfacet *batch[EXPIRE_MAX_BATCH]; + int n_batch; + n_batch = 0; HMAP_FOR_EACH_SAFE (subfacet, next_subfacet, hmap_node, &ofproto->subfacets) { if (subfacet->used < cutoff) { - subfacet_destroy(ofproto, subfacet); + if (subfacet->installed) { + batch[n_batch++] = subfacet; + if (n_batch >= EXPIRE_MAX_BATCH) { + expire_batch(ofproto, batch, n_batch); + n_batch = 0; + } + } else { + subfacet_destroy(subfacet); + } } } + + if (n_batch > 0) { + expire_batch(ofproto, batch, n_batch); + } } /* If 'rule' is an OpenFlow rule, that has expired according to OpenFlow rules, @@ -3059,7 +3370,6 @@ expire_subfacets(struct ofproto_dpif *ofproto, int dp_max_idle) static void rule_expire(struct rule_dpif *rule) { - struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct facet *facet, *next_facet; long long int now; uint8_t reason; @@ -3069,8 +3379,8 @@ rule_expire(struct rule_dpif *rule) if (rule->up.hard_timeout && now > rule->up.modified + rule->up.hard_timeout * 1000) { reason = OFPRR_HARD_TIMEOUT; - } else if (rule->up.idle_timeout && list_is_empty(&rule->facets) - && now > rule->used + rule->up.idle_timeout * 1000) { + } else if (rule->up.idle_timeout + && now > rule->up.used + rule->up.idle_timeout * 1000) { reason = OFPRR_IDLE_TIMEOUT; } else { return; @@ -3081,7 +3391,7 @@ rule_expire(struct rule_dpif *rule) /* Update stats. (This is a no-op if the rule expired due to an idle * timeout, because that only happens when the rule has no facets left.) */ LIST_FOR_EACH_SAFE (facet, next_facet, list_node, &rule->facets) { - facet_remove(ofproto, facet); + facet_remove(facet); } /* Get rid of the rule. */ @@ -3096,17 +3406,19 @@ rule_expire(struct rule_dpif *rule) * 'flow' exists in 'ofproto' and that 'flow' is the best match for 'rule' in * the ofproto's classifier table. * + * 'hash' must be the return value of flow_hash(flow, 0). + * * The facet will initially have no subfacets. The caller should create (at * least) one subfacet with subfacet_create(). */ static struct facet * -facet_create(struct rule_dpif *rule, const struct flow *flow) +facet_create(struct rule_dpif *rule, const struct flow *flow, uint32_t hash) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct facet *facet; facet = xzalloc(sizeof *facet); facet->used = time_msec(); - hmap_insert(&ofproto->facets, &facet->hmap_node, flow_hash(flow, 0)); + hmap_insert(&ofproto->facets, &facet->hmap_node, hash); list_push_back(&rule->facets, &facet->list_node); facet->rule = rule; facet->flow = *flow; @@ -3154,15 +3466,16 @@ execute_odp_actions(struct ofproto_dpif *ofproto, const struct flow *flow, * - Removes 'facet' from its rule and from ofproto->facets. */ static void -facet_remove(struct ofproto_dpif *ofproto, struct facet *facet) +facet_remove(struct facet *facet) { + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); struct subfacet *subfacet, *next_subfacet; assert(!list_is_empty(&facet->subfacets)); /* First uninstall all of the subfacets to get final statistics. */ LIST_FOR_EACH (subfacet, list_node, &facet->subfacets) { - subfacet_uninstall(ofproto, subfacet); + subfacet_uninstall(subfacet); } /* Flush the final stats to the rule. @@ -3170,50 +3483,55 @@ facet_remove(struct ofproto_dpif *ofproto, struct facet *facet) * This might require us to have at least one subfacet around so that we * can use its actions for accounting in facet_account(), which is why we * have uninstalled but not yet destroyed the subfacets. */ - facet_flush_stats(ofproto, facet); + facet_flush_stats(facet); /* Now we're really all done so destroy everything. */ LIST_FOR_EACH_SAFE (subfacet, next_subfacet, list_node, &facet->subfacets) { - subfacet_destroy__(ofproto, subfacet); + subfacet_destroy__(subfacet); } hmap_remove(&ofproto->facets, &facet->hmap_node); list_remove(&facet->list_node); facet_free(facet); } +/* Feed information from 'facet' back into the learning table to keep it in + * sync with what is actually flowing through the datapath. */ static void -facet_account(struct ofproto_dpif *ofproto, struct facet *facet) +facet_learn(struct facet *facet) { - uint64_t n_bytes; - struct subfacet *subfacet; - const struct nlattr *a; - unsigned int left; - ovs_be16 vlan_tci; + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); + struct action_xlate_ctx ctx; - if (facet->byte_count <= facet->accounted_bytes) { + if (!facet->has_learn + && !facet->has_normal + && (!facet->has_fin_timeout + || !(facet->tcp_flags & (TCP_FIN | TCP_RST)))) { return; } - n_bytes = facet->byte_count - facet->accounted_bytes; - facet->accounted_bytes = facet->byte_count; - /* Feed information from the active flows back into the learning table to - * ensure that table is always in sync with what is actually flowing - * through the datapath. */ - if (facet->has_learn || facet->has_normal) { - struct action_xlate_ctx ctx; + action_xlate_ctx_init(&ctx, ofproto, &facet->flow, + facet->flow.vlan_tci, + facet->rule, facet->tcp_flags, NULL); + ctx.may_learn = true; + xlate_actions_for_side_effects(&ctx, facet->rule->up.actions, + facet->rule->up.n_actions); +} - action_xlate_ctx_init(&ctx, ofproto, &facet->flow, - facet->flow.vlan_tci, - facet->rule->up.flow_cookie, NULL); - ctx.may_learn = true; - ofpbuf_delete(xlate_actions(&ctx, facet->rule->up.actions, - facet->rule->up.n_actions)); - } +static void +facet_account(struct facet *facet) +{ + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); + struct subfacet *subfacet; + const struct nlattr *a; + unsigned int left; + ovs_be16 vlan_tci; + uint64_t n_bytes; if (!facet->has_normal || !ofproto->has_bonded_bundles) { return; } + n_bytes = facet->byte_count - facet->accounted_bytes; /* This loop feeds byte counters to bond_account() for rebalancing to use * as a basis. We also need to track the actual VLAN on which the packet @@ -3269,8 +3587,9 @@ facet_is_controller_flow(struct facet *facet) * 'facet''s statistics in the datapath should have been zeroed and folded into * its packet and byte counts before this function is called. */ static void -facet_flush_stats(struct ofproto_dpif *ofproto, struct facet *facet) +facet_flush_stats(struct facet *facet) { + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); struct subfacet *subfacet; LIST_FOR_EACH (subfacet, list_node, &facet->subfacets) { @@ -3279,7 +3598,10 @@ facet_flush_stats(struct ofproto_dpif *ofproto, struct facet *facet) } facet_push_stats(facet); - facet_account(ofproto, facet); + if (facet->accounted_bytes < facet->byte_count) { + facet_account(facet); + facet->accounted_bytes = facet->byte_count; + } if (ofproto->netflow && !facet_is_controller_flow(facet)) { struct ofexpired expired; @@ -3298,20 +3620,23 @@ facet_flush_stats(struct ofproto_dpif *ofproto, struct facet *facet) facet_reset_counters(facet); netflow_flow_clear(&facet->nf_flow); + facet->tcp_flags = 0; } /* Searches 'ofproto''s table of facets for one exactly equal to 'flow'. * Returns it if found, otherwise a null pointer. * + * 'hash' must be the return value of flow_hash(flow, 0). + * * The returned facet might need revalidation; use facet_lookup_valid() * instead if that is important. */ static struct facet * -facet_find(struct ofproto_dpif *ofproto, const struct flow *flow) +facet_find(struct ofproto_dpif *ofproto, + const struct flow *flow, uint32_t hash) { struct facet *facet; - HMAP_FOR_EACH_WITH_HASH (facet, hmap_node, flow_hash(flow, 0), - &ofproto->facets) { + HMAP_FOR_EACH_WITH_HASH (facet, hmap_node, hash, &ofproto->facets) { if (flow_equal(flow, &facet->flow)) { return facet; } @@ -3323,18 +3648,21 @@ facet_find(struct ofproto_dpif *ofproto, const struct flow *flow) /* Searches 'ofproto''s table of facets for one exactly equal to 'flow'. * Returns it if found, otherwise a null pointer. * + * 'hash' must be the return value of flow_hash(flow, 0). + * * The returned facet is guaranteed to be valid. */ static struct facet * -facet_lookup_valid(struct ofproto_dpif *ofproto, const struct flow *flow) +facet_lookup_valid(struct ofproto_dpif *ofproto, const struct flow *flow, + uint32_t hash) { - struct facet *facet = facet_find(ofproto, flow); + struct facet *facet = facet_find(ofproto, flow, hash); /* The facet we found might not be valid, since we could be in need of * revalidation. If it is not valid, don't return it. */ if (facet && (ofproto->need_revalidate || tag_set_intersects(&ofproto->revalidate_set, facet->tags)) - && !facet_revalidate(ofproto, facet)) { + && !facet_revalidate(facet)) { COVERAGE_INC(facet_invalidated); return NULL; } @@ -3342,7 +3670,125 @@ facet_lookup_valid(struct ofproto_dpif *ofproto, const struct flow *flow) return facet; } -/* Re-searches 'ofproto''s classifier for a rule matching 'facet': +static bool +facet_check_consistency(struct facet *facet) +{ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 15); + + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); + + uint64_t odp_actions_stub[1024 / 8]; + struct ofpbuf odp_actions; + + struct rule_dpif *rule; + struct subfacet *subfacet; + bool may_log = false; + bool ok; + + /* Check the rule for consistency. */ + rule = rule_dpif_lookup(ofproto, &facet->flow, 0); + if (!rule) { + if (!VLOG_DROP_WARN(&rl)) { + char *s = flow_to_string(&facet->flow); + VLOG_WARN("%s: facet should not exist", s); + free(s); + } + return false; + } else if (rule != facet->rule) { + may_log = !VLOG_DROP_WARN(&rl); + ok = false; + if (may_log) { + struct ds s; + + ds_init(&s); + flow_format(&s, &facet->flow); + ds_put_format(&s, ": facet associated with wrong rule (was " + "table=%"PRIu8",", facet->rule->up.table_id); + cls_rule_format(&facet->rule->up.cr, &s); + ds_put_format(&s, ") (should have been table=%"PRIu8",", + rule->up.table_id); + cls_rule_format(&rule->up.cr, &s); + ds_put_char(&s, ')'); + + VLOG_WARN("%s", ds_cstr(&s)); + ds_destroy(&s); + } + } else { + ok = true; + } + + /* Check the datapath actions for consistency. */ + ofpbuf_use_stub(&odp_actions, odp_actions_stub, sizeof odp_actions_stub); + LIST_FOR_EACH (subfacet, list_node, &facet->subfacets) { + struct action_xlate_ctx ctx; + bool actions_changed; + bool should_install; + + action_xlate_ctx_init(&ctx, ofproto, &facet->flow, + subfacet->initial_tci, rule, 0, NULL); + xlate_actions(&ctx, rule->up.actions, rule->up.n_actions, + &odp_actions); + + should_install = (ctx.may_set_up_flow + && subfacet->key_fitness != ODP_FIT_TOO_LITTLE); + if (!should_install && !subfacet->installed) { + /* The actions for uninstallable flows may vary from one packet to + * the next, so don't compare the actions. */ + continue; + } + + actions_changed = (subfacet->actions_len != odp_actions.size + || memcmp(subfacet->actions, odp_actions.data, + subfacet->actions_len)); + if (should_install != subfacet->installed || actions_changed) { + if (ok) { + may_log = !VLOG_DROP_WARN(&rl); + ok = false; + } + + if (may_log) { + struct odputil_keybuf keybuf; + struct ofpbuf key; + struct ds s; + + ds_init(&s); + subfacet_get_key(subfacet, &keybuf, &key); + odp_flow_key_format(key.data, key.size, &s); + + ds_put_cstr(&s, ": inconsistency in subfacet"); + if (should_install != subfacet->installed) { + enum odp_key_fitness fitness = subfacet->key_fitness; + + ds_put_format(&s, " (should%s have been installed)", + should_install ? "" : " not"); + ds_put_format(&s, " (may_set_up_flow=%s, fitness=%s)", + ctx.may_set_up_flow ? "true" : "false", + odp_key_fitness_to_string(fitness)); + } + if (actions_changed) { + ds_put_cstr(&s, " (actions were: "); + format_odp_actions(&s, subfacet->actions, + subfacet->actions_len); + ds_put_cstr(&s, ") (correct actions: "); + format_odp_actions(&s, odp_actions.data, odp_actions.size); + ds_put_char(&s, ')'); + } else { + ds_put_cstr(&s, " (actions: "); + format_odp_actions(&s, subfacet->actions, + subfacet->actions_len); + ds_put_char(&s, ')'); + } + VLOG_WARN("%s", ds_cstr(&s)); + ds_destroy(&s); + } + } + } + ofpbuf_uninit(&odp_actions); + + return ok; +} + +/* Re-searches the classifier for 'facet': * * - If the rule found is different from 'facet''s current rule, moves * 'facet' to the new rule and recompiles its actions. @@ -3354,8 +3800,9 @@ facet_lookup_valid(struct ofproto_dpif *ofproto, const struct flow *flow) * * Returns true if 'facet' still exists, false if it has been destroyed. */ static bool -facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) +facet_revalidate(struct facet *facet) { + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); struct actions { struct nlattr *odp_actions; size_t actions_len; @@ -3363,6 +3810,9 @@ facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) struct actions *new_actions; struct action_xlate_ctx ctx; + uint64_t odp_actions_stub[1024 / 8]; + struct ofpbuf odp_actions; + struct rule_dpif *new_rule; struct subfacet *subfacet; bool actions_changed; @@ -3374,7 +3824,7 @@ facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) new_rule = rule_dpif_lookup(ofproto, &facet->flow, 0); if (!new_rule) { /* No new rule, so delete the facet. */ - facet_remove(ofproto, facet); + facet_remove(facet); return false; } @@ -3389,17 +3839,16 @@ facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) i = 0; new_actions = NULL; memset(&ctx, 0, sizeof ctx); + ofpbuf_use_stub(&odp_actions, odp_actions_stub, sizeof odp_actions_stub); LIST_FOR_EACH (subfacet, list_node, &facet->subfacets) { - struct ofpbuf *odp_actions; bool should_install; action_xlate_ctx_init(&ctx, ofproto, &facet->flow, - subfacet->initial_tci, new_rule->up.flow_cookie, - NULL); - odp_actions = xlate_actions(&ctx, new_rule->up.actions, - new_rule->up.n_actions); - actions_changed = (subfacet->actions_len != odp_actions->size - || memcmp(subfacet->actions, odp_actions->data, + subfacet->initial_tci, new_rule, 0, NULL); + xlate_actions(&ctx, new_rule->up.actions, new_rule->up.n_actions, + &odp_actions); + actions_changed = (subfacet->actions_len != odp_actions.size + || memcmp(subfacet->actions, odp_actions.data, subfacet->actions_len)); should_install = (ctx.may_set_up_flow @@ -3408,27 +3857,28 @@ facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) if (should_install) { struct dpif_flow_stats stats; - subfacet_install(ofproto, subfacet, - odp_actions->data, odp_actions->size, &stats); - subfacet_update_stats(ofproto, subfacet, &stats); + subfacet_install(subfacet, + odp_actions.data, odp_actions.size, &stats); + subfacet_update_stats(subfacet, &stats); } else { - subfacet_uninstall(ofproto, subfacet); + subfacet_uninstall(subfacet); } if (!new_actions) { new_actions = xcalloc(list_size(&facet->subfacets), sizeof *new_actions); } - new_actions[i].odp_actions = xmemdup(odp_actions->data, - odp_actions->size); - new_actions[i].actions_len = odp_actions->size; + new_actions[i].odp_actions = xmemdup(odp_actions.data, + odp_actions.size); + new_actions[i].actions_len = odp_actions.size; } - ofpbuf_delete(odp_actions); i++; } + ofpbuf_uninit(&odp_actions); + if (new_actions) { - facet_flush_stats(ofproto, facet); + facet_flush_stats(facet); } /* Update 'facet' now that we've taken care of all the old state. */ @@ -3437,6 +3887,7 @@ facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) facet->may_install = ctx.may_set_up_flow; facet->has_learn = ctx.has_learn; facet->has_normal = ctx.has_normal; + facet->has_fin_timeout = ctx.has_fin_timeout; facet->mirrors = ctx.mirrors; if (new_actions) { i = 0; @@ -3465,14 +3916,12 @@ facet_revalidate(struct ofproto_dpif *ofproto, struct facet *facet) /* Updates 'facet''s used time. Caller is responsible for calling * facet_push_stats() to update the flows which 'facet' resubmits into. */ static void -facet_update_time(struct ofproto_dpif *ofproto, struct facet *facet, - long long int used) +facet_update_time(struct facet *facet, long long int used) { + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); if (used > facet->used) { facet->used = used; - if (used > facet->rule->used) { - facet->rule->used = used; - } + ofproto_rule_update_used(&facet->rule->up, used); netflow_flow_update_time(ofproto->netflow, &facet->nf_flow, used); } } @@ -3490,66 +3939,52 @@ facet_reset_counters(struct facet *facet) static void facet_push_stats(struct facet *facet) { - uint64_t new_packets, new_bytes; + struct dpif_flow_stats stats; assert(facet->packet_count >= facet->prev_packet_count); assert(facet->byte_count >= facet->prev_byte_count); assert(facet->used >= facet->prev_used); - new_packets = facet->packet_count - facet->prev_packet_count; - new_bytes = facet->byte_count - facet->prev_byte_count; + stats.n_packets = facet->packet_count - facet->prev_packet_count; + stats.n_bytes = facet->byte_count - facet->prev_byte_count; + stats.used = facet->used; + stats.tcp_flags = 0; - if (new_packets || new_bytes || facet->used > facet->prev_used) { + if (stats.n_packets || stats.n_bytes || facet->used > facet->prev_used) { facet->prev_packet_count = facet->packet_count; facet->prev_byte_count = facet->byte_count; facet->prev_used = facet->used; - flow_push_stats(facet->rule, &facet->flow, - new_packets, new_bytes, facet->used); + flow_push_stats(facet->rule, &facet->flow, &stats); update_mirror_stats(ofproto_dpif_cast(facet->rule->up.ofproto), - facet->mirrors, new_packets, new_bytes); + facet->mirrors, stats.n_packets, stats.n_bytes); } } -struct ofproto_push { - struct action_xlate_ctx ctx; - uint64_t packets; - uint64_t bytes; - long long int used; -}; - static void -push_resubmit(struct action_xlate_ctx *ctx, struct rule_dpif *rule) +rule_credit_stats(struct rule_dpif *rule, const struct dpif_flow_stats *stats) { - struct ofproto_push *push = CONTAINER_OF(ctx, struct ofproto_push, ctx); - - if (rule) { - rule->packet_count += push->packets; - rule->byte_count += push->bytes; - rule->used = MAX(push->used, rule->used); - } + rule->packet_count += stats->n_packets; + rule->byte_count += stats->n_bytes; + ofproto_rule_update_used(&rule->up, stats->used); } /* Pushes flow statistics to the rules which 'flow' resubmits into given * 'rule''s actions and mirrors. */ static void -flow_push_stats(const struct rule_dpif *rule, - const struct flow *flow, uint64_t packets, uint64_t bytes, - long long int used) +flow_push_stats(struct rule_dpif *rule, + const struct flow *flow, const struct dpif_flow_stats *stats) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); - struct ofproto_push push; + struct action_xlate_ctx ctx; - push.packets = packets; - push.bytes = bytes; - push.used = used; + ofproto_rule_update_used(&rule->up, stats->used); - action_xlate_ctx_init(&push.ctx, ofproto, flow, flow->vlan_tci, - rule->up.flow_cookie, NULL); - push.ctx.resubmit_hook = push_resubmit; - ofpbuf_delete(xlate_actions(&push.ctx, - rule->up.actions, rule->up.n_actions)); + action_xlate_ctx_init(&ctx, ofproto, flow, flow->vlan_tci, rule, + 0, NULL); + ctx.resubmit_stats = stats; + xlate_actions_for_side_effects(&ctx, rule->up.actions, rule->up.n_actions); } /* Subfacets. */ @@ -3582,10 +4017,10 @@ subfacet_find__(struct ofproto_dpif *ofproto, * which case the caller must populate the actions with * subfacet_make_actions(). */ static struct subfacet * -subfacet_create(struct ofproto_dpif *ofproto, struct facet *facet, - enum odp_key_fitness key_fitness, +subfacet_create(struct facet *facet, enum odp_key_fitness key_fitness, const struct nlattr *key, size_t key_len, ovs_be16 initial_tci) { + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); uint32_t key_hash = odp_flow_key_hash(key, key_len); struct subfacet *subfacet; @@ -3597,19 +4032,28 @@ subfacet_create(struct ofproto_dpif *ofproto, struct facet *facet, /* This shouldn't happen. */ VLOG_ERR_RL(&rl, "subfacet with wrong facet"); - subfacet_destroy(ofproto, subfacet); + subfacet_destroy(subfacet); } - subfacet = xzalloc(sizeof *subfacet); + subfacet = (list_is_empty(&facet->subfacets) + ? &facet->one_subfacet + : xmalloc(sizeof *subfacet)); hmap_insert(&ofproto->subfacets, &subfacet->hmap_node, key_hash); list_push_back(&facet->subfacets, &subfacet->list_node); subfacet->facet = facet; - subfacet->used = time_msec(); subfacet->key_fitness = key_fitness; if (key_fitness != ODP_FIT_PERFECT) { subfacet->key = xmemdup(key, key_len); subfacet->key_len = key_len; + } else { + subfacet->key = NULL; + subfacet->key_len = 0; } + subfacet->used = time_msec(); + subfacet->dp_packet_count = 0; + subfacet->dp_byte_count = 0; + subfacet->actions_len = 0; + subfacet->actions = NULL; subfacet->installed = false; subfacet->initial_tci = initial_tci; @@ -3637,28 +4081,33 @@ subfacet_find(struct ofproto_dpif *ofproto, /* Uninstalls 'subfacet' from the datapath, if it is installed, removes it from * its facet within 'ofproto', and frees it. */ static void -subfacet_destroy__(struct ofproto_dpif *ofproto, struct subfacet *subfacet) +subfacet_destroy__(struct subfacet *subfacet) { - subfacet_uninstall(ofproto, subfacet); + struct facet *facet = subfacet->facet; + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); + + subfacet_uninstall(subfacet); hmap_remove(&ofproto->subfacets, &subfacet->hmap_node); list_remove(&subfacet->list_node); free(subfacet->key); free(subfacet->actions); - free(subfacet); + if (subfacet != &facet->one_subfacet) { + free(subfacet); + } } /* Destroys 'subfacet', as with subfacet_destroy__(), and then if this was the * last remaining subfacet in its facet destroys the facet too. */ static void -subfacet_destroy(struct ofproto_dpif *ofproto, struct subfacet *subfacet) +subfacet_destroy(struct subfacet *subfacet) { struct facet *facet = subfacet->facet; if (list_is_singleton(&facet->subfacets)) { /* facet_remove() needs at least one subfacet (it will remove it). */ - facet_remove(ofproto, facet); + facet_remove(facet); } else { - subfacet_destroy__(ofproto, subfacet); + subfacet_destroy__(subfacet); } } @@ -3677,23 +4126,27 @@ subfacet_get_key(struct subfacet *subfacet, struct odputil_keybuf *keybuf, } } -/* Composes the datapath actions for 'subfacet' based on its rule's actions. */ +/* Composes the datapath actions for 'subfacet' based on its rule's actions. + * Translates the actions into 'odp_actions', which the caller must have + * initialized and is responsible for uninitializing. */ static void -subfacet_make_actions(struct ofproto_dpif *p, struct subfacet *subfacet, - const struct ofpbuf *packet) +subfacet_make_actions(struct subfacet *subfacet, const struct ofpbuf *packet, + struct ofpbuf *odp_actions) { struct facet *facet = subfacet->facet; - const struct rule_dpif *rule = facet->rule; - struct ofpbuf *odp_actions; + struct rule_dpif *rule = facet->rule; + struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); + struct action_xlate_ctx ctx; - action_xlate_ctx_init(&ctx, p, &facet->flow, subfacet->initial_tci, - rule->up.flow_cookie, packet); - odp_actions = xlate_actions(&ctx, rule->up.actions, rule->up.n_actions); + action_xlate_ctx_init(&ctx, ofproto, &facet->flow, subfacet->initial_tci, + rule, 0, packet); + xlate_actions(&ctx, rule->up.actions, rule->up.n_actions, odp_actions); facet->tags = ctx.tags; facet->may_install = ctx.may_set_up_flow; facet->has_learn = ctx.has_learn; facet->has_normal = ctx.has_normal; + facet->has_fin_timeout = ctx.has_fin_timeout; facet->nf_flow.output_iface = ctx.nf_output_iface; facet->mirrors = ctx.mirrors; @@ -3703,8 +4156,6 @@ subfacet_make_actions(struct ofproto_dpif *p, struct subfacet *subfacet, subfacet->actions_len = odp_actions->size; subfacet->actions = xmemdup(odp_actions->data, odp_actions->size); } - - ofpbuf_delete(odp_actions); } /* Updates 'subfacet''s datapath flow, setting its actions to 'actions_len' @@ -3714,10 +4165,12 @@ subfacet_make_actions(struct ofproto_dpif *p, struct subfacet *subfacet, * * Returns 0 if successful, otherwise a positive errno value. */ static int -subfacet_install(struct ofproto_dpif *ofproto, struct subfacet *subfacet, +subfacet_install(struct subfacet *subfacet, const struct nlattr *actions, size_t actions_len, struct dpif_flow_stats *stats) { + struct facet *facet = subfacet->facet; + struct ofproto_dpif *ofproto = ofproto_dpif_cast(facet->rule->up.ofproto); struct odputil_keybuf keybuf; enum dpif_flow_put_flags flags; struct ofpbuf key; @@ -3741,19 +4194,21 @@ subfacet_install(struct ofproto_dpif *ofproto, struct subfacet *subfacet, /* If 'subfacet' is installed in the datapath, uninstalls it. */ static void -subfacet_uninstall(struct ofproto_dpif *p, struct subfacet *subfacet) +subfacet_uninstall(struct subfacet *subfacet) { if (subfacet->installed) { + struct rule_dpif *rule = subfacet->facet->rule; + struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct odputil_keybuf keybuf; struct dpif_flow_stats stats; struct ofpbuf key; int error; subfacet_get_key(subfacet, &keybuf, &key); - error = dpif_flow_del(p->dpif, key.data, key.size, &stats); + error = dpif_flow_del(ofproto->dpif, key.data, key.size, &stats); subfacet_reset_dp_stats(subfacet, &stats); if (!error) { - subfacet_update_stats(p, subfacet, &stats); + subfacet_update_stats(subfacet, &stats); } subfacet->installed = false; } else { @@ -3785,12 +4240,11 @@ subfacet_reset_dp_stats(struct subfacet *subfacet, /* Updates 'subfacet''s used time. The caller is responsible for calling * facet_push_stats() to update the flows which 'subfacet' resubmits into. */ static void -subfacet_update_time(struct ofproto_dpif *ofproto, struct subfacet *subfacet, - long long int used) +subfacet_update_time(struct subfacet *subfacet, long long int used) { if (used > subfacet->used) { subfacet->used = used; - facet_update_time(ofproto, subfacet->facet, used); + facet_update_time(subfacet->facet, used); } } @@ -3801,15 +4255,16 @@ subfacet_update_time(struct ofproto_dpif *ofproto, struct subfacet *subfacet, * represents a packet that was sent by hand or if it represents statistics * that have been cleared out of the datapath. */ static void -subfacet_update_stats(struct ofproto_dpif *ofproto, struct subfacet *subfacet, +subfacet_update_stats(struct subfacet *subfacet, const struct dpif_flow_stats *stats) { if (stats->n_packets || stats->used > subfacet->used) { struct facet *facet = subfacet->facet; - subfacet_update_time(ofproto, subfacet, stats->used); + subfacet_update_time(subfacet, stats->used); facet->packet_count += stats->n_packets; facet->byte_count += stats->n_bytes; + facet->tcp_flags |= stats->tcp_flags; facet_push_stats(facet); netflow_flow_update_flags(&facet->nf_flow, stats->tcp_flags); } @@ -3828,7 +4283,7 @@ rule_dpif_lookup(struct ofproto_dpif *ofproto, const struct flow *flow, return NULL; } - cls = &ofproto->up.tables[table_id]; + cls = &ofproto->up.tables[table_id].cls; if (flow->nw_frag & FLOW_NW_FRAG_ANY && ofproto->up.frag_handling == OFPC_FRAG_NORMAL) { /* For OFPC_NORMAL frag_handling, we must pretend that transport ports @@ -3872,14 +4327,14 @@ rule_dealloc(struct rule *rule_) free(rule); } -static int +static enum ofperr rule_construct(struct rule *rule_) { struct rule_dpif *rule = rule_dpif_cast(rule_); struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct rule_dpif *victim; uint8_t table_id; - int error; + enum ofperr error; error = validate_actions(rule->up.actions, rule->up.n_actions, &rule->up.cr.flow, ofproto->max_ports); @@ -3887,7 +4342,6 @@ rule_construct(struct rule *rule_) return error; } - rule->used = rule->up.created; rule->packet_count = 0; rule->byte_count = 0; @@ -3926,11 +4380,10 @@ static void rule_destruct(struct rule *rule_) { struct rule_dpif *rule = rule_dpif_cast(rule_); - struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); struct facet *facet, *next_facet; LIST_FOR_EACH_SAFE (facet, next_facet, list_node, &rule->facets) { - facet_revalidate(ofproto, facet); + facet_revalidate(facet); } complete_operation(rule); @@ -3956,28 +4409,32 @@ rule_get_stats(struct rule *rule_, uint64_t *packets, uint64_t *bytes) } } -static int +static enum ofperr rule_execute(struct rule *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; + struct action_xlate_ctx ctx; - struct ofpbuf *odp_actions; - size_t size; + uint64_t odp_actions_stub[1024 / 8]; + struct ofpbuf odp_actions; + + dpif_flow_stats_extract(flow, packet, &stats); + rule_credit_stats(rule, &stats); + ofpbuf_use_stub(&odp_actions, odp_actions_stub, sizeof odp_actions_stub); action_xlate_ctx_init(&ctx, ofproto, flow, flow->vlan_tci, - rule->up.flow_cookie, packet); - odp_actions = xlate_actions(&ctx, rule->up.actions, rule->up.n_actions); - size = packet->size; - if (execute_odp_actions(ofproto, flow, odp_actions->data, - odp_actions->size, packet)) { - rule->used = time_msec(); - rule->packet_count++; - rule->byte_count += size; - flow_push_stats(rule, flow, 1, size, rule->used); - } - ofpbuf_delete(odp_actions); + rule, stats.tcp_flags, packet); + ctx.resubmit_stats = &stats; + xlate_actions(&ctx, rule->up.actions, rule->up.n_actions, &odp_actions); + + execute_odp_actions(ofproto, flow, odp_actions.data, + odp_actions.size, packet); + + ofpbuf_uninit(&odp_actions); return 0; } @@ -3987,7 +4444,7 @@ rule_modify_actions(struct rule *rule_) { struct rule_dpif *rule = rule_dpif_cast(rule_); struct ofproto_dpif *ofproto = ofproto_dpif_cast(rule->up.ofproto); - int error; + enum ofperr error; error = validate_actions(rule->up.actions, rule->up.n_actions, &rule->up.cr.flow, ofproto->max_ports); @@ -4161,7 +4618,7 @@ compose_output_action__(struct action_xlate_ctx *ctx, uint16_t ofp_port, if (ofport) { struct priority_to_dscp *pdscp; - if (ofport->up.opp.config & htonl(OFPPC_NO_FWD) + if (ofport->up.pp.config & OFPUTIL_PC_NO_FWD || (check_stp && !stp_forward_in_state(ofport->stp_state))) { return; } @@ -4220,7 +4677,7 @@ xlate_table_action(struct action_xlate_ctx *ctx, if (table_id > 0 && table_id < N_TABLES) { struct table_dpif *table = &ofproto->tables[table_id]; if (table->other_table) { - ctx->tags |= (rule + ctx->tags |= (rule && rule->tag ? rule->tag : rule_calculate_tag(&ctx->flow, &table->other_table->wc, @@ -4237,12 +4694,16 @@ xlate_table_action(struct action_xlate_ctx *ctx, } if (rule) { - ovs_be64 old_cookie = ctx->cookie; + struct rule_dpif *old_rule = ctx->rule; + + if (ctx->resubmit_stats) { + rule_credit_stats(rule, ctx->resubmit_stats); + } ctx->recurse++; - ctx->cookie = rule->up.flow_cookie; + ctx->rule = rule; do_xlate_actions(rule->up.actions, rule->up.n_actions, ctx); - ctx->cookie = old_cookie; + ctx->rule = old_rule; ctx->recurse--; } @@ -4252,6 +4713,7 @@ xlate_table_action(struct action_xlate_ctx *ctx, VLOG_ERR_RL(&recurse_rl, "resubmit actions recursed over %d times", MAX_RESUBMIT_RECURSION); + ctx->max_resubmit_trigger = true; } } @@ -4284,7 +4746,7 @@ flood_packets(struct action_xlate_ctx *ctx, bool all) if (all) { compose_output_action__(ctx, ofp_port, false); - } else if (!(ofport->up.opp.config & htonl(OFPPC_NO_FLOOD))) { + } else if (!(ofport->up.pp.config & OFPUTIL_PC_NO_FLOOD)) { compose_output_action(ctx, ofp_port); } } @@ -4293,7 +4755,9 @@ flood_packets(struct action_xlate_ctx *ctx, bool all) } static void -execute_controller_action(struct action_xlate_ctx *ctx, int len) +execute_controller_action(struct action_xlate_ctx *ctx, int len, + enum ofp_packet_in_reason reason, + uint16_t controller_id) { struct ofputil_packet_in pin; struct ofpbuf *packet; @@ -4310,7 +4774,13 @@ execute_controller_action(struct action_xlate_ctx *ctx, int len) eth_pop_vlan(packet); eh = packet->l2; - assert(eh->eth_type == ctx->flow.dl_type); + + /* 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. */ + 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); @@ -4338,19 +4808,37 @@ execute_controller_action(struct action_xlate_ctx *ctx, int len) pin.packet = packet->data; pin.packet_len = packet->size; - pin.reason = OFPR_ACTION; + pin.reason = reason; + pin.controller_id = controller_id; pin.table_id = ctx->table_id; - pin.cookie = ctx->cookie; + pin.cookie = ctx->rule ? ctx->rule->up.flow_cookie : 0; - pin.buffer_id = 0; pin.send_len = len; - pin.total_len = packet->size; flow_get_metadata(&ctx->flow, &pin.fmd); - connmgr_send_packet_in(ctx->ofproto->up.connmgr, &pin, &ctx->flow); + connmgr_send_packet_in(ctx->ofproto->up.connmgr, &pin); ofpbuf_delete(packet); } +static bool +compose_dec_ttl(struct action_xlate_ctx *ctx) +{ + if (ctx->flow.dl_type != htons(ETH_TYPE_IP) && + ctx->flow.dl_type != htons(ETH_TYPE_IPV6)) { + return false; + } + + if (ctx->flow.nw_ttl > 1) { + ctx->flow.nw_ttl--; + return false; + } else { + execute_controller_action(ctx, UINT16_MAX, OFPR_INVALID_TTL, 0); + + /* Stop processing for current table. */ + return true; + } +} + static void xlate_output_action__(struct action_xlate_ctx *ctx, uint16_t port, uint16_t max_len) @@ -4376,13 +4864,11 @@ xlate_output_action__(struct action_xlate_ctx *ctx, flood_packets(ctx, true); break; case OFPP_CONTROLLER: - execute_controller_action(ctx, max_len); - break; - case OFPP_LOCAL: - compose_output_action(ctx, OFPP_LOCAL); + execute_controller_action(ctx, max_len, OFPR_ACTION, 0); break; case OFPP_NONE: break; + case OFPP_LOCAL: default: if (port != ctx->flow.in_port) { compose_output_action(ctx, port); @@ -4404,9 +4890,11 @@ static void xlate_output_reg_action(struct action_xlate_ctx *ctx, const struct nx_action_output_reg *naor) { + struct mf_subfield src; uint64_t ofp_port; - ofp_port = nxm_read_field_bits(naor->src, naor->ofs_nbits, &ctx->flow); + nxm_decode(&src, naor->src, naor->ofs_nbits); + ofp_port = mf_get_subfield(&src, &ctx->flow); if (ofp_port <= UINT16_MAX) { xlate_output_action__(ctx, ofp_port, ntohs(naor->max_len)); @@ -4535,20 +5023,41 @@ xlate_learn_action(struct action_xlate_ctx *ctx, error = ofproto_flow_mod(&ctx->ofproto->up, &fm); if (error && !VLOG_DROP_WARN(&rl)) { - char *msg = ofputil_error_to_string(error); - VLOG_WARN("learning action failed to modify flow table (%s)", msg); - free(msg); + VLOG_WARN("learning action failed to modify flow table (%s)", + ofperr_get_name(error)); } free(fm.actions); } +/* Reduces '*timeout' to no more than 'max'. A value of zero in either case + * means "infinite". */ +static void +reduce_timeout(uint16_t max, uint16_t *timeout) +{ + if (max && (!*timeout || *timeout > max)) { + *timeout = max; + } +} + +static void +xlate_fin_timeout(struct action_xlate_ctx *ctx, + const struct nx_action_fin_timeout *naft) +{ + if (ctx->tcp_flags & (TCP_FIN | TCP_RST) && ctx->rule) { + struct rule_dpif *rule = ctx->rule; + + reduce_timeout(ntohs(naft->fin_idle_timeout), &rule->up.idle_timeout); + reduce_timeout(ntohs(naft->fin_hard_timeout), &rule->up.hard_timeout); + } +} + static bool may_receive(const struct ofport_dpif *port, struct action_xlate_ctx *ctx) { - if (port->up.opp.config & (eth_addr_equals(ctx->flow.dl_dst, eth_addr_stp) - ? htonl(OFPPC_NO_RECV_STP) - : htonl(OFPPC_NO_RECV))) { + if (port->up.pp.config & (eth_addr_equals(ctx->flow.dl_dst, eth_addr_stp) + ? OFPUTIL_PC_NO_RECV_STP + : OFPUTIL_PC_NO_RECV)) { return false; } @@ -4570,6 +5079,7 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, { const struct ofport_dpif *port; const union ofp_action *ia; + bool was_evictable = true; size_t left; port = get_ofp_port(ctx->ofproto, ctx->flow.in_port); @@ -4578,6 +5088,11 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, return; } + if (ctx->rule) { + /* Don't let the rule we're working on get evicted underneath us. */ + was_evictable = ctx->rule->up.evictable; + ctx->rule->up.evictable = false; + } OFPUTIL_ACTION_FOR_EACH_UNSAFE (ia, left, in, n_in) { const struct ofp_action_dl_addr *oada; const struct nx_action_resubmit *nar; @@ -4587,6 +5102,7 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, const struct nx_action_autopath *naa; const struct nx_action_bundle *nab; const struct nx_action_output_reg *naor; + const struct nx_action_controller *nac; enum ofputil_action_code code; ovs_be64 tun_id; @@ -4596,57 +5112,60 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, code = ofputil_decode_action_unsafe(ia); switch (code) { - case OFPUTIL_OFPAT_OUTPUT: + case OFPUTIL_OFPAT10_OUTPUT: xlate_output_action(ctx, &ia->output); break; - case OFPUTIL_OFPAT_SET_VLAN_VID: + case OFPUTIL_OFPAT10_SET_VLAN_VID: ctx->flow.vlan_tci &= ~htons(VLAN_VID_MASK); ctx->flow.vlan_tci |= ia->vlan_vid.vlan_vid | htons(VLAN_CFI); break; - case OFPUTIL_OFPAT_SET_VLAN_PCP: + case OFPUTIL_OFPAT10_SET_VLAN_PCP: ctx->flow.vlan_tci &= ~htons(VLAN_PCP_MASK); ctx->flow.vlan_tci |= htons( (ia->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT) | VLAN_CFI); break; - case OFPUTIL_OFPAT_STRIP_VLAN: + case OFPUTIL_OFPAT10_STRIP_VLAN: ctx->flow.vlan_tci = htons(0); break; - case OFPUTIL_OFPAT_SET_DL_SRC: + case OFPUTIL_OFPAT10_SET_DL_SRC: oada = ((struct ofp_action_dl_addr *) ia); memcpy(ctx->flow.dl_src, oada->dl_addr, ETH_ADDR_LEN); break; - case OFPUTIL_OFPAT_SET_DL_DST: + case OFPUTIL_OFPAT10_SET_DL_DST: oada = ((struct ofp_action_dl_addr *) ia); memcpy(ctx->flow.dl_dst, oada->dl_addr, ETH_ADDR_LEN); break; - case OFPUTIL_OFPAT_SET_NW_SRC: + case OFPUTIL_OFPAT10_SET_NW_SRC: ctx->flow.nw_src = ia->nw_addr.nw_addr; break; - case OFPUTIL_OFPAT_SET_NW_DST: + case OFPUTIL_OFPAT10_SET_NW_DST: ctx->flow.nw_dst = ia->nw_addr.nw_addr; break; - case OFPUTIL_OFPAT_SET_NW_TOS: - ctx->flow.nw_tos &= ~IP_DSCP_MASK; - ctx->flow.nw_tos |= ia->nw_tos.nw_tos & IP_DSCP_MASK; + case OFPUTIL_OFPAT10_SET_NW_TOS: + /* OpenFlow 1.0 only supports IPv4. */ + if (ctx->flow.dl_type == htons(ETH_TYPE_IP)) { + ctx->flow.nw_tos &= ~IP_DSCP_MASK; + ctx->flow.nw_tos |= ia->nw_tos.nw_tos & IP_DSCP_MASK; + } break; - case OFPUTIL_OFPAT_SET_TP_SRC: + case OFPUTIL_OFPAT10_SET_TP_SRC: ctx->flow.tp_src = ia->tp_port.tp_port; break; - case OFPUTIL_OFPAT_SET_TP_DST: + case OFPUTIL_OFPAT10_SET_TP_DST: ctx->flow.tp_dst = ia->tp_port.tp_port; break; - case OFPUTIL_OFPAT_ENQUEUE: + case OFPUTIL_OFPAT10_ENQUEUE: xlate_enqueue_action(ctx, (const struct ofp_action_enqueue *) ia); break; @@ -4730,58 +5249,101 @@ do_xlate_actions(const union ofp_action *in, size_t n_in, } break; + case OFPUTIL_NXAST_DEC_TTL: + if (compose_dec_ttl(ctx)) { + goto out; + } + break; + case OFPUTIL_NXAST_EXIT: ctx->exit = true; break; + + case OFPUTIL_NXAST_FIN_TIMEOUT: + ctx->has_fin_timeout = true; + xlate_fin_timeout(ctx, (const struct nx_action_fin_timeout *) ia); + break; + + case OFPUTIL_NXAST_CONTROLLER: + nac = (const struct nx_action_controller *) ia; + execute_controller_action(ctx, ntohs(nac->max_len), nac->reason, + ntohs(nac->controller_id)); + break; } } +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; + } } static void action_xlate_ctx_init(struct action_xlate_ctx *ctx, struct ofproto_dpif *ofproto, const struct flow *flow, - ovs_be16 initial_tci, ovs_be64 cookie, - const struct ofpbuf *packet) + ovs_be16 initial_tci, struct rule_dpif *rule, + uint8_t tcp_flags, const struct ofpbuf *packet) { ctx->ofproto = ofproto; ctx->flow = *flow; ctx->base_flow = ctx->flow; ctx->base_flow.tun_id = 0; ctx->base_flow.vlan_tci = initial_tci; - ctx->cookie = cookie; + ctx->rule = rule; ctx->packet = packet; ctx->may_learn = packet != NULL; + ctx->tcp_flags = tcp_flags; ctx->resubmit_hook = NULL; + ctx->resubmit_stats = NULL; } -static struct ofpbuf * +/* Translates the 'n_in' "union ofp_action"s in 'in' into datapath actions in + * 'odp_actions', using 'ctx'. */ +static void xlate_actions(struct action_xlate_ctx *ctx, - const union ofp_action *in, size_t n_in) + const union ofp_action *in, size_t n_in, + struct ofpbuf *odp_actions) { - struct flow orig_flow = ctx->flow; + /* Normally false. Set to true if we ever hit MAX_RESUBMIT_RECURSION, so + * that in the future we always keep a copy of the original flow for + * tracing purposes. */ + static bool hit_resubmit_limit; COVERAGE_INC(ofproto_dpif_xlate); - ctx->odp_actions = ofpbuf_new(512); - ofpbuf_reserve(ctx->odp_actions, NL_A_U32_SIZE); + ofpbuf_clear(odp_actions); + ofpbuf_reserve(odp_actions, NL_A_U32_SIZE); + + ctx->odp_actions = odp_actions; ctx->tags = 0; ctx->may_set_up_flow = true; ctx->has_learn = false; ctx->has_normal = false; + ctx->has_fin_timeout = false; ctx->nf_output_iface = NF_OUT_DROP; ctx->mirrors = 0; ctx->recurse = 0; + ctx->max_resubmit_trigger = false; ctx->orig_skb_priority = ctx->flow.skb_priority; ctx->table_id = 0; ctx->exit = false; + 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; + } + if (ctx->flow.nw_frag & FLOW_NW_FRAG_ANY) { switch (ctx->ofproto->up.frag_handling) { case OFPC_FRAG_NORMAL: @@ -4791,7 +5353,7 @@ xlate_actions(struct action_xlate_ctx *ctx, break; case OFPC_FRAG_DROP: - return ctx->odp_actions; + return; case OFPC_FRAG_REASM: NOT_REACHED(); @@ -4799,16 +5361,37 @@ xlate_actions(struct action_xlate_ctx *ctx, case OFPC_FRAG_NX_MATCH: /* Nothing to do. */ break; + + case OFPC_INVALID_TTL_TO_CONTROLLER: + NOT_REACHED(); } } if (process_special(ctx->ofproto, &ctx->flow, ctx->packet)) { ctx->may_set_up_flow = false; - return ctx->odp_actions; } else { + static struct vlog_rate_limit trace_rl = VLOG_RATE_LIMIT_INIT(1, 1); + ovs_be16 initial_tci = ctx->base_flow.vlan_tci; + add_sflow_action(ctx); do_xlate_actions(in, n_in, ctx); + if (ctx->max_resubmit_trigger && !ctx->resubmit_hook) { + if (!hit_resubmit_limit) { + /* We didn't record the original flow. Make sure we do from + * now on. */ + hit_resubmit_limit = true; + } else if (!VLOG_DROP_ERR(&trace_rl)) { + struct ds ds = DS_EMPTY_INITIALIZER; + + ofproto_trace(ctx->ofproto, &ctx->orig_flow, ctx->packet, + initial_tci, &ds); + VLOG_ERR("Trace triggered by excessive resubmit " + "recursion:\n%s", ds_cstr(&ds)); + ds_destroy(&ds); + } + } + if (!connmgr_may_set_up_flow(ctx->ofproto->up.connmgr, &ctx->flow, ctx->odp_actions->data, ctx->odp_actions->size)) { @@ -4819,11 +5402,25 @@ xlate_actions(struct action_xlate_ctx *ctx, compose_output_action(ctx, OFPP_LOCAL); } } - add_mirror_actions(ctx, &orig_flow); + if (ctx->ofproto->has_mirrors) { + add_mirror_actions(ctx, &ctx->orig_flow); + } fix_sflow_action(ctx); } +} + +/* Translates the 'n_in' "union ofp_action"s in 'in' into datapath actions, + * using 'ctx', and discards the datapath actions. */ +static void +xlate_actions_for_side_effects(struct action_xlate_ctx *ctx, + const union ofp_action *in, size_t n_in) +{ + uint64_t odp_actions_stub[1024 / 8]; + struct ofpbuf odp_actions; - return ctx->odp_actions; + ofpbuf_use_stub(&odp_actions, odp_actions_stub, sizeof odp_actions_stub); + xlate_actions(ctx, in, n_in, &odp_actions); + ofpbuf_uninit(&odp_actions); } /* OFPP_NORMAL implementation. */ @@ -5060,7 +5657,7 @@ add_mirror_actions(struct action_xlate_ctx *ctx, const struct flow *orig_flow) size_t left; in_bundle = lookup_input_bundle(ctx->ofproto, orig_flow->in_port, - ctx->packet != NULL); + ctx->packet != NULL, NULL); if (!in_bundle) { return; } @@ -5220,22 +5817,26 @@ update_learning_table(struct ofproto_dpif *ofproto, } static struct ofbundle * -lookup_input_bundle(struct ofproto_dpif *ofproto, uint16_t in_port, bool warn) +lookup_input_bundle(struct ofproto_dpif *ofproto, uint16_t in_port, bool warn, + struct ofport_dpif **in_ofportp) { struct ofport_dpif *ofport; - /* Special-case OFPP_NONE, which a controller may use as the ingress - * port for traffic that it is sourcing. */ - if (in_port == OFPP_NONE) { - return &ofpp_none_bundle; - } - /* Find the port and bundle for the received packet. */ ofport = get_ofp_port(ofproto, in_port); + if (in_ofportp) { + *in_ofportp = ofport; + } if (ofport && ofport->bundle) { return ofport->bundle; } + /* Special-case OFPP_NONE, which a controller may use as the ingress + * port for traffic that it is sourcing. */ + if (in_port == OFPP_NONE) { + return &ofpp_none_bundle; + } + /* Odd. A few possible reasons here: * * - We deleted a port but there are still a few packets queued up @@ -5318,15 +5919,11 @@ xlate_normal(struct action_xlate_ctx *ctx) ctx->has_normal = true; in_bundle = lookup_input_bundle(ctx->ofproto, ctx->flow.in_port, - ctx->packet != NULL); + ctx->packet != NULL, &in_port); if (!in_bundle) { return; } - /* We know 'in_port' exists unless it is "ofpp_none_bundle", - * since lookup_input_bundle() succeeded. */ - in_port = get_ofp_port(ctx->ofproto, ctx->flow.in_port); - /* Drop malformed frames. */ if (ctx->flow.dl_type == htons(ETH_TYPE_VLAN) && !(ctx->flow.vlan_tci & htons(VLAN_CFI))) { @@ -5413,7 +6010,7 @@ xlate_normal(struct action_xlate_ctx *ctx) /* Calculates the tag to use for 'flow' and wildcards 'wc' when it is inserted * into an OpenFlow table with the given 'basis'. */ -static uint32_t +static tag_type rule_calculate_tag(const struct flow *flow, const struct flow_wildcards *wc, uint32_t secret) { @@ -5439,13 +6036,13 @@ static void table_update_taggable(struct ofproto_dpif *ofproto, uint8_t table_id) { struct table_dpif *table = &ofproto->tables[table_id]; - const struct classifier *cls = &ofproto->up.tables[table_id]; + const struct oftable *oftable = &ofproto->up.tables[table_id]; struct cls_table *catchall, *other; struct cls_table *t; catchall = other = NULL; - switch (hmap_count(&cls->tables)) { + switch (hmap_count(&oftable->cls.tables)) { case 0: /* We could tag this OpenFlow table but it would make the logic a * little harder and it's a corner case that doesn't seem worth it @@ -5454,7 +6051,7 @@ table_update_taggable(struct ofproto_dpif *ofproto, uint8_t table_id) case 1: case 2: - HMAP_FOR_EACH (t, hmap_node, &cls->tables) { + HMAP_FOR_EACH (t, hmap_node, &oftable->cls.tables) { if (cls_table_is_catchall(t)) { catchall = t; } else if (!other) { @@ -5518,43 +6115,45 @@ set_frag_handling(struct ofproto *ofproto_, } } -static int +static enum ofperr packet_out(struct ofproto *ofproto_, struct ofpbuf *packet, const struct flow *flow, const union ofp_action *ofp_actions, size_t n_ofp_actions) { struct ofproto_dpif *ofproto = ofproto_dpif_cast(ofproto_); - int error; + enum ofperr error; if (flow->in_port >= ofproto->max_ports && flow->in_port < OFPP_MAX) { - return ofp_mkerr_nicira(OFPET_BAD_REQUEST, NXBRC_BAD_IN_PORT); + return OFPERR_NXBRC_BAD_IN_PORT; } error = validate_actions(ofp_actions, n_ofp_actions, flow, ofproto->max_ports); if (!error) { struct odputil_keybuf keybuf; - struct ofpbuf *odp_actions; - struct ofproto_push push; + struct dpif_flow_stats stats; + struct ofpbuf key; + struct action_xlate_ctx ctx; + uint64_t odp_actions_stub[1024 / 8]; + struct ofpbuf odp_actions; + ofpbuf_use_stack(&key, &keybuf, sizeof keybuf); odp_flow_key_from_flow(&key, flow); - action_xlate_ctx_init(&push.ctx, ofproto, flow, flow->vlan_tci, 0, - packet); + dpif_flow_stats_extract(flow, packet, &stats); - /* Ensure that resubmits in 'ofp_actions' get accounted to their - * matching rules. */ - push.packets = 1; - push.bytes = packet->size; - push.used = time_msec(); - push.ctx.resubmit_hook = push_resubmit; + action_xlate_ctx_init(&ctx, ofproto, flow, flow->vlan_tci, NULL, + packet_get_tcp_flags(packet, flow), packet); + ctx.resubmit_stats = &stats; - odp_actions = xlate_actions(&push.ctx, ofp_actions, n_ofp_actions); + ofpbuf_use_stub(&odp_actions, + odp_actions_stub, sizeof odp_actions_stub); + xlate_actions(&ctx, ofp_actions, n_ofp_actions, &odp_actions); dpif_execute(ofproto->dpif, key.data, key.size, - odp_actions->data, odp_actions->size, packet); - ofpbuf_delete(odp_actions); + odp_actions.data, odp_actions.size, packet); + ofpbuf_uninit(&odp_actions); } return error; } @@ -5600,9 +6199,9 @@ send_active_timeout(struct ofproto_dpif *ofproto, struct facet *facet) if (subfacet->installed) { struct dpif_flow_stats stats; - subfacet_install(ofproto, subfacet, subfacet->actions, + subfacet_install(subfacet, subfacet->actions, subfacet->actions_len, &stats); - subfacet_update_stats(ofproto, subfacet, &stats); + subfacet_update_stats(subfacet, &stats); } } @@ -5639,19 +6238,25 @@ ofproto_dpif_lookup(const char *name) } static void -ofproto_unixctl_fdb_flush(struct unixctl_conn *conn, int argc OVS_UNUSED, +ofproto_unixctl_fdb_flush(struct unixctl_conn *conn, int argc, const char *argv[], void *aux OVS_UNUSED) { - const struct ofproto_dpif *ofproto; + struct ofproto_dpif *ofproto; - ofproto = ofproto_dpif_lookup(argv[1]); - if (!ofproto) { - unixctl_command_reply(conn, 501, "no such bridge"); - return; + if (argc > 1) { + ofproto = ofproto_dpif_lookup(argv[1]); + if (!ofproto) { + unixctl_command_reply_error(conn, "no such bridge"); + return; + } + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); + } else { + HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, &all_ofproto_dpifs) { + mac_learning_flush(ofproto->ml, &ofproto->revalidate_set); + } } - mac_learning_flush(ofproto->ml); - unixctl_command_reply(conn, 200, "table successfully flushed"); + unixctl_command_reply(conn, "table successfully flushed"); } static void @@ -5664,7 +6269,7 @@ ofproto_unixctl_fdb_show(struct unixctl_conn *conn, int argc OVS_UNUSED, ofproto = ofproto_dpif_lookup(argv[1]); if (!ofproto) { - unixctl_command_reply(conn, 501, "no such bridge"); + unixctl_command_reply_error(conn, "no such bridge"); return; } @@ -5673,13 +6278,14 @@ ofproto_unixctl_fdb_show(struct unixctl_conn *conn, int argc OVS_UNUSED, struct ofbundle *bundle = e->port.p; ds_put_format(&ds, "%5d %4d "ETH_ADDR_FMT" %3d\n", ofbundle_get_a_port(bundle)->odp_port, - e->vlan, ETH_ADDR_ARGS(e->mac), mac_entry_age(e)); + e->vlan, ETH_ADDR_ARGS(e->mac), + mac_entry_age(ofproto->ml, e)); } - unixctl_command_reply(conn, 200, ds_cstr(&ds)); + unixctl_command_reply(conn, ds_cstr(&ds)); ds_destroy(&ds); } -struct ofproto_trace { +struct trace_ctx { struct action_xlate_ctx ctx; struct flow flow; struct ds *result; @@ -5708,7 +6314,7 @@ trace_format_rule(struct ds *result, uint8_t table_id, int level, static void trace_format_flow(struct ds *result, int level, const char *title, - struct ofproto_trace *trace) + struct trace_ctx *trace) { ds_put_char_multiple(result, '\t', level); ds_put_format(result, "%s: ", title); @@ -5723,7 +6329,7 @@ trace_format_flow(struct ds *result, int level, const char *title, static void trace_format_regs(struct ds *result, int level, const char *title, - struct ofproto_trace *trace) + struct trace_ctx *trace) { size_t i; @@ -5735,15 +6341,28 @@ trace_format_regs(struct ds *result, int level, const char *title, ds_put_char(result, '\n'); } +static void +trace_format_odp(struct ds *result, int level, const char *title, + struct trace_ctx *trace) +{ + struct ofpbuf *odp_actions = trace->ctx.odp_actions; + + ds_put_char_multiple(result, '\t', level); + ds_put_format(result, "%s: ", title); + format_odp_actions(result, odp_actions->data, odp_actions->size); + ds_put_char(result, '\n'); +} + static void trace_resubmit(struct action_xlate_ctx *ctx, struct rule_dpif *rule) { - struct ofproto_trace *trace = CONTAINER_OF(ctx, struct ofproto_trace, ctx); + struct trace_ctx *trace = CONTAINER_OF(ctx, struct trace_ctx, ctx); struct ds *result = trace->result; ds_put_char(result, '\n'); trace_format_flow(result, ctx->recurse + 1, "Resubmitted flow", trace); trace_format_regs(result, ctx->recurse + 1, "Resubmitted regs", trace); + trace_format_odp(result, ctx->recurse + 1, "Resubmitted odp", trace); trace_format_rule(result, ctx->table_id, ctx->recurse + 1, rule); } @@ -5755,7 +6374,6 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[], struct ofproto_dpif *ofproto; struct ofpbuf odp_key; struct ofpbuf *packet; - struct rule_dpif *rule; ovs_be16 initial_tci; struct ds result; struct flow flow; @@ -5767,8 +6385,8 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[], ofproto = ofproto_dpif_lookup(dpname); if (!ofproto) { - unixctl_command_reply(conn, 501, "Unknown ofproto (use ofproto/list " - "for help)"); + unixctl_command_reply_error(conn, "Unknown ofproto (use ofproto/list " + "for help)"); goto exit; } if (argc == 3 || (argc == 4 && !strcmp(argv[3], "-generate"))) { @@ -5781,7 +6399,7 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[], ofpbuf_init(&odp_key, 0); error = odp_flow_key_from_string(flow_s, NULL, &odp_key); if (error) { - unixctl_command_reply(conn, 501, "Bad flow syntax"); + unixctl_command_reply_error(conn, "Bad flow syntax"); goto exit; } @@ -5790,7 +6408,7 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[], odp_key.size, &flow, &initial_tci, NULL); if (error == ODP_FIT_ERROR) { - unixctl_command_reply(conn, 501, "Invalid flow"); + unixctl_command_reply_error(conn, "Invalid flow"); goto exit; } @@ -5812,7 +6430,7 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[], msg = eth_from_hex(packet_s, &packet); if (msg) { - unixctl_command_reply(conn, 501, msg); + unixctl_command_reply_error(conn, msg); goto exit; } @@ -5824,50 +6442,65 @@ ofproto_unixctl_trace(struct unixctl_conn *conn, int argc, const char *argv[], flow_extract(packet, priority, tun_id, in_port, &flow); initial_tci = flow.vlan_tci; } else { - unixctl_command_reply(conn, 501, "Bad command syntax"); + unixctl_command_reply_error(conn, "Bad command syntax"); goto exit; } - ds_put_cstr(&result, "Flow: "); - flow_format(&result, &flow); - ds_put_char(&result, '\n'); + ofproto_trace(ofproto, &flow, packet, initial_tci, &result); + unixctl_command_reply(conn, ds_cstr(&result)); - rule = rule_dpif_lookup(ofproto, &flow, 0); - trace_format_rule(&result, 0, 0, rule); - if (rule) { - struct ofproto_trace trace; - struct ofpbuf *odp_actions; +exit: + ds_destroy(&result); + ofpbuf_delete(packet); + ofpbuf_uninit(&odp_key); +} - trace.result = &result; - trace.flow = flow; - action_xlate_ctx_init(&trace.ctx, ofproto, &flow, initial_tci, - rule->up.flow_cookie, packet); +static void +ofproto_trace(struct ofproto_dpif *ofproto, const struct flow *flow, + const struct ofpbuf *packet, ovs_be16 initial_tci, + struct ds *ds) +{ + struct rule_dpif *rule; + + ds_put_cstr(ds, "Flow: "); + flow_format(ds, flow); + ds_put_char(ds, '\n'); + + rule = rule_dpif_lookup(ofproto, flow, 0); + trace_format_rule(ds, 0, 0, rule); + if (rule) { + uint64_t odp_actions_stub[1024 / 8]; + struct ofpbuf odp_actions; + + struct trace_ctx trace; + uint8_t tcp_flags; + + tcp_flags = packet ? packet_get_tcp_flags(packet, flow) : 0; + trace.result = ds; + trace.flow = *flow; + ofpbuf_use_stub(&odp_actions, + odp_actions_stub, sizeof odp_actions_stub); + action_xlate_ctx_init(&trace.ctx, ofproto, flow, initial_tci, + rule, tcp_flags, packet); trace.ctx.resubmit_hook = trace_resubmit; - odp_actions = xlate_actions(&trace.ctx, - rule->up.actions, rule->up.n_actions); + xlate_actions(&trace.ctx, rule->up.actions, rule->up.n_actions, + &odp_actions); - ds_put_char(&result, '\n'); - trace_format_flow(&result, 0, "Final flow", &trace); - ds_put_cstr(&result, "Datapath actions: "); - format_odp_actions(&result, odp_actions->data, odp_actions->size); - ofpbuf_delete(odp_actions); + ds_put_char(ds, '\n'); + trace_format_flow(ds, 0, "Final flow", &trace); + ds_put_cstr(ds, "Datapath actions: "); + format_odp_actions(ds, odp_actions.data, odp_actions.size); + ofpbuf_uninit(&odp_actions); if (!trace.ctx.may_set_up_flow) { if (packet) { - ds_put_cstr(&result, "\nThis flow is not cachable."); + ds_put_cstr(ds, "\nThis flow is not cachable."); } else { - ds_put_cstr(&result, "\nThe datapath actions are incomplete--" + ds_put_cstr(ds, "\nThe datapath actions are incomplete--" "for complete actions, please supply a packet."); } } } - - unixctl_command_reply(conn, 200, ds_cstr(&result)); - -exit: - ds_destroy(&result); - ofpbuf_delete(packet); - ofpbuf_uninit(&odp_key); } static void @@ -5875,7 +6508,7 @@ ofproto_dpif_clog(struct unixctl_conn *conn OVS_UNUSED, int argc OVS_UNUSED, const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED) { clogged = true; - unixctl_command_reply(conn, 200, NULL); + unixctl_command_reply(conn, NULL); } static void @@ -5883,7 +6516,58 @@ ofproto_dpif_unclog(struct unixctl_conn *conn OVS_UNUSED, int argc OVS_UNUSED, const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED) { clogged = false; - unixctl_command_reply(conn, 200, NULL); + unixctl_command_reply(conn, NULL); +} + +/* Runs a self-check of flow translations in 'ofproto'. Appends a message to + * 'reply' describing the results. */ +static void +ofproto_dpif_self_check__(struct ofproto_dpif *ofproto, struct ds *reply) +{ + struct facet *facet; + int errors; + + errors = 0; + HMAP_FOR_EACH (facet, hmap_node, &ofproto->facets) { + if (!facet_check_consistency(facet)) { + errors++; + } + } + if (errors) { + ofproto->need_revalidate = true; + } + + if (errors) { + ds_put_format(reply, "%s: self-check failed (%d errors)\n", + ofproto->up.name, errors); + } else { + ds_put_format(reply, "%s: self-check passed\n", ofproto->up.name); + } +} + +static void +ofproto_dpif_self_check(struct unixctl_conn *conn, + int argc, const char *argv[], void *aux OVS_UNUSED) +{ + struct ds reply = DS_EMPTY_INITIALIZER; + struct ofproto_dpif *ofproto; + + if (argc > 1) { + ofproto = ofproto_dpif_lookup(argv[1]); + if (!ofproto) { + unixctl_command_reply_error(conn, "Unknown ofproto (use " + "ofproto/list for help)"); + return; + } + ofproto_dpif_self_check__(ofproto, &reply); + } else { + HMAP_FOR_EACH (ofproto, all_ofproto_dpifs_node, &all_ofproto_dpifs) { + ofproto_dpif_self_check__(ofproto, &reply); + } + } + + unixctl_command_reply(conn, ds_cstr(&reply)); + ds_destroy(&reply); } static void @@ -5898,8 +6582,8 @@ ofproto_dpif_unixctl_init(void) unixctl_command_register( "ofproto/trace", "bridge {tun_id in_port packet | odp_flow [-generate]}", - 2, 4, ofproto_unixctl_trace, NULL); - unixctl_command_register("fdb/flush", "bridge", 1, 1, + 2, 5, ofproto_unixctl_trace, NULL); + unixctl_command_register("fdb/flush", "[bridge]", 0, 1, ofproto_unixctl_fdb_flush, NULL); unixctl_command_register("fdb/show", "bridge", 1, 1, ofproto_unixctl_fdb_show, NULL); @@ -5907,6 +6591,8 @@ ofproto_dpif_unixctl_init(void) ofproto_dpif_clog, NULL); unixctl_command_register("ofproto/unclog", "", 0, 0, ofproto_dpif_unclog, NULL); + unixctl_command_register("ofproto/self-check", "[bridge]", 0, 1, + ofproto_dpif_self_check, NULL); } /* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.) @@ -5954,6 +6640,13 @@ hash_realdev_vid(uint16_t realdev_ofp_port, int vid) return hash_2words(realdev_ofp_port, vid); } +/* Returns the ODP port number of the Linux VLAN device that corresponds to + * 'vlan_tci' on the network device with port number 'realdev_odp_port' in + * 'ofproto'. For example, given 'realdev_odp_port' of eth0 and 'vlan_tci' 9, + * it would return the port number of eth0.9. + * + * Unless VLAN splinters are enabled for port 'realdev_odp_port', this + * function just returns its 'realdev_odp_port' argument. */ static uint32_t vsp_realdev_to_vlandev(const struct ofproto_dpif *ofproto, uint32_t realdev_odp_port, ovs_be16 vlan_tci) @@ -5990,9 +6683,18 @@ vlandev_find(const struct ofproto_dpif *ofproto, uint16_t vlandev_ofp_port) return NULL; } +/* Returns the OpenFlow port number of the "real" device underlying the Linux + * VLAN device with OpenFlow port number 'vlandev_ofp_port' and stores the + * VLAN VID of the Linux VLAN device in '*vid'. For example, given + * 'vlandev_ofp_port' of eth0.9, it would return the OpenFlow port number of + * eth0 and store 9 in '*vid'. + * + * Returns 0 and does not modify '*vid' if 'vlandev_ofp_port' is not a Linux + * VLAN device. Unless VLAN splinters are enabled, this is what this function + * always does.*/ static uint16_t vsp_vlandev_to_realdev(const struct ofproto_dpif *ofproto, - uint16_t vlandev_ofp_port, int *vid) + uint16_t vlandev_ofp_port, int *vid) { if (!hmap_is_empty(&ofproto->vlandev_map)) { const struct vlan_splinter *vsp; @@ -6097,6 +6799,7 @@ const struct ofproto_class ofproto_dpif_class = { set_cfm, get_cfm_fault, get_cfm_remote_mpids, + get_cfm_health, set_stp, get_stp_status, set_stp_port, @@ -6109,5 +6812,6 @@ const struct ofproto_class ofproto_dpif_class = { set_flood_vlans, is_mirror_output_bundle, forward_bpdu_changed, + set_mac_idle_time, set_realdev, };