ofproto: Fix potential leak during flow mods.
[sliver-openvswitch.git] / datapath / flow.c
index a7832a4..c52081b 100644 (file)
@@ -1,9 +1,19 @@
 /*
- * Distributed under the terms of the GNU GPL version 2.
- * Copyright (c) 2007, 2008, 2009, 2010, 2011 Nicira Networks.
+ * Copyright (c) 2007-2014 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
  */
 
 #include "flow.h"
 #include <linux/in.h>
 #include <linux/rcupdate.h>
 #include <linux/if_arp.h>
-#include <linux/if_ether.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
+#include <linux/sctp.h>
+#include <linux/smp.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/icmp.h>
 #include <linux/icmpv6.h>
 #include <linux/rculist.h>
-#include <net/inet_ecn.h>
 #include <net/ip.h>
 #include <net/ipv6.h>
 #include <net/ndisc.h>
 
 #include "vlan.h"
 
-static struct kmem_cache *flow_cache;
-static unsigned int hash_seed __read_mostly;
+u64 ovs_flow_used_time(unsigned long flow_jiffies)
+{
+       struct timespec cur_ts;
+       u64 cur_ms, idle_ms;
+
+       ktime_get_ts(&cur_ts);
+       idle_ms = jiffies_to_msecs(jiffies - flow_jiffies);
+       cur_ms = (u64)cur_ts.tv_sec * MSEC_PER_SEC +
+                cur_ts.tv_nsec / NSEC_PER_MSEC;
+
+       return cur_ms - idle_ms;
+}
+
+#define TCP_FLAGS_BE16(tp) (*(__be16 *)&tcp_flag_word(tp) & htons(0x0FFF))
+
+void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,
+                          struct sk_buff *skb)
+{
+       struct flow_stats *stats;
+       int node = numa_node_id();
+
+       stats = rcu_dereference(flow->stats[node]);
+
+       /* Check if already have node-specific stats. */
+       if (likely(stats)) {
+               spin_lock(&stats->lock);
+               /* Mark if we write on the pre-allocated stats. */
+               if (node == 0 && unlikely(flow->stats_last_writer != node))
+                       flow->stats_last_writer = node;
+       } else {
+               stats = rcu_dereference(flow->stats[0]); /* Pre-allocated. */
+               spin_lock(&stats->lock);
+
+               /* If the current NUMA-node is the only writer on the
+                * pre-allocated stats keep using them.
+                */
+               if (unlikely(flow->stats_last_writer != node)) {
+                       /* A previous locker may have already allocated the
+                        * stats, so we need to check again.  If node-specific
+                        * stats were already allocated, we update the pre-
+                        * allocated stats as we have already locked them.
+                        */
+                       if (likely(flow->stats_last_writer != NUMA_NO_NODE)
+                           && likely(!rcu_dereference(flow->stats[node]))) {
+                               /* Try to allocate node-specific stats. */
+                               struct flow_stats *new_stats;
+
+                               new_stats =
+                                       kmem_cache_alloc_node(flow_stats_cache,
+                                                             GFP_THISNODE |
+                                                             __GFP_NOMEMALLOC,
+                                                             node);
+                               if (likely(new_stats)) {
+                                       new_stats->used = jiffies;
+                                       new_stats->packet_count = 1;
+                                       new_stats->byte_count = skb->len;
+                                       new_stats->tcp_flags = tcp_flags;
+                                       spin_lock_init(&new_stats->lock);
+
+                                       rcu_assign_pointer(flow->stats[node],
+                                                          new_stats);
+                                       goto unlock;
+                               }
+                       }
+                       flow->stats_last_writer = node;
+               }
+       }
+
+       stats->used = jiffies;
+       stats->packet_count++;
+       stats->byte_count += skb->len;
+       stats->tcp_flags |= tcp_flags;
+unlock:
+       spin_unlock(&stats->lock);
+}
+
+/* Must be called with rcu_read_lock or ovs_mutex. */
+void ovs_flow_stats_get(const struct sw_flow *flow,
+                       struct ovs_flow_stats *ovs_stats,
+                       unsigned long *used, __be16 *tcp_flags)
+{
+       int node;
+
+       *used = 0;
+       *tcp_flags = 0;
+       memset(ovs_stats, 0, sizeof(*ovs_stats));
+
+       for_each_node(node) {
+               struct flow_stats *stats = rcu_dereference_ovsl(flow->stats[node]);
+
+               if (stats) {
+                       /* Local CPU may write on non-local stats, so we must
+                        * block bottom-halves here.
+                        */
+                       spin_lock_bh(&stats->lock);
+                       if (!*used || time_after(stats->used, *used))
+                               *used = stats->used;
+                       *tcp_flags |= stats->tcp_flags;
+                       ovs_stats->n_packets += stats->packet_count;
+                       ovs_stats->n_bytes += stats->byte_count;
+                       spin_unlock_bh(&stats->lock);
+               }
+       }
+}
+
+/* Called with ovs_mutex. */
+void ovs_flow_stats_clear(struct sw_flow *flow)
+{
+       int node;
+
+       for_each_node(node) {
+               struct flow_stats *stats = ovsl_dereference(flow->stats[node]);
+
+               if (stats) {
+                       spin_lock_bh(&stats->lock);
+                       stats->used = 0;
+                       stats->packet_count = 0;
+                       stats->byte_count = 0;
+                       stats->tcp_flags = 0;
+                       spin_unlock_bh(&stats->lock);
+               }
+       }
+}
 
 static int check_header(struct sk_buff *skb, int len)
 {
@@ -96,102 +227,28 @@ static bool udphdr_ok(struct sk_buff *skb)
                                  sizeof(struct udphdr));
 }
 
-static bool icmphdr_ok(struct sk_buff *skb)
+static bool sctphdr_ok(struct sk_buff *skb)
 {
        return pskb_may_pull(skb, skb_transport_offset(skb) +
-                                 sizeof(struct icmphdr));
-}
-
-u64 flow_used_time(unsigned long flow_jiffies)
-{
-       struct timespec cur_ts;
-       u64 cur_ms, idle_ms;
-
-       ktime_get_ts(&cur_ts);
-       idle_ms = jiffies_to_msecs(jiffies - flow_jiffies);
-       cur_ms = (u64)cur_ts.tv_sec * MSEC_PER_SEC +
-                cur_ts.tv_nsec / NSEC_PER_MSEC;
-
-       return cur_ms - idle_ms;
+                                 sizeof(struct sctphdr));
 }
 
