X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fflow.h;h=d6dc30837cd0688d3855f6aa4f534178aab97f34;hb=7efa3dccd1968535ae32caf59746aa11ce7532f2;hp=9e8549d45e0bc351dd4e51f232f07e26bb83fae6;hpb=4b0424809b823101c969a0691fc1db0c880ae64a;p=sliver-openvswitch.git diff --git a/lib/flow.h b/lib/flow.h index 9e8549d45..d6dc30837 100644 --- a/lib/flow.h +++ b/lib/flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,11 +32,12 @@ struct ds; struct flow_wildcards; struct minimask; struct ofpbuf; +struct pkt_metadata; /* This sequence number should be incremented whenever anything involving flows * or the wildcarding of flows changes. This will cause build assertion * failures in places which likely need to be updated. */ -#define FLOW_WC_SEQ 23 +#define FLOW_WC_SEQ 25 #define FLOW_N_REGS 8 BUILD_ASSERT_DECL(FLOW_N_REGS <= NXM_NX_MAX_REGS); @@ -72,10 +73,13 @@ struct flow_tnl { * numbers and other times datapath (dpif) port numbers. This union allows * access to both. */ union flow_in_port { - ofp_port_t ofp_port; odp_port_t odp_port; + ofp_port_t ofp_port; }; +/* Maximum number of supported MPLS labels. */ +#define FLOW_MAX_MPLS_LABELS 3 + /* * A flow in the network. * @@ -99,6 +103,7 @@ struct flow { uint32_t regs[FLOW_N_REGS]; /* Registers. */ uint32_t skb_priority; /* Packet priority for QoS. */ uint32_t pkt_mark; /* Packet mark. */ + uint32_t recirc_id; /* Must be exact match. */ union flow_in_port in_port; /* Input port.*/ /* L2 */ @@ -106,9 +111,9 @@ struct flow { uint8_t dl_dst[6]; /* Ethernet destination address. */ ovs_be16 dl_type; /* Ethernet frame type. */ ovs_be16 vlan_tci; /* If 802.1Q, TCI | VLAN_CFI; otherwise 0. */ + ovs_be32 mpls_lse[FLOW_MAX_MPLS_LABELS]; /* MPLS label stack entry. */ /* L3 */ - ovs_be32 mpls_lse; /* MPLS label stack entry. */ struct in6_addr ipv6_src; /* IPv6 source address. */ struct in6_addr ipv6_dst; /* IPv6 destination address. */ struct in6_addr nd_target; /* IPv6 neighbor discovery (ND) target. */ @@ -123,7 +128,10 @@ struct flow { uint8_t arp_tha[6]; /* ARP/ND target hardware address. */ ovs_be16 tcp_flags; /* TCP flags. With L3 to avoid matching L4. */ ovs_be16 pad; /* Padding. */ + /* L4 */ + uint32_t dp_hash; /* Datapath computed hash value. The exact + computation is opaque to the user space.*/ ovs_be16 tp_src; /* TCP/UDP/SCTP source port. */ ovs_be16 tp_dst; /* TCP/UDP/SCTP destination port. * Keep last for the BUILD_ASSERT_DECL below */ @@ -134,8 +142,8 @@ BUILD_ASSERT_DECL(sizeof(struct flow) % 4 == 0); /* Remember to update FLOW_WC_SEQ when changing 'struct flow'. */ BUILD_ASSERT_DECL(offsetof(struct flow, tp_dst) + 2 - == sizeof(struct flow_tnl) + 156 - && FLOW_WC_SEQ == 23); + == sizeof(struct flow_tnl) + 172 + && FLOW_WC_SEQ == 25); /* Incremental points at which flow classification may be performed in * segments. @@ -145,8 +153,8 @@ BUILD_ASSERT_DECL(offsetof(struct flow, tp_dst) + 2 * within the struct flow. */ enum { FLOW_SEGMENT_1_ENDS_AT = offsetof(struct flow, dl_src), - FLOW_SEGMENT_2_ENDS_AT = offsetof(struct flow, mpls_lse), - FLOW_SEGMENT_3_ENDS_AT = offsetof(struct flow, tp_src), + FLOW_SEGMENT_2_ENDS_AT = offsetof(struct flow, ipv6_src), + FLOW_SEGMENT_3_ENDS_AT = offsetof(struct flow, dp_hash), }; BUILD_ASSERT_DECL(FLOW_SEGMENT_1_ENDS_AT % 4 == 0); BUILD_ASSERT_DECL(FLOW_SEGMENT_2_ENDS_AT % 4 == 0); @@ -160,6 +168,8 @@ extern const uint8_t flow_segment_u32s[]; /* Represents the metadata fields of struct flow. */ struct flow_metadata { + uint32_t dp_hash; /* Datapath computed hash field. */ + uint32_t recirc_id; /* Recirculation ID. */ ovs_be64 tun_id; /* Encapsulating tunnel ID. */ ovs_be32 tun_src; /* Tunnel outer IPv4 src addr */ ovs_be32 tun_dst; /* Tunnel outer IPv4 dst addr */ @@ -169,8 +179,7 @@ struct flow_metadata { ofp_port_t in_port; /* OpenFlow port or zero. */ }; -void flow_extract(struct ofpbuf *, uint32_t priority, uint32_t mark, - const struct flow_tnl *, const union flow_in_port *in_port, +void flow_extract(struct ofpbuf *, const struct pkt_metadata *md, struct flow *); void flow_zero_wildcards(struct flow *, const struct flow_wildcards *); @@ -194,10 +203,19 @@ void flow_set_dl_vlan(struct flow *, ovs_be16 vid); void flow_set_vlan_vid(struct flow *, ovs_be16 vid); void flow_set_vlan_pcp(struct flow *, uint8_t pcp); -void flow_set_mpls_label(struct flow *flow, ovs_be32 label); -void flow_set_mpls_ttl(struct flow *flow, uint8_t ttl); -void flow_set_mpls_tc(struct flow *flow, uint8_t tc); -void flow_set_mpls_bos(struct flow *flow, uint8_t stack); +int flow_count_mpls_labels(const struct flow *, struct flow_wildcards *); +int flow_count_common_mpls_labels(const struct flow *a, int an, + const struct flow *b, int bn, + struct flow_wildcards *wc); +void flow_push_mpls(struct flow *, int n, ovs_be16 mpls_eth_type, + struct flow_wildcards *); +bool flow_pop_mpls(struct flow *, int n, ovs_be16 eth_type, + struct flow_wildcards *); +void flow_set_mpls_label(struct flow *, int idx, ovs_be32 label); +void flow_set_mpls_ttl(struct flow *, int idx, uint8_t ttl); +void flow_set_mpls_tc(struct flow *, int idx, uint8_t tc); +void flow_set_mpls_bos(struct flow *, int idx, uint8_t stack); +void flow_set_mpls_lse(struct flow *, int idx, ovs_be32 lse); void flow_compose(struct ofpbuf *, const struct flow *); @@ -310,6 +328,7 @@ void flow_wildcards_fold_minimask_range(struct flow_wildcards *, uint32_t flow_wildcards_hash(const struct flow_wildcards *, uint32_t basis); bool flow_wildcards_equal(const struct flow_wildcards *, const struct flow_wildcards *); +uint32_t flow_hash_5tuple(const struct flow *flow, uint32_t basis); uint32_t flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis); /* Initialize a flow with random fields that matter for nx_hash_fields. */