/*
- * Copyright (c) 2009, 2010 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
struct sw_flow_key {
__be64 tun_id; /* Encapsulating tunnel ID. */
- __be32 nw_src; /* IP source address. */
- __be32 nw_dst; /* IP destination address. */
+ union {
+ struct {
+ __be32 ipv4_src; /* IPv4 source address. */
+ __be32 ipv4_dst; /* IPv4 destination address. */
+ };
+ struct {
+ __be32 ipv6_src[4]; /* IPv6 source address. */
+ __be32 ipv6_dst[4]; /* IPv6 source address. */
+ };
+ };
+ __be32 nd_target[4]; /* 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. */
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 {
void flow_deferred_free(struct sw_flow *);
void flow_free_tbl(struct tbl_node *);
-struct sw_flow_actions *flow_actions_alloc(u32 actions_len);
+struct sw_flow_actions *flow_actions_alloc(const struct nlattr *);
void flow_deferred_free_acts(struct sw_flow_actions *);
void flow_hold(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);
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
+ * ------ --- ------ -----
+ * 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 96
+#define FLOW_BUFSIZE 132
-int flow_copy_from_user(struct sw_flow_key *, const struct nlattr __user *ukey, u32 key_len);
-int flow_copy_to_user(struct nlattr __user *ukey, const struct sw_flow_key *, u32 key_len);
+int flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);
+int flow_from_nlattrs(struct sw_flow_key *swkey, const struct nlattr *);
static inline struct sw_flow *flow_cast(const struct tbl_node *node)
{