-#define SW_FLOW_KEY_OFFSET(field)              \
-       (offsetof(struct sw_flow_key, field) +  \
-        FIELD_SIZEOF(struct sw_flow_key, field))
-
-/**
- * skip_exthdr - skip any IPv6 extension headers
- * @skb: skbuff to parse
- * @start: offset of first extension header
- * @nexthdrp: Initially, points to the type of the extension header at @start.
- * This function updates it to point to the extension header at the final
- * offset.
- * @tos_frag: Points to the @tos_frag member in a &struct sw_flow_key.  This
- * function sets an appropriate %OVS_FRAG_TYPE_* value.
- *
- * This is based on ipv6_skip_exthdr() but adds the updates to *@tos_frag.
- *
- * When there is more than one fragment header, this version reports whether
- * the final fragment header that it examines is a first fragment.
- *
- * Returns the final payload offset, or -1 on error.
- */
-static int skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp,
-                      u8 *tos_frag)
+static bool icmphdr_ok(struct sk_buff *skb)
 {
-       u8 nexthdr = *nexthdrp;
-
-       while (ipv6_ext_hdr(nexthdr)) {
-               struct ipv6_opt_hdr _hdr, *hp;
-               int hdrlen;
-
-               if (nexthdr == NEXTHDR_NONE)
-                       return -1;
-               hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr);
-               if (hp == NULL)
-                       return -1;
-               if (nexthdr == NEXTHDR_FRAGMENT) {
-                       __be16 _frag_off, *fp;
-                       fp = skb_header_pointer(skb,
-                                               start+offsetof(struct frag_hdr,
-                                                              frag_off),
-                                               sizeof(_frag_off),
-                                               &_frag_off);
-                       if (fp == NULL)
-                               return -1;
-
-                       *tos_frag &= ~OVS_FRAG_TYPE_MASK;
-                       if (ntohs(*fp) & ~0x7) {
-                               *tos_frag |= OVS_FRAG_TYPE_LATER;
-                               break;
-                       }
-                       *tos_frag |= OVS_FRAG_TYPE_FIRST;
-                       hdrlen = 8;
-               } else if (nexthdr == NEXTHDR_AUTH)
-                       hdrlen = (hp->hdrlen+2)<<2;
-               else
-                       hdrlen = ipv6_optlen(hp);
-
-               nexthdr = hp->nexthdr;
-               start += hdrlen;
-       }
-
-       *nexthdrp = nexthdr;
-       return start;
+       return pskb_may_pull(skb, skb_transport_offset(skb) +
+                                 sizeof(struct icmphdr));
 }
 
-static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key,
-                        int *key_lenp)
+static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key)
 {
        unsigned int nh_ofs = skb_network_offset(skb);
        unsigned int nh_len;
        int payload_ofs;
        struct ipv6hdr *nh;
        uint8_t nexthdr;
+       __be16 frag_off;
        int err;
 
-       *key_lenp = SW_FLOW_KEY_OFFSET(ipv6.label);
-
        err = check_header(skb, nh_ofs + sizeof(*nh));
        if (unlikely(err))
                return err;
@@ -201,16 +258,23 @@ static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key,
        payload_ofs = (u8 *)(nh + 1) - skb->data;
 
        key->ip.proto = NEXTHDR_NONE;
-       key->ip.tos_frag = ipv6_get_dsfield(nh) & ~INET_ECN_MASK;
+       key->ip.tos = ipv6_get_dsfield(nh);
+       key->ip.ttl = nh->hop_limit;
        key->ipv6.label = *(__be32 *)nh & htonl(IPV6_FLOWINFO_FLOWLABEL);
-       ipv6_addr_copy(&key->ipv6.addr.src, &nh->saddr);
-       ipv6_addr_copy(&key->ipv6.addr.dst, &nh->daddr);
+       key->ipv6.addr.src = nh->saddr;
+       key->ipv6.addr.dst = nh->daddr;
 
-       payload_ofs = skip_exthdr(skb, payload_ofs,
-                                 &nexthdr, &key->ip.tos_frag);
+       payload_ofs = ipv6_skip_exthdr(skb, payload_ofs, &nexthdr, &frag_off);
        if (unlikely(payload_ofs < 0))
                return -EINVAL;
 
+       if (frag_off) {
+               if (frag_off & htons(~0x7))
+                       key->ip.frag = OVS_FRAG_TYPE_LATER;
+               else
+                       key->ip.frag = OVS_FRAG_TYPE_FIRST;
+       }
+
        nh_len = payload_ofs - nh_ofs;
        skb_set_transport_header(skb, nh_ofs + nh_len);
        key->ip.proto = nexthdr;
@@ -223,257 +287,6 @@ static bool icmp6hdr_ok(struct sk_buff *skb)
                                  sizeof(struct icmp6hdr));
 }
 
