1 files changed, 104 insertions, 629 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index 2aa13bd7f2b2..6f5e1dd3be2d 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -55,21 +55,17 @@
 
 #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,
-                       struct genl_multicast_group *grp)
+static void ovs_notify(struct genl_family *family,
+                       struct sk_buff *skb, struct genl_info *info)
 {
-        genl_notify(skb, genl_info_net(info), info->snd_portid,
-                    grp->id, info->nlhdr, GFP_KERNEL);
+        genl_notify(family, skb, genl_info_net(info), info->snd_portid,
+                    0, info->nlhdr, GFP_KERNEL);
 }
 
 /**
@@ -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;
-}
-
-static inline void add_nested_action_end(struct sw_flow_actions *sfa, int st_offset)
-{
-        struct nlattr *a = (struct nlattr *) ((unsigned char *)sfa->actions + st_offset);
-
-        a->nla_len = sfa->actions_len - st_offset;
-}
-
-static int validate_and_copy_actions(const struct nlattr *attr,
-                                     const struct sw_flow_key *key, int depth,
-                                     struct sw_flow_actions **sfa);
-
-static int validate_and_copy_sample(const struct nlattr *attr,
-                                    const struct sw_flow_key *key, int depth,
-                                    struct sw_flow_actions **sfa)
-{
-        const struct nlattr *attrs[OVS_SAMPLE_ATTR_MAX + 1];
-        const struct nlattr *probability, *actions;
-        const struct nlattr *a;
-        int rem, start, err, st_acts;
-
-        memset(attrs, 0, sizeof(attrs));
-        nla_for_each_nested(a, attr, rem) {
-                int type = nla_type(a);
-                if (!type || type > OVS_SAMPLE_ATTR_MAX || attrs[type])
-                        return -EINVAL;
-                attrs[type] = a;
-        }
-        if (rem)
-                return -EINVAL;
-
-        probability = attrs[OVS_SAMPLE_ATTR_PROBABILITY];
-        if (!probability || nla_len(probability) != sizeof(u32))
-                return -EINVAL;
-
-        actions = attrs[OVS_SAMPLE_ATTR_ACTIONS];
-        if (!actions || (nla_len(actions) && nla_len(actions) < NLA_HDRLEN))
-                return -EINVAL;
-
-        /* validation done, copy sample action. */
-        start = add_nested_action_start(sfa, OVS_ACTION_ATTR_SAMPLE);
-        if (start < 0)
-                return start;
-        err = add_action(sfa, OVS_SAMPLE_ATTR_PROBABILITY, nla_data(probability), sizeof(u32));
-        if (err)
-                return err;
-        st_acts = add_nested_action_start(sfa, OVS_SAMPLE_ATTR_ACTIONS);
-        if (st_acts < 0)
-                return st_acts;
-
-        err = validate_and_copy_actions(actions, key, depth + 1, sfa);
-        if (err)
-                return err;
-
-        add_nested_action_end(*sfa, st_acts);
-        add_nested_action_end(*sfa, start);
-
-        return 0;
-}
-
-static int validate_tp_port(const struct sw_flow_key *flow_key)
-{
-        if (flow_key->eth.type == htons(ETH_P_IP)) {
-                if (flow_key->ipv4.tp.src || flow_key->ipv4.tp.dst)
-                        return 0;
-        } else if (flow_key->eth.type == htons(ETH_P_IPV6)) {
-                if (flow_key->ipv6.tp.src || flow_key->ipv6.tp.dst)
-                        return 0;
-        }
-
-        return -EINVAL;
-}
-
-static int validate_and_copy_set_tun(const struct nlattr *attr,
-                                     struct sw_flow_actions **sfa)
-{
-        struct sw_flow_match match;
-        struct sw_flow_key key;
-        int err, start;
-
-        ovs_match_init(&match, &key, NULL);
-        err = ovs_ipv4_tun_from_nlattr(nla_data(attr), &match, false);
-        if (err)
-                return err;
-
-        start = add_nested_action_start(sfa, OVS_ACTION_ATTR_SET);
-        if (start < 0)
-                return start;
-
-        err = add_action(sfa, OVS_KEY_ATTR_IPV4_TUNNEL, &match.key->tun_key,
-                        sizeof(match.key->tun_key));
-        add_nested_action_end(*sfa, start);
-
-        return err;
-}
-
-static int validate_set(const struct nlattr *a,
-                        const struct sw_flow_key *flow_key,
-                        struct sw_flow_actions **sfa,
-                        bool *set_tun)
-{
-        const struct nlattr *ovs_key = nla_data(a);
-        int key_type = nla_type(ovs_key);
-
-        /* There can be only one key in a action */
-        if (nla_total_size(nla_len(ovs_key)) != nla_len(a))
-                return -EINVAL;
-
-        if (key_type > OVS_KEY_ATTR_MAX ||
-           (ovs_key_lens[key_type] != nla_len(ovs_key) &&
-            ovs_key_lens[key_type] != -1))
-                return -EINVAL;
-
-        switch (key_type) {
-        const struct ovs_key_ipv4 *ipv4_key;
-        const struct ovs_key_ipv6 *ipv6_key;
-        int err;
-
-        case OVS_KEY_ATTR_PRIORITY:
-        case OVS_KEY_ATTR_SKB_MARK:
-        case OVS_KEY_ATTR_ETHERNET:
-                break;
-
-        case OVS_KEY_ATTR_TUNNEL:
-                *set_tun = true;
-                err = validate_and_copy_set_tun(a, sfa);
-                if (err)
-                        return err;
-                break;
-
-        case OVS_KEY_ATTR_IPV4:
-                if (flow_key->eth.type != htons(ETH_P_IP))
-                        return -EINVAL;
-
-                if (!flow_key->ip.proto)
-                        return -EINVAL;
-
-                ipv4_key = nla_data(ovs_key);
-                if (ipv4_key->ipv4_proto != flow_key->ip.proto)
-                        return -EINVAL;
-
-                if (ipv4_key->ipv4_frag != flow_key->ip.frag)
-                        return -EINVAL;
-
-                break;
-
-        case OVS_KEY_ATTR_IPV6:
-                if (flow_key->eth.type != htons(ETH_P_IPV6))
-                        return -EINVAL;
-
-                if (!flow_key->ip.proto)
-                        return -EINVAL;
-
-                ipv6_key = nla_data(ovs_key);
-                if (ipv6_key->ipv6_proto != flow_key->ip.proto)
-                        return -EINVAL;
-
-                if (ipv6_key->ipv6_frag != flow_key->ip.frag)
-                        return -EINVAL;
-
-                if (ntohl(ipv6_key->ipv6_label) & 0xFFF00000)
-                        return -EINVAL;
-
-                break;
-
-        case OVS_KEY_ATTR_TCP:
-                if (flow_key->ip.proto != IPPROTO_TCP)
-                        return -EINVAL;
-
-                return validate_tp_port(flow_key);
-
-        case OVS_KEY_ATTR_UDP:
-                if (flow_key->ip.proto != IPPROTO_UDP)
-                        return -EINVAL;
-
-                return validate_tp_port(flow_key);
-
-        case OVS_KEY_ATTR_SCTP:
-                if (flow_key->ip.proto != IPPROTO_SCTP)
-                        return -EINVAL;
-
-                return validate_tp_port(flow_key);
-
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int validate_userspace(const struct nlattr *attr)
-{
-        static const struct nla_policy userspace_policy[OVS_USERSPACE_ATTR_MAX + 1] =   {
-                [OVS_USERSPACE_ATTR_PID] = {.type = NLA_U32 },
-                [OVS_USERSPACE_ATTR_USERDATA] = {.type = NLA_UNSPEC },
-        };
-        struct nlattr *a[OVS_USERSPACE_ATTR_MAX + 1];
-        int error;
-
-        error = nla_parse_nested(a, OVS_USERSPACE_ATTR_MAX,
-                                 attr, userspace_policy);
-        if (error)
-                return error;
-
-        if (!a[OVS_USERSPACE_ATTR_PID] ||
-            !nla_get_u32(a[OVS_USERSPACE_ATTR_PID]))
-                return -EINVAL;
-
-        return 0;
-}
-
-static int copy_action(const struct nlattr *from,
-                       struct sw_flow_actions **sfa)
-{
-        int totlen = NLA_ALIGN(from->nla_len);
-        struct nlattr *to;
-
-        to = reserve_sfa_size(sfa, from->nla_len);
-        if (IS_ERR(to))
-                return PTR_ERR(to);
-
-        memcpy(to, from, totlen);
-        return 0;
-}
-
-static int validate_and_copy_actions(const struct nlattr *attr,
-                                     const struct sw_flow_key *key,
-                                     int depth,
-                                     struct sw_flow_actions **sfa)
-{
-        const struct nlattr *a;
-        int rem, err;
-
-        if (depth >= SAMPLE_ACTION_DEPTH)
-                return -EOVERFLOW;
-
-        nla_for_each_nested(a, attr, rem) {
-                /* Expected argument lengths, (u32)-1 for variable length. */
-                static const u32 action_lens[OVS_ACTION_ATTR_MAX + 1] = {
-                        [OVS_ACTION_ATTR_OUTPUT] = sizeof(u32),
-                        [OVS_ACTION_ATTR_USERSPACE] = (u32)-1,
-                        [OVS_ACTION_ATTR_PUSH_VLAN] = sizeof(struct ovs_action_push_vlan),
-                        [OVS_ACTION_ATTR_POP_VLAN] = 0,
-                        [OVS_ACTION_ATTR_SET] = (u32)-1,
-                        [OVS_ACTION_ATTR_SAMPLE] = (u32)-1
-                };
-                const struct ovs_action_push_vlan *vlan;
-                int type = nla_type(a);
-                bool skip_copy;
-
-                if (type > OVS_ACTION_ATTR_MAX ||
-                    (action_lens[type] != nla_len(a) &&
-                     action_lens[type] != (u32)-1))
-                        return -EINVAL;
-
-                skip_copy = false;
-                switch (type) {
-                case OVS_ACTION_ATTR_UNSPEC:
-                        return -EINVAL;
-
-                case OVS_ACTION_ATTR_USERSPACE:
-                        err = validate_userspace(a);
-                        if (err)
-                                return err;
-                        break;
-
-                case OVS_ACTION_ATTR_OUTPUT:
-                        if (nla_get_u32(a) >= DP_MAX_PORTS)
-                                return -EINVAL;
-                        break;
-
-
-                case OVS_ACTION_ATTR_POP_VLAN:
-                        break;
-
-                case OVS_ACTION_ATTR_PUSH_VLAN:
-                        vlan = nla_data(a);
-                        if (vlan->vlan_tpid != htons(ETH_P_8021Q))
-                                return -EINVAL;
-                        if (!(vlan->vlan_tci & htons(VLAN_TAG_PRESENT)))
-                                return -EINVAL;
-                        break;
-
-                case OVS_ACTION_ATTR_SET:
-                        err = validate_set(a, key, sfa, &skip_copy);
-                        if (err)
-                                return err;
-                        break;
-
-                case OVS_ACTION_ATTR_SAMPLE:
-                        err = validate_and_copy_sample(a, key, depth, sfa);
-                        if (err)
-                                return err;
-                        skip_copy = true;
-                        break;
-
-                default:
-                        return -EINVAL;
-                }
-                if (!skip_copy) {
-                        err = copy_action(a, sfa);
-                        if (err)
-                                return err;
-                }
-        }
-
-        if (rem > 0)
-                return -EINVAL;
-
-        return 0;
-}
-
 static void clear_stats(struct sw_flow *flow)
 {
         flow->used = 0;
@@ -902,15 +508,16 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
         if (err)
                 goto err_flow_free;
 
-        err = ovs_flow_metadata_from_nlattrs(flow, a[OVS_PACKET_ATTR_KEY]);
+        err = ovs_nla_get_flow_metadata(flow, a[OVS_PACKET_ATTR_KEY]);
         if (err)
                 goto err_flow_free;
-        acts = ovs_flow_actions_alloc(nla_len(a[OVS_PACKET_ATTR_ACTIONS]));
+        acts = ovs_nla_alloc_flow_actions(nla_len(a[OVS_PACKET_ATTR_ACTIONS]));
         err = PTR_ERR(acts);
         if (IS_ERR(acts))
                 goto err_flow_free;
 
-        err = validate_and_copy_actions(a[OVS_PACKET_ATTR_ACTIONS], &flow->key, 0, &acts);
+        err = ovs_nla_copy_actions(a[OVS_PACKET_ATTR_ACTIONS],
+                                   &flow->key, 0, &acts);
         rcu_assign_pointer(flow->sf_acts, acts);
         if (err)
                 goto err_flow_free;
@@ -950,7 +557,7 @@ static const struct nla_policy packet_policy[OVS_PACKET_ATTR_MAX + 1] = {
         [OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
 };
 
-static struct genl_ops dp_packet_genl_ops[] = {
+static const struct genl_ops dp_packet_genl_ops[] = {
         { .cmd = OVS_PACKET_CMD_EXECUTE,
           .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
           .policy = packet_policy,
@@ -958,15 +565,18 @@ static struct genl_ops dp_packet_genl_ops[] = {
         }
 };
 
-static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats)
+static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats,
+                         struct ovs_dp_megaflow_stats *mega_stats)
 {
-        struct flow_table *table;
         int i;
 
-        table = rcu_dereference_check(dp->table, lockdep_ovsl_is_held());
-        stats->n_flows = ovs_flow_tbl_count(table);
+        memset(mega_stats, 0, sizeof(*mega_stats));
+
+        stats->n_flows = ovs_flow_tbl_count(&dp->table);
+        mega_stats->n_masks = ovs_flow_tbl_num_masks(&dp->table);
 
         stats->n_hit = stats->n_missed = stats->n_lost = 0;
+
         for_each_possible_cpu(i) {
                 const struct dp_stats_percpu *percpu_stats;
                 struct dp_stats_percpu local_stats;
@@ -982,6 +592,7 @@ static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats)
                 stats->n_hit += local_stats.n_hit;
                 stats->n_missed += local_stats.n_missed;
                 stats->n_lost += local_stats.n_lost;
+                mega_stats->n_mask_hit += local_stats.n_mask_hit;
         }
 }
 
@@ -1005,100 +616,6 @@ static struct genl_multicast_group ovs_dp_flow_multicast_group = {
         .name = OVS_FLOW_MCGROUP
 };
 
-static int actions_to_attr(const struct nlattr *attr, int len, struct sk_buff *skb);
-static int sample_action_to_attr(const struct nlattr *attr, struct sk_buff *skb)
-{
-        const struct nlattr *a;
-        struct nlattr *start;
-        int err = 0, rem;
-
-        start = nla_nest_start(skb, OVS_ACTION_ATTR_SAMPLE);
-        if (!start)
-                return -EMSGSIZE;
-
-        nla_for_each_nested(a, attr, rem) {
-                int type = nla_type(a);
-                struct nlattr *st_sample;
-
-                switch (type) {
-                case OVS_SAMPLE_ATTR_PROBABILITY:
-                        if (nla_put(skb, OVS_SAMPLE_ATTR_PROBABILITY, sizeof(u32), nla_data(a)))
-                                return -EMSGSIZE;
-                        break;
-                case OVS_SAMPLE_ATTR_ACTIONS:
-                        st_sample = nla_nest_start(skb, OVS_SAMPLE_ATTR_ACTIONS);
-                        if (!st_sample)
-                                return -EMSGSIZE;
-                        err = actions_to_attr(nla_data(a), nla_len(a), skb);
-                        if (err)
-                                return err;
-                        nla_nest_end(skb, st_sample);
-                        break;
-                }
-        }
-
-        nla_nest_end(skb, start);
-        return err;
-}
-
-static int set_action_to_attr(const struct nlattr *a, struct sk_buff *skb)
-{
-        const struct nlattr *ovs_key = nla_data(a);
-        int key_type = nla_type(ovs_key);
-        struct nlattr *start;
-        int err;
-
-        switch (key_type) {
-        case OVS_KEY_ATTR_IPV4_TUNNEL:
-                start = nla_nest_start(skb, OVS_ACTION_ATTR_SET);
-                if (!start)
-                        return -EMSGSIZE;
-
-                err = ovs_ipv4_tun_to_nlattr(skb, nla_data(ovs_key),
-                                             nla_data(ovs_key));
-                if (err)
-                        return err;
-                nla_nest_end(skb, start);
-                break;
-        default:
-                if (nla_put(skb, OVS_ACTION_ATTR_SET, nla_len(a), ovs_key))
-                        return -EMSGSIZE;
-                break;
-        }
-
-        return 0;
-}
-
-static int actions_to_attr(const struct nlattr *attr, int len, struct sk_buff *skb)
-{
-        const struct nlattr *a;
-        int rem, err;
-
-        nla_for_each_attr(a, attr, len, rem) {
-                int type = nla_type(a);
-
-                switch (type) {
-                case OVS_ACTION_ATTR_SET:
-                        err = set_action_to_attr(a, skb);
-                        if (err)
-                                return err;
-                        break;
-
-                case OVS_ACTION_ATTR_SAMPLE:
-                        err = sample_action_to_attr(a, skb);
-                        if (err)
-                                return err;
-                        break;
-                default:
-                        if (nla_put(skb, type, nla_len(a), nla_data(a)))
-                                return -EMSGSIZE;
-                        break;
-                }
-        }
-
-        return 0;
-}
-
 static size_t ovs_flow_cmd_msg_size(const struct sw_flow_actions *acts)
 {
         return NLMSG_ALIGN(sizeof(struct ovs_header))
@@ -1135,8 +652,7 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
         if (!nla)
                 goto nla_put_failure;
 
-        err = ovs_flow_to_nlattrs(&flow->unmasked_key,
-                        &flow->unmasked_key, skb);
+        err = ovs_nla_put_flow(&flow->unmasked_key, &flow->unmasked_key, skb);
         if (err)
                 goto error;
         nla_nest_end(skb, nla);
@@ -1145,7 +661,7 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
         if (!nla)
                 goto nla_put_failure;
 
-        err = ovs_flow_to_nlattrs(&flow->key, &flow->mask->key, skb);
+        err = ovs_nla_put_flow(&flow->key, &flow->mask->key, skb);
         if (err)
                 goto error;
 
@@ -1155,7 +671,7 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
         used = flow->used;
         stats.n_packets = flow->packet_count;
         stats.n_bytes = flow->byte_count;
-        tcp_flags = flow->tcp_flags;
+        tcp_flags = (u8)ntohs(flow->tcp_flags);
         spin_unlock_bh(&flow->lock);
 
         if (used &&
@@ -1188,7 +704,8 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
                 sf_acts = rcu_dereference_check(flow->sf_acts,
                                                 lockdep_ovsl_is_held());
 
-                err = actions_to_attr(sf_acts->actions, sf_acts->actions_len, skb);
+                err = ovs_nla_put_actions(sf_acts->actions,
+                                          sf_acts->actions_len, skb);
                 if (!err)
                         nla_nest_end(skb, start);
                 else {
@@ -1234,6 +751,14 @@ static struct sk_buff *ovs_flow_cmd_build_info(struct sw_flow *flow,
         return skb;
 }
 
+static 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(tbl, key, &n_mask_hit);
+}
+
 static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
 {
         struct nlattr **a = info->attrs;
@@ -1243,7 +768,6 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
         struct sw_flow_mask mask;
         struct sk_buff *reply;
         struct datapath *dp;
-        struct flow_table *table;
         struct sw_flow_actions *acts = NULL;
         struct sw_flow_match match;
         int error;
@@ -1254,21 +778,21 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
                 goto error;
 
         ovs_match_init(&match, &key, &mask);
-        error = ovs_match_from_nlattrs(&match,
-                        a[OVS_FLOW_ATTR_KEY], a[OVS_FLOW_ATTR_MASK]);
+        error = ovs_nla_get_match(&match,
+                                  a[OVS_FLOW_ATTR_KEY], a[OVS_FLOW_ATTR_MASK]);
         if (error)
                 goto error;
 
         /* Validate actions. */
         if (a[OVS_FLOW_ATTR_ACTIONS]) {
-                acts = ovs_flow_actions_alloc(nla_len(a[OVS_FLOW_ATTR_ACTIONS]));
+                acts = ovs_nla_alloc_flow_actions(nla_len(a[OVS_FLOW_ATTR_ACTIONS]));
                 error = PTR_ERR(acts);
                 if (IS_ERR(acts))
                         goto error;
 
-                ovs_flow_key_mask(&masked_key, &key, &mask);
-                error = validate_and_copy_actions(a[OVS_FLOW_ATTR_ACTIONS],
-                                                  &masked_key, 0, &acts);
+                ovs_flow_mask_key(&masked_key, &key, &mask);
+                error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS],
+                                             &masked_key, 0, &acts);
                 if (error) {
                         OVS_NLERR("Flow actions may not be safe on all matching packets.\n");
                         goto err_kfree;
@@ -1284,29 +808,14 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
         if (!dp)
                 goto err_unlock_ovs;
 
-        table = ovsl_dereference(dp->table);
-
         /* Check if this is a duplicate flow */
-        flow = ovs_flow_lookup(table, &key);
+        flow = __ovs_flow_tbl_lookup(&dp->table, &key);
         if (!flow) {
-                struct sw_flow_mask *mask_p;
                 /* Bail out if we're not allowed to create a new flow. */
                 error = -ENOENT;
                 if (info->genlhdr->cmd == OVS_FLOW_CMD_SET)
                         goto err_unlock_ovs;
 
-                /* Expand table, if necessary, to make room. */
-                if (ovs_flow_tbl_need_to_expand(table)) {
-                        struct flow_table *new_table;
-
-                        new_table = ovs_flow_tbl_expand(table);
-                        if (!IS_ERR(new_table)) {
-                                rcu_assign_pointer(dp->table, new_table);
-                                ovs_flow_tbl_destroy(table, true);
-                                table = ovsl_dereference(dp->table);
-                        }
-                }
-
                 /* Allocate flow. */
                 flow = ovs_flow_alloc();
                 if (IS_ERR(flow)) {
@@ -1317,25 +826,14 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
 
                 flow->key = masked_key;
                 flow->unmasked_key = key;
-
-                /* Make sure mask is unique in the system */
-                mask_p = ovs_sw_flow_mask_find(table, &mask);
-                if (!mask_p) {
-                        /* Allocate a new mask if none exsits. */
-                        mask_p = ovs_sw_flow_mask_alloc();
-                        if (!mask_p)
-                                goto err_flow_free;
-                        mask_p->key = mask.key;
-                        mask_p->range = mask.range;
-                        ovs_sw_flow_mask_insert(table, mask_p);
-                }
-
-                ovs_sw_flow_mask_add_ref(mask_p);
-                flow->mask = mask_p;
                 rcu_assign_pointer(flow->sf_acts, acts);
 
                 /* Put flow in bucket. */
-                ovs_flow_insert(table, flow);
+                error = ovs_flow_tbl_insert(&dp->table, flow, &mask);
+                if (error) {
+                        acts = NULL;
+                        goto err_flow_free;
+                }
 
                 reply = ovs_flow_cmd_build_info(flow, dp, info->snd_portid,
                                                 info->snd_seq, OVS_FLOW_CMD_NEW);
@@ -1356,7 +854,7 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
 
                 /* The unmasked key has to be the same for flow updates. */
                 error = -EINVAL;
-                if (!ovs_flow_cmp_unmasked_key(flow, &key, match.range.end)) {
+                if (!ovs_flow_cmp_unmasked_key(flow, &match)) {
                         OVS_NLERR("Flow modification message rejected, unmasked key does not match.\n");
                         goto err_unlock_ovs;
                 }
@@ -1364,7 +862,7 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
                 /* Update actions. */
                 old_acts = ovsl_dereference(flow->sf_acts);
                 rcu_assign_pointer(flow->sf_acts, acts);
-                ovs_flow_deferred_free_acts(old_acts);
+                ovs_nla_free_flow_actions(old_acts);
 
                 reply = ovs_flow_cmd_build_info(flow, dp, info->snd_portid,
                                                info->snd_seq, OVS_FLOW_CMD_NEW);
@@ -1379,10 +877,10 @@ static int ovs_flow_cmd_new_or_set(struct sk_buff *skb, struct genl_info *info)
         ovs_unlock();
 
         if (!IS_ERR(reply))
-                ovs_notify(reply, info, &ovs_dp_flow_multicast_group);
+                ovs_notify(&dp_flow_genl_family, reply, info);
         else
-                netlink_set_err(sock_net(skb->sk)->genl_sock, 0,
-                                ovs_dp_flow_multicast_group.id, PTR_ERR(reply));
+                genl_set_err(&dp_flow_genl_family, sock_net(skb->sk), 0,
+                             0, PTR_ERR(reply));
         return 0;
 
 err_flow_free:
@@ -1403,7 +901,6 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
         struct sk_buff *reply;
         struct sw_flow *flow;
         struct datapath *dp;
-        struct flow_table *table;
         struct sw_flow_match match;
         int err;
 
@@ -1413,7 +910,7 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
         }
 
         ovs_match_init(&match, &key, NULL);
-        err = ovs_match_from_nlattrs(&match, a[OVS_FLOW_ATTR_KEY], NULL);
+        err = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY], NULL);
         if (err)
                 return err;
 
@@ -1424,9 +921,8 @@ static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
                 goto unlock;
         }
 
-        table = ovsl_dereference(dp->table);
-        flow = ovs_flow_lookup_unmasked_key(table, &match);
-        if (!flow) {
+        flow = __ovs_flow_tbl_lookup(&dp->table, &key);
+        if (!flow || !ovs_flow_cmp_unmasked_key(flow, &match)) {
                 err = -ENOENT;
                 goto unlock;
         }
@@ -1453,7 +949,6 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
         struct sk_buff *reply;
         struct sw_flow *flow;
         struct datapath *dp;
-        struct flow_table *table;
         struct sw_flow_match match;
         int err;
 
@@ -1465,18 +960,17 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
         }
 
         if (!a[OVS_FLOW_ATTR_KEY]) {
-                err = flush_flows(dp);
+                err = ovs_flow_tbl_flush(&dp->table);
                 goto unlock;
         }
 
         ovs_match_init(&match, &key, NULL);
-        err = ovs_match_from_nlattrs(&match, a[OVS_FLOW_ATTR_KEY], NULL);
+        err = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY], NULL);
         if (err)
                 goto unlock;
 
-        table = ovsl_dereference(dp->table);
-        flow = ovs_flow_lookup_unmasked_key(table, &match);
-        if (!flow) {
+        flow = __ovs_flow_tbl_lookup(&dp->table, &key);
+        if (!flow || !ovs_flow_cmp_unmasked_key(flow, &match)) {
                 err = -ENOENT;
                 goto unlock;
         }
@@ -1487,7 +981,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
                 goto unlock;
         }
 
-        ovs_flow_remove(table, flow);
+        ovs_flow_tbl_remove(&dp->table, flow);
 
         err = ovs_flow_cmd_fill_info(flow, dp, reply, info->snd_portid,
                                      info->snd_seq, 0, OVS_FLOW_CMD_DEL);
@@ -1496,7 +990,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
         ovs_flow_free(flow, true);
         ovs_unlock();
 
-        ovs_notify(reply, info, &ovs_dp_flow_multicast_group);
+        ovs_notify(&dp_flow_genl_family, reply, info);
         return 0;
 unlock:
         ovs_unlock();
@@ -1506,8 +1000,8 @@ unlock:
 static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
 {
         struct ovs_header *ovs_header = genlmsg_data(nlmsg_data(cb->nlh));
+        struct table_instance *ti;
         struct datapath *dp;
-        struct flow_table *table;
 
         rcu_read_lock();
         dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
@@ -1516,14 +1010,14 @@ static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
                 return -ENODEV;
         }
 
-        table = rcu_dereference(dp->table);
+        ti = rcu_dereference(dp->table.ti);
         for (;;) {
                 struct sw_flow *flow;
                 u32 bucket, obj;
 
                 bucket = cb->args[0];
                 obj = cb->args[1];
-                flow = ovs_flow_dump_next(table, &bucket, &obj);
+                flow = ovs_flow_tbl_dump_next(ti, &bucket, &obj);
                 if (!flow)
                         break;
 
@@ -1540,7 +1034,7 @@ static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
         return skb->len;
 }
 
-static struct genl_ops dp_flow_genl_ops[] = {
+static const struct genl_ops dp_flow_genl_ops[] = {
         { .cmd = OVS_FLOW_CMD_NEW,
           .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
           .policy = flow_policy,
@@ -1589,6 +1083,7 @@ static size_t ovs_dp_cmd_msg_size(void)
 
         msgsize += nla_total_size(IFNAMSIZ);
         msgsize += nla_total_size(sizeof(struct ovs_dp_stats));
+        msgsize += nla_total_size(sizeof(struct ovs_dp_megaflow_stats));
 
         return msgsize;
 }
@@ -1598,6 +1093,7 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
 {
         struct ovs_header *ovs_header;
         struct ovs_dp_stats dp_stats;
+        struct ovs_dp_megaflow_stats dp_megaflow_stats;
         int err;
 
         ovs_header = genlmsg_put(skb, portid, seq, &dp_datapath_genl_family,
@@ -1613,8 +1109,14 @@ static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
         if (err)
                 goto nla_put_failure;
 
-        get_dp_stats(dp, &dp_stats);
-        if (nla_put(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats), &dp_stats))
+        get_dp_stats(dp, &dp_stats, &dp_megaflow_stats);
+        if (nla_put(skb, OVS_DP_ATTR_STATS, sizeof(struct ovs_dp_stats),
+                        &dp_stats))
+                goto nla_put_failure;
+
+        if (nla_put(skb, OVS_DP_ATTR_MEGAFLOW_STATS,
+                        sizeof(struct ovs_dp_megaflow_stats),
+                        &dp_megaflow_stats))
                 goto nla_put_failure;
 
         return genlmsg_end(skb, ovs_header);
@@ -1687,9 +1189,8 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
         ovs_dp_set_net(dp, hold_net(sock_net(skb->sk)));
 
         /* Allocate table. */
-        err = -ENOMEM;
-        rcu_assign_pointer(dp->table, ovs_flow_tbl_alloc(TBL_MIN_BUCKETS));
-        if (!dp->table)
+        err = ovs_flow_tbl_init(&dp->table);
+        if (err)
                 goto err_free_dp;
 
         dp->stats_percpu = alloc_percpu(struct dp_stats_percpu);
@@ -1698,8 +1199,14 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
                 goto err_destroy_table;
         }
 
+        for_each_possible_cpu(i) {
+                struct dp_stats_percpu *dpath_stats;
+                dpath_stats = per_cpu_ptr(dp->stats_percpu, i);
+                u64_stats_init(&dpath_stats->sync);
+        }
+
         dp->ports = kmalloc(DP_VPORT_HASH_BUCKETS * sizeof(struct hlist_head),
-                        GFP_KERNEL);
+                            GFP_KERNEL);
         if (!dp->ports) {
                 err = -ENOMEM;
                 goto err_destroy_percpu;
@@ -1736,7 +1243,7 @@ static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
 
         ovs_unlock();
 
-        ovs_notify(reply, info, &ovs_dp_datapath_multicast_group);
+        ovs_notify(&dp_datapath_genl_family, reply, info);
         return 0;
 
 err_destroy_local_port:
@@ -1746,7 +1253,7 @@ err_destroy_ports_array:
 err_destroy_percpu:
         free_percpu(dp->stats_percpu);
 err_destroy_table:
-        ovs_flow_tbl_destroy(ovsl_dereference(dp->table), false);
+        ovs_flow_tbl_destroy(&dp->table);
 err_free_dp:
         release_net(ovs_dp_get_net(dp));
         kfree(dp);
@@ -1801,7 +1308,7 @@ static int ovs_dp_cmd_del(struct sk_buff *skb, struct genl_info *info)
         __dp_destroy(dp);
         ovs_unlock();
 
-        ovs_notify(reply, info, &ovs_dp_datapath_multicast_group);
+        ovs_notify(&dp_datapath_genl_family, reply, info);
 
         return 0;
 unlock:
@@ -1825,14 +1332,14 @@ static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info)
                                       info->snd_seq, OVS_DP_CMD_NEW);
         if (IS_ERR(reply)) {
                 err = PTR_ERR(reply);
-                netlink_set_err(sock_net(skb->sk)->genl_sock, 0,
-                                ovs_dp_datapath_multicast_group.id, err);
+                genl_set_err(&dp_datapath_genl_family, sock_net(skb->sk), 0,
+                             0, err);
                 err = 0;
                 goto unlock;
         }
 
         ovs_unlock();
-        ovs_notify(reply, info, &ovs_dp_datapath_multicast_group);
+        ovs_notify(&dp_datapath_genl_family, reply, info);
 
         return 0;
 unlock:
@@ -1891,7 +1398,7 @@ static int ovs_dp_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
         return skb->len;
 }
 
-static struct genl_ops dp_datapath_genl_ops[] = {
+static const struct genl_ops dp_datapath_genl_ops[] = {
         { .cmd = OVS_DP_CMD_NEW,
           .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
           .policy = datapath_policy,
@@ -1924,7 +1431,7 @@ static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = {
         [OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
 };
 
-static struct genl_family dp_vport_genl_family = {
+struct genl_family dp_vport_genl_family = {
         .id = GENL_ID_GENERATE,
         .hdrsize = sizeof(struct ovs_header),
         .name = OVS_VPORT_FAMILY,
@@ -2094,7 +1601,7 @@ static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
                 goto exit_unlock;
         }
 
-        ovs_notify(reply, info, &ovs_dp_vport_multicast_group);
+        ovs_notify(&dp_vport_genl_family, reply, info);
 
 exit_unlock:
         ovs_unlock();
@@ -2141,7 +1648,7 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
         BUG_ON(err < 0);
 
         ovs_unlock();
-        ovs_notify(reply, info, &ovs_dp_vport_multicast_group);
+        ovs_notify(&dp_vport_genl_family, reply, info);
         return 0;
 
 exit_free:
@@ -2178,7 +1685,7 @@ static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
         err = 0;
         ovs_dp_detach_port(vport);
 
-        ovs_notify(reply, info, &ovs_dp_vport_multicast_group);
+        ovs_notify(&dp_vport_genl_family, reply, info);
 
 exit_unlock:
         ovs_unlock();
@@ -2252,7 +1759,7 @@ out:
         return skb->len;
 }
 
-static struct genl_ops dp_vport_genl_ops[] = {
+static const struct genl_ops dp_vport_genl_ops[] = {
         { .cmd = OVS_VPORT_CMD_NEW,
           .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
           .policy = vport_policy,
@@ -2278,9 +1785,9 @@ static struct genl_ops dp_vport_genl_ops[] = {
 
 struct genl_family_and_ops {
         struct genl_family *family;
-        struct genl_ops *ops;
+        const struct genl_ops *ops;
         int n_ops;
-        struct genl_multicast_group *group;
+        const struct genl_multicast_group *group;
 };
 
 static const struct genl_family_and_ops dp_genl_families[] = {
@@ -2316,17 +1823,14 @@ static int dp_register_genl(void)
         for (i = 0; i < ARRAY_SIZE(dp_genl_families); i++) {
                 const struct genl_family_and_ops *f = &dp_genl_families[i];
 
-                err = genl_register_family_with_ops(f->family, f->ops,
-                                                    f->n_ops);
+                f->family->ops = f->ops;
+                f->family->n_ops = f->n_ops;
+                f->family->mcgrps = f->group;
+                f->family->n_mcgrps = f->group ? 1 : 0;
+                err = genl_register_family(f->family);
                 if (err)
                         goto error;
                 n_registered++;
-
-                if (f->group) {
-                        err = genl_register_mc_group(f->family, f->group);
-                        if (err)
-                                goto error;
-                }
         }
 
         return 0;
@@ -2336,32 +1840,6 @@ error:
         return err;
 }
 
-static void rehash_flow_table(struct work_struct *work)
-{
-        struct datapath *dp;
-        struct net *net;
-
-        ovs_lock();
-        rtnl_lock();
-        for_each_net(net) {
-                struct ovs_net *ovs_net = net_generic(net, ovs_net_id);
-
-                list_for_each_entry(dp, &ovs_net->dps, list_node) {
-                        struct flow_table *old_table = ovsl_dereference(dp->table);
-                        struct flow_table *new_table;
-
-                        new_table = ovs_flow_tbl_rehash(old_table);
-                        if (!IS_ERR(new_table)) {
-                                rcu_assign_pointer(dp->table, new_table);
-                                ovs_flow_tbl_destroy(old_table, true);
-                        }
-                }
-        }
-        rtnl_unlock();
-        ovs_unlock();
-        schedule_delayed_work(&rehash_flow_wq, REHASH_FLOW_INTERVAL);
-}
-
 static int __net_init ovs_init_net(struct net *net)
 {
         struct ovs_net *ovs_net = net_generic(net, ovs_net_id);
@@ -2419,8 +1897,6 @@ static int __init dp_init(void)
         if (err < 0)
                 goto error_unreg_notifier;
 
-        schedule_delayed_work(&rehash_flow_wq, REHASH_FLOW_INTERVAL);
-
         return 0;
 
 error_unreg_notifier:
@@ -2437,7 +1913,6 @@ error:
 
 static void dp_cleanup(void)
 {
-        cancel_delayed_work_sync(&rehash_flow_wq);
         dp_unregister_genl(ARRAY_SIZE(dp_genl_families));
         unregister_netdevice_notifier(&ovs_dp_device_notifier);
         unregister_pernet_device(&ovs_net_ops);