X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=6a3c5393c64d80c78e1873c1ff3a2e60e6ac2fb9;hb=72c644fd6de23d69f66b755237e3f5c74b4d9af7;hp=a825366fe844767c3604c00695db48f000e32d46;hpb=34e63086edddcae06d7c1a4fa84fec0861e50758;p=sliver-openvswitch.git diff --git a/datapath/flow.h b/datapath/flow.h index a825366fe..6a3c5393c 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * Distributed under the terms of the GNU GPL version 2. * * Significant portions of this file may be copied from parts of the Linux @@ -10,48 +10,154 @@ #define FLOW_H 1 #include +#include #include #include #include -#include +#include +#include +#include +#include #include "openvswitch/datapath-protocol.h" +#include "table.h" struct sk_buff; struct sw_flow_actions { struct rcu_head rcu; - unsigned int n_actions; - union odp_action actions[]; + u32 actions_len; + struct nlattr actions[]; +}; + +struct sw_flow_key { + struct { + __be64 tun_id; /* Encapsulating tunnel ID. */ + u16 in_port; /* Input switch port. */ + 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 odp_flow_key key; - struct sw_flow_actions *sf_acts; + struct tbl_node tbl_node; - struct timespec used; /* Last used time. */ + struct sw_flow_key key; + struct sw_flow_actions __rcu *sf_acts; - u8 ip_tos; /* IP TOS value. */ + 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. */ u64 byte_count; /* Number of bytes matched. */ u8 tcp_flags; /* Union of seen TCP flags. */ }; -extern struct kmem_cache *flow_cache; +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 */ + unsigned char ar_pln; /* length of protocol address */ + __be16 ar_op; /* ARP opcode (command) */ + + /* Ethernet+IPv4 specific members. */ + unsigned char ar_sha[ETH_ALEN]; /* sender hardware address */ + unsigned char ar_sip[4]; /* sender IP address */ + unsigned char ar_tha[ETH_ALEN]; /* target hardware address */ + unsigned char ar_tip[4]; /* target IP address */ +} __packed; + +int flow_init(void); +void flow_exit(void); -struct sw_flow_actions *flow_actions_alloc(size_t n_actions); -void flow_free(struct sw_flow *); +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 flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *); + +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 *, + int *key_lenp, bool *is_frag); void flow_used(struct sw_flow *, struct sk_buff *); +u64 flow_used_time(unsigned long flow_jiffies); -void print_flow(const struct odp_flow_key *); +u32 flow_hash(const struct sw_flow_key *, int key_lenp); +int flow_cmp(const struct tbl_node *, void *target, int len); -int flow_init(void); -void flow_exit(void); +/* 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 + */ +#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, + const struct nlattr *); +int flow_metadata_from_nlattrs(u16 *in_port, __be64 *tun_id, + const struct nlattr *); + +static inline struct sw_flow *flow_cast(const struct tbl_node *node) +{ + return container_of(node, struct sw_flow, tbl_node); +} #endif /* flow.h */