X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=ae12fe4d9011d947f7b762604e581cdd4b7a75e3;hb=dc155bff1bf6045c4eccbb5443b24d19448a4f7d;hp=78d5a7019c00b5d02f33a9aa6f81b63308a5f19b;hpb=37a1300c3ca05a97160d44dc34298c447b50ed9d;p=sliver-openvswitch.git diff --git a/datapath/flow.h b/datapath/flow.h index 78d5a7019..ae12fe4d9 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -15,11 +15,11 @@ #include #include #include +#include #include #include - +#include #include "openvswitch/datapath-protocol.h" -#include "table.h" struct sk_buff; @@ -30,23 +30,58 @@ struct sw_flow_actions { }; struct sw_flow_key { - __be64 tun_id; /* Encapsulating tunnel ID. */ - __be32 nw_src; /* IP source address. */ - __be32 nw_dst; /* IP destination 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). */ + 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. */ + __be16 type; /* Ethernet frame type. */ + } eth; + struct { + u8 proto; /* IP protocol or lower 8 bits of ARP opcode. */ + u8 tos; /* IP ToS (DSCP field, 6 bits). */ + } ip; + union { + struct { + 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 { + struct in6_addr src; /* IPv6 source address. */ + struct in6_addr dst; /* IPv6 destination address. */ + } addr; + 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 sw_flow { struct rcu_head rcu; - struct tbl_node tbl_node; + struct hlist_node hash_node; + u32 hash; + u32 upcall_pid; struct sw_flow_key key; struct sw_flow_actions __rcu *sf_acts; @@ -81,7 +116,6 @@ 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 *); @@ -89,23 +123,63 @@ void flow_deferred_free_acts(struct sw_flow_actions *); void flow_hold(struct sw_flow *); void flow_put(struct sw_flow *); -int flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, bool *is_frag); +int flow_extract(struct sk_buff *, u16 in_port, struct sw_flow_key *, + int *key_lenp, bool *is_frag); void flow_used(struct sw_flow *, struct sk_buff *); +u64 flow_used_time(unsigned long flow_jiffies); -u32 flow_hash(const struct sw_flow_key *); -int flow_cmp(const struct tbl_node *, void *target); - -/* By my calculations currently the longest valid nlattr-formatted flow key is - * 80 bytes long, so this leaves some safety margin. +/* 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 96 +#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, const struct nlattr *); +int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, + const struct nlattr *); +int flow_metadata_from_nlattrs(u16 *in_port, __be64 *tun_id, + const struct nlattr *); + +#define TBL_MIN_BUCKETS 1024 + +struct flow_table { + struct flex_array *buckets; + unsigned int count, n_buckets; + struct rcu_head rcu; +}; -static inline struct sw_flow *flow_cast(const struct tbl_node *node) +static inline int flow_tbl_count(struct flow_table *table) { - return container_of(node, struct sw_flow, tbl_node); + return table->count; } +static inline int 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 *flow_tbl_next(struct flow_table *table, u32 *bucket, u32 *idx); + #endif /* flow.h */