-#define TCP_FLAGS_OFFSET 13
-#define TCP_FLAG_MASK 0x3f
-
-void flow_used(struct sw_flow *flow, struct sk_buff *skb)
-{
-       u8 tcp_flags = 0;
-
-       if (flow->key.eth.type == htons(ETH_P_IP) &&
-           flow->key.ip.proto == IPPROTO_TCP) {
-               u8 *tcp = (u8 *)tcp_hdr(skb);
-               tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK;
-       }
-
-       spin_lock(&flow->lock);
-       flow->used = jiffies;
-       flow->packet_count++;
-       flow->byte_count += skb->len;
-       flow->tcp_flags |= tcp_flags;
-       spin_unlock(&flow->lock);
-}
-
-struct sw_flow_actions *flow_actions_alloc(const struct nlattr *actions)
-{
-       int actions_len = nla_len(actions);
-       struct sw_flow_actions *sfa;
-
-       /* At least DP_MAX_PORTS actions are required to be able to flood a
-        * packet to every port.  Factor of 2 allows for setting VLAN tags,
-        * etc. */
-       if (actions_len > 2 * DP_MAX_PORTS * nla_total_size(4))
-               return ERR_PTR(-EINVAL);
-
-       sfa = kmalloc(sizeof(*sfa) + actions_len, GFP_KERNEL);
-       if (!sfa)
-               return ERR_PTR(-ENOMEM);
-
-       sfa->actions_len = actions_len;
-       memcpy(sfa->actions, nla_data(actions), actions_len);
-       return sfa;
-}
-
-struct sw_flow *flow_alloc(void)
-{
-       struct sw_flow *flow;
-
-       flow = kmem_cache_alloc(flow_cache, GFP_KERNEL);
-       if (!flow)
-               return ERR_PTR(-ENOMEM);
-
-       spin_lock_init(&flow->lock);
-       atomic_set(&flow->refcnt, 1);
-       flow->sf_acts = NULL;
-       flow->dead = false;
-
-       return flow;
-}
-
-static struct hlist_head __rcu *find_bucket(struct flow_table * table, u32 hash)
-{
-       return flex_array_get(table->buckets,
-                               (hash & (table->n_buckets - 1)));
-}
-
-static struct flex_array  __rcu *alloc_buckets(unsigned int n_buckets)
-{
-       struct flex_array  __rcu *buckets;
-       int i, err;
-
-       buckets = flex_array_alloc(sizeof(struct hlist_head *),
-                                  n_buckets, GFP_KERNEL);
-       if (!buckets)
-               return NULL;
-
-       err = flex_array_prealloc(buckets, 0, n_buckets, GFP_KERNEL);
-       if (err) {
-               flex_array_free(buckets);
-               return NULL;
-       }
-
-       for (i = 0; i < n_buckets; i++)
-               INIT_HLIST_HEAD((struct hlist_head *)
-                                       flex_array_get(buckets, i));
-
-       return buckets;
-}
-
-static void free_buckets(struct flex_array *buckets)
-{
-       flex_array_free(buckets);
-}
-
-struct flow_table *flow_tbl_alloc(int new_size)
-{
-       struct flow_table *table = kmalloc(sizeof(*table), GFP_KERNEL);
-
-       if (!table)
-               return NULL;
-
-       table->buckets = alloc_buckets(new_size);
-
-       if (!table->buckets) {
-               kfree(table);
-               return NULL;
-       }
-       table->n_buckets = new_size;
-       table->count = 0;
-
-       return table;
-}
-
-static void flow_free(struct sw_flow *flow)
-{
-       flow->dead = true;
-       flow_put(flow);
-}
-
-void flow_tbl_destroy(struct flow_table *table)
-{
-       int i;
-
-       if (!table)
-               return;
-
-       for (i = 0; i < table->n_buckets; i++) {
-               struct sw_flow *flow;
-               struct hlist_head *head = flex_array_get(table->buckets, i);
-               struct hlist_node *node, *n;
-
-               hlist_for_each_entry_safe(flow, node, n, head, hash_node) {
-                       hlist_del_init_rcu(&flow->hash_node);
-                       flow_free(flow);
-               }
-       }
-
-       free_buckets(table->buckets);
-       kfree(table);
-}
-
-static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu)
-{
-       struct flow_table *table = container_of(rcu, struct flow_table, rcu);
-
-       flow_tbl_destroy(table);
-}
-
-void flow_tbl_deferred_destroy(struct flow_table *table)
-{
-       if (!table)
-               return;
-
-       call_rcu(&table->rcu, flow_tbl_destroy_rcu_cb);
-}
-
-struct sw_flow *flow_tbl_next(struct flow_table *table, u32 *bucket, u32 *last)
-{
-       struct sw_flow *flow;
-       struct hlist_head *head;
-       struct hlist_node *n;
-       int i;
-
-       while (*bucket < table->n_buckets) {
-               i = 0;
-               head = flex_array_get(table->buckets, *bucket);
-               hlist_for_each_entry_rcu(flow, n, head, hash_node) {
-                       if (i < *last) {
-                               i++;
-                               continue;
-                       }
-                       *last = i + 1;
-                       return flow;
-               }
-               (*bucket)++;
-               *last = 0;
-       }
-
-       return NULL;
-}
-
-struct flow_table *flow_tbl_expand(struct flow_table *table)
-{
-       struct flow_table *new_table;
-       int n_buckets = table->n_buckets * 2;
-       int i;
-
-       new_table = flow_tbl_alloc(n_buckets);
-       if (!new_table)
-               return ERR_PTR(-ENOMEM);
-
-       for (i = 0; i < table->n_buckets; i++) {
-               struct sw_flow *flow;
-               struct hlist_head *head;
-               struct hlist_node *n, *pos;
-
-               head = flex_array_get(table->buckets, i);
-
-               hlist_for_each_entry_safe(flow, n, pos, head, hash_node) {
-                       hlist_del_init_rcu(&flow->hash_node);
-                       flow_tbl_insert(new_table, flow);
-               }
-       }
-
-       return new_table;
-}
-
-/* RCU callback used by flow_deferred_free. */
-static void rcu_free_flow_callback(struct rcu_head *rcu)
-{
-       struct sw_flow *flow = container_of(rcu, struct sw_flow, rcu);
-
-       flow->dead = true;
-       flow_put(flow);
-}
-
-/* Schedules 'flow' to be freed after the next RCU grace period.
- * The caller must hold rcu_read_lock for this to be sensible. */
-void flow_deferred_free(struct sw_flow *flow)
-{
-       call_rcu(&flow->rcu, rcu_free_flow_callback);
-}
-
-void flow_hold(struct sw_flow *flow)
-{
-       atomic_inc(&flow->refcnt);
-}
-
-void flow_put(struct sw_flow *flow)
-{
-       if (unlikely(!flow))
-               return;
-
-       if (atomic_dec_and_test(&flow->refcnt)) {
-               kfree((struct sf_flow_acts __force *)flow->sf_acts);
-               kmem_cache_free(flow_cache, flow);
-       }
-}
-
-/* RCU callback used by flow_deferred_free_acts. */
-static void rcu_free_acts_callback(struct rcu_head *rcu)
-{
-       struct sw_flow_actions *sf_acts = container_of(rcu,
-                       struct sw_flow_actions, rcu);
-       kfree(sf_acts);
-}
-
-/* Schedules 'sf_acts' to be freed after the next RCU grace period.
- * The caller must hold rcu_read_lock for this to be sensible. */
-void flow_deferred_free_acts(struct sw_flow_actions *sf_acts)
-{
-       call_rcu(&sf_acts->rcu, rcu_free_acts_callback);
-}
-
 static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
 {
        struct qtag_prefix {
@@ -482,6 +295,9 @@ static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
        };
        struct qtag_prefix *qp;
 
+       if (unlikely(skb->len < sizeof(struct qtag_prefix) + sizeof(__be16)))
+               return 0;
+
        if (unlikely(!pskb_may_pull(skb, sizeof(struct qtag_prefix) +
                                         sizeof(__be16))))
                return -ENOMEM;
@@ -508,7 +324,7 @@ static __be16 parse_ethertype(struct sk_buff *skb)
        proto = *(__be16 *) skb->data;
        __skb_pull(skb, sizeof(__be16));
 
-       if (ntohs(proto) >= 1536)
+       if (ntohs(proto) >= ETH_P_802_3_MIN)
                return proto;
 
        if (skb->len < sizeof(struct llc_snap_hdr))
@@ -524,22 +340,23 @@ static __be16 parse_ethertype(struct sk_buff *skb)
                return htons(ETH_P_802_2);
 
        __skb_pull(skb, sizeof(struct llc_snap_hdr));
-       return llc->ethertype;
+
+       if (ntohs(llc->ethertype) >= ETH_P_802_3_MIN)
+               return llc->ethertype;
+
+       return htons(ETH_P_802_2);
 }
 
 static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,
-                       int *key_lenp, int nh_len)
+                       int nh_len)
 {
        struct icmp6hdr *icmp = icmp6_hdr(skb);
-       int error = 0;
-       int key_len;
 
        /* The ICMPv6 type and code fields use the 16-bit transport port
         * fields, so we need to store them in 16-bit network byte order.
         */
-       key->ipv6.tp.src = htons(icmp->icmp6_type);
-       key->ipv6.tp.dst = htons(icmp->icmp6_code);
-       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
+       key->tp.src = htons(icmp->icmp6_type);
+       key->tp.dst = htons(icmp->icmp6_code);
 
        if (icmp->icmp6_code == 0 &&
            (icmp->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||
@@ -548,21 +365,17 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,
                struct nd_msg *nd;
                int offset;
 
-               key_len = SW_FLOW_KEY_OFFSET(ipv6.nd);
-
                /* In order to process neighbor discovery options, we need the
                 * entire packet.
                 */
                if (unlikely(icmp_len < sizeof(*nd)))
-                       goto out;
-               if (unlikely(skb_linearize(skb))) {
-                       error = -ENOMEM;
-                       goto out;
-               }
+                       return 0;
+
+               if (unlikely(skb_linearize(skb)))
+                       return -ENOMEM;
 
                nd = (struct nd_msg *)skb_transport_header(skb);
-               ipv6_addr_copy(&key->ipv6.nd.target, &nd->target);
-               key_len = SW_FLOW_KEY_OFFSET(ipv6.nd);
+               key->ipv6.nd.target = nd->target;
 
                icmp_len -= sizeof(*nd);
                offset = 0;
@@ -572,7 +385,7 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,
                        int opt_len = nd_opt->nd_opt_len * 8;
 
                        if (unlikely(!opt_len || opt_len > icmp_len))
-                               goto invalid;
+                               return 0;
 
                        /* Store the link layer address if the appropriate
                         * option is provided.  It is considered an error if
@@ -582,14 +395,14 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,
                            && opt_len == 8) {
                                if (unlikely(!is_zero_ether_addr(key->ipv6.nd.sll)))
                                        goto invalid;
-                               memcpy(key->ipv6.nd.sll,
-                                   &nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN);
+                               ether_addr_copy(key->ipv6.nd.sll,
+                                   &nd->opt[offset+sizeof(*nd_opt)]);
                        } else if (nd_opt->nd_opt_type == ND_OPT_TARGET_LL_ADDR
                                   && opt_len == 8) {
                                if (unlikely(!is_zero_ether_addr(key->ipv6.nd.tll)))
                                        goto invalid;
-                               memcpy(key->ipv6.nd.tll,
-                                   &nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN);
+                               ether_addr_copy(key->ipv6.nd.tll,
+                                   &nd->opt[offset+sizeof(*nd_opt)]);
                        }
 
                        icmp_len -= opt_len;
@@ -597,25 +410,22 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,
                }
        }
 
-       goto out;
+       return 0;
 
 invalid:
        memset(&key->ipv6.nd.target, 0, sizeof(key->ipv6.nd.target));
        memset(key->ipv6.nd.sll, 0, sizeof(key->ipv6.nd.sll));
        memset(key->ipv6.nd.tll, 0, sizeof(key->ipv6.nd.tll));
 
-out:
-       *key_lenp = key_len;
-       return error;
+       return 0;
 }
 
 /**
- * flow_extract - extracts a flow key from an Ethernet frame.
+ * ovs_flow_extract - extracts a flow key from an Ethernet frame.
  * @skb: sk_buff that contains the frame, with skb->data pointing to the
  * Ethernet header
  * @in_port: port number on which @skb was received.
  * @key: output flow key
- * @key_lenp: length of output flow key
  *
  * The caller must ensure that skb->len >= ETH_HLEN.
  *
@@ -628,23 +438,23 @@ out:
  *    - skb->network_header: just past the Ethernet header, or just past the
  *      VLAN header, to the first byte of the Ethernet payload.
  *
- *    - skb->transport_header: If key->dl_type is ETH_P_IP or ETH_P_IPV6
+ *    - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6
  *      on output, then just past the IP header, if one is present and
  *      of a correct length, otherwise the same as skb->network_header.
- *      For other key->dl_type values it is left untouched.
+ *      For other key->eth.type values it is left untouched.
  */
-int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
-                int *key_lenp)
+int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key)
 {
-       int error = 0;
-       int key_len = SW_FLOW_KEY_OFFSET(eth);
+       int error;
        struct ethhdr *eth;
 
        memset(key, 0, sizeof(*key));
 
        key->phy.priority = skb->priority;
-       key->phy.tun_id = OVS_CB(skb)->tun_id;
+       if (OVS_CB(skb)->tun_key)
+               memcpy(&key->tun_key, OVS_CB(skb)->tun_key, sizeof(key->tun_key));
        key->phy.in_port = in_port;
+       key->phy.skb_mark = skb->mark;
 
        skb_reset_mac_header(skb);
 
@@ -652,10 +462,12 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
         * header in the linear data area.
         */
        eth = eth_hdr(skb);
-       memcpy(key->eth.src, eth->h_source, ETH_ALEN);
-       memcpy(key->eth.dst, eth->h_dest, ETH_ALEN);
+       ether_addr_copy(key->eth.src, eth->h_source);
+       ether_addr_copy(key->eth.dst, eth->h_dest);
 
        __skb_pull(skb, 2 * ETH_ALEN);
+       /* We are going to push all headers that we pull, so no need to
+        * update skb->csum here. */
 
        if (vlan_tx_tag_present(skb))
                key->eth.tci = htons(vlan_get_tci(skb));
@@ -675,15 +487,13 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
                struct iphdr *nh;
                __be16 offset;
 
-               key_len = SW_FLOW_KEY_OFFSET(ipv4.addr);
-
                error = check_iphdr(skb);
                if (unlikely(error)) {
                        if (error == -EINVAL) {
                                skb->transport_header = skb->network_header;
                                error = 0;
                        }
-                       goto out;
+                       return error;
                }
 
                nh = ip_hdr(skb);
@@ -691,45 +501,51 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
                key->ipv4.addr.dst = nh->daddr;
 
                key->ip.proto = nh->protocol;
-               key->ip.tos_frag = nh->tos & ~INET_ECN_MASK;
+               key->ip.tos = nh->tos;
+               key->ip.ttl = nh->ttl;
 
                offset = nh->frag_off & htons(IP_OFFSET);
                if (offset) {
-                       key->ip.tos_frag |= OVS_FRAG_TYPE_LATER;
-                       goto out;
+                       key->ip.frag = OVS_FRAG_TYPE_LATER;
+                       return 0;
                }
                if (nh->frag_off & htons(IP_MF) ||
                         skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
-                       key->ip.tos_frag |= OVS_FRAG_TYPE_FIRST;
+                       key->ip.frag = OVS_FRAG_TYPE_FIRST;
 
                /* Transport layer. */
                if (key->ip.proto == IPPROTO_TCP) {
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.tp);
                        if (tcphdr_ok(skb)) {
                                struct tcphdr *tcp = tcp_hdr(skb);
-                               key->ipv4.tp.src = tcp->source;
-                               key->ipv4.tp.dst = tcp->dest;
+                               key->tp.src = tcp->source;
+                               key->tp.dst = tcp->dest;
+                               key->tp.flags = TCP_FLAGS_BE16(tcp);
                        }
                } else if (key->ip.proto == IPPROTO_UDP) {
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.tp);
                        if (udphdr_ok(skb)) {
                                struct udphdr *udp = udp_hdr(skb);
-                               key->ipv4.tp.src = udp->source;
-                               key->ipv4.tp.dst = udp->dest;
+                               key->tp.src = udp->source;
+                               key->tp.dst = udp->dest;
+                       }
+               } else if (key->ip.proto == IPPROTO_SCTP) {
+                       if (sctphdr_ok(skb)) {
+                               struct sctphdr *sctp = sctp_hdr(skb);
+                               key->tp.src = sctp->source;
+                               key->tp.dst = sctp->dest;
                        }
                } else if (key->ip.proto == IPPROTO_ICMP) {
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.tp);
                        if (icmphdr_ok(skb)) {
                                struct icmphdr *icmp = icmp_hdr(skb);
                                /* The ICMP type and code fields use the 16-bit
                                 * transport port fields, so we need to store
                                 * them in 16-bit network byte order. */
-                               key->ipv4.tp.src = htons(icmp->type);
-                               key->ipv4.tp.dst = htons(icmp->code);
+                               key->tp.src = htons(icmp->type);
+                               key->tp.dst = htons(icmp->code);
                        }
                }
 
-       } else if (key->eth.type == htons(ETH_P_ARP) && arphdr_ok(skb)) {
+       } else if ((key->eth.type == htons(ETH_P_ARP) ||
+                  key->eth.type == htons(ETH_P_RARP)) && arphdr_ok(skb)) {
                struct arp_eth_header *arp;
 
                arp = (struct arp_eth_header *)skb_network_header(skb);
@@ -742,645 +558,58 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key,
                        /* We only match on the lower 8 bits of the opcode. */
                        if (ntohs(arp->ar_op) <= 0xff)
                                key->ip.proto = ntohs(arp->ar_op);
-
-                       if (key->ip.proto == ARPOP_REQUEST
-                                       || key->ip.proto == ARPOP_REPLY) {
-                               memcpy(&key->ipv4.addr.src, arp->ar_sip, sizeof(key->ipv4.addr.src));
-                               memcpy(&key->ipv4.addr.dst, arp->ar_tip, sizeof(key->ipv4.addr.dst));
-                               memcpy(key->ipv4.arp.sha, arp->ar_sha, ETH_ALEN);
-                               memcpy(key->ipv4.arp.tha, arp->ar_tha, ETH_ALEN);
-                               key_len = SW_FLOW_KEY_OFFSET(ipv4.arp);
-                       }
+                       memcpy(&key->ipv4.addr.src, arp->ar_sip, sizeof(key->ipv4.addr.src));
+                       memcpy(&key->ipv4.addr.dst, arp->ar_tip, sizeof(key->ipv4.addr.dst));
+                       ether_addr_copy(key->ipv4.arp.sha, arp->ar_sha);
+                       ether_addr_copy(key->ipv4.arp.tha, arp->ar_tha);
                }
        } else if (key->eth.type == htons(ETH_P_IPV6)) {
                int nh_len;             /* IPv6 Header + Extensions */
 
-               nh_len = parse_ipv6hdr(skb, key, &key_len);
+               nh_len = parse_ipv6hdr(skb, key);
                if (unlikely(nh_len < 0)) {
-                       if (nh_len == -EINVAL)
+                       if (nh_len == -EINVAL) {
                                skb->transport_header = skb->network_header;
-                       else
+                               error = 0;
+                       } else {
                                error = nh_len;
-                       goto out;
+                       }
+                       return error;
                }
 
-               if ((key->ip.tos_frag & OVS_FRAG_TYPE_MASK) == OVS_FRAG_TYPE_LATER)
-                       goto out;
+               if (key->ip.frag == OVS_FRAG_TYPE_LATER)
+                       return 0;
                if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
-                       key->ip.tos_frag |= OVS_FRAG_TYPE_FIRST;
+                       key->ip.frag = OVS_FRAG_TYPE_FIRST;
 
                /* Transport layer. */
                if (key->ip.proto == NEXTHDR_TCP) {
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
                        if (tcphdr_ok(skb)) {
                                struct tcphdr *tcp = tcp_hdr(skb);
-                               key->ipv6.tp.src = tcp->source;
-                               key->ipv6.tp.dst = tcp->dest;
+                               key->tp.src = tcp->source;
+                               key->tp.dst = tcp->dest;
+                               key->tp.flags = TCP_FLAGS_BE16(tcp);
                        }
                } else if (key->ip.proto == NEXTHDR_UDP) {
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
                        if (udphdr_ok(skb)) {
                                struct udphdr *udp = udp_hdr(skb);
-                               key->ipv6.tp.src = udp->source;
-                               key->ipv6.tp.dst = udp->dest;
+                               key->tp.src = udp->source;
+                               key->tp.dst = udp->dest;
+                       }
+               } else if (key->ip.proto == NEXTHDR_SCTP) {
+                       if (sctphdr_ok(skb)) {
+                               struct sctphdr *sctp = sctp_hdr(skb);
+                               key->tp.src = sctp->source;
+                               key->tp.dst = sctp->dest;
                        }
                } else if (key->ip.proto == NEXTHDR_ICMP) {
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
                        if (icmp6hdr_ok(skb)) {
-                               error = parse_icmpv6(skb, key, &key_len, nh_len);
-                               if (error < 0)
-                                       goto out;
-                       }
-               }
-       }
-
-out:
-       *key_lenp = key_len;
-       return error;
-}
-
-u32 flow_hash(const struct sw_flow_key *key, int key_len)
-{
-       return jhash2((u32 *)key, DIV_ROUND_UP(key_len, sizeof(u32)), hash_seed);
-}
-
-struct sw_flow *flow_tbl_lookup(struct flow_table *table,
-                               struct sw_flow_key *key, int key_len)
-{
-       struct sw_flow *flow;
-       struct hlist_node *n;
-       struct hlist_head *head;
-       u32 hash;
-
-       hash = flow_hash(key, key_len);
-
-       head = find_bucket(table, hash);
-       hlist_for_each_entry_rcu(flow, n, head, hash_node) {
-
-               if (flow->hash == hash &&
-                   !memcmp(&flow->key, key, key_len)) {
-                       return flow;
-               }
-       }
-       return NULL;
-}
-
-void flow_tbl_insert(struct flow_table *table, struct sw_flow *flow)
-{
-       struct hlist_head *head;
-
-       head = find_bucket(table, flow->hash);
-       hlist_add_head_rcu(&flow->hash_node, head);
-       table->count++;
-}
-
-void flow_tbl_remove(struct flow_table *table, struct sw_flow *flow)
-{
-       if (!hlist_unhashed(&flow->hash_node)) {
-               hlist_del_init_rcu(&flow->hash_node);
-               table->count--;
-               BUG_ON(table->count < 0);
-       }
-}
-
-static int parse_tos_frag(struct sw_flow_key *swkey, u8 tos, u8 frag)
-{
-       if (tos & INET_ECN_MASK || frag > OVS_FRAG_TYPE_MAX)
-               return -EINVAL;
-
-       swkey->ip.tos_frag = tos | frag;
-       return 0;
-}
-
-/* The size of the argument for each %OVS_KEY_ATTR_* Netlink attribute.  */
-const u32 ovs_key_lens[OVS_KEY_ATTR_MAX + 1] = {
-       [OVS_KEY_ATTR_PRIORITY] = 4,
-       [OVS_KEY_ATTR_TUN_ID] = 8,
-       [OVS_KEY_ATTR_IN_PORT] = 4,
-       [OVS_KEY_ATTR_ETHERNET] = sizeof(struct ovs_key_ethernet),
-       [OVS_KEY_ATTR_8021Q] = sizeof(struct ovs_key_8021q),
-       [OVS_KEY_ATTR_ETHERTYPE] = 2,
-       [OVS_KEY_ATTR_IPV4] = sizeof(struct ovs_key_ipv4),
-       [OVS_KEY_ATTR_IPV6] = sizeof(struct ovs_key_ipv6),
-       [OVS_KEY_ATTR_TCP] = sizeof(struct ovs_key_tcp),
-       [OVS_KEY_ATTR_UDP] = sizeof(struct ovs_key_udp),
-       [OVS_KEY_ATTR_ICMP] = sizeof(struct ovs_key_icmp),
-       [OVS_KEY_ATTR_ICMPV6] = sizeof(struct ovs_key_icmpv6),
-       [OVS_KEY_ATTR_ARP] = sizeof(struct ovs_key_arp),
-       [OVS_KEY_ATTR_ND] = sizeof(struct ovs_key_nd),
-};
-
-/**
- * flow_from_nlattrs - parses Netlink attributes into a flow key.
- * @swkey: receives the extracted flow key.
- * @key_lenp: number of bytes used in @swkey.
- * @attr: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
- * sequence.
- *
- * This state machine accepts the following forms, with [] for optional
- * elements and | for alternatives:
- *
- * [priority] [tun_id] [in_port] ethernet [8021q] [ethertype \
- *              [IPv4 [TCP|UDP|ICMP] | IPv6 [TCP|UDP|ICMPv6 [ND]] | ARP]]
- *
- * except that IPv4 or IPv6 terminates the sequence if its @ipv4_frag or
- * @ipv6_frag member, respectively, equals %OVS_FRAG_TYPE_LATER.
- */
-int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
-                     const struct nlattr *attr)
-{
-       int error = 0;
-       enum ovs_frag_type frag_type;
-       const struct nlattr *nla;
-       u16 prev_type;
-       int rem;
-       int key_len;
-
-       memset(swkey, 0, sizeof(*swkey));
-       swkey->phy.in_port = USHRT_MAX;
-       swkey->eth.type = htons(ETH_P_802_2);
-       key_len = SW_FLOW_KEY_OFFSET(eth);
-
-       prev_type = OVS_KEY_ATTR_UNSPEC;
-       nla_for_each_nested(nla, attr, rem) {
-               const struct ovs_key_ethernet *eth_key;
-               const struct ovs_key_8021q *q_key;
-               const struct ovs_key_ipv4 *ipv4_key;
-               const struct ovs_key_ipv6 *ipv6_key;
-               const struct ovs_key_tcp *tcp_key;
-               const struct ovs_key_udp *udp_key;
-               const struct ovs_key_icmp *icmp_key;
-               const struct ovs_key_icmpv6 *icmpv6_key;
-               const struct ovs_key_arp *arp_key;
-               const struct ovs_key_nd *nd_key;
-
-               int type = nla_type(nla);
-
-               if (type > OVS_KEY_ATTR_MAX ||
-                   nla_len(nla) != ovs_key_lens[type])
-                       goto invalid;
-
-#define TRANSITION(PREV_TYPE, TYPE) (((PREV_TYPE) << 16) | (TYPE))
-               switch (TRANSITION(prev_type, type)) {
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_PRIORITY):
-                       swkey->phy.priority = nla_get_u32(nla);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_TUN_ID):
-               case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_TUN_ID):
-                       swkey->phy.tun_id = nla_get_be64(nla);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_IN_PORT):
-               case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_IN_PORT):
-               case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_IN_PORT):
-                       if (nla_get_u32(nla) >= DP_MAX_PORTS)
-                               goto invalid;
-                       swkey->phy.in_port = nla_get_u32(nla);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_ETHERNET):
-               case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_ETHERNET):
-               case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_ETHERNET):
-               case TRANSITION(OVS_KEY_ATTR_IN_PORT, OVS_KEY_ATTR_ETHERNET):
-                       eth_key = nla_data(nla);
-                       memcpy(swkey->eth.src, eth_key->eth_src, ETH_ALEN);
-                       memcpy(swkey->eth.dst, eth_key->eth_dst, ETH_ALEN);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_ETHERNET, OVS_KEY_ATTR_8021Q):
-                       q_key = nla_data(nla);
-                       /* Only standard 0x8100 VLANs currently supported. */
-                       if (q_key->q_tpid != htons(ETH_P_8021Q))
-                               goto invalid;
-                       if (q_key->q_tci & htons(VLAN_TAG_PRESENT))
-                               goto invalid;
-                       swkey->eth.tci = q_key->q_tci | htons(VLAN_TAG_PRESENT);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_8021Q, OVS_KEY_ATTR_ETHERTYPE):
-               case TRANSITION(OVS_KEY_ATTR_ETHERNET, OVS_KEY_ATTR_ETHERTYPE):
-                       swkey->eth.type = nla_get_be16(nla);
-                       if (ntohs(swkey->eth.type) < 1536)
-                               goto invalid;
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_ETHERTYPE, OVS_KEY_ATTR_IPV4):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.addr);
-                       if (swkey->eth.type != htons(ETH_P_IP))
-                               goto invalid;
-                       ipv4_key = nla_data(nla);
-                       swkey->ip.proto = ipv4_key->ipv4_proto;
-                       if (parse_tos_frag(swkey, ipv4_key->ipv4_tos,
-                                          ipv4_key->ipv4_frag))
-                               goto invalid;
-                       swkey->ipv4.addr.src = ipv4_key->ipv4_src;
-                       swkey->ipv4.addr.dst = ipv4_key->ipv4_dst;
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_ETHERTYPE, OVS_KEY_ATTR_IPV6):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.label);
-                       if (swkey->eth.type != htons(ETH_P_IPV6))
-                               goto invalid;
-                       ipv6_key = nla_data(nla);
-                       swkey->ipv6.label = ipv6_key->ipv6_label;
-                       swkey->ip.proto = ipv6_key->ipv6_proto;
-                       if (parse_tos_frag(swkey, ipv6_key->ipv6_tos,
-                                          ipv6_key->ipv6_frag))
-                               goto invalid;
-                       memcpy(&swkey->ipv6.addr.src, ipv6_key->ipv6_src,
-                                       sizeof(swkey->ipv6.addr.src));
-                       memcpy(&swkey->ipv6.addr.dst, ipv6_key->ipv6_dst,
-                                       sizeof(swkey->ipv6.addr.dst));
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_IPV4, OVS_KEY_ATTR_TCP):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.tp);
-                       if (swkey->ip.proto != IPPROTO_TCP)
-                               goto invalid;
-                       tcp_key = nla_data(nla);
-                       swkey->ipv4.tp.src = tcp_key->tcp_src;
-                       swkey->ipv4.tp.dst = tcp_key->tcp_dst;
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_IPV6, OVS_KEY_ATTR_TCP):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
-                       if (swkey->ip.proto != IPPROTO_TCP)
-                               goto invalid;
-                       tcp_key = nla_data(nla);
-                       swkey->ipv6.tp.src = tcp_key->tcp_src;
-                       swkey->ipv6.tp.dst = tcp_key->tcp_dst;
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_IPV4, OVS_KEY_ATTR_UDP):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.tp);
-                       if (swkey->ip.proto != IPPROTO_UDP)
-                               goto invalid;
-                       udp_key = nla_data(nla);
-                       swkey->ipv4.tp.src = udp_key->udp_src;
-                       swkey->ipv4.tp.dst = udp_key->udp_dst;
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_IPV6, OVS_KEY_ATTR_UDP):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
-                       if (swkey->ip.proto != IPPROTO_UDP)
-                               goto invalid;
-                       udp_key = nla_data(nla);
-                       swkey->ipv6.tp.src = udp_key->udp_src;
-                       swkey->ipv6.tp.dst = udp_key->udp_dst;
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_IPV4, OVS_KEY_ATTR_ICMP):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.tp);
-                       if (swkey->ip.proto != IPPROTO_ICMP)
-                               goto invalid;
-                       icmp_key = nla_data(nla);
-                       swkey->ipv4.tp.src = htons(icmp_key->icmp_type);
-                       swkey->ipv4.tp.dst = htons(icmp_key->icmp_code);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_IPV6, OVS_KEY_ATTR_ICMPV6):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.tp);
-                       if (swkey->ip.proto != IPPROTO_ICMPV6)
-                               goto invalid;
-                       icmpv6_key = nla_data(nla);
-                       swkey->ipv6.tp.src = htons(icmpv6_key->icmpv6_type);
-                       swkey->ipv6.tp.dst = htons(icmpv6_key->icmpv6_code);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_ETHERTYPE, OVS_KEY_ATTR_ARP):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv4.arp);
-                       if (swkey->eth.type != htons(ETH_P_ARP))
-                               goto invalid;
-                       arp_key = nla_data(nla);
-                       swkey->ipv4.addr.src = arp_key->arp_sip;
-                       swkey->ipv4.addr.dst = arp_key->arp_tip;
-                       if (arp_key->arp_op & htons(0xff00))
-                               goto invalid;
-                       swkey->ip.proto = ntohs(arp_key->arp_op);
-                       memcpy(swkey->ipv4.arp.sha, arp_key->arp_sha, ETH_ALEN);
-                       memcpy(swkey->ipv4.arp.tha, arp_key->arp_tha, ETH_ALEN);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_ICMPV6, OVS_KEY_ATTR_ND):
-                       key_len = SW_FLOW_KEY_OFFSET(ipv6.nd);
-                       if (swkey->ipv6.tp.src != htons(NDISC_NEIGHBOUR_SOLICITATION)
-                           && swkey->ipv6.tp.src != htons(NDISC_NEIGHBOUR_ADVERTISEMENT))
-                               goto invalid;
-                       nd_key = nla_data(nla);
-                       memcpy(&swkey->ipv6.nd.target, nd_key->nd_target,
-                                       sizeof(swkey->ipv6.nd.target));
-                       memcpy(swkey->ipv6.nd.sll, nd_key->nd_sll, ETH_ALEN);
-                       memcpy(swkey->ipv6.nd.tll, nd_key->nd_tll, ETH_ALEN);
-                       break;
-
-               default:
-                       goto invalid;
-               }
-
-               prev_type = type;
-       }
-       if (rem)
-               goto invalid;
-
-       frag_type = swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK;
-       switch (prev_type) {
-       case OVS_KEY_ATTR_UNSPEC:
-               goto invalid;
-
-       case OVS_KEY_ATTR_PRIORITY:
-       case OVS_KEY_ATTR_TUN_ID:
-       case OVS_KEY_ATTR_IN_PORT:
-               goto invalid;
-
-       case OVS_KEY_ATTR_ETHERNET:
-       case OVS_KEY_ATTR_8021Q:
-               goto ok;
-
-       case OVS_KEY_ATTR_ETHERTYPE:
-               if (swkey->eth.type == htons(ETH_P_IP) ||
-                   swkey->eth.type == htons(ETH_P_IPV6) ||
-                   swkey->eth.type == htons(ETH_P_ARP))
-                       goto invalid;
-               goto ok;
-
-       case OVS_KEY_ATTR_IPV4:
-               if (frag_type == OVS_FRAG_TYPE_LATER)
-                       goto ok;
-               if (swkey->ip.proto == IPPROTO_TCP ||
-                   swkey->ip.proto == IPPROTO_UDP ||
-                   swkey->ip.proto == IPPROTO_ICMP)
-                       goto invalid;
-               goto ok;
-
-       case OVS_KEY_ATTR_IPV6:
-               if (frag_type == OVS_FRAG_TYPE_LATER)
-                       goto ok;
-               if (swkey->ip.proto == IPPROTO_TCP ||
-                   swkey->ip.proto == IPPROTO_UDP ||
-                   swkey->ip.proto == IPPROTO_ICMPV6)
-                       goto invalid;
-               goto ok;
-
-       case OVS_KEY_ATTR_ICMPV6:
-               if (swkey->ipv6.tp.src == htons(NDISC_NEIGHBOUR_SOLICITATION) ||
-                   swkey->ipv6.tp.src == htons(NDISC_NEIGHBOUR_ADVERTISEMENT) ||
-                   frag_type == OVS_FRAG_TYPE_LATER)
-                       goto invalid;
-               goto ok;
-
-       case OVS_KEY_ATTR_TCP:
-       case OVS_KEY_ATTR_UDP:
-       case OVS_KEY_ATTR_ICMP:
-       case OVS_KEY_ATTR_ND:
-               if (frag_type == OVS_FRAG_TYPE_LATER)
-                       goto invalid;
-               goto ok;
-
-       case OVS_KEY_ATTR_ARP:
-               goto ok;
-
-       default:
-               WARN_ON_ONCE(1);
-       }
-
-invalid:
-       error = -EINVAL;
-
-ok:
-       *key_lenp = key_len;
-       return error;
-}
-
-/**
- * flow_metadata_from_nlattrs - parses Netlink attributes into a flow key.
- * @in_port: receives the extracted input port.
- * @tun_id: receives the extracted tunnel ID.
- * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute
- * sequence.
- *
- * This parses a series of Netlink attributes that form a flow key, which must
- * take the same form accepted by flow_from_nlattrs(), but only enough of it to
- * get the metadata, that is, the parts of the flow key that cannot be
- * extracted from the packet itself.
- */
-int flow_metadata_from_nlattrs(u32 *priority, u16 *in_port, __be64 *tun_id,
-                              const struct nlattr *attr)
-{
-       const struct nlattr *nla;
-       u16 prev_type;
-       int rem;
-
-       *in_port = USHRT_MAX;
-       *tun_id = 0;
-       *priority = 0;
-
-       prev_type = OVS_KEY_ATTR_UNSPEC;
-       nla_for_each_nested(nla, attr, rem) {
-               int type = nla_type(nla);
-
-               if (type > OVS_KEY_ATTR_MAX || nla_len(nla) != ovs_key_lens[type])
-                       return -EINVAL;
-
-               switch (TRANSITION(prev_type, type)) {
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_PRIORITY):
-                       *priority = nla_get_u32(nla);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_TUN_ID):
-               case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_TUN_ID):
-                       *tun_id = nla_get_be64(nla);
-                       break;
-
-               case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_IN_PORT):
-               case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_IN_PORT):
-               case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_IN_PORT):
-                       if (nla_get_u32(nla) >= DP_MAX_PORTS)
-                               return -EINVAL;
-                       *in_port = nla_get_u32(nla);
-                       break;
-
-               default:
-                       return 0;
-               }
-
-               prev_type = type;
-       }
-       if (rem)
-               return -EINVAL;
-       return 0;
-}
-
-int flow_to_nlattrs(const struct sw_flow_key *swkey, struct sk_buff *skb)
-{
-       struct ovs_key_ethernet *eth_key;
-       struct nlattr *nla;
-
-       if (swkey->phy.priority)
-               NLA_PUT_U32(skb, OVS_KEY_ATTR_PRIORITY, swkey->phy.priority);
-
-       if (swkey->phy.tun_id != cpu_to_be64(0))
-               NLA_PUT_BE64(skb, OVS_KEY_ATTR_TUN_ID, swkey->phy.tun_id);
-
-       if (swkey->phy.in_port != USHRT_MAX)
-               NLA_PUT_U32(skb, OVS_KEY_ATTR_IN_PORT, swkey->phy.in_port);
-
-       nla = nla_reserve(skb, OVS_KEY_ATTR_ETHERNET, sizeof(*eth_key));
-       if (!nla)
-               goto nla_put_failure;
-       eth_key = nla_data(nla);
-       memcpy(eth_key->eth_src, swkey->eth.src, ETH_ALEN);
-       memcpy(eth_key->eth_dst, swkey->eth.dst, ETH_ALEN);
-
-       if (swkey->eth.tci != htons(0)) {
-               struct ovs_key_8021q q_key;
-
-               q_key.q_tpid = htons(ETH_P_8021Q);
-               q_key.q_tci = swkey->eth.tci & ~htons(VLAN_TAG_PRESENT);
-               NLA_PUT(skb, OVS_KEY_ATTR_8021Q, sizeof(q_key), &q_key);
-       }
-
-       if (swkey->eth.type == htons(ETH_P_802_2))
-               return 0;
-
-       NLA_PUT_BE16(skb, OVS_KEY_ATTR_ETHERTYPE, swkey->eth.type);
-
-       if (swkey->eth.type == htons(ETH_P_IP)) {
-               struct ovs_key_ipv4 *ipv4_key;
-
-               nla = nla_reserve(skb, OVS_KEY_ATTR_IPV4, sizeof(*ipv4_key));
-               if (!nla)
-                       goto nla_put_failure;
-               ipv4_key = nla_data(nla);
-               memset(ipv4_key, 0, sizeof(struct ovs_key_ipv4));
-               ipv4_key->ipv4_src = swkey->ipv4.addr.src;
-               ipv4_key->ipv4_dst = swkey->ipv4.addr.dst;
-               ipv4_key->ipv4_proto = swkey->ip.proto;
-               ipv4_key->ipv4_tos = swkey->ip.tos_frag & ~INET_ECN_MASK;
-               ipv4_key->ipv4_frag = swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK;
-       } else if (swkey->eth.type == htons(ETH_P_IPV6)) {
-               struct ovs_key_ipv6 *ipv6_key;
-
-               nla = nla_reserve(skb, OVS_KEY_ATTR_IPV6, sizeof(*ipv6_key));
-               if (!nla)
-                       goto nla_put_failure;
-               ipv6_key = nla_data(nla);
-               memset(ipv6_key, 0, sizeof(struct ovs_key_ipv6));
-               memcpy(ipv6_key->ipv6_src, &swkey->ipv6.addr.src,
-                               sizeof(ipv6_key->ipv6_src));
-               memcpy(ipv6_key->ipv6_dst, &swkey->ipv6.addr.dst,
-                               sizeof(ipv6_key->ipv6_dst));
-               ipv6_key->ipv6_label = swkey->ipv6.label;
-               ipv6_key->ipv6_proto = swkey->ip.proto;
-               ipv6_key->ipv6_tos = swkey->ip.tos_frag & ~INET_ECN_MASK;
-               ipv6_key->ipv6_frag = swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK;
-       } else if (swkey->eth.type == htons(ETH_P_ARP)) {
-               struct ovs_key_arp *arp_key;
-
-               nla = nla_reserve(skb, OVS_KEY_ATTR_ARP, sizeof(*arp_key));
-               if (!nla)
-                       goto nla_put_failure;
-               arp_key = nla_data(nla);
-               memset(arp_key, 0, sizeof(struct ovs_key_arp));
-               arp_key->arp_sip = swkey->ipv4.addr.src;
-               arp_key->arp_tip = swkey->ipv4.addr.dst;
-               arp_key->arp_op = htons(swkey->ip.proto);
-               memcpy(arp_key->arp_sha, swkey->ipv4.arp.sha, ETH_ALEN);
-               memcpy(arp_key->arp_tha, swkey->ipv4.arp.tha, ETH_ALEN);
-       }
-
-       if ((swkey->eth.type == htons(ETH_P_IP) ||
-            swkey->eth.type == htons(ETH_P_IPV6)) &&
-           (swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK) != OVS_FRAG_TYPE_LATER) {
-
-               if (swkey->ip.proto == IPPROTO_TCP) {
-                       struct ovs_key_tcp *tcp_key;
-
-                       nla = nla_reserve(skb, OVS_KEY_ATTR_TCP, sizeof(*tcp_key));
-                       if (!nla)
-                               goto nla_put_failure;
-                       tcp_key = nla_data(nla);
-                       if (swkey->eth.type == htons(ETH_P_IP)) {
-                               tcp_key->tcp_src = swkey->ipv4.tp.src;
-                               tcp_key->tcp_dst = swkey->ipv4.tp.dst;
-                       } else if (swkey->eth.type == htons(ETH_P_IPV6)) {
-                               tcp_key->tcp_src = swkey->ipv6.tp.src;
-                               tcp_key->tcp_dst = swkey->ipv6.tp.dst;
-                       }
-               } else if (swkey->ip.proto == IPPROTO_UDP) {
-                       struct ovs_key_udp *udp_key;
-
-                       nla = nla_reserve(skb, OVS_KEY_ATTR_UDP, sizeof(*udp_key));
-                       if (!nla)
-                               goto nla_put_failure;
-                       udp_key = nla_data(nla);
-                       if (swkey->eth.type == htons(ETH_P_IP)) {
-                               udp_key->udp_src = swkey->ipv4.tp.src;
-                               udp_key->udp_dst = swkey->ipv4.tp.dst;
-                       } else if (swkey->eth.type == htons(ETH_P_IPV6)) {
-                               udp_key->udp_src = swkey->ipv6.tp.src;
-                               udp_key->udp_dst = swkey->ipv6.tp.dst;
-                       }
-               } else if (swkey->eth.type == htons(ETH_P_IP) &&
-                          swkey->ip.proto == IPPROTO_ICMP) {
-                       struct ovs_key_icmp *icmp_key;
-
-                       nla = nla_reserve(skb, OVS_KEY_ATTR_ICMP, sizeof(*icmp_key));
-                       if (!nla)
-                               goto nla_put_failure;
-                       icmp_key = nla_data(nla);
-                       icmp_key->icmp_type = ntohs(swkey->ipv4.tp.src);
-                       icmp_key->icmp_code = ntohs(swkey->ipv4.tp.dst);
-               } else if (swkey->eth.type == htons(ETH_P_IPV6) &&
-                          swkey->ip.proto == IPPROTO_ICMPV6) {
-                       struct ovs_key_icmpv6 *icmpv6_key;
-
-                       nla = nla_reserve(skb, OVS_KEY_ATTR_ICMPV6,
-                                               sizeof(*icmpv6_key));
-                       if (!nla)
-                               goto nla_put_failure;
-                       icmpv6_key = nla_data(nla);
-                       icmpv6_key->icmpv6_type = ntohs(swkey->ipv6.tp.src);
-                       icmpv6_key->icmpv6_code = ntohs(swkey->ipv6.tp.dst);
-
-                       if (icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_SOLICITATION ||
-                           icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) {
-                               struct ovs_key_nd *nd_key;
-
-                               nla = nla_reserve(skb, OVS_KEY_ATTR_ND, sizeof(*nd_key));
-                               if (!nla)
-                                       goto nla_put_failure;
-                               nd_key = nla_data(nla);
-                               memcpy(nd_key->nd_target, &swkey->ipv6.nd.target,
-                                                       sizeof(nd_key->nd_target));
-                               memcpy(nd_key->nd_sll, swkey->ipv6.nd.sll, ETH_ALEN);
-                               memcpy(nd_key->nd_tll, swkey->ipv6.nd.tll, ETH_ALEN);
+                               error = parse_icmpv6(skb, key, nh_len);
+                               if (error)
+                                       return error;
                        }
                }
        }
 
        return 0;
-
-nla_put_failure:
-       return -EMSGSIZE;
-}
-
-/* Initializes the flow module.
- * Returns zero if successful or a negative error code. */
-int flow_init(void)
-{
-       flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow), 0,
-                                       0, NULL);
-       if (flow_cache == NULL)
-               return -ENOMEM;
-
-       get_random_bytes(&hash_seed, sizeof(hash_seed));
-
-       return 0;
-}
-
-/* Uninitializes the flow module. */
-void flow_exit(void)
-{
-       kmem_cache_destroy(flow_cache);
 }