X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=a31dab0d4e378e6ea8ff682cfaf44bd9c49d998e;hb=04b13268fd76434019fa433da299da87a759272a;hp=484ea626b65b5dde5075d9a675dd8c4c4bcdd366;hpb=7257b535ab8e5fafd811c5f6788205eefdd44948;p=sliver-openvswitch.git diff --git a/datapath/flow.h b/datapath/flow.h index 484ea626b..a31dab0d4 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -1,9 +1,19 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2013 Nicira, Inc. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ #ifndef FLOW_H @@ -20,9 +30,13 @@ #include #include #include + #include +#include struct sk_buff; +struct sw_flow_mask; +struct flow_table; struct sw_flow_actions { struct rcu_head rcu; @@ -30,14 +44,28 @@ struct sw_flow_actions { struct nlattr actions[]; }; -/* Mask for the OVS_FRAG_TYPE_* value in the low 2 bits of ip.tos_frag in - * struct sw_flow_key. */ -#define OVS_FRAG_TYPE_MASK INET_ECN_MASK +/* Used to memset ovs_key_ipv4_tunnel padding. */ +#define OVS_TUNNEL_KEY_SIZE \ + (offsetof(struct ovs_key_ipv4_tunnel, ipv4_ttl) + \ + FIELD_SIZEOF(struct ovs_key_ipv4_tunnel, ipv4_ttl)) + +struct ovs_key_ipv4_tunnel { + __be64 tun_id; + __be32 ipv4_src; + __be32 ipv4_dst; + __be16 tun_flags; + u8 ipv4_tos; + u8 ipv4_ttl; +}; struct sw_flow_key { + struct ovs_key_ipv4_tunnel tun_key; /* Encapsulating tunnel key. */ + struct { + u32 priority; /* Packet QoS priority. */ + u32 skb_mark; /* SKB mark. */ + u16 in_port; /* Input switch port (or DP_MAX_PORTS). */ + } phy; struct { - __be64 tun_id; /* Encapsulating tunnel ID. */ - u16 in_port; /* Input switch port (or USHRT_MAX). */ u8 src[ETH_ALEN]; /* Ethernet source address. */ u8 dst[ETH_ALEN]; /* Ethernet destination address. */ __be16 tci; /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */ @@ -45,8 +73,9 @@ struct sw_flow_key { } eth; struct { u8 proto; /* IP protocol or lower 8 bits of ARP opcode. */ - u8 tos_frag; /* IP ToS DSCP in high 6 bits, - * OVS_FRAG_TYPE_* in low 2 bits. */ + u8 tos; /* IP ToS. */ + u8 ttl; /* IP TTL/hop limit. */ + u8 frag; /* One of OVS_FRAG_TYPE_*. */ } ip; union { struct { @@ -70,6 +99,7 @@ struct sw_flow_key { struct in6_addr src; /* IPv6 source address. */ struct in6_addr dst; /* IPv6 destination address. */ } addr; + __be32 label; /* IPv6 flow label. */ struct { __be16 src; /* TCP/UDP source port. */ __be16 dst; /* TCP/UDP destination port. */ @@ -85,15 +115,14 @@ struct sw_flow_key { struct sw_flow { struct rcu_head rcu; - struct hlist_node hash_node; + struct hlist_node hash_node[2]; u32 hash; struct sw_flow_key key; + struct sw_flow_key unmasked_key; + struct sw_flow_mask __rcu *mask; struct sw_flow_actions __rcu *sf_acts; - atomic_t refcnt; - bool dead; - spinlock_t lock; /* Lock for values below. */ unsigned long used; /* Last used time (in jiffies). */ u64 packet_count; /* Number of packets matched. */ @@ -101,8 +130,26 @@ struct sw_flow { u8 tcp_flags; /* Union of seen TCP flags. */ }; -struct arp_eth_header +struct sw_flow_key_range { + size_t start; + size_t end; +}; + +static inline u16 ovs_sw_flow_key_range_actual_size(const struct sw_flow_key_range *range) { + return range->end - range->start; +} + +struct sw_flow_match { + struct sw_flow_key *key; + struct sw_flow_key_range range; + struct sw_flow_mask *mask; +}; + +void ovs_match_init(struct sw_flow_match *match, + struct sw_flow_key *key, struct sw_flow_mask *mask); + +struct arp_eth_header { __be16 ar_hrd; /* format of hardware address */ __be16 ar_pro; /* format of protocol address */ unsigned char ar_hln; /* length of hardware address */ @@ -116,76 +163,99 @@ struct arp_eth_header unsigned char ar_tip[4]; /* target IP address */ } __packed; -int flow_init(void); -void flow_exit(void); - -struct sw_flow *flow_alloc(void); -void flow_deferred_free(struct sw_flow *); +int ovs_flow_init(void); +void ovs_flow_exit(void); -struct sw_flow_actions *flow_actions_alloc(const struct nlattr *); -void flow_deferred_free_acts(struct sw_flow_actions *); +struct sw_flow *ovs_flow_alloc(void); +void ovs_flow_deferred_free(struct sw_flow *); +void ovs_flow_free(struct sw_flow *, bool deferred); -void flow_hold(struct sw_flow *); -void flow_put(struct sw_flow *); +struct sw_flow_actions *ovs_flow_actions_alloc(int actions_len); +void ovs_flow_deferred_free_acts(struct sw_flow_actions *); -int flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, - int *key_lenp); -void flow_used(struct sw_flow *, struct sk_buff *); -u64 flow_used_time(unsigned long flow_jiffies); - -/* Upper bound on the length of a nlattr-formatted flow key. The longest - * nlattr-formatted flow key would be: - * - * struct pad nl hdr total - * ------ --- ------ ----- - * OVS_KEY_ATTR_TUN_ID 8 -- 4 12 - * OVS_KEY_ATTR_IN_PORT 4 -- 4 8 - * OVS_KEY_ATTR_ETHERNET 12 -- 4 16 - * OVS_KEY_ATTR_8021Q 4 -- 4 8 - * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 - * OVS_KEY_ATTR_IPV6 34 2 4 40 - * OVS_KEY_ATTR_ICMPV6 2 2 4 8 - * OVS_KEY_ATTR_ND 28 -- 4 32 - * ------------------------------------------------- - * total 132 - */ -#define FLOW_BUFSIZE 132 - -int flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *); -int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, +int ovs_flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *); +void ovs_flow_used(struct sw_flow *, struct sk_buff *); +u64 ovs_flow_used_time(unsigned long flow_jiffies); +int ovs_flow_to_nlattrs(const struct sw_flow_key *, + const struct sw_flow_key *, struct sk_buff *); +int ovs_match_from_nlattrs(struct sw_flow_match *match, + const struct nlattr *, const struct nlattr *); -int flow_metadata_from_nlattrs(u16 *in_port, __be64 *tun_id, - const struct nlattr *); +int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow, + const struct nlattr *attr); +#define MAX_ACTIONS_BUFSIZE (32 * 1024) #define TBL_MIN_BUCKETS 1024 struct flow_table { - struct flex_array *buckets; - unsigned int count, n_buckets; - struct rcu_head rcu; + struct flex_array *buckets; + unsigned int count, n_buckets; + struct rcu_head rcu; + struct list_head *mask_list; + int node_ver; + u32 hash_seed; + bool keep_flows; }; -static inline int flow_tbl_count(struct flow_table *table) +static inline int ovs_flow_tbl_count(struct flow_table *table) { return table->count; } -static inline int flow_tbl_need_to_expand(struct flow_table *table) +static inline int ovs_flow_tbl_need_to_expand(struct flow_table *table) { return (table->count > table->n_buckets); } -struct sw_flow *flow_tbl_lookup(struct flow_table *table, - struct sw_flow_key *key, int len); -void flow_tbl_destroy(struct flow_table *table); -void flow_tbl_deferred_destroy(struct flow_table *table); -struct flow_table *flow_tbl_alloc(int new_size); -struct flow_table *flow_tbl_expand(struct flow_table *table); -void flow_tbl_insert(struct flow_table *table, struct sw_flow *flow); -void flow_tbl_remove(struct flow_table *table, struct sw_flow *flow); -u32 flow_hash(const struct sw_flow_key *key, int key_len); +struct sw_flow *ovs_flow_lookup(struct flow_table *, + const struct sw_flow_key *); +struct sw_flow *ovs_flow_lookup_unmasked_key(struct flow_table *table, + struct sw_flow_match *match); + +void ovs_flow_tbl_destroy(struct flow_table *table, bool deferred); +struct flow_table *ovs_flow_tbl_alloc(int new_size); +struct flow_table *ovs_flow_tbl_expand(struct flow_table *table); +struct flow_table *ovs_flow_tbl_rehash(struct flow_table *table); +void ovs_flow_insert(struct flow_table *table, struct sw_flow *flow, + const struct sw_flow_key *key, int key_len); + +void ovs_flow_remove(struct flow_table *table, struct sw_flow *flow); + +struct sw_flow *ovs_flow_dump_next(struct flow_table *table, u32 *bucket, u32 *idx); +extern const int ovs_key_lens[OVS_KEY_ATTR_MAX + 1]; +int ipv4_tun_from_nlattr(const struct nlattr *attr, + struct sw_flow_match *match, bool is_mask); +int ipv4_tun_to_nlattr(struct sk_buff *skb, + const struct ovs_key_ipv4_tunnel *tun_key, + const struct ovs_key_ipv4_tunnel *output); + +bool ovs_flow_cmp_unmasked_key(const struct sw_flow *flow, + const struct sw_flow_key *key, int key_len); + +struct sw_flow_mask { + int ref_count; + struct rcu_head rcu; + struct list_head list; + struct sw_flow_key_range range; + struct sw_flow_key key; +}; + +static inline u16 +ovs_sw_flow_mask_actual_size(const struct sw_flow_mask *mask) +{ + return ovs_sw_flow_key_range_actual_size(&mask->range); +} -struct sw_flow *flow_tbl_next(struct flow_table *table, u32 *bucket, u32 *idx); -extern const u32 ovs_key_lens[OVS_KEY_ATTR_MAX + 1]; +static inline u16 +ovs_sw_flow_mask_size_roundup(const struct sw_flow_mask *mask) +{ + return roundup(ovs_sw_flow_mask_actual_size(mask), sizeof(u32)); +} +struct sw_flow_mask *ovs_sw_flow_mask_alloc(void); +void ovs_sw_flow_mask_add_ref(struct sw_flow_mask *); +void ovs_sw_flow_mask_del_ref(struct sw_flow_mask *, bool deferred); +void ovs_sw_flow_mask_insert(struct flow_table *, struct sw_flow_mask *); +struct sw_flow_mask *ovs_sw_flow_mask_find(const struct flow_table *, + const struct sw_flow_mask *); #endif /* flow.h */