nicira-ext: Support matching IPv6 traffic.

[sliver-openvswitch.git] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index d58196e..ee1c4c9 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -10,6 +10,7 @@
 #define FLOW_H 1
 
 #include <linux/kernel.h>
+#include <linux/netlink.h>
 #include <linux/spinlock.h>
 #include <linux/types.h>
 #include <linux/rcupdate.h>
@@ -28,12 +29,37 @@ struct sw_flow_actions {
        struct nlattr actions[];
 };
 
+struct sw_flow_key {
+       __be64  tun_id;     /* Encapsulating tunnel ID. */
+       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. */
+               };
+       };
+       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 source hardware address. */
+       u8      arp_tha[ETH_ALEN]; /* ARP target hardware address. */
+};
+
 struct sw_flow {
        struct rcu_head rcu;
        struct tbl_node tbl_node;
 
-       struct odp_flow_key key;
-       struct sw_flow_actions *sf_acts;
+       struct sw_flow_key key;
+       struct sw_flow_actions __rcu *sf_acts;
 
        atomic_t refcnt;
        bool dead;
@@ -58,7 +84,7 @@ struct arp_eth_header
        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        */
-} __attribute__((packed));
+} __packed;
 
 int flow_init(void);
 void flow_exit(void);
@@ -67,18 +93,27 @@ 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(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 *);
 void flow_put(struct sw_flow *);
 
-int flow_extract(struct sk_buff *, u16 in_port, struct odp_flow_key *, bool *is_frag);
+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 odp_flow_key *key);
+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.
+ */
+#define FLOW_BUFSIZE 96
+
+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)
 {
        return container_of(node, struct sw_flow, tbl_node);