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

Jesse Gross says:

====================
Open vSwitch

A set of updates for net-next/3.13. Major changes are:
 * Restructure flow handling code to be more logically organized and
   easier to read.
 * Rehashing of the flow table is moved from a workqueue to flow
   installation time. Before, heavy load could block the workqueue for
   excessive periods of time.
 * Additional debugging information is provided to help diagnose megaflows.
 * It's now possible to match on TCP flags.
====================

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

12 files changed, 2496 insertions, 2288 deletions

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index ea36e99089af..3591cb5dae91 100644
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -9,6 +9,8 @@ openvswitch-y := \
         datapath.o \
         dp_notify.o \
         flow.o \
+        flow_netlink.o \
+        flow_table.o \
         vport.o \
         vport-internal_dev.o \
         vport-netdev.o
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 2aa13bd7f2b2..1408adc2a2a7 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -55,14 +55,10 @@
 
 #include "datapath.h"
 #include "flow.h"
+#include "flow_netlink.h"
 #include "vport-internal_dev.h"
 #include "vport-netdev.h"
 
-
-#define REHASH_FLOW_INTERVAL (10 * 60 * HZ)
-static void rehash_flow_table(struct work_struct *work);
-static DECLARE_DELAYED_WORK(rehash_flow_wq, rehash_flow_table);
-
 int ovs_net_id __read_mostly;
 
 static void ovs_notify(struct sk_buff *skb, struct genl_info *info,
@@ -165,7 +161,7 @@ static void destroy_dp_rcu(struct rcu_head *rcu)
 {
         struct datapath *dp = container_of(rcu, struct datapath, rcu);
 
-        ovs_flow_tbl_destroy((__force struct flow_table *)dp->table, false);
+        ovs_flow_tbl_destroy(&dp->table);
         free_percpu(dp->stats_percpu);
         release_net(ovs_dp_get_net(dp));
         kfree(dp->ports);
@@ -225,6 +221,7 @@ void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb)
         struct dp_stats_percpu *stats;
         struct sw_flow_key key;
         u64 *stats_counter;
+        u32 n_mask_hit;
         int error;
 
         stats = this_cpu_ptr(dp->stats_percpu);
@@ -237,7 +234,7 @@ void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb)
         }
 
         /* Look up flow. */
-        flow = ovs_flow_lookup(rcu_dereference(dp->table), &key);
+        flow = ovs_flow_tbl_lookup(&dp->table, &key, &n_mask_hit);
         if (unlikely(!flow)) {
                 struct dp_upcall_info upcall;
 
@@ -262,6 +259,7 @@ out:
         /* Update datapath statistics. */
         u64_stats_update_begin(&stats->sync);
         (*stats_counter)++;
+        stats->n_mask_hit += n_mask_hit;
         u64_stats_update_end(&stats->sync);
 }
 
@@ -435,7 +433,7 @@ static int queue_userspace_packet(struct net *net, int dp_ifindex,
         upcall->dp_ifindex = dp_ifindex;
 
         nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_KEY);
-        ovs_flow_to_nlattrs(upcall_info->key, upcall_info->key, user_skb);
+        ovs_nla_put_flow(upcall_info->key, upcall_info->key, user_skb);
         nla_nest_end(user_skb, nla);
 
         if (upcall_info->userdata)
@@ -455,398 +453,6 @@ out:
         return err;
 }
 
-/* Called with ovs_mutex. */
-static int flush_flows(struct datapath *dp)
-{
-        struct flow_table *old_table;
-        struct flow_table *new_table;
-
-        old_table = ovsl_dereference(dp->table);
-        new_table = ovs_flow_tbl_alloc(TBL_MIN_BUCKETS);
-        if (!new_table)
-                return -ENOMEM;
-
-        rcu_assign_pointer(dp->table, new_table);
-
-        ovs_flow_tbl_destroy(old_table, true);
-        return 0;
-}
-
-static struct nlattr *reserve_sfa_size(struct sw_flow_actions **sfa, int attr_len)
-{
-
-        struct sw_flow_actions *acts;
-        int new_acts_size;
-        int req_size = NLA_ALIGN(attr_len);
-        int next_offset = offsetof(struct sw_flow_actions, actions) +
-                                        (*sfa)->actions_len;
-
-        if (req_size <= (ksize(*sfa) - next_offset))
-                goto out;
-
-        new_acts_size = ksize(*sfa) * 2;
-
-        if (new_acts_size > MAX_ACTIONS_BUFSIZE) {
-                if ((MAX_ACTIONS_BUFSIZE - next_offset) < req_size)
-                        return ERR_PTR(-EMSGSIZE);
-                new_acts_size = MAX_ACTIONS_BUFSIZE;
-        }
-
-        acts = ovs_flow_actions_alloc(new_acts_size);
-        if (IS_ERR(acts))
-                return (void *)acts;
-
-        memcpy(acts->actions, (*sfa)->actions, (*sfa)->actions_len);
-        acts->actions_len = (*sfa)->actions_len;
-        kfree(*sfa);
-        *sfa = acts;
-
-out:
-        (*sfa)->actions_len += req_size;
-        return  (struct nlattr *) ((unsigned char *)(*sfa) + next_offset);
-}
-
-static int add_action(struct sw_flow_actions **sfa, int attrtype, void *data, int len)
-{
-        struct nlattr *a;
-
-        a = reserve_sfa_size(sfa, nla_attr_size(len));
-        if (IS_ERR(a))
-                return PTR_ERR(a);
-
-        a->nla_type = attrtype;
-        a->nla_len = nla_attr_size(len);
-
-        if (data)
-                memcpy(nla_data(a), data, len);
-        memset((unsigned char *) a + a->nla_len, 0, nla_padlen(len));
-
-        return 0;
-}
-
-static inline int add_nested_action_start(struct sw_flow_actions **sfa, int attrtype)
-{
-        int used = (*sfa)->actions_len;
-        int err;
-
-        err = add_action(sfa, attrtype, NULL, 0);
-        if (err)
-                return err;
-
-        return used;
-}