X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=c4b9c4f6e451dbfe6040830548d2e17cc68517a4;hb=85c9de194b9f432f7b8a66bda980cbab52a55b72;hp=5c232791ada53e96b846f0ca9c45daf7cf195e3b;hpb=bfef471742202cedac0a50303f392bea3debd22f;p=sliver-openvswitch.git diff --git a/datapath/flow.h b/datapath/flow.h index 5c232791a..c4b9c4f6e 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-2011 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 @@ -11,6 +21,7 @@ #include #include +#include #include #include #include @@ -18,9 +29,8 @@ #include #include #include - -#include "openvswitch/datapath-protocol.h" -#include "table.h" +#include +#include struct sk_buff; @@ -30,42 +40,88 @@ struct sw_flow_actions { struct nlattr actions[]; }; +/* Tunnel flow flags. */ +#define OVS_TNL_F_DONT_FRAGMENT (1 << 0) +#define OVS_TNL_F_CSUM (1 << 1) +#define OVS_TNL_F_KEY (1 << 2) + +/* 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; + u16 tun_flags; + u8 ipv4_tos; + u8 ipv4_ttl; +}; + struct sw_flow_key { - __be64 tun_id; /* Encapsulating tunnel ID. */ + 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 { + 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. */ + __be16 type; /* Ethernet frame type. */ + } eth; + struct { + u8 proto; /* IP protocol or lower 8 bits of ARP opcode. */ + u8 tos; /* IP ToS. */ + u8 ttl; /* IP TTL/hop limit. */ + u8 frag; /* One of OVS_FRAG_TYPE_*. */ + } ip; union { struct { - __be32 ipv4_src; /* IPv4 source address. */ - __be32 ipv4_dst; /* IPv4 destination address. */ - }; + struct { + __be32 src; /* IP source address. */ + __be32 dst; /* IP destination address. */ + } addr; + union { + struct { + __be16 src; /* TCP/UDP source port. */ + __be16 dst; /* TCP/UDP destination port. */ + } tp; + struct { + u8 sha[ETH_ALEN]; /* ARP source hardware address. */ + u8 tha[ETH_ALEN]; /* ARP target hardware address. */ + } arp; + }; + } ipv4; struct { - struct in6_addr ipv6_src; /* IPv6 source address. */ - struct in6_addr ipv6_dst; /* IPv6 source address. */ - }; + struct { + 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. */ + } tp; + struct { + struct in6_addr target; /* ND target address. */ + u8 sll[ETH_ALEN]; /* ND source link layer address. */ + u8 tll[ETH_ALEN]; /* ND target link layer address. */ + } nd; + } ipv6; }; - struct in6_addr nd_target; /* IPv6 ND target address. */ - u16 in_port; /* Input switch port. */ - __be16 dl_tci; /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */ - __be16 dl_type; /* Ethernet frame type. */ - __be16 tp_src; /* TCP/UDP source port. */ - __be16 tp_dst; /* TCP/UDP destination port. */ - u8 dl_src[ETH_ALEN]; /* Ethernet source address. */ - u8 dl_dst[ETH_ALEN]; /* Ethernet destination address. */ - u8 nw_proto; /* IP protocol or lower 8 bits of ARP opcode. */ - u8 nw_tos; /* IP ToS (DSCP field, 6 bits). */ - u8 arp_sha[ETH_ALEN]; /* ARP/ND source hardware address. */ - u8 arp_tha[ETH_ALEN]; /* ARP/ND target hardware address. */ }; struct sw_flow { struct rcu_head rcu; - struct tbl_node tbl_node; + struct hlist_node hash_node[2]; + u32 hash; struct sw_flow_key key; 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. */ @@ -73,8 +129,7 @@ struct sw_flow { u8 tcp_flags; /* Union of seen TCP flags. */ }; -struct arp_eth_header -{ +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 */ @@ -88,50 +143,94 @@ 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 *); -void flow_free_tbl(struct tbl_node *); - -struct sw_flow_actions *flow_actions_alloc(const struct nlattr *); -void flow_deferred_free_acts(struct sw_flow_actions *); +int ovs_flow_init(void); +void ovs_flow_exit(void); -void flow_hold(struct sw_flow *); -void flow_put(struct sw_flow *); +struct sw_flow *ovs_flow_alloc(void); +void ovs_flow_deferred_free(struct sw_flow *); +void ovs_flow_free(struct sw_flow *); -int flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, bool *is_frag); -void flow_used(struct sw_flow *, struct sk_buff *); -u64 flow_used_time(unsigned long flow_jiffies); +struct sw_flow_actions *ovs_flow_actions_alloc(int actions_len); +void ovs_flow_deferred_free_acts(struct sw_flow_actions *); -u32 flow_hash(const struct sw_flow_key *); -int flow_cmp(const struct tbl_node *, void *target); +int ovs_flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, + int *key_lenp); +void ovs_flow_used(struct sw_flow *, struct sk_buff *); +u64 ovs_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 - * ------ --- ------ ----- - * ODP_KEY_ATTR_TUN_ID 8 -- 4 12 - * ODP_KEY_ATTR_IN_PORT 4 -- 4 8 - * ODP_KEY_ATTR_ETHERNET 12 -- 4 16 - * ODP_KEY_ATTR_8021Q 4 -- 4 8 - * ODP_KEY_ATTR_ETHERTYPE 2 2 4 8 - * ODP_KEY_ATTR_IPV6 34 2 4 40 - * ODP_KEY_ATTR_ICMPV6 2 2 4 8 - * ODP_KEY_ATTR_ND 28 -- 4 32 - * ------------------------------------------------- - * total 132 + * struct pad nl hdr total + * ------ --- ------ ----- + * OVS_KEY_ATTR_PRIORITY 4 -- 4 8 + * OVS_KEY_ATTR_TUNNEL 0 -- 4 4 + * - OVS_TUNNEL_KEY_ATTR_ID 8 -- 4 12 + * - OVS_TUNNEL_KEY_ATTR_IPV4_SRC 4 -- 4 8 + * - OVS_TUNNEL_KEY_ATTR_IPV4_DST 4 -- 4 8 + * - OVS_TUNNEL_KEY_ATTR_TOS 1 3 4 8 + * - OVS_TUNNEL_KEY_ATTR_TTL 1 3 4 8 + * - OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT 0 -- 4 4 + * - OVS_TUNNEL_KEY_ATTR_CSUM 0 -- 4 4 + * OVS_KEY_ATTR_IN_PORT 4 -- 4 8 + * OVS_KEY_ATTR_SKB_MARK 4 -- 4 8 + * OVS_KEY_ATTR_ETHERNET 12 -- 4 16 + * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (outer VLAN ethertype) + * OVS_KEY_ATTR_8021Q 4 -- 4 8 + * OVS_KEY_ATTR_ENCAP 0 -- 4 4 (VLAN encapsulation) + * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (inner VLAN ethertype) + * OVS_KEY_ATTR_IPV6 40 -- 4 44 + * OVS_KEY_ATTR_ICMPV6 2 2 4 8 + * OVS_KEY_ATTR_ND 28 -- 4 32 + * ---------------------------------------------------------- + * total 208 */ -#define FLOW_BUFSIZE 132 +#define FLOW_BUFSIZE 208 -int flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *); -int flow_from_nlattrs(struct sw_flow_key *swkey, const struct nlattr *); +int ovs_flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *); +int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, + const struct nlattr *); +int ovs_flow_metadata_from_nlattrs(struct sw_flow *flow, int key_len, + const struct nlattr *attr); -static inline struct sw_flow *flow_cast(const struct tbl_node *node) +#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; + int node_ver; + u32 hash_seed; + bool keep_flows; +}; + +static inline int ovs_flow_tbl_count(struct flow_table *table) { - return container_of(node, struct sw_flow, tbl_node); + return table->count; } +static inline int ovs_flow_tbl_need_to_expand(struct flow_table *table) +{ + return (table->count > table->n_buckets); +} + +struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *table, + struct sw_flow_key *key, int len); +void ovs_flow_tbl_destroy(struct flow_table *table); +void ovs_flow_tbl_deferred_destroy(struct flow_table *table); +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_tbl_insert(struct flow_table *table, struct sw_flow *flow, + struct sw_flow_key *key, int key_len); +void ovs_flow_tbl_remove(struct flow_table *table, struct sw_flow *flow); + +struct sw_flow *ovs_flow_tbl_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 ovs_key_ipv4_tunnel *tun_key); +int ipv4_tun_to_nlattr(struct sk_buff *skb, + const struct ovs_key_ipv4_tunnel *tun_key); + #endif /* flow.h */