X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif.h;h=8af66458e439a7e162b5dde21b8ea7f67f8e6a8b;hb=1a7c0cd710e19db3ff85606dbfd5fdad964a1eea;hp=d09e285ef23c306b565f890421e1cddb8bb7a221;hpb=8bfd0fdace852f2208b97430bd8de9aeadbf2fb0;p=sliver-openvswitch.git diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h index d09e285ef..8af66458e 100644 --- a/ofproto/ofproto-dpif.h +++ b/ofproto/ofproto-dpif.h @@ -21,12 +21,14 @@ #include "odp-util.h" #include "ofp-util.h" #include "ovs-thread.h" +#include "ofproto-provider.h" #include "timer.h" #include "util.h" #include "ovs-thread.h" union user_action_cookie; struct dpif_flow_stats; +struct ofproto; struct ofproto_dpif; struct ofproto_packet_in; struct ofport_dpif; @@ -34,6 +36,22 @@ struct dpif_backer; struct OVS_LOCKABLE rule_dpif; struct OVS_LOCKABLE group_dpif; +enum rule_dpif_lookup_verdict { + RULE_DPIF_LOOKUP_VERDICT_MATCH, /* A match occurred. */ + RULE_DPIF_LOOKUP_VERDICT_CONTROLLER, /* A miss occurred and the packet + * should be passed to + * the controller. */ + RULE_DPIF_LOOKUP_VERDICT_DROP, /* A miss occurred and the packet + * should be dropped. */ + RULE_DPIF_LOOKUP_VERDICT_DEFAULT, /* A miss occurred and the packet + * should handled by the default + * miss behaviour. + * For pre-OF1.3 it should be + * forwarded to the controller. + * For OF1.3+ it should be + * dropped. */ +}; + /* For lock annotation below only. */ extern struct ovs_rwlock xlate_rwlock; @@ -66,13 +84,19 @@ extern struct ovs_rwlock xlate_rwlock; * actions into datapath actions. */ size_t ofproto_dpif_get_max_mpls_depth(const struct ofproto_dpif *); +bool ofproto_dpif_get_enable_recirc(const struct ofproto_dpif *); -void rule_dpif_lookup(struct ofproto_dpif *, const struct flow *, - struct flow_wildcards *, struct rule_dpif **rule); +uint8_t rule_dpif_lookup(struct ofproto_dpif *, struct flow *, + struct flow_wildcards *, struct rule_dpif **rule, + bool take_ref); -bool rule_dpif_lookup_in_table(struct ofproto_dpif *, const struct flow *, - struct flow_wildcards *, uint8_t table_id, - struct rule_dpif **rule); +enum rule_dpif_lookup_verdict rule_dpif_lookup_from_table(struct ofproto_dpif *, + const struct flow *, + struct flow_wildcards *, + bool force_controller_on_miss, + uint8_t *table_id, + struct rule_dpif **rule, + bool take_ref); void rule_dpif_ref(struct rule_dpif *); void rule_dpif_unref(struct rule_dpif *); @@ -82,6 +106,8 @@ void rule_dpif_credit_stats(struct rule_dpif *rule , bool rule_dpif_is_fail_open(const struct rule_dpif *); bool rule_dpif_is_table_miss(const struct rule_dpif *); +bool rule_dpif_is_internal(const struct rule_dpif *); +uint8_t rule_dpif_get_table(const struct rule_dpif *); struct rule_actions *rule_dpif_get_actions(const struct rule_dpif *); @@ -93,7 +119,7 @@ void rule_dpif_reduce_timeouts(struct rule_dpif *rule, uint16_t idle_timeout, void choose_miss_rule(enum ofputil_port_config, struct rule_dpif *miss_rule, struct rule_dpif *no_packet_in_rule, - struct rule_dpif **rule); + struct rule_dpif **rule, bool take_ref); bool group_dpif_lookup(struct ofproto_dpif *ofproto, uint32_t group_id, struct group_dpif **group); @@ -116,9 +142,82 @@ int ofproto_dpif_execute_actions(struct ofproto_dpif *, const struct flow *, OVS_EXCLUDED(xlate_rwlock); void ofproto_dpif_send_packet_in(struct ofproto_dpif *, struct ofproto_packet_in *); +bool ofproto_dpif_wants_packet_in_on_miss(struct ofproto_dpif *); int ofproto_dpif_send_packet(const struct ofport_dpif *, struct ofpbuf *); void ofproto_dpif_flow_mod(struct ofproto_dpif *, struct ofputil_flow_mod *); +struct rule_dpif *ofproto_dpif_refresh_rule(struct rule_dpif *); struct ofport_dpif *odp_port_to_ofport(const struct dpif_backer *, odp_port_t); +/* + * Recirculation + * ============= + * + * Recirculation is a technique to allow a frame to re-enter the packet + * processing path for one or multiple times to achieve more flexible packet + * processing in the data path. MPLS handling and selecting bond slave port + * of a bond ports. + * + * Data path and user space interface + * ----------------------------------- + * + * Two new fields, recirc_id and dp_hash, are added to the current flow data + * structure. They are both of type uint32_t. In addition, a new action, + * RECIRC, are added. + * + * The value recirc_id is used to distinguish a packet from multiple + * iterations of recirculation. A packet initially received is considered of + * having recirc_id of 0. Recirc_id is managed by the user space, opaque to + * the data path. + * + * On the other hand, dp_hash can only be computed by the data path, opaque to + * the user space. In fact, user space may not able to recompute the hash + * value. The dp_hash value should be wildcarded when for a newly received + * packet. RECIRC action specifies whether the hash is computed. If computed, + * how many fields to be included in the hash computation. The computed hash + * value is stored into the dp_hash field prior to recirculation. + * + * The RECIRC action computes and set the dp_hash field, set the recirc_id + * field and then reprocess the packet as if it was received on the same input + * port. RECIRC action works like a function call; actions listed behind the + * RECIRC action will be executed after its execution. RECIRC action can be + * nested, data path implementation limits the number of recirculation executed + * to prevent unreasonable nesting depth or infinite loop. + * + * Both flow fields and the RECIRC action are exposed as open flow fields via + * Nicira extensions. + * + * Post recirculation flow + * ------------------------ + * + * At the open flow level, post recirculation rules are always hidden from the + * controller. They are installed in table 254 which is set up as a hidden + * table during boot time. Those rules are managed by the local user space + * program only. + * + * To speed up the classifier look up process, recirc_id is always reflected + * into the metadata field, since recirc_id is required to be exactly matched. + * + * Classifier look up always starts with table 254. A post recirculation flow + * lookup should find its hidden rule within this table. On the other hand, A + * newly received packet should miss all post recirculation rules because its + * recirc_id is zero, then hit a pre-installed lower priority rule to redirect + * classifier to look up starting from table 0: + * + * * , actions=resubmit(,0) + * + * Post recirculation data path flows are managed like other data path flows. + * They are created on demand. Miss handling, stats collection and revalidation + * work the same way as regular flows. + */ + +uint32_t ofproto_dpif_alloc_recirc_id(struct ofproto_dpif *ofproto); +void ofproto_dpif_free_recirc_id(struct ofproto_dpif *ofproto, uint32_t recirc_id); +int ofproto_dpif_add_internal_flow(struct ofproto_dpif *, + struct match *, int priority, + const struct ofpbuf *ofpacts, + struct rule **rulep); +int ofproto_dpif_delete_internal_flow(struct ofproto_dpif *, struct match *, + int priority); + #endif /* ofproto-dpif.h */