X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif.h;h=dab422aac723f29ed6bfde381d6cb52524c0c251;hb=bab86012066c353c75d2b8446c25daea2471d939;hp=48e1b30bcf058a09f5db1691f160a8b3715cf73a;hpb=a36de779d739cdcd72c65c67a547a786798b595a;p=cascardo%2Fovs.git diff --git a/ofproto/ofproto-dpif.h b/ofproto/ofproto-dpif.h index 48e1b30bc..dab422aac 100644 --- a/ofproto/ofproto-dpif.h +++ b/ofproto/ofproto-dpif.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. +/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,11 @@ struct dpif_backer; struct OVS_LOCKABLE rule_dpif; struct OVS_LOCKABLE group_dpif; +/* Number of implemented OpenFlow tables. */ +enum { N_TABLES = 255 }; +enum { TBL_INTERNAL = N_TABLES - 1 }; /* Used for internal hidden rules. */ +BUILD_ASSERT_DECL(N_TABLES >= 2 && N_TABLES <= 255); + /* Ofproto-dpif -- DPIF based ofproto implementation. * * Ofproto-dpif provides an ofproto implementation for those platforms which @@ -68,18 +73,35 @@ struct OVS_LOCKABLE group_dpif; * Ofproto-dpif-xlate is responsible for translating OpenFlow 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 *); +/* Stores the various features which the corresponding backer supports. */ +struct dpif_backer_support { + /* True if the datapath supports variable-length + * OVS_USERSPACE_ATTR_USERDATA in OVS_ACTION_ATTR_USERSPACE actions. + * False if the datapath supports only 8-byte (or shorter) userdata. */ + bool variable_length_userdata; + + /* True if the datapath supports masked data in OVS_ACTION_ATTR_SET + * actions. */ + bool masked_set_action; + + /* True if the datapath supports tnl_push and pop actions. */ + bool tnl_push_pop; + + /* True if the datapath supports OVS_FLOW_ATTR_UFID. */ + bool ufid; + + /* Each member represents support for related OVS_KEY_ATTR_* fields. */ + struct odp_support odp; +}; -struct rule_dpif *rule_dpif_lookup(struct ofproto_dpif *, struct flow *, - struct flow_wildcards *, bool take_ref, - const struct dpif_flow_stats *, - uint8_t *table_id); +bool ofproto_dpif_get_enable_ufid(const struct dpif_backer *backer); +struct dpif_backer_support *ofproto_dpif_get_support(const struct ofproto_dpif *); + +cls_version_t ofproto_dpif_get_tables_version(struct ofproto_dpif *); struct rule_dpif *rule_dpif_lookup_from_table(struct ofproto_dpif *, - struct flow *, + cls_version_t, struct flow *, struct flow_wildcards *, - bool take_ref, const struct dpif_flow_stats *, uint8_t *table_id, ofp_port_t in_port, @@ -101,7 +123,6 @@ uint8_t rule_dpif_get_table(const struct rule_dpif *); bool table_is_internal(uint8_t table_id); const struct rule_actions *rule_dpif_get_actions(const struct rule_dpif *); -uint32_t rule_dpif_get_recirc_id(struct rule_dpif *); void rule_set_recirc_id(struct rule *, uint32_t id); ovs_be64 rule_dpif_get_flow_cookie(const struct rule_dpif *rule); @@ -109,11 +130,6 @@ ovs_be64 rule_dpif_get_flow_cookie(const struct rule_dpif *rule); void rule_dpif_reduce_timeouts(struct rule_dpif *rule, uint16_t idle_timeout, uint16_t hard_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, bool take_ref); - void group_dpif_credit_stats(struct group_dpif *, struct ofputil_bucket *, const struct dpif_flow_stats *); @@ -121,92 +137,40 @@ bool group_dpif_lookup(struct ofproto_dpif *ofproto, uint32_t group_id, struct group_dpif **group); void group_dpif_get_buckets(const struct group_dpif *group, - const struct list **buckets); + const struct ovs_list **buckets); enum ofp11_group_type group_dpif_get_type(const struct group_dpif *group); +const char *group_dpif_get_selection_method(const struct group_dpif *group); +uint64_t group_dpif_get_selection_method_param(const struct group_dpif *group); +const struct field_array *group_dpif_get_fields(const struct group_dpif *group); bool ofproto_has_vlan_splinters(const struct ofproto_dpif *); ofp_port_t vsp_realdev_to_vlandev(const struct ofproto_dpif *, ofp_port_t realdev_ofp_port, ovs_be16 vlan_tci); bool vsp_adjust_flow(const struct ofproto_dpif *, struct flow *, - struct ofpbuf *packet); + struct dp_packet *packet); int ofproto_dpif_execute_actions(struct ofproto_dpif *, const struct flow *, struct rule_dpif *, const struct ofpact *, - size_t ofpacts_len, struct ofpbuf *); + size_t ofpacts_len, struct dp_packet *); +int ofproto_dpif_execute_actions__(struct ofproto_dpif *, const struct flow *, + struct rule_dpif *, const struct ofpact *, + size_t ofpacts_len, int recurse, + int resubmits, struct dp_packet *); 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 *); +int ofproto_dpif_send_packet(const struct ofport_dpif *, struct dp_packet *); +void ofproto_dpif_flow_mod(struct ofproto_dpif *, + const 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); +struct ofport_dpif *ofp_port_to_ofport(const struct ofproto_dpif *, + ofp_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 OpenFlow fields via - * Nicira extensions. - * - * Post recirculation flow - * ------------------------ - * - * At the OpenFlow 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. - */ +bool ofproto_dpif_backer_enabled(struct dpif_backer* backer); -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 *, const struct match *, int priority, uint16_t idle_timeout, @@ -214,12 +178,6 @@ int ofproto_dpif_add_internal_flow(struct ofproto_dpif *, struct rule **rulep); int ofproto_dpif_delete_internal_flow(struct ofproto_dpif *, struct match *, int priority); - -/* Number of implemented OpenFlow tables. */ -enum { N_TABLES = 255 }; -enum { TBL_INTERNAL = N_TABLES - 1 }; /* Used for internal hidden rules. */ -BUILD_ASSERT_DECL(N_TABLES >= 2 && N_TABLES <= 255); - /* struct rule_dpif has struct rule as it's first member. */ #define RULE_CAST(RULE) ((struct rule *)RULE) @@ -247,15 +205,6 @@ static inline void rule_dpif_ref(struct rule_dpif *rule) } } -static inline bool rule_dpif_try_ref(struct rule_dpif *rule) -{ - if (rule) { - return ofproto_rule_try_ref(RULE_CAST(rule)); - } - return false; -} - - static inline void rule_dpif_unref(struct rule_dpif *rule) { if (rule) {