Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch

Jesse Gross says:

====================
[GIT net-next] Open vSwitch

Open vSwitch changes for net-next/3.14. Highlights are:
 * Performance improvements in the mechanism to get packets to userspace
   using memory mapped netlink and skb zero copy where appropriate.
 * Per-cpu flow stats in situations where flows are likely to be shared
   across CPUs. Standard flow stats are used in other situations to save
   memory and allocation time.
 * A handful of code cleanups and rationalization.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 41 insertions, 19 deletions

diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index 0e720c316070..b430d42b2d0f 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -44,8 +44,6 @@
 #include <net/ipv6.h>
 #include <net/ndisc.h>
 
-#include "datapath.h"
-
 #define TBL_MIN_BUCKETS         1024
 #define REHASH_INTERVAL         (10 * 60 * HZ)
 
@@ -72,19 +70,42 @@ void ovs_flow_mask_key(struct sw_flow_key *dst, const struct sw_flow_key *src,
                 *d++ = *s++ & *m++;
 }
 
-struct sw_flow *ovs_flow_alloc(void)
+struct sw_flow *ovs_flow_alloc(bool percpu_stats)
 {
         struct sw_flow *flow;
+        int cpu;
 
         flow = kmem_cache_alloc(flow_cache, GFP_KERNEL);
         if (!flow)
                 return ERR_PTR(-ENOMEM);
 
-        spin_lock_init(&flow->lock);
         flow->sf_acts = NULL;
         flow->mask = NULL;
 
+        flow->stats.is_percpu = percpu_stats;
+
+        if (!percpu_stats) {
+                flow->stats.stat = kzalloc(sizeof(*flow->stats.stat), GFP_KERNEL);
+                if (!flow->stats.stat)
+                        goto err;
+
+                spin_lock_init(&flow->stats.stat->lock);
+        } else {
+                flow->stats.cpu_stats = alloc_percpu(struct flow_stats);
+                if (!flow->stats.cpu_stats)
+                        goto err;
+
+                for_each_possible_cpu(cpu) {
+                        struct flow_stats *cpu_stats;
+
+                        cpu_stats = per_cpu_ptr(flow->stats.cpu_stats, cpu);
+                        spin_lock_init(&cpu_stats->lock);
+                }
+        }
         return flow;
+err:
+        kfree(flow);
+        return ERR_PTR(-ENOMEM);
 }
 
 int ovs_flow_tbl_count(struct flow_table *table)
@@ -118,6 +139,10 @@ static struct flex_array *alloc_buckets(unsigned int n_buckets)
 static void flow_free(struct sw_flow *flow)
 {
         kfree((struct sf_flow_acts __force *)flow->sf_acts);
+        if (flow->stats.is_percpu)
+                free_percpu(flow->stats.cpu_stats);
+        else
+                kfree(flow->stats.stat);
         kmem_cache_free(flow_cache, flow);
 }
 
@@ -128,13 +153,6 @@ static void rcu_free_flow_callback(struct rcu_head *rcu)
         flow_free(flow);
 }
 
-static void rcu_free_sw_flow_mask_cb(struct rcu_head *rcu)
-{
-        struct sw_flow_mask *mask = container_of(rcu, struct sw_flow_mask, rcu);
-
-        kfree(mask);
-}
-
 static void flow_mask_del_ref(struct sw_flow_mask *mask, bool deferred)
 {
         if (!mask)
@@ -146,7 +164,7 @@ static void flow_mask_del_ref(struct sw_flow_mask *mask, bool deferred)
         if (!mask->ref_count) {
                 list_del_rcu(&mask->list);
                 if (deferred)
-                        call_rcu(&mask->rcu, rcu_free_sw_flow_mask_cb);
+                        kfree_rcu(mask, rcu);
                 else
                         kfree(mask);
         }
@@ -429,11 +447,11 @@ static struct sw_flow *masked_flow_lookup(struct table_instance *ti,
         return NULL;
 }
 
-struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,
+struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
                                     const struct sw_flow_key *key,
                                     u32 *n_mask_hit)
 {
-        struct table_instance *ti = rcu_dereference(tbl->ti);
+        struct table_instance *ti = rcu_dereference_ovsl(tbl->ti);
         struct sw_flow_mask *mask;
         struct sw_flow *flow;
 
@@ -447,6 +465,14 @@ struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,
         return NULL;
 }
 
+struct sw_flow *ovs_flow_tbl_lookup(struct flow_table *tbl,
+                                    const struct sw_flow_key *key)
+{
+        u32 __always_unused n_mask_hit;
+
+        return ovs_flow_tbl_lookup_stats(tbl, key, &n_mask_hit);
+}
+
 int ovs_flow_tbl_num_masks(const struct flow_table *table)
 {
         struct sw_flow_mask *mask;
@@ -514,11 +540,7 @@ static struct sw_flow_mask *flow_mask_find(const struct flow_table *tbl,
         return NULL;
 }
 
-/**
- * add a new mask into the mask list.
- * The caller needs to make sure that 'mask' is not the same
- * as any masks that are already on the list.
- */
+/* Add 'mask' into the mask list, if it is not already there. */
 static int flow_mask_insert(struct flow_table *tbl, struct sw_flow *flow,
                             struct sw_flow_mask *new)
 {