X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-xlate.h;h=760736a645d984859e63a4385491b17880230c58;hb=92c08f09804c4a32ecc5f24473f3e15cbbdb1d5e;hp=9f8ff44a644ecfc569517a08df17946f385219c8;hpb=8449c4d680d813fb55e30a0352b159662e0e111b;p=sliver-openvswitch.git diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h index 9f8ff44a6..760736a64 100644 --- a/ofproto/ofproto-dpif-xlate.h +++ b/ofproto/ofproto-dpif-xlate.h @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef OFPROT_DPIF_XLATE_H -#define OFPROT_DPIF_XLATE_H 1 +#ifndef OFPROTO_DPIF_XLATE_H +#define OFPROTO_DPIF_XLATE_H 1 #include "flow.h" #include "meta-flow.h" @@ -21,6 +21,8 @@ #include "ofpbuf.h" #include "ofproto-dpif-mirror.h" #include "ofproto-dpif.h" +#include "ofproto.h" +#include "stp.h" struct bfd; struct bond; @@ -29,6 +31,13 @@ struct lacp; struct dpif_ipfix; struct dpif_sflow; struct mac_learning; +struct xlate_cache; + +struct xlate_recirc { + uint32_t recirc_id; /* !0 Use recirculation instead of output. */ + uint8_t hash_alg; /* !0 Compute hash for recirc before. */ + uint32_t hash_basis; /* Compute hash for recirc before. */ +}; struct xlate_out { /* Wildcards relevant in translation. Any fields that were used to @@ -41,6 +50,7 @@ struct xlate_out { struct flow_wildcards wc; enum slow_path_reason slow; /* 0 if fast path may be used. */ + bool fail_open; /* Initial rule is fail open? */ bool has_learn; /* Actions include NXAST_LEARN? */ bool has_normal; /* Actions output to OFPP_NORMAL? */ bool has_fin_timeout; /* Actions include NXAST_FIN_TIMEOUT? */ @@ -70,7 +80,14 @@ struct xlate_in { * not if we are just revalidating. */ bool may_learn; - /* The rule initiating translation or NULL. */ + /* If the caller of xlate_actions() doesn't need the flow_wildcards + * contained in struct xlate_out. 'skip_wildcards' can be set to true + * disabling the expensive wildcard computation. When true, 'wc' in struct + * xlate_out is undefined and should not be read. */ + bool skip_wildcards; + + /* The rule initiating translation or NULL. If both 'rule' and 'ofpacts' + * are NULL, xlate_actions() will do the initial rule lookup itself. */ struct rule_dpif *rule; /* The actions to translate. If 'rule' is not NULL, these may be NULL. */ @@ -80,7 +97,7 @@ struct xlate_in { /* 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; + uint16_t tcp_flags; /* If nonnull, flow translation calls this function just before executing a * resubmit or OFPP_TABLE action. In addition, disables logging of traces @@ -108,42 +125,71 @@ struct xlate_in { * This is normally null so the client has to set it manually after * calling xlate_in_init(). */ const struct dpif_flow_stats *resubmit_stats; + + /* If nonnull, flow translation populates this cache with references to all + * modules that are affected by translation. This 'xlate_cache' may be + * passed to xlate_push_stats() to perform the same function as + * xlate_actions() without the full cost of translation. + * + * This is normally null so the client has to set it manually after + * calling xlate_in_init(). */ + struct xlate_cache *xcache; }; +extern struct ovs_rwlock xlate_rwlock; + void xlate_ofproto_set(struct ofproto_dpif *, const char *name, - struct dpif *, const struct mac_learning *, - struct stp *, const struct mbridge *, - const struct dpif_sflow *, const struct dpif_ipfix *, + struct dpif *, struct rule_dpif *miss_rule, + struct rule_dpif *no_packet_in_rule, + const struct mac_learning *, struct stp *, + const struct mbridge *, const struct dpif_sflow *, + const struct dpif_ipfix *, const struct netflow *, enum ofp_config_flags, bool forward_bpdu, - bool has_in_band, bool has_netflow); -void xlate_remove_ofproto(struct ofproto_dpif *); + bool has_in_band, bool enable_recirc, + bool variable_length_userdata, + size_t mpls_label_stack_length) + OVS_REQ_WRLOCK(xlate_rwlock); +void xlate_remove_ofproto(struct ofproto_dpif *) OVS_REQ_WRLOCK(xlate_rwlock); void xlate_bundle_set(struct ofproto_dpif *, struct ofbundle *, const char *name, enum port_vlan_mode, int vlan, unsigned long *trunks, bool use_priority_tags, const struct bond *, const struct lacp *, - bool floodable); -void xlate_bundle_remove(struct ofbundle *); + bool floodable) OVS_REQ_WRLOCK(xlate_rwlock); +void xlate_bundle_remove(struct ofbundle *) OVS_REQ_WRLOCK(xlate_rwlock); void xlate_ofport_set(struct ofproto_dpif *, struct ofbundle *, struct ofport_dpif *, ofp_port_t, odp_port_t, const struct netdev *, const struct cfm *, const struct bfd *, struct ofport_dpif *peer, int stp_port_no, const struct ofproto_port_queue *qdscp, - size_t n_qdscp, enum ofputil_port_config, bool is_tunnel, - bool may_enable); -void xlate_ofport_remove(struct ofport_dpif *); + size_t n_qdscp, enum ofputil_port_config, + enum ofputil_port_state, bool is_tunnel, + bool may_enable) OVS_REQ_WRLOCK(xlate_rwlock); +void xlate_ofport_remove(struct ofport_dpif *) OVS_REQ_WRLOCK(xlate_rwlock); int xlate_receive(const struct dpif_backer *, struct ofpbuf *packet, const struct nlattr *key, size_t key_len, - struct flow *, enum odp_key_fitness *, - struct ofproto_dpif **, odp_port_t *odp_in_port); + struct flow *, struct ofproto_dpif **, struct dpif_ipfix **, + struct dpif_sflow **, struct netflow **, + odp_port_t *odp_in_port) + OVS_EXCLUDED(xlate_rwlock); -void xlate_actions(struct xlate_in *, struct xlate_out *); +void xlate_actions(struct xlate_in *, struct xlate_out *) + OVS_EXCLUDED(xlate_rwlock); void xlate_in_init(struct xlate_in *, struct ofproto_dpif *, const struct flow *, struct rule_dpif *, - uint8_t tcp_flags, const struct ofpbuf *packet); + uint16_t tcp_flags, const struct ofpbuf *packet); void xlate_out_uninit(struct xlate_out *); void xlate_actions_for_side_effects(struct xlate_in *); void xlate_out_copy(struct xlate_out *dst, const struct xlate_out *src); + +int xlate_send_packet(const struct ofport_dpif *, struct ofpbuf *); + +struct xlate_cache *xlate_cache_new(void); +void xlate_push_stats(struct xlate_cache *, bool may_learn, + const struct dpif_flow_stats *); +void xlate_cache_clear(struct xlate_cache *); +void xlate_cache_delete(struct xlate_cache *); + #endif /* ofproto-dpif-xlate.h */