netdev-vport: Checks tunnel status change when route-table is reset.
[sliver-openvswitch.git] / datapath / datapath.c
index 0205fd2..81ecc0f 100644 (file)
@@ -1,25 +1,34 @@
 /*
- * Copyright (c) 2007, 2008, 2009, 2010 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
+ * 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
  */
 
-/* Functions for managing the dp interface/device. */
-
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/fs.h>
 #include <linux/if_arp.h>
 #include <linux/if_vlan.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <linux/jhash.h>
 #include <linux/delay.h>
 #include <linux/time.h>
 #include <linux/etherdevice.h>
+#include <linux/genetlink.h>
 #include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/mutex.h>
 #include <linux/version.h>
 #include <linux/ethtool.h>
 #include <linux/wait.h>
-#include <asm/system.h>
 #include <asm/div64.h>
-#include <asm/bug.h>
 #include <linux/highmem.h>
 #include <linux/netfilter_bridge.h>
 #include <linux/netfilter_ipv4.h>
 #include <linux/inetdevice.h>
 #include <linux/list.h>
+#include <linux/openvswitch.h>
 #include <linux/rculist.h>
 #include <linux/dmi.h>
-#include <net/inet_ecn.h>
-#include <linux/compat.h>
+#include <linux/genetlink.h>
+#include <net/genetlink.h>
+#include <net/genetlink.h>
+#include <net/net_namespace.h>
+#include <net/netns/generic.h>
 
-#include "openvswitch/datapath-protocol.h"
-#include "checksum.h"
 #include "datapath.h"
-#include "actions.h"
 #include "flow.h"
-#include "loop_counter.h"
-#include "odp-compat.h"
-#include "table.h"
+#include "flow_table.h"
+#include "flow_netlink.h"
+#include "vlan.h"
 #include "vport-internal_dev.h"
+#include "vport-netdev.h"
+
+int ovs_net_id __read_mostly;
 
-#include "compat.h"
+static struct genl_family dp_packet_genl_family;
+static struct genl_family dp_flow_genl_family;
+static struct genl_family dp_datapath_genl_family;
+
+static struct genl_multicast_group ovs_dp_flow_multicast_group = {
+       .name = OVS_FLOW_MCGROUP
+};
+
+static struct genl_multicast_group ovs_dp_datapath_multicast_group = {
+       .name = OVS_DATAPATH_MCGROUP
+};
 
-int (*dp_ioctl_hook)(struct net_device *dev, struct ifreq *rq, int cmd);
-EXPORT_SYMBOL(dp_ioctl_hook);
+struct genl_multicast_group ovs_dp_vport_multicast_group = {
+       .name = OVS_VPORT_MCGROUP
+};
+
+/* Check if need to build a reply message.
+ * OVS userspace sets the NLM_F_ECHO flag if it needs the reply. */
+static bool ovs_must_notify(struct genl_info *info,
+                           const struct genl_multicast_group *grp)
+{
+       return info->nlhdr->nlmsg_flags & NLM_F_ECHO ||
+               netlink_has_listeners(genl_info_net(info)->genl_sock, GROUP_ID(grp));
+}
+
+static void ovs_notify(struct genl_family *family, struct genl_multicast_group *grp,
+                      struct sk_buff *skb, struct genl_info *info)
+{
+       genl_notify(family, skb, genl_info_net(info),
+                   info->snd_portid, GROUP_ID(grp), info->nlhdr, GFP_KERNEL);
+}
 
-/* Datapaths.  Protected on the read side by rcu_read_lock, on the write side
- * by dp_mutex.
+/**
+ * DOC: Locking:
  *
- * dp_mutex nests inside the RTNL lock: if you need both you must take the RTNL
- * lock first.
+ * All writes e.g. Writes to device state (add/remove datapath, port, set
+ * operations on vports, etc.), Writes to other state (flow table
+ * modifications, set miscellaneous datapath parameters, etc.) are protected
+ * by ovs_lock.
  *
- * It is safe to access the datapath and vport structures with just
- * dp_mutex.
+ * Reads are protected by RCU.
+ *
+ * There are a few special cases (mostly stats) that have their own
+ * synchronization but they nest under all of above and don't interact with
+ * each other.
+ *
+ * The RTNL lock nests inside ovs_mutex.
  */
-static struct datapath __rcu *dps[ODP_MAX];
-static DEFINE_MUTEX(dp_mutex);
 
-static int new_vport(struct datapath *, struct odp_port *, int port_no);
+static DEFINE_MUTEX(ovs_mutex);
 
-/* Must be called with rcu_read_lock or dp_mutex. */
-struct datapath *get_dp(int dp_idx)
+void ovs_lock(void)
 {
-       if (dp_idx < 0 || dp_idx >= ODP_MAX)
-               return NULL;
-       return rcu_dereference_check(dps[dp_idx], rcu_read_lock_held() ||
-                                        lockdep_is_held(&dp_mutex));
+       mutex_lock(&ovs_mutex);
 }
-EXPORT_SYMBOL_GPL(get_dp);
 
-static struct datapath *get_dp_locked(int dp_idx)
+void ovs_unlock(void)
 {
-       struct datapath *dp;
-
-       mutex_lock(&dp_mutex);
-       dp = get_dp(dp_idx);
-       if (dp)
-               mutex_lock(&dp->mutex);
-       mutex_unlock(&dp_mutex);
-       return dp;
+       mutex_unlock(&ovs_mutex);
 }
 
-static struct tbl *get_table_protected(struct datapath *dp)
+#ifdef CONFIG_LOCKDEP
+int lockdep_ovsl_is_held(void)
 {
-       return rcu_dereference_protected(dp->table, lockdep_is_held(&dp->mutex));
+       if (debug_locks)
+               return lockdep_is_held(&ovs_mutex);
+       else
+               return 1;
 }
+#endif
+
+static int queue_gso_packets(struct datapath *dp, struct sk_buff *,
+                            const struct dp_upcall_info *);
+static int queue_userspace_packet(struct datapath *dp, struct sk_buff *,
+                                 const struct dp_upcall_info *);
 
-/* Must be called with rcu_read_lock or RTNL lock. */
-const char *dp_name(const struct datapath *dp)
+/* Must be called with rcu_read_lock or ovs_mutex. */
+static struct datapath *get_dp(struct net *net, int dp_ifindex)
 {
-       return vport_get_name(rcu_dereference_rtnl(dp->ports[ODPP_LOCAL]));
+       struct datapath *dp = NULL;
+       struct net_device *dev;
+
+       rcu_read_lock();
+       dev = dev_get_by_index_rcu(net, dp_ifindex);
+       if (dev) {
+               struct vport *vport = ovs_internal_dev_get_vport(dev);
+               if (vport)
+                       dp = vport->dp;
+       }
+       rcu_read_unlock();
+
+       return dp;
 }
 
-static inline size_t br_nlmsg_size(void)
+/* Must be called with rcu_read_lock or ovs_mutex. */
+const char *ovs_dp_name(const struct datapath *dp)
 {
-       return NLMSG_ALIGN(sizeof(struct ifinfomsg))
-              + nla_total_size(IFNAMSIZ) /* IFLA_IFNAME */
-              + nla_total_size(MAX_ADDR_LEN) /* IFLA_ADDRESS */
-              + nla_total_size(4) /* IFLA_MASTER */
-              + nla_total_size(4) /* IFLA_MTU */
-              + nla_total_size(4) /* IFLA_LINK */
-              + nla_total_size(1); /* IFLA_OPERSTATE */
+       struct vport *vport = ovs_vport_ovsl_rcu(dp, OVSP_LOCAL);
+       return vport->ops->get_name(vport);
 }
 
-static int dp_fill_ifinfo(struct sk_buff *skb,
-                         const struct vport *port,
-                         int event, unsigned int flags)
+static int get_dpifindex(struct datapath *dp)
 {
-       const struct datapath *dp = port->dp;
-       int ifindex = vport_get_ifindex(port);
-       int iflink = vport_get_iflink(port);
-       struct ifinfomsg *hdr;
-       struct nlmsghdr *nlh;
+       struct vport *local;
+       int ifindex;
 
-       if (ifindex < 0)
-               return ifindex;
+       rcu_read_lock();
 
-       if (iflink < 0)
-               return iflink;
+       local = ovs_vport_rcu(dp, OVSP_LOCAL);
+       if (local)
+               ifindex = netdev_vport_priv(local)->dev->ifindex;
+       else
+               ifindex = 0;
 
-       nlh = nlmsg_put(skb, 0, 0, event, sizeof(*hdr), flags);
-       if (nlh == NULL)
-               return -EMSGSIZE;
+       rcu_read_unlock();
 
-       hdr = nlmsg_data(nlh);
-       hdr->ifi_family = AF_BRIDGE;
-       hdr->__ifi_pad = 0;
-       hdr->ifi_type = ARPHRD_ETHER;
-       hdr->ifi_index = ifindex;
-       hdr->ifi_flags = vport_get_flags(port);
-       hdr->ifi_change = 0;
-
-       NLA_PUT_STRING(skb, IFLA_IFNAME, vport_get_name(port));
-       NLA_PUT_U32(skb, IFLA_MASTER,
-               vport_get_ifindex(rtnl_dereference(dp->ports[ODPP_LOCAL])));
-       NLA_PUT_U32(skb, IFLA_MTU, vport_get_mtu(port));
-#ifdef IFLA_OPERSTATE
-       NLA_PUT_U8(skb, IFLA_OPERSTATE,
-                  vport_is_running(port)
-                       ? vport_get_operstate(port)
-                       : IF_OPER_DOWN);
-#endif
+       return ifindex;
+}
 
-       NLA_PUT(skb, IFLA_ADDRESS, ETH_ALEN, vport_get_addr(port));
+static void destroy_dp_rcu(struct rcu_head *rcu)
+{
+       struct datapath *dp = container_of(rcu, struct datapath, rcu);
 
-       if (ifindex != iflink)
-               NLA_PUT_U32(skb, IFLA_LINK,iflink);
+       ovs_flow_tbl_destroy(&dp->table);
+       free_percpu(dp->stats_percpu);
+       release_net(ovs_dp_get_net(dp));
+       kfree(dp->ports);
+       kfree(dp);
+}
 
-       return nlmsg_end(skb, nlh);
+static struct hlist_head *vport_hash_bucket(const struct datapath *dp,
+                                           u16 port_no)
+{
+       return &dp->ports[port_no & (DP_VPORT_HASH_BUCKETS - 1)];
+}
 
-nla_put_failure:
-       nlmsg_cancel(skb, nlh);
-       return -EMSGSIZE;
+/* Called with ovs_mutex or RCU read lock. */
+struct vport *ovs_lookup_vport(const struct datapath *dp, u16 port_no)
+{
+       struct vport *vport;
+       struct hlist_head *head;
+
+       head = vport_hash_bucket(dp, port_no);
+       hlist_for_each_entry_rcu(vport, head, dp_hash_node) {
+               if (vport->port_no == port_no)
+                       return vport;
+       }
+       return NULL;
 }
 
-static void dp_ifinfo_notify(int event, struct vport *port)
+/* Called with ovs_mutex. */
+static struct vport *new_vport(const struct vport_parms *parms)
 {
-       struct sk_buff *skb;
-       int err = -ENOBUFS;
+       struct vport *vport;
 
-       skb = nlmsg_new(br_nlmsg_size(), GFP_KERNEL);
-       if (skb == NULL)
-               goto errout;
+       vport = ovs_vport_add(parms);
+       if (!IS_ERR(vport)) {
+               struct datapath *dp = parms->dp;
+               struct hlist_head *head = vport_hash_bucket(dp, vport->port_no);
 
-       err = dp_fill_ifinfo(skb, port, event, 0);
-       if (err < 0) {
-               /* -EMSGSIZE implies BUG in br_nlmsg_size() */
-               WARN_ON(err == -EMSGSIZE);
-               kfree_skb(skb);
-               goto errout;
+               hlist_add_head_rcu(&vport->dp_hash_node, head);
        }
-       rtnl_notify(skb, &init_net, 0, RTNLGRP_LINK, NULL, GFP_KERNEL);
-       return;
-errout:
-       if (err < 0)
-               rtnl_set_sk_err(&init_net, RTNLGRP_LINK, err);
+       return vport;
 }
 
-static void release_dp(struct kobject *kobj)
+void ovs_dp_detach_port(struct vport *p)
 {
-       struct datapath *dp = container_of(kobj, struct datapath, ifobj);
-       kfree(dp);
-}
+       ASSERT_OVSL();
 
-static struct kobj_type dp_ktype = {
-       .release = release_dp
-};
+       /* First drop references to device. */
+       hlist_del_rcu(&p->dp_hash_node);
 
-static int create_dp(int dp_idx, const char __user *devnamep)
-{
-       struct odp_port internal_dev_port;
-       char devname[IFNAMSIZ];
-       struct datapath *dp;
-       int err;
-       int i;
+       /* Then destroy it. */
+       ovs_vport_del(p);
+}
 
-       if (devnamep) {
-               int retval = strncpy_from_user(devname, devnamep, IFNAMSIZ);
-               if (retval < 0) {
-                       err = -EFAULT;
-                       goto err;
-               } else if (retval >= IFNAMSIZ) {
-                       err = -ENAMETOOLONG;
-                       goto err;
-               }
-       } else {
-               snprintf(devname, sizeof devname, "of%d", dp_idx);
+void ovs_dp_process_packet_with_key(struct sk_buff *skb,
+                                   struct sw_flow_key *pkt_key,
+                                   bool recirc)
+{
+       const struct vport *p = OVS_CB(skb)->input_vport;
+       struct datapath *dp = p->dp;
+       struct sw_flow *flow;
+       struct dp_stats_percpu *stats;
+       u64 *stats_counter;
+       u32 n_mask_hit;
+
+       stats = this_cpu_ptr(dp->stats_percpu);
+
+       /* Look up flow. */
+       flow = ovs_flow_tbl_lookup_stats(&dp->table, pkt_key, skb_get_hash(skb),
+                                        &n_mask_hit);
+       if (unlikely(!flow)) {
+               struct dp_upcall_info upcall;
+
+               upcall.cmd = OVS_PACKET_CMD_MISS;
+               upcall.key = pkt_key;
+               upcall.userdata = NULL;
+               upcall.portid = ovs_vport_find_upcall_portid(p, skb);
+               ovs_dp_upcall(dp, skb, &upcall);
+               consume_skb(skb);
+               stats_counter = &stats->n_missed;
+               goto out;
        }
 
-       rtnl_lock();
-       mutex_lock(&dp_mutex);
-       err = -ENODEV;
-       if (!try_module_get(THIS_MODULE))
-               goto err_unlock;
+       OVS_CB(skb)->pkt_key = pkt_key;
+       OVS_CB(skb)->flow = flow;
 
-       /* Exit early if a datapath with that number already exists.
-        * (We don't use -EEXIST because that's ambiguous with 'devname'
-        * conflicting with an existing network device name.) */
-       err = -EBUSY;
-       if (get_dp(dp_idx))
-               goto err_put_module;
+       ovs_flow_stats_update(OVS_CB(skb)->flow, pkt_key->tp.flags, skb);
+       ovs_execute_actions(dp, skb, recirc);
+       stats_counter = &stats->n_hit;
 
-       err = -ENOMEM;
-       dp = kzalloc(sizeof *dp, GFP_KERNEL);
-       if (dp == NULL)
-               goto err_put_module;
-       INIT_LIST_HEAD(&dp->port_list);
-       mutex_init(&dp->mutex);
-       dp->dp_idx = dp_idx;
-       for (i = 0; i < DP_N_QUEUES; i++)
-               skb_queue_head_init(&dp->queues[i]);
-       init_waitqueue_head(&dp->waitqueue);
-
-       /* Initialize kobject for bridge.  This will be added as
-        * /sys/class/net/<devname>/brif later, if sysfs is enabled. */
-       dp->ifobj.kset = NULL;
-       kobject_init(&dp->ifobj, &dp_ktype);
+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);
+}
 
-       /* Allocate table. */
-       err = -ENOMEM;
-       rcu_assign_pointer(dp->table, tbl_create(0));
-       if (!dp->table)
-               goto err_free_dp;
+/* Must be called with rcu_read_lock. */
+void ovs_dp_process_received_packet(struct vport *p, struct sk_buff *skb)
+{
+       int error;
+       struct sw_flow_key key;
 
-       /* Set up our datapath device. */
-       BUILD_BUG_ON(sizeof(internal_dev_port.devname) != sizeof(devname));
-       strcpy(internal_dev_port.devname, devname);
-       strcpy(internal_dev_port.type, "internal");
-       err = new_vport(dp, &internal_dev_port, ODPP_LOCAL);
-       if (err) {
-               if (err == -EBUSY)
-                       err = -EEXIST;
+       OVS_CB(skb)->input_vport = p;
 
-               goto err_destroy_table;
+       /* Extract flow from 'skb' into 'key'. */
+       error = ovs_flow_extract(skb, p->port_no, &key);
+       if (unlikely(error)) {
+               kfree_skb(skb);
+               return;
        }
 
-       dp->drop_frags = 0;
-       dp->stats_percpu = alloc_percpu(struct dp_stats_percpu);
-       if (!dp->stats_percpu)
-               goto err_destroy_local_port;
+       ovs_dp_process_packet_with_key(skb, &key, false);
+}
+
+int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb,
+                 const struct dp_upcall_info *upcall_info)
+{
+       struct dp_stats_percpu *stats;
+       int err;
 
-       rcu_assign_pointer(dps[dp_idx], dp);
-       dp_sysfs_add_dp(dp);
+       if (upcall_info->portid == 0) {
+               err = -ENOTCONN;
+               goto err;
+       }
 
-       mutex_unlock(&dp_mutex);
-       rtnl_unlock();
+       if (!skb_is_gso(skb))
+               err = queue_userspace_packet(dp, skb, upcall_info);
+       else
+               err = queue_gso_packets(dp, skb, upcall_info);
+       if (err)
+               goto err;
 
        return 0;
 
-err_destroy_local_port:
-       dp_detach_port(dp->ports[ODPP_LOCAL]);
-err_destroy_table:
-       tbl_destroy(dp->table, NULL);
-err_free_dp:
-       kfree(dp);
-err_put_module:
-       module_put(THIS_MODULE);
-err_unlock:
-       mutex_unlock(&dp_mutex);
-       rtnl_unlock();
 err:
+       stats = this_cpu_ptr(dp->stats_percpu);
+
+       u64_stats_update_begin(&stats->sync);
+       stats->n_lost++;
+       u64_stats_update_end(&stats->sync);
+
        return err;
 }
 
-static void do_destroy_dp(struct datapath *dp)
+static int queue_gso_packets(struct datapath *dp, struct sk_buff *skb,
+                            const struct dp_upcall_info *upcall_info)
 {
-       struct vport *p, *n;
-       int i;
-
-       list_for_each_entry_safe (p, n, &dp->port_list, node)
-               if (p->port_no != ODPP_LOCAL)
-                       dp_detach_port(p);
-
-       dp_sysfs_del_dp(dp);
+       unsigned short gso_type = skb_shinfo(skb)->gso_type;
+       struct dp_upcall_info later_info;
+       struct sw_flow_key later_key;
+       struct sk_buff *segs, *nskb;
+       int err;
 
-       rcu_assign_pointer(dps[dp->dp_idx], NULL);
+       segs = __skb_gso_segment(skb, NETIF_F_SG, false);
+       if (IS_ERR(segs))
+               return PTR_ERR(segs);
 
-       dp_detach_port(dp->ports[ODPP_LOCAL]);
+       /* Queue all of the segments. */
+       skb = segs;
+       do {
+               err = queue_userspace_packet(dp, skb, upcall_info);
+               if (err)
+                       break;
 
-       tbl_destroy(dp->table, flow_free_tbl);
+               if (skb == segs && gso_type & SKB_GSO_UDP) {
+                       /* The initial flow key extracted by ovs_flow_extract()
+                        * in this case is for a first fragment, so we need to
+                        * properly mark later fragments.
+                        */
+                       later_key = *upcall_info->key;
+                       later_key.ip.frag = OVS_FRAG_TYPE_LATER;
+
+                       later_info = *upcall_info;
+                       later_info.key = &later_key;
+                       upcall_info = &later_info;
+               }
+       } while ((skb = skb->next));
 
-       for (i = 0; i < DP_N_QUEUES; i++)
-               skb_queue_purge(&dp->queues[i]);
-       free_percpu(dp->stats_percpu);
-       kobject_put(&dp->ifobj);
-       module_put(THIS_MODULE);
+       /* Free all of the segments. */
+       skb = segs;
+       do {
+               nskb = skb->next;
+               if (err)
+                       kfree_skb(skb);
+               else
+                       consume_skb(skb);
+       } while ((skb = nskb));
+       return err;
 }
 
-static int destroy_dp(int dp_idx)
+static size_t key_attr_size(void)
 {
-       struct datapath *dp;
-       int err;
+       return    nla_total_size(4)   /* OVS_KEY_ATTR_PRIORITY */
+               + nla_total_size(0)   /* OVS_KEY_ATTR_TUNNEL */
+                 + nla_total_size(8)   /* OVS_TUNNEL_KEY_ATTR_ID */
+                 + nla_total_size(4)   /* OVS_TUNNEL_KEY_ATTR_IPV4_SRC */
+                 + nla_total_size(4)   /* OVS_TUNNEL_KEY_ATTR_IPV4_DST */
+                 + nla_total_size(1)   /* OVS_TUNNEL_KEY_ATTR_TOS */
+                 + nla_total_size(1)   /* OVS_TUNNEL_KEY_ATTR_TTL */
+                 + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_DONT_FRAGMENT */
+                 + nla_total_size(0)   /* OVS_TUNNEL_KEY_ATTR_CSUM */
+               + nla_total_size(4)   /* OVS_KEY_ATTR_IN_PORT */
+               + nla_total_size(4)   /* OVS_KEY_ATTR_SKB_MARK */
+               + nla_total_size(12)  /* OVS_KEY_ATTR_ETHERNET */
+               + nla_total_size(2)   /* OVS_KEY_ATTR_ETHERTYPE */
+               + nla_total_size(4)   /* OVS_KEY_ATTR_8021Q */
+               + nla_total_size(0)   /* OVS_KEY_ATTR_ENCAP */
+               + nla_total_size(2)   /* OVS_KEY_ATTR_ETHERTYPE */
+               + nla_total_size(40)  /* OVS_KEY_ATTR_IPV6 */
+               + nla_total_size(2)   /* OVS_KEY_ATTR_ICMPV6 */
+               + nla_total_size(28); /* OVS_KEY_ATTR_ND */
+}
 
-       rtnl_lock();
-       mutex_lock(&dp_mutex);
-       dp = get_dp(dp_idx);
-       err = -ENODEV;
-       if (!dp)
-               goto err_unlock;
+static size_t upcall_msg_size(const struct nlattr *userdata,
+                             unsigned int hdrlen)
+{
+       size_t size = NLMSG_ALIGN(sizeof(struct ovs_header))
+               + nla_total_size(hdrlen) /* OVS_PACKET_ATTR_PACKET */
+               + nla_total_size(key_attr_size()); /* OVS_PACKET_ATTR_KEY */
 
-       do_destroy_dp(dp);
-       err = 0;
+       /* OVS_PACKET_ATTR_USERDATA */
+       if (userdata)
+               size += NLA_ALIGN(userdata->nla_len);
 
-err_unlock:
-       mutex_unlock(&dp_mutex);
-       rtnl_unlock();
-       return err;
+       return size;
 }
 
-/* Called with RTNL lock and dp_mutex. */
-static int new_vport(struct datapath *dp, struct odp_port *odp_port, int port_no)
+static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb,
+                                 const struct dp_upcall_info *upcall_info)
 {
-       struct vport_parms parms;
-       struct vport *vport;
+       struct ovs_header *upcall;
+       struct sk_buff *nskb = NULL;
+       struct sk_buff *user_skb; /* to be queued to userspace */
+       struct nlattr *nla;
+       struct genl_info info = {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
+               .dst_sk = ovs_dp_get_net(dp)->genl_sock,
+#endif
+               .snd_portid = upcall_info->portid,
+       };
+       size_t len;
+       unsigned int hlen;
+       int err, dp_ifindex;
+
+       dp_ifindex = get_dpifindex(dp);
+       if (!dp_ifindex)
+               return -ENODEV;
 
-       parms.name = odp_port->devname;
-       parms.type = odp_port->type;
-       parms.config = odp_port->config;
-       parms.dp = dp;
-       parms.port_no = port_no;
+       if (vlan_tx_tag_present(skb)) {
+               nskb = skb_clone(skb, GFP_ATOMIC);
+               if (!nskb)
+                       return -ENOMEM;
 
-       vport_lock();
-       vport = vport_add(&parms);
-       vport_unlock();
+               nskb = __vlan_put_tag(nskb, nskb->vlan_proto, vlan_tx_tag_get(nskb));
+               if (!nskb)
+                       return -ENOMEM;
 
-       if (IS_ERR(vport))
-               return PTR_ERR(vport);
+               vlan_set_tci(nskb, 0);
 
-       rcu_assign_pointer(dp->ports[port_no], vport);
-       list_add_rcu(&vport->node, &dp->port_list);
-       dp->n_ports++;
+               skb = nskb;
+       }
 
-       dp_ifinfo_notify(RTM_NEWLINK, vport);
+       if (nla_attr_size(skb->len) > USHRT_MAX) {
+               err = -EFBIG;
+               goto out;
+       }
 
-       return 0;
-}
+       /* Complete checksum if needed */
+       if (skb->ip_summed == CHECKSUM_PARTIAL &&
+           (err = skb_checksum_help(skb)))
+               goto out;
 
-static int attach_port(int dp_idx, struct odp_port __user *portp)
-{
-       struct datapath *dp;
-       struct odp_port port;
-       int port_no;
-       int err;
+       /* Older versions of OVS user space enforce alignment of the last
+        * Netlink attribute to NLA_ALIGNTO which would require extensive
+        * padding logic. Only perform zerocopy if padding is not required.
+        */
+       if (dp->user_features & OVS_DP_F_UNALIGNED)
+               hlen = skb_zerocopy_headlen(skb);
+       else
+               hlen = skb->len;
 
-       err = -EFAULT;
-       if (copy_from_user(&port, portp, sizeof port))
+       len = upcall_msg_size(upcall_info->userdata, hlen);
+       user_skb = genlmsg_new_unicast(len, &info, GFP_ATOMIC);
+       if (!user_skb) {
+               err = -ENOMEM;
                goto out;
-       port.devname[IFNAMSIZ - 1] = '\0';
-       port.type[VPORT_TYPE_SIZE - 1] = '\0';
+       }
 
-       rtnl_lock();
-       dp = get_dp_locked(dp_idx);
-       err = -ENODEV;
-       if (!dp)
-               goto out_unlock_rtnl;
+       upcall = genlmsg_put(user_skb, 0, 0, &dp_packet_genl_family,
+                            0, upcall_info->cmd);
+       upcall->dp_ifindex = dp_ifindex;
+
+       nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_KEY);
+       ovs_nla_put_flow(upcall_info->key, upcall_info->key, user_skb);
+       nla_nest_end(user_skb, nla);
 
-       for (port_no = 1; port_no < DP_MAX_PORTS; port_no++)
-               if (!dp->ports[port_no])
-                       goto got_port_no;
-       err = -EFBIG;
-       goto out_unlock_dp;
+       if (upcall_info->userdata)
+               __nla_put(user_skb, OVS_PACKET_ATTR_USERDATA,
+                         nla_len(upcall_info->userdata),
+                         nla_data(upcall_info->userdata));
 
-got_port_no:
-       err = new_vport(dp, &port, port_no);
+       /* Only reserve room for attribute header, packet data is added
+        * in skb_zerocopy() */
+       if (!(nla = nla_reserve(user_skb, OVS_PACKET_ATTR_PACKET, 0))) {
+               err = -ENOBUFS;
+               goto out;
+       }
+       nla->nla_len = nla_attr_size(skb->len);
+
+       err = skb_zerocopy(user_skb, skb, skb->len, hlen);
        if (err)
-               goto out_unlock_dp;
+               goto out;
 
-       set_internal_devs_mtu(dp);
-       dp_sysfs_add_if(dp->ports[port_no]);
+       /* Pad OVS_PACKET_ATTR_PACKET if linear copy was performed */
+       if (!(dp->user_features & OVS_DP_F_UNALIGNED)) {
+               size_t plen = NLA_ALIGN(user_skb->len) - user_skb->len;
 
-       err = put_user(port_no, &portp->port);
+               if (plen > 0)
+                       memset(skb_put(user_skb, plen), 0, plen);
+       }
+
+       ((struct nlmsghdr *) user_skb->data)->nlmsg_len = user_skb->len;
 
-out_unlock_dp:
-       mutex_unlock(&dp->mutex);
-out_unlock_rtnl:
-       rtnl_unlock();
+       err = genlmsg_unicast(ovs_dp_get_net(dp), user_skb, upcall_info->portid);
 out:
+       if (err)
+               skb_tx_error(skb);
+       kfree_skb(nskb);
        return err;
 }
 
-int dp_detach_port(struct vport *p)
+static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info)
 {
+       struct ovs_header *ovs_header = info->userhdr;
+       struct nlattr **a = info->attrs;
+       struct sw_flow_actions *acts;
+       struct sk_buff *packet;
+       struct sw_flow *flow;
+       struct datapath *dp;
+       struct ethhdr *eth;
+       struct vport *input_vport;
+       int len;
        int err;
 
-       ASSERT_RTNL();
+       err = -EINVAL;
+       if (!a[OVS_PACKET_ATTR_PACKET] || !a[OVS_PACKET_ATTR_KEY] ||
+           !a[OVS_PACKET_ATTR_ACTIONS])
+               goto err;
 
-       if (p->port_no != ODPP_LOCAL)
-               dp_sysfs_del_if(p);
-       dp_ifinfo_notify(RTM_DELLINK, p);
+       len = nla_len(a[OVS_PACKET_ATTR_PACKET]);
+       packet = __dev_alloc_skb(NET_IP_ALIGN + len, GFP_KERNEL);
+       err = -ENOMEM;
+       if (!packet)
+               goto err;
+       skb_reserve(packet, NET_IP_ALIGN);
 
-       /* First drop references to device. */
-       p->dp->n_ports--;
-       list_del_rcu(&p->node);
-       rcu_assign_pointer(p->dp->ports[p->port_no], NULL);
+       nla_memcpy(__skb_put(packet, len), a[OVS_PACKET_ATTR_PACKET], len);
 
-       /* Then destroy it. */
-       vport_lock();
-       err = vport_del(p);
-       vport_unlock();
+       skb_reset_mac_header(packet);
+       eth = eth_hdr(packet);
 
-       return err;
-}
+       /* Normally, setting the skb 'protocol' field would be handled by a
+        * call to eth_type_trans(), but it assumes there's a sending
+        * device, which we may not have. */
+       if (ntohs(eth->h_proto) >= ETH_P_802_3_MIN)
+               packet->protocol = eth->h_proto;
+       else
+               packet->protocol = htons(ETH_P_802_2);
 
-static int detach_port(int dp_idx, int port_no)
-{
-       struct vport *p;
-       struct datapath *dp;
-       int err;
+       /* Build an sw_flow for sending this packet. */
+       flow = ovs_flow_alloc();
+       err = PTR_ERR(flow);
+       if (IS_ERR(flow))
+               goto err_kfree_skb;
 
-       err = -EINVAL;
-       if (port_no < 0 || port_no >= DP_MAX_PORTS || port_no == ODPP_LOCAL)
-               goto out;
+       err = ovs_flow_extract(packet, -1, &flow->key);
+       if (err)
+               goto err_flow_free;
 
-       rtnl_lock();
-       dp = get_dp_locked(dp_idx);
-       err = -ENODEV;
-       if (!dp)
-               goto out_unlock_rtnl;
+       err = ovs_nla_get_flow_metadata(flow, a[OVS_PACKET_ATTR_KEY]);
+       if (err)
+               goto err_flow_free;
+       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 = 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;
 
-       p = dp->ports[port_no];
-       err = -ENOENT;
-       if (!p)
-               goto out_unlock_dp;
+       OVS_CB(packet)->flow = flow;
+       OVS_CB(packet)->pkt_key = &flow->key;
+       packet->priority = flow->key.phy.priority;
+       packet->mark = flow->key.phy.skb_mark;
 
-       err = dp_detach_port(p);
+       rcu_read_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       err = -ENODEV;
+       if (!dp)
+               goto err_unlock;
 
-out_unlock_dp:
-       mutex_unlock(&dp->mutex);
-out_unlock_rtnl:
-       rtnl_unlock();
-out:
-       return err;
-}
+       input_vport = ovs_vport_rcu(dp, flow->key.phy.in_port);
+       if (!input_vport)
+               input_vport = ovs_vport_rcu(dp, OVSP_LOCAL);
 
-/* Must be called with rcu_read_lock. */
-void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
-{
-       struct datapath *dp = p->dp;
-       struct dp_stats_percpu *stats;
-       int stats_counter_off;
-       struct sw_flow_actions *acts;
-       struct loop_counter *loop;
-       int error;
+       if (!input_vport)
+               goto err_unlock;
 
-       OVS_CB(skb)->vport = p;
+       OVS_CB(packet)->input_vport = input_vport;
 
-       if (!OVS_CB(skb)->flow) {
-               struct odp_flow_key key;
-               struct tbl_node *flow_node;
-               bool is_frag;
+       local_bh_disable();
+       err = ovs_execute_actions(dp, packet, false);
+       local_bh_enable();
+       rcu_read_unlock();
 
-               /* Extract flow from 'skb' into 'key'. */
-               error = flow_extract(skb, p ? p->port_no : ODPP_NONE, &key, &is_frag);
-               if (unlikely(error)) {
-                       kfree_skb(skb);
-                       return;
-               }
+       ovs_flow_free(flow, false);
+       return err;
 
-               if (is_frag && dp->drop_frags) {
-                       kfree_skb(skb);
-                       stats_counter_off = offsetof(struct dp_stats_percpu, n_frags);
-                       goto out;
-               }
+err_unlock:
+       rcu_read_unlock();
+err_flow_free:
+       ovs_flow_free(flow, false);
+err_kfree_skb:
+       kfree_skb(packet);
+err:
+       return err;
+}
 
-               /* Look up flow. */
-               flow_node = tbl_lookup(rcu_dereference(dp->table), &key,
-                                       flow_hash(&key), flow_cmp);
-               if (unlikely(!flow_node)) {
-                       dp_output_control(dp, skb, _ODPL_MISS_NR,
-                                        (__force u64)OVS_CB(skb)->tun_id);
-                       stats_counter_off = offsetof(struct dp_stats_percpu, n_missed);
-                       goto out;
-               }
+static const struct nla_policy packet_policy[OVS_PACKET_ATTR_MAX + 1] = {
+       [OVS_PACKET_ATTR_PACKET] = { .len = ETH_HLEN },
+       [OVS_PACKET_ATTR_KEY] = { .type = NLA_NESTED },
+       [OVS_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
+};
 
-               OVS_CB(skb)->flow = flow_cast(flow_node);
+static struct genl_ops dp_packet_genl_ops[] = {
+       { .cmd = OVS_PACKET_CMD_EXECUTE,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = packet_policy,
+         .doit = ovs_packet_cmd_execute
        }
+};
 
-       stats_counter_off = offsetof(struct dp_stats_percpu, n_hit);
-       flow_used(OVS_CB(skb)->flow, skb);
+static struct genl_family dp_packet_genl_family = {
+       .id = GENL_ID_GENERATE,
+       .hdrsize = sizeof(struct ovs_header),
+       .name = OVS_PACKET_FAMILY,
+       .version = OVS_PACKET_VERSION,
+       .maxattr = OVS_PACKET_ATTR_MAX,
+       .netnsok = true,
+       .parallel_ops = true,
+       .ops = dp_packet_genl_ops,
+       .n_ops = ARRAY_SIZE(dp_packet_genl_ops),
+};
 
-       acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);
+static void get_dp_stats(struct datapath *dp, struct ovs_dp_stats *stats,
+                        struct ovs_dp_megaflow_stats *mega_stats)
+{
+       int i;
 
-       /* Check whether we've looped too much. */
-       loop = loop_get_counter();
-       if (unlikely(++loop->count > MAX_LOOPS))
-               loop->looping = true;
-       if (unlikely(loop->looping)) {
-               loop_suppress(dp, acts);
-               kfree_skb(skb);
-               goto out_loop;
-       }
+       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);
 
-       /* Execute actions. */
-       execute_actions(dp, skb, &OVS_CB(skb)->flow->key, acts->actions,
-                       acts->actions_len);
+       stats->n_hit = stats->n_missed = stats->n_lost = 0;
 
-       /* Check whether sub-actions looped too much. */
-       if (unlikely(loop->looping))
-               loop_suppress(dp, acts);
+       for_each_possible_cpu(i) {
+               const struct dp_stats_percpu *percpu_stats;
+               struct dp_stats_percpu local_stats;
+               unsigned int start;
 
-out_loop:
-       /* Decrement loop counter. */
-       if (!--loop->count)
-               loop->looping = false;
-       loop_put_counter();
+               percpu_stats = per_cpu_ptr(dp->stats_percpu, i);
 
-out:
-       /* Update datapath statistics. */
-       local_bh_disable();
-       stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
+               do {
+                       start = u64_stats_fetch_begin_bh(&percpu_stats->sync);
+                       local_stats = *percpu_stats;
+               } while (u64_stats_fetch_retry_bh(&percpu_stats->sync, start));
 
-       write_seqcount_begin(&stats->seqlock);
-       (*(u64 *)((u8 *)stats + stats_counter_off))++;
-       write_seqcount_end(&stats->seqlock);
+               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;
+       }
+}
 
-       local_bh_enable();
+static size_t ovs_flow_cmd_msg_size(const struct sw_flow_actions *acts)
+{
+       return NLMSG_ALIGN(sizeof(struct ovs_header))
+               + nla_total_size(key_attr_size()) /* OVS_FLOW_ATTR_KEY */
+               + nla_total_size(key_attr_size()) /* OVS_FLOW_ATTR_MASK */
+               + nla_total_size(sizeof(struct ovs_flow_stats)) /* OVS_FLOW_ATTR_STATS */
+               + nla_total_size(1) /* OVS_FLOW_ATTR_TCP_FLAGS */
+               + nla_total_size(8) /* OVS_FLOW_ATTR_USED */
+               + nla_total_size(acts->actions_len); /* OVS_FLOW_ATTR_ACTIONS */
 }
 
-/* Append each packet in 'skb' list to 'queue'.  There will be only one packet
- * unless we broke up a GSO packet. */
-static int queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue,
-                                int queue_no, u64 arg)
+/* Called with ovs_mutex or RCU read lock. */
+static int ovs_flow_cmd_fill_info(const struct sw_flow *flow, int dp_ifindex,
+                                 struct sk_buff *skb, u32 portid,
+                                 u32 seq, u32 flags, u8 cmd)
 {
-       struct sk_buff *nskb;
-       int port_no;
+       const int skb_orig_len = skb->len;
+       struct nlattr *start;
+       struct ovs_flow_stats stats;
+       __be16 tcp_flags;
+       unsigned long used;
+       struct ovs_header *ovs_header;
+       struct nlattr *nla;
        int err;
 
-       if (OVS_CB(skb)->vport)
-               port_no = OVS_CB(skb)->vport->port_no;
-       else
-               port_no = ODPP_LOCAL;
+       ovs_header = genlmsg_put(skb, portid, seq, &dp_flow_genl_family, flags, cmd);
+       if (!ovs_header)
+               return -EMSGSIZE;
 
-       do {
-               struct odp_msg *header;
+       ovs_header->dp_ifindex = dp_ifindex;
 
-               nskb = skb->next;
-               skb->next = NULL;
+       /* Fill flow key. */
+       nla = nla_nest_start(skb, OVS_FLOW_ATTR_KEY);
+       if (!nla)
+               goto nla_put_failure;
 
-               err = skb_cow(skb, sizeof *header);
-               if (err)
-                       goto err_kfree_skbs;
+       err = ovs_nla_put_flow(&flow->unmasked_key, &flow->unmasked_key, skb);
+       if (err)
+               goto error;
+       nla_nest_end(skb, nla);
 
-               header = (struct odp_msg*)__skb_push(skb, sizeof *header);
-               header->type = queue_no;
-               header->length = skb->len;
-               header->port = port_no;
-               header->arg = arg;
-               skb_queue_tail(queue, skb);
+       nla = nla_nest_start(skb, OVS_FLOW_ATTR_MASK);
+       if (!nla)
+               goto nla_put_failure;
 
-               skb = nskb;
-       } while (skb);
-       return 0;
+       err = ovs_nla_put_flow(&flow->key, &flow->mask->key, skb);
+       if (err)
+               goto error;
 
-err_kfree_skbs:
-       kfree_skb(skb);
-       while ((skb = nskb) != NULL) {
-               nskb = skb->next;
-               kfree_skb(skb);
-       }
-       return err;
-}
+       nla_nest_end(skb, nla);
 
-int dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
-                     u64 arg)
-{
-       struct dp_stats_percpu *stats;
-       struct sk_buff_head *queue;
-       int err;
+       ovs_flow_stats_get(flow, &stats, &used, &tcp_flags);
 
-       WARN_ON_ONCE(skb_shared(skb));
-       BUG_ON(queue_no != _ODPL_MISS_NR && queue_no != _ODPL_ACTION_NR && queue_no != _ODPL_SFLOW_NR);
-       queue = &dp->queues[queue_no];
-       err = -ENOBUFS;
-       if (skb_queue_len(queue) >= DP_MAX_QUEUE_LEN)
-               goto err_kfree_skb;
+       if (used &&
+           nla_put_u64(skb, OVS_FLOW_ATTR_USED, ovs_flow_used_time(used)))
+               goto nla_put_failure;
 
-       forward_ip_summed(skb);
+       if (stats.n_packets &&
+           nla_put(skb, OVS_FLOW_ATTR_STATS, sizeof(struct ovs_flow_stats), &stats))
+               goto nla_put_failure;
 
-       err = vswitch_skb_checksum_setup(skb);
-       if (err)
-               goto err_kfree_skb;
+       if ((u8)ntohs(tcp_flags) &&
+            nla_put_u8(skb, OVS_FLOW_ATTR_TCP_FLAGS, (u8)ntohs(tcp_flags)))
+               goto nla_put_failure;
 
-       /* Break apart GSO packets into their component pieces.  Otherwise
-        * userspace may try to stuff a 64kB packet into a 1500-byte MTU. */
-       if (skb_is_gso(skb)) {
-               struct sk_buff *nskb = skb_gso_segment(skb, NETIF_F_SG | NETIF_F_HW_CSUM);
-               
-               kfree_skb(skb);
-               skb = nskb;
-               if (IS_ERR(skb)) {
-                       err = PTR_ERR(skb);
-                       goto err;
-               }
-       }
+       /* If OVS_FLOW_ATTR_ACTIONS doesn't fit, skip dumping the actions if
+        * this is the first flow to be dumped into 'skb'.  This is unusual for
+        * Netlink but individual action lists can be longer than
+        * NLMSG_GOODSIZE and thus entirely undumpable if we didn't do this.
+        * The userspace caller can always fetch the actions separately if it
+        * really wants them.  (Most userspace callers in fact don't care.)
+        *
+        * This can only fail for dump operations because the skb is always
+        * properly sized for single flows.
+        */
+       start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS);
+       if (start) {
+               const struct sw_flow_actions *sf_acts;
 
-       err = queue_control_packets(skb, queue, queue_no, arg);
-       wake_up_interruptible(&dp->waitqueue);
-       return err;
+               sf_acts = rcu_dereference_ovsl(flow->sf_acts);
+               err = ovs_nla_put_actions(sf_acts->actions,
+                                         sf_acts->actions_len, skb);
 
-err_kfree_skb:
-       kfree_skb(skb);
-err:
-       local_bh_disable();
-       stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
+               if (!err)
+                       nla_nest_end(skb, start);
+               else {
+                       if (skb_orig_len)
+                               goto error;
 
-       write_seqcount_begin(&stats->seqlock);
-       stats->n_lost++;
-       write_seqcount_end(&stats->seqlock);
+                       nla_nest_cancel(skb, start);
+               }
+       } else if (skb_orig_len)
+               goto nla_put_failure;
 
-       local_bh_enable();
+       return genlmsg_end(skb, ovs_header);
 
+nla_put_failure:
+       err = -EMSGSIZE;
+error:
+       genlmsg_cancel(skb, ovs_header);
        return err;
 }
 
-static int flush_flows(struct datapath *dp)
+/* May not be called with RCU read lock. */
+static struct sk_buff *ovs_flow_cmd_alloc_info(const struct sw_flow_actions *acts,
+                                              struct genl_info *info,
+                                              bool always)
 {
-       struct tbl *old_table = get_table_protected(dp);
-       struct tbl *new_table;
+       struct sk_buff *skb;
 
-       new_table = tbl_create(0);
-       if (!new_table)
-               return -ENOMEM;
+       if (!always && !ovs_must_notify(info, &ovs_dp_flow_multicast_group))
+               return NULL;
 
-       rcu_assign_pointer(dp->table, new_table);
+       skb = genlmsg_new_unicast(ovs_flow_cmd_msg_size(acts), info, GFP_KERNEL);
 
-       tbl_deferred_destroy(old_table, flow_free_tbl);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
 
-       return 0;
+       return skb;
 }
 
-static int validate_actions(const struct nlattr *actions, u32 actions_len)
+/* Called with ovs_mutex. */
+static struct sk_buff *ovs_flow_cmd_build_info(const struct sw_flow *flow,
+                                              int dp_ifindex,
+                                              struct genl_info *info, u8 cmd,
+                                              bool always)
 {
-        const struct nlattr *a;
-        int rem;
-
-        nla_for_each_attr(a, actions, actions_len, rem) {
-                static const u32 action_lens[ODPAT_MAX + 1] = {
-                        [ODPAT_OUTPUT] = 4,
-                        [ODPAT_CONTROLLER] = 8,
-                        [ODPAT_SET_DL_TCI] = 2,
-                        [ODPAT_STRIP_VLAN] = 0,
-                        [ODPAT_SET_DL_SRC] = ETH_ALEN,
-                        [ODPAT_SET_DL_DST] = ETH_ALEN,
-                        [ODPAT_SET_NW_SRC] = 4,
-                        [ODPAT_SET_NW_DST] = 4,
-                        [ODPAT_SET_NW_TOS] = 1,
-                        [ODPAT_SET_TP_SRC] = 2,
-                        [ODPAT_SET_TP_DST] = 2,
-                        [ODPAT_SET_TUNNEL] = 8,
-                        [ODPAT_SET_PRIORITY] = 4,
-                        [ODPAT_POP_PRIORITY] = 0,
-                        [ODPAT_DROP_SPOOFED_ARP] = 0,
-                };
-                int type = nla_type(a);
-
-                if (type > ODPAT_MAX || nla_len(a) != action_lens[type])
-                        return -EINVAL;
-
-                switch (type) {
-               case ODPAT_UNSPEC:
-                       return -EINVAL;
-
-                case ODPAT_CONTROLLER:
-                case ODPAT_STRIP_VLAN:
-                case ODPAT_SET_DL_SRC:
-                case ODPAT_SET_DL_DST:
-                case ODPAT_SET_NW_SRC:
-                case ODPAT_SET_NW_DST:
-                case ODPAT_SET_TP_SRC:
-                case ODPAT_SET_TP_DST:
-                case ODPAT_SET_TUNNEL:
-                case ODPAT_SET_PRIORITY:
-                case ODPAT_POP_PRIORITY:
-                case ODPAT_DROP_SPOOFED_ARP:
-                        /* No validation needed. */
-                        break;
-
-                case ODPAT_OUTPUT:
-                        if (nla_get_u32(a) >= DP_MAX_PORTS)
-                                return -EINVAL;
-
-                case ODPAT_SET_DL_TCI:
-                       if (nla_get_be16(a) & htons(VLAN_CFI_MASK))
-                               return -EINVAL;
-                        break;
-
-                case ODPAT_SET_NW_TOS:
-                        if (nla_get_u8(a) & INET_ECN_MASK)
-                                return -EINVAL;
-                        break;
-
-                default:
-                        return -EOPNOTSUPP;
-                }
-        }
-
-        if (rem > 0)
-                return -EINVAL;
-
-        return 0;
+       struct sk_buff *skb;
+       int retval;
+
+       skb = ovs_flow_cmd_alloc_info(ovsl_dereference(flow->sf_acts), info,
+                                     always);
+       if (!skb || IS_ERR(skb))
+               return skb;
+
+       retval = ovs_flow_cmd_fill_info(flow, dp_ifindex, skb,
+                                       info->snd_portid, info->snd_seq, 0,
+                                       cmd);
+       BUG_ON(retval < 0);
+       return skb;
 }
 
-static struct sw_flow_actions *get_actions(const struct odp_flow *flow)
+static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info)
 {
-       struct sw_flow_actions *actions;
+       struct nlattr **a = info->attrs;
+       struct ovs_header *ovs_header = info->userhdr;
+       struct sw_flow *flow, *new_flow;
+       struct sw_flow_mask mask;
+       struct sk_buff *reply;
+       struct datapath *dp;
+       struct sw_flow_actions *acts;
+       struct sw_flow_match match;
        int error;
 
-       actions = flow_actions_alloc(flow->actions_len);
-       error = PTR_ERR(actions);
-       if (IS_ERR(actions))
+       /* Must have key and actions. */
+       error = -EINVAL;
+       if (!a[OVS_FLOW_ATTR_KEY])
+               goto error;
+       if (!a[OVS_FLOW_ATTR_ACTIONS])
                goto error;
 
-       error = -EFAULT;
-       if (copy_from_user(actions->actions,
-                          (struct nlattr __user *)flow->actions,
-                          flow->actions_len))
-               goto error_free_actions;
-       error = validate_actions(actions->actions, actions->actions_len);
-       if (error)
-               goto error_free_actions;
+       /* Most of the time we need to allocate a new flow, do it before
+        * locking. */
+       new_flow = ovs_flow_alloc();
+       if (IS_ERR(new_flow)) {
+               error = PTR_ERR(new_flow);
+               goto error;
+       }
 
-       return actions;
+       /* Extract key. */
+       ovs_match_init(&match, &new_flow->unmasked_key, &mask);
+       error = ovs_nla_get_match(&match,
+                                 a[OVS_FLOW_ATTR_KEY], a[OVS_FLOW_ATTR_MASK]);
+       if (error)
+               goto err_kfree_flow;
 
-error_free_actions:
-       kfree(actions);
-error:
-       return ERR_PTR(error);
-}
+       ovs_flow_mask_key(&new_flow->key, &new_flow->unmasked_key, &mask);
 
-static void get_stats(struct sw_flow *flow, struct odp_flow_stats *stats)
-{
-       if (flow->used) {
-               struct timespec offset_ts, used, now_mono;
+       /* Validate actions. */
+       acts = ovs_nla_alloc_flow_actions(nla_len(a[OVS_FLOW_ATTR_ACTIONS]));
+       error = PTR_ERR(acts);
+       if (IS_ERR(acts))
+               goto err_kfree_flow;
 
-               ktime_get_ts(&now_mono);
-               jiffies_to_timespec(jiffies - flow->used, &offset_ts);
-               set_normalized_timespec(&used, now_mono.tv_sec - offset_ts.tv_sec,
-                                       now_mono.tv_nsec - offset_ts.tv_nsec);
+       error = ovs_nla_copy_actions(a[OVS_FLOW_ATTR_ACTIONS], &new_flow->key,
+                                    0, &acts);
+       if (error) {
+               OVS_NLERR("Flow actions may not be safe on all matching packets.\n");
+               goto err_kfree_acts;
+       }
 
-               stats->used_sec = used.tv_sec;
-               stats->used_nsec = used.tv_nsec;
-       } else {
-               stats->used_sec = 0;
-               stats->used_nsec = 0;
+       reply = ovs_flow_cmd_alloc_info(acts, info, false);
+       if (IS_ERR(reply)) {
+               error = PTR_ERR(reply);
+               goto err_kfree_acts;
        }
 
-       stats->n_packets = flow->packet_count;
-       stats->n_bytes = flow->byte_count;
-       stats->reserved = 0;
-       stats->tcp_flags = flow->tcp_flags;
-       stats->error = 0;
-}
+       ovs_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       if (unlikely(!dp)) {
+               error = -ENODEV;
+               goto err_unlock_ovs;
+       }
+       /* Check if this is a duplicate flow */
+       flow = ovs_flow_tbl_lookup(&dp->table, &new_flow->unmasked_key);
+       if (likely(!flow)) {
+               rcu_assign_pointer(new_flow->sf_acts, acts);
 
-static void clear_stats(struct sw_flow *flow)
-{
-       flow->used = 0;
-       flow->tcp_flags = 0;
-       flow->packet_count = 0;
-       flow->byte_count = 0;
-}
+               /* Put flow in bucket. */
+               error = ovs_flow_tbl_insert(&dp->table, new_flow, &mask);
+               if (unlikely(error)) {
+                       acts = NULL;
+                       goto err_unlock_ovs;
+               }
 
-static int expand_table(struct datapath *dp)
-{
-       struct tbl *old_table = get_table_protected(dp);
-       struct tbl *new_table;
+               if (unlikely(reply)) {
+                       error = ovs_flow_cmd_fill_info(new_flow,
+                                                      ovs_header->dp_ifindex,
+                                                      reply, info->snd_portid,
+                                                      info->snd_seq, 0,
+                                                      OVS_FLOW_CMD_NEW);
+                       BUG_ON(error < 0);
+               }
+               ovs_unlock();
+       } else {
+               struct sw_flow_actions *old_acts;
+
+               /* Bail out if we're not allowed to modify an existing flow.
+                * We accept NLM_F_CREATE in place of the intended NLM_F_EXCL
+                * because Generic Netlink treats the latter as a dump
+                * request.  We also accept NLM_F_EXCL in case that bug ever
+                * gets fixed.
+                */
+               if (unlikely(info->nlhdr->nlmsg_flags & (NLM_F_CREATE
+                                                        | NLM_F_EXCL))) {
+                       error = -EEXIST;
+                       goto err_unlock_ovs;
+               }
+               /* The unmasked key has to be the same for flow updates. */
+               if (unlikely(!ovs_flow_cmp_unmasked_key(flow, &match))) {
+                       error = -EEXIST;
+                       goto err_unlock_ovs;
+               }
+               /* Update actions. */
+               old_acts = ovsl_dereference(flow->sf_acts);
+               rcu_assign_pointer(flow->sf_acts, acts);
 
-       new_table = tbl_expand(old_table);
-       if (IS_ERR(new_table))
-               return PTR_ERR(new_table);
+               if (unlikely(reply)) {
+                       error = ovs_flow_cmd_fill_info(flow,
+                                                      ovs_header->dp_ifindex,
+                                                      reply, info->snd_portid,
+                                                      info->snd_seq, 0,
+                                                      OVS_FLOW_CMD_NEW);
+                       BUG_ON(error < 0);
+               }
+               ovs_unlock();
 
-       rcu_assign_pointer(dp->table, new_table);
-       tbl_deferred_destroy(old_table, NULL);
+               ovs_nla_free_flow_actions(old_acts);
+               ovs_flow_free(new_flow, false);
+       }
 
+       if (reply)
+               ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
        return 0;
+
+err_unlock_ovs:
+       ovs_unlock();
+       kfree_skb(reply);
+err_kfree_acts:
+       kfree(acts);
+err_kfree_flow:
+       ovs_flow_free(new_flow, false);
+error:
+       return error;
 }
 
-static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf,
-                      struct odp_flow_stats *stats)
+static int ovs_flow_cmd_set(struct sk_buff *skb, struct genl_info *info)
 {
-       struct tbl_node *flow_node;
+       struct nlattr **a = info->attrs;
+       struct ovs_header *ovs_header = info->userhdr;
+       struct sw_flow_key key, masked_key;
        struct sw_flow *flow;
-       struct tbl *table;
+       struct sw_flow_mask mask;
+       struct sk_buff *reply = NULL;
+       struct datapath *dp;
+       struct sw_flow_actions *old_acts = NULL, *acts = NULL;
+       struct sw_flow_match match;
        int error;
 
-       table = get_table_protected(dp);
-       flow_node = tbl_lookup(table, &uf->flow.key, flow_hash(&uf->flow.key), flow_cmp);
-       if (!flow_node) {
-               /* No such flow. */
-               struct sw_flow_actions *acts;
+       /* Extract key. */
+       error = -EINVAL;
+       if (!a[OVS_FLOW_ATTR_KEY])
+               goto error;
 
-               error = -ENOENT;
-               if (!(uf->flags & ODPPF_CREATE))
+       ovs_match_init(&match, &key, &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_nla_alloc_flow_actions(nla_len(a[OVS_FLOW_ATTR_ACTIONS]));
+               error = PTR_ERR(acts);
+               if (IS_ERR(acts))
                        goto error;
 
-               /* Expand table, if necessary, to make room. */
-               if (tbl_count(table) >= tbl_n_buckets(table)) {
-                       error = expand_table(dp);
-                       if (error)
-                               goto error;
-                       table = get_table_protected(dp);
+               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_acts;
                }
+       }
 
-               /* Allocate flow. */
-               flow = flow_alloc();
-               if (IS_ERR(flow)) {
-                       error = PTR_ERR(flow);
-                       goto error;
+       /* Can allocate before locking if have acts. */
+       if (acts) {
+               reply = ovs_flow_cmd_alloc_info(acts, info, false);
+               if (IS_ERR(reply)) {
+                       error = PTR_ERR(reply);
+                       goto err_kfree_acts;
                }
-               flow->key = uf->flow.key;
-               clear_stats(flow);
+       }
 
-               /* Obtain actions. */
-               acts = get_actions(&uf->flow);
-               error = PTR_ERR(acts);
-               if (IS_ERR(acts))
-                       goto error_free_flow;
+       ovs_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       if (unlikely(!dp)) {
+               error = -ENODEV;
+               goto err_unlock_ovs;
+       }
+       /* Check that the flow exists. */
+       flow = ovs_flow_tbl_lookup(&dp->table, &key);
+       if (unlikely(!flow)) {
+               error = -ENOENT;
+               goto err_unlock_ovs;
+       }
+       /* The unmasked key has to be the same for flow updates. */
+       if (unlikely(!ovs_flow_cmp_unmasked_key(flow, &match))) {
+               error = -EEXIST;
+               goto err_unlock_ovs;
+       }
+       /* Update actions, if present. */
+       if (likely(acts)) {
+               old_acts = ovsl_dereference(flow->sf_acts);
                rcu_assign_pointer(flow->sf_acts, acts);
 
-               /* Put flow in bucket. */
-               error = tbl_insert(table, &flow->tbl_node, flow_hash(&flow->key));
-               if (error)
-                       goto error_free_flow_acts;
-
-               memset(stats, 0, sizeof(struct odp_flow_stats));
+               if (unlikely(reply)) {
+                       error = ovs_flow_cmd_fill_info(flow,
+                                                      ovs_header->dp_ifindex,
+                                                      reply, info->snd_portid,
+                                                      info->snd_seq, 0,
+                                                      OVS_FLOW_CMD_NEW);
+                       BUG_ON(error < 0);
+               }
        } else {
-               /* We found a matching flow. */
-               struct sw_flow_actions *old_acts, *new_acts;
-
-               flow = flow_cast(flow_node);
-
-               /* Bail out if we're not allowed to modify an existing flow. */
-               error = -EEXIST;
-               if (!(uf->flags & ODPPF_MODIFY))
-                       goto error;
-
-               /* Swap actions. */
-               new_acts = get_actions(&uf->flow);
-               error = PTR_ERR(new_acts);
-               if (IS_ERR(new_acts))
-                       goto error;
-
-               old_acts = rcu_dereference_protected(flow->sf_acts,
-                                                    lockdep_is_held(&dp->mutex));
-               if (old_acts->actions_len != new_acts->actions_len ||
-                   memcmp(old_acts->actions, new_acts->actions,
-                          old_acts->actions_len)) {
-                       rcu_assign_pointer(flow->sf_acts, new_acts);
-                       flow_deferred_free_acts(old_acts);
-               } else {
-                       kfree(new_acts);
+               /* Could not alloc without acts before locking. */
+               reply = ovs_flow_cmd_build_info(flow, ovs_header->dp_ifindex,
+                                               info, OVS_FLOW_CMD_NEW, false);
+               if (unlikely(IS_ERR(reply))) {
+                       error = PTR_ERR(reply);
+                       goto err_unlock_ovs;
                }
-
-               /* Fetch stats, then clear them if necessary. */
-               spin_lock_bh(&flow->lock);
-               get_stats(flow, stats);
-               if (uf->flags & ODPPF_ZERO_STATS)
-                       clear_stats(flow);
-               spin_unlock_bh(&flow->lock);
        }
 
+       /* Clear stats. */
+       if (a[OVS_FLOW_ATTR_CLEAR])
+               ovs_flow_stats_clear(flow);
+       ovs_unlock();
+
+       if (reply)
+               ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
+       if (old_acts)
+               ovs_nla_free_flow_actions(old_acts);
        return 0;
 
-error_free_flow_acts:
-       kfree(flow->sf_acts);
-error_free_flow:
-       flow->sf_acts = NULL;
-       flow_put(flow);
+err_unlock_ovs:
+       ovs_unlock();
+       kfree_skb(reply);
+err_kfree_acts:
+       kfree(acts);
 error:
        return error;
 }
 
-static int put_flow(struct datapath *dp, struct odp_flow_put __user *ufp)
+static int ovs_flow_cmd_get(struct sk_buff *skb, struct genl_info *info)
 {
-       struct odp_flow_stats stats;
-       struct odp_flow_put uf;
-       int error;
-
-       if (copy_from_user(&uf, ufp, sizeof(struct odp_flow_put)))
-               return -EFAULT;
-
-       error = do_put_flow(dp, &uf, &stats);
-       if (error)
-               return error;
-
-       if (copy_to_user(&ufp->flow.stats, &stats,
-                        sizeof(struct odp_flow_stats)))
-               return -EFAULT;
-
-       return 0;
-}
-
-static int do_answer_query(struct datapath *dp, struct sw_flow *flow,
-                          u32 query_flags,
-                          struct odp_flow_stats __user *ustats,
-                          struct nlattr __user *actions,
-                          u32 __user *actions_lenp)
-{
-       struct sw_flow_actions *sf_acts;
-       struct odp_flow_stats stats;
-       u32 actions_len;
+       struct nlattr **a = info->attrs;
+       struct ovs_header *ovs_header = info->userhdr;
+       struct sw_flow_key key;
+       struct sk_buff *reply;
+       struct sw_flow *flow;
+       struct datapath *dp;
+       struct sw_flow_match match;
+       int err;
 
-       spin_lock_bh(&flow->lock);
-       get_stats(flow, &stats);
-       if (query_flags & ODPFF_ZERO_TCP_FLAGS)
-               flow->tcp_flags = 0;
+       if (!a[OVS_FLOW_ATTR_KEY]) {
+               OVS_NLERR("Flow get message rejected, Key attribute missing.\n");
+               return -EINVAL;
+       }
 
-       spin_unlock_bh(&flow->lock);
+       ovs_match_init(&match, &key, NULL);
+       err = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY], NULL);
+       if (err)
+               return err;
 
-       if (copy_to_user(ustats, &stats, sizeof(struct odp_flow_stats)) ||
-           get_user(actions_len, actions_lenp))
-               return -EFAULT;
+       ovs_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       if (!dp) {
+               err = -ENODEV;
+               goto unlock;
+       }
 
-       if (!actions_len)
-               return 0;
+       flow = ovs_flow_tbl_lookup(&dp->table, &key);
+       if (!flow || !ovs_flow_cmp_unmasked_key(flow, &match)) {
+               err = -ENOENT;
+               goto unlock;
+       }
 
-       sf_acts = rcu_dereference_protected(flow->sf_acts,
-                                           lockdep_is_held(&dp->mutex));
-       if (put_user(sf_acts->actions_len, actions_lenp) ||
-           (actions && copy_to_user(actions, sf_acts->actions,
-                                    min(sf_acts->actions_len, actions_len))))
-               return -EFAULT;
+       reply = ovs_flow_cmd_build_info(flow, ovs_header->dp_ifindex, info,
+                                       OVS_FLOW_CMD_NEW, true);
+       if (IS_ERR(reply)) {
+               err = PTR_ERR(reply);
+               goto unlock;
+       }
 
-       return 0;
+       ovs_unlock();
+       return genlmsg_reply(reply, info);
+unlock:
+       ovs_unlock();
+       return err;
 }
 
-static int answer_query(struct datapath *dp, struct sw_flow *flow,
-                       u32 query_flags, struct odp_flow __user *ufp)
+static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info)
 {
-       struct nlattr __user *actions;
-
-       if (get_user(actions, (struct nlattr __user * __user *)&ufp->actions))
-               return -EFAULT;
+       struct nlattr **a = info->attrs;
+       struct ovs_header *ovs_header = info->userhdr;
+       struct sw_flow_key key;
+       struct sk_buff *reply;
+       struct sw_flow *flow;
+       struct datapath *dp;
+       struct sw_flow_match match;
+       int err;
 
-       return do_answer_query(dp, flow, query_flags, 
-                              &ufp->stats, actions, &ufp->actions_len);
-}
+       if (likely(a[OVS_FLOW_ATTR_KEY])) {
+               ovs_match_init(&match, &key, NULL);
+               err = ovs_nla_get_match(&match, a[OVS_FLOW_ATTR_KEY], NULL);
+               if (unlikely(err))
+                       return err;
+       }
 
-static struct sw_flow *do_del_flow(struct datapath *dp, struct odp_flow_key *key)
-{
-       struct tbl *table = get_table_protected(dp);
-       struct tbl_node *flow_node;
-       int error;
+       ovs_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       if (unlikely(!dp)) {
+               err = -ENODEV;
+               goto unlock;
+       }
+       if (unlikely(!a[OVS_FLOW_ATTR_KEY])) {
+               err = ovs_flow_tbl_flush(&dp->table);
+               goto unlock;
+       }
+       flow = ovs_flow_tbl_lookup(&dp->table, &key);
+       if (unlikely(!flow || !ovs_flow_cmp_unmasked_key(flow, &match))) {
+               err = -ENOENT;
+               goto unlock;
+       }
 
-       flow_node = tbl_lookup(table, key, flow_hash(key), flow_cmp);
-       if (!flow_node)
-               return ERR_PTR(-ENOENT);
+       ovs_flow_tbl_remove(&dp->table, flow);
+       ovs_unlock();
+
+       reply = ovs_flow_cmd_alloc_info((const struct sw_flow_actions __force *)flow->sf_acts,
+                                       info, false);
+
+       if (likely(reply)) {
+               if (likely(!IS_ERR(reply))) {
+                       rcu_read_lock(); /* Keep RCU checker happy. */
+                       err = ovs_flow_cmd_fill_info(flow,
+                                                    ovs_header->dp_ifindex,
+                                                    reply, info->snd_portid,
+                                                    info->snd_seq, 0,
+                                                    OVS_FLOW_CMD_DEL);
+                       rcu_read_unlock();
+                       BUG_ON(err < 0);
+                       ovs_notify(&dp_flow_genl_family, &ovs_dp_flow_multicast_group, reply, info);
+               } else {
+                       genl_set_err(&dp_flow_genl_family, sock_net(skb->sk), 0,
+                                    GROUP_ID(&ovs_dp_flow_multicast_group), PTR_ERR(reply));
 
-       error = tbl_remove(table, flow_node);
-       if (error)
-               return ERR_PTR(error);
+               }
+       }
 
-       /* XXX Returned flow_node's statistics might lose a few packets, since
-        * other CPUs can be using this flow.  We used to synchronize_rcu() to
-        * make sure that we get completely accurate stats, but that blows our
-        * performance, badly. */
-       return flow_cast(flow_node);
+       ovs_flow_free(flow, true);
+       return 0;
+unlock:
+       ovs_unlock();
+       return err;
 }
 
-static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
+static int ovs_flow_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
 {
-       struct sw_flow *flow;
-       struct odp_flow uf;
-       int error;
-
-       if (copy_from_user(&uf, ufp, sizeof uf))
-               return -EFAULT;
-
-       flow = do_del_flow(dp, &uf.key);
-       if (IS_ERR(flow))
-               return PTR_ERR(flow);
+       struct ovs_header *ovs_header = genlmsg_data(nlmsg_data(cb->nlh));
+       struct table_instance *ti;
+       struct datapath *dp;
 
-       error = answer_query(dp, flow, 0, ufp);
-       flow_deferred_free(flow);
-       return error;
-}
+       rcu_read_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       if (!dp) {
+               rcu_read_unlock();
+               return -ENODEV;
+       }
 
-static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
-{
-       struct tbl *table = get_table_protected(dp);
-       u32 i;
+       ti = rcu_dereference(dp->table.ti);
+       for (;;) {
+               struct sw_flow *flow;
+               u32 bucket, obj;
 
-       for (i = 0; i < flowvec->n_flows; i++) {
-               struct odp_flow __user *ufp = (struct odp_flow __user *)&flowvec->flows[i];
-               struct odp_flow uf;
-               struct tbl_node *flow_node;
-               int error;
+               bucket = cb->args[0];
+               obj = cb->args[1];
+               flow = ovs_flow_tbl_dump_next(ti, &bucket, &obj);
+               if (!flow)
+                       break;
 
-               if (copy_from_user(&uf, ufp, sizeof uf))
-                       return -EFAULT;
+               if (ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex, skb,
+                                          NETLINK_CB(cb->skb).portid,
+                                          cb->nlh->nlmsg_seq, NLM_F_MULTI,
+                                          OVS_FLOW_CMD_NEW) < 0)
+                       break;
 
-               flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp);
-               if (!flow_node)
-                       error = put_user(ENOENT, &ufp->stats.error);
-               else
-                       error = answer_query(dp, flow_cast(flow_node), uf.flags, ufp);
-               if (error)
-                       return -EFAULT;
+               cb->args[0] = bucket;
+               cb->args[1] = obj;
        }
-       return flowvec->n_flows;
+       rcu_read_unlock();
+       return skb->len;
 }
 
-struct list_flows_cbdata {
-       struct datapath *dp;
-       struct odp_flow __user *uflows;
-       u32 n_flows;
-       u32 listed_flows;
+static const struct nla_policy flow_policy[OVS_FLOW_ATTR_MAX + 1] = {
+       [OVS_FLOW_ATTR_KEY] = { .type = NLA_NESTED },
+       [OVS_FLOW_ATTR_ACTIONS] = { .type = NLA_NESTED },
+       [OVS_FLOW_ATTR_CLEAR] = { .type = NLA_FLAG },
 };
 
-static int list_flow(struct tbl_node *node, void *cbdata_)
-{
-       struct sw_flow *flow = flow_cast(node);
-       struct list_flows_cbdata *cbdata = cbdata_;
-       struct odp_flow __user *ufp = &cbdata->uflows[cbdata->listed_flows++];
-       int error;
-
-       if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
-               return -EFAULT;
-       error = answer_query(cbdata->dp, flow, 0, ufp);
-       if (error)
-               return error;
-
-       if (cbdata->listed_flows >= cbdata->n_flows)
-               return cbdata->listed_flows;
-       return 0;
-}
-
-static int do_list_flows(struct datapath *dp, const struct odp_flowvec *flowvec)
-{
-       struct list_flows_cbdata cbdata;
-       int error;
-
-       if (!flowvec->n_flows)
-               return 0;
-
-       cbdata.dp = dp;
-       cbdata.uflows = (struct odp_flow __user *)flowvec->flows;
-       cbdata.n_flows = flowvec->n_flows;
-       cbdata.listed_flows = 0;
+static struct genl_ops dp_flow_genl_ops[] = {
+       { .cmd = OVS_FLOW_CMD_NEW,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = flow_policy,
+         .doit = ovs_flow_cmd_new
+       },
+       { .cmd = OVS_FLOW_CMD_DEL,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = flow_policy,
+         .doit = ovs_flow_cmd_del
+       },
+       { .cmd = OVS_FLOW_CMD_GET,
+         .flags = 0,               /* OK for unprivileged users. */
+         .policy = flow_policy,
+         .doit = ovs_flow_cmd_get,
+         .dumpit = ovs_flow_cmd_dump
+       },
+       { .cmd = OVS_FLOW_CMD_SET,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = flow_policy,
+         .doit = ovs_flow_cmd_set,
+       },
+};
 
-       error = tbl_foreach(get_table_protected(dp), list_flow, &cbdata);
-       return error ? error : cbdata.listed_flows;
-}
+static struct genl_family dp_flow_genl_family = {
+       .id = GENL_ID_GENERATE,
+       .hdrsize = sizeof(struct ovs_header),
+       .name = OVS_FLOW_FAMILY,
+       .version = OVS_FLOW_VERSION,
+       .maxattr = OVS_FLOW_ATTR_MAX,
+       .netnsok = true,
+       .parallel_ops = true,
+       .ops = dp_flow_genl_ops,
+       .n_ops = ARRAY_SIZE(dp_flow_genl_ops),
+       .mcgrps = &ovs_dp_flow_multicast_group,
+       .n_mcgrps = 1,
+};
 
-static int do_flowvec_ioctl(struct datapath *dp, unsigned long argp,
-                           int (*function)(struct datapath *,
-                                           const struct odp_flowvec *))
+static size_t ovs_dp_cmd_msg_size(void)
 {
-       struct odp_flowvec __user *uflowvec;
-       struct odp_flowvec flowvec;
-       int retval;
+       size_t msgsize = NLMSG_ALIGN(sizeof(struct ovs_header));
 
-       uflowvec = (struct odp_flowvec __user *)argp;
-       if (copy_from_user(&flowvec, uflowvec, sizeof flowvec))
-               return -EFAULT;
-
-       if (flowvec.n_flows > INT_MAX / sizeof(struct odp_flow))
-               return -EINVAL;
+       msgsize += nla_total_size(IFNAMSIZ);
+       msgsize += nla_total_size(sizeof(struct ovs_dp_stats));
+       msgsize += nla_total_size(sizeof(struct ovs_dp_megaflow_stats));
+       msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_USER_FEATURES */
 
-       retval = function(dp, &flowvec);
-       return (retval < 0 ? retval
-               : retval == flowvec.n_flows ? 0
-               : put_user(retval, &uflowvec->n_flows));
+       return msgsize;
 }
 
-static int do_execute(struct datapath *dp, const struct odp_execute *execute)
+/* Called with ovs_mutex or RCU read lock. */
+static int ovs_dp_cmd_fill_info(struct datapath *dp, struct sk_buff *skb,
+                               u32 portid, u32 seq, u32 flags, u8 cmd)
 {
-       struct odp_flow_key key;
-       struct sk_buff *skb;
-       struct sw_flow_actions *actions;
-       struct ethhdr *eth;
-       bool is_frag;
+       struct ovs_header *ovs_header;
+       struct ovs_dp_stats dp_stats;
+       struct ovs_dp_megaflow_stats dp_megaflow_stats;
        int err;
 
-       err = -EINVAL;
-       if (execute->length < ETH_HLEN || execute->length > 65535)
-               goto error;
-
-       actions = flow_actions_alloc(execute->actions_len);
-       if (IS_ERR(actions)) {
-               err = PTR_ERR(actions);
+       ovs_header = genlmsg_put(skb, portid, seq, &dp_datapath_genl_family,
+                                  flags, cmd);
+       if (!ovs_header)
                goto error;
-       }
 
-       err = -EFAULT;
-       if (copy_from_user(actions->actions,
-           (struct nlattr __user *)execute->actions, execute->actions_len))
-               goto error_free_actions;
+       ovs_header->dp_ifindex = get_dpifindex(dp);
 
-       err = validate_actions(actions->actions, execute->actions_len);
+       err = nla_put_string(skb, OVS_DP_ATTR_NAME, ovs_dp_name(dp));
        if (err)
-               goto error_free_actions;
+               goto nla_put_failure;
 
-       err = -ENOMEM;
-       skb = alloc_skb(execute->length, GFP_KERNEL);
-       if (!skb)
-               goto error_free_actions;
+       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;
 
-       err = -EFAULT;
-       if (copy_from_user(skb_put(skb, execute->length),
-                          (const void __user *)execute->data,
-                          execute->length))
-               goto error_free_skb;
+       if (nla_put(skb, OVS_DP_ATTR_MEGAFLOW_STATS,
+                       sizeof(struct ovs_dp_megaflow_stats),
+                       &dp_megaflow_stats))
+               goto nla_put_failure;
 
-       skb_reset_mac_header(skb);
-       eth = eth_hdr(skb);
+       if (nla_put_u32(skb, OVS_DP_ATTR_USER_FEATURES, dp->user_features))
+               goto nla_put_failure;
 
-       /* Normally, setting the skb 'protocol' field would be handled by a
-        * call to eth_type_trans(), but it assumes there's a sending
-        * device, which we may not have. */
-       if (ntohs(eth->h_proto) >= 1536)
-               skb->protocol = eth->h_proto;
-       else
-               skb->protocol = htons(ETH_P_802_2);
+       return genlmsg_end(skb, ovs_header);
 
-       err = flow_extract(skb, -1, &key, &is_frag);
-       if (err)
-               goto error_free_skb;
+nla_put_failure:
+       genlmsg_cancel(skb, ovs_header);
+error:
+       return -EMSGSIZE;
+}
 
-       rcu_read_lock();
-       err = execute_actions(dp, skb, &key, actions->actions, actions->actions_len);
-       rcu_read_unlock();
+static struct sk_buff *ovs_dp_cmd_alloc_info(struct genl_info *info)
+{
+       return genlmsg_new_unicast(ovs_dp_cmd_msg_size(), info, GFP_KERNEL);
+}
 
-       kfree(actions);
-       return err;
+/* Called with rcu_read_lock or ovs_mutex. */
+static struct datapath *lookup_datapath(struct net *net,
+                                       struct ovs_header *ovs_header,
+                                       struct nlattr *a[OVS_DP_ATTR_MAX + 1])
+{
+       struct datapath *dp;
 
-error_free_skb:
-       kfree_skb(skb);
-error_free_actions:
-       kfree(actions);
-error:
-       return err;
+       if (!a[OVS_DP_ATTR_NAME])
+               dp = get_dp(net, ovs_header->dp_ifindex);
+       else {
+               struct vport *vport;
+
+               vport = ovs_vport_locate(net, nla_data(a[OVS_DP_ATTR_NAME]));
+               dp = vport && vport->port_no == OVSP_LOCAL ? vport->dp : NULL;
+       }
+       return dp ? dp : ERR_PTR(-ENODEV);
 }
 
-static int execute_packet(struct datapath *dp, const struct odp_execute __user *executep)
+static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *info)
 {
-       struct odp_execute execute;
+       struct datapath *dp;
 
-       if (copy_from_user(&execute, executep, sizeof execute))
-               return -EFAULT;
+       dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
+       if (IS_ERR(dp))
+               return;
 
-       return do_execute(dp, &execute);
+       WARN(dp->user_features, "Dropping previously announced user features\n");
+       dp->user_features = 0;
 }
 
-static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp)
+static void ovs_dp_change(struct datapath *dp, struct nlattr **a)
 {
-       struct tbl *table = get_table_protected(dp);
-       struct odp_stats stats;
-       int i;
+       if (a[OVS_DP_ATTR_USER_FEATURES])
+               dp->user_features = nla_get_u32(a[OVS_DP_ATTR_USER_FEATURES]);
+}
 
-       stats.n_flows = tbl_count(table);
-       stats.cur_capacity = tbl_n_buckets(table);
-       stats.max_capacity = TBL_MAX_BUCKETS;
-       stats.n_ports = dp->n_ports;
-       stats.max_ports = DP_MAX_PORTS;
-       stats.n_frags = 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;
-               unsigned seqcount;
+static int ovs_dp_cmd_new(struct sk_buff *skb, struct genl_info *info)
+{
+       struct nlattr **a = info->attrs;
+       struct vport_parms parms;
+       struct sk_buff *reply;
+       struct datapath *dp;
+       struct vport *vport;
+       struct ovs_net *ovs_net;
+       int err, i;
 
-               percpu_stats = per_cpu_ptr(dp->stats_percpu, i);
+       err = -EINVAL;
+       if (!a[OVS_DP_ATTR_NAME] || !a[OVS_DP_ATTR_UPCALL_PID])
+               goto err;
 
-               do {
-                       seqcount = read_seqcount_begin(&percpu_stats->seqlock);
-                       local_stats = *percpu_stats;
-               } while (read_seqcount_retry(&percpu_stats->seqlock, seqcount));
+       reply = ovs_dp_cmd_alloc_info(info);
+       if (!reply)
+               return -ENOMEM;
 
-               stats.n_frags += local_stats.n_frags;
-               stats.n_hit += local_stats.n_hit;
-               stats.n_missed += local_stats.n_missed;
-               stats.n_lost += local_stats.n_lost;
-       }
-       stats.max_miss_queue = DP_MAX_QUEUE_LEN;
-       stats.max_action_queue = DP_MAX_QUEUE_LEN;
-       return copy_to_user(statsp, &stats, sizeof stats) ? -EFAULT : 0;
-}
+       err = -ENOMEM;
+       dp = kzalloc(sizeof(*dp), GFP_KERNEL);
+       if (dp == NULL)
+               goto err_free_reply;
 
-/* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports */
-int dp_min_mtu(const struct datapath *dp)
-{
-       struct vport *p;
-       int mtu = 0;
+       ovs_dp_set_net(dp, hold_net(sock_net(skb->sk)));
 
-       ASSERT_RTNL();
+       /* Allocate table. */
+       err = ovs_flow_tbl_init(&dp->table);
+       if (err)
+               goto err_free_dp;
 
-       list_for_each_entry_rcu (p, &dp->port_list, node) {
-               int dev_mtu;
+       dp->stats_percpu = alloc_percpu(struct dp_stats_percpu);
+       if (!dp->stats_percpu) {
+               err = -ENOMEM;
+               goto err_destroy_table;
+       }
 
-               /* Skip any internal ports, since that's what we're trying to
-                * set. */
-               if (is_internal_vport(p))
-                       continue;
+       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);
+       }
 
-               dev_mtu = vport_get_mtu(p);
-               if (!mtu || dev_mtu < mtu)
-                       mtu = dev_mtu;
+       dp->ports = kmalloc(DP_VPORT_HASH_BUCKETS * sizeof(struct hlist_head),
+                           GFP_KERNEL);
+       if (!dp->ports) {
+               err = -ENOMEM;
+               goto err_destroy_percpu;
        }
 
-       return mtu ? mtu : ETH_DATA_LEN;
-}
+       for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)
+               INIT_HLIST_HEAD(&dp->ports[i]);
 
-/* Sets the MTU of all datapath devices to the minimum of the ports.  Must
- * be called with RTNL lock. */
-void set_internal_devs_mtu(const struct datapath *dp)
-{
-       struct vport *p;
-       int mtu;
+       /* Set up our datapath device. */
+       parms.name = nla_data(a[OVS_DP_ATTR_NAME]);
+       parms.type = OVS_VPORT_TYPE_INTERNAL;
+       parms.options = NULL;
+       parms.dp = dp;
+       parms.port_no = OVSP_LOCAL;
+       parms.upcall_portids = a[OVS_DP_ATTR_UPCALL_PID];
+
+       ovs_dp_change(dp, a);
 
-       ASSERT_RTNL();
+       /* So far only local changes have been made, now need the lock. */
+       ovs_lock();
 
-       mtu = dp_min_mtu(dp);
+       vport = new_vport(&parms);
+       if (IS_ERR(vport)) {
+               err = PTR_ERR(vport);
+               if (err == -EBUSY)
+                       err = -EEXIST;
+
+               if (err == -EEXIST) {
+                       /* An outdated user space instance that does not understand
+                        * the concept of user_features has attempted to create a new
+                        * datapath and is likely to reuse it. Drop all user features.
+                        */
+                       if (info->genlhdr->version < OVS_DP_VER_FEATURES)
+                               ovs_dp_reset_user_features(skb, info);
+               }
 
-       list_for_each_entry_rcu (p, &dp->port_list, node) {
-               if (is_internal_vport(p))
-                       vport_set_mtu(p, mtu);
+               goto err_destroy_ports_array;
        }
-}
 
-static int put_port(const struct vport *p, struct odp_port __user *uop)
-{
-       struct odp_port op;
+       err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
+                                  info->snd_seq, 0, OVS_DP_CMD_NEW);
+       BUG_ON(err < 0);
 
-       memset(&op, 0, sizeof op);
+       ovs_net = net_generic(ovs_dp_get_net(dp), ovs_net_id);
+       list_add_tail_rcu(&dp->list_node, &ovs_net->dps);
 
-       rcu_read_lock();
-       strncpy(op.devname, vport_get_name(p), sizeof op.devname);
-       strncpy(op.type, vport_get_type(p), sizeof op.type);
-       rcu_read_unlock();
+       ovs_unlock();
 
-       op.port = p->port_no;
+       ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
+       return 0;
 
-       return copy_to_user(uop, &op, sizeof op) ? -EFAULT : 0;
+err_destroy_ports_array:
+       ovs_unlock();
+       kfree(dp->ports);
+err_destroy_percpu:
+       free_percpu(dp->stats_percpu);
+err_destroy_table:
+       ovs_flow_tbl_destroy(&dp->table);
+err_free_dp:
+       release_net(ovs_dp_get_net(dp));
+       kfree(dp);
+err_free_reply:
+       kfree_skb(reply);
+err:
+       return err;
 }
 
-static int query_port(struct datapath *dp, struct odp_port __user *uport)
+/* Called with ovs_mutex. */
+static void __dp_destroy(struct datapath *dp)
 {
-       struct odp_port port;
-
-       if (copy_from_user(&port, uport, sizeof port))
-               return -EFAULT;
+       int i;
 
-       if (port.devname[0]) {
+       for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {
                struct vport *vport;
-               int err = 0;
-
-               port.devname[IFNAMSIZ - 1] = '\0';
-
-               vport_lock();
-               rcu_read_lock();
-
-               vport = vport_locate(port.devname);
-               if (!vport) {
-                       err = -ENODEV;
-                       goto error_unlock;
-               }
-               if (vport->dp != dp) {
-                       err = -ENOENT;
-                       goto error_unlock;
-               }
+               struct hlist_node *n;
 
-               port.port = vport->port_no;
+               hlist_for_each_entry_safe(vport, n, &dp->ports[i], dp_hash_node)
+                       if (vport->port_no != OVSP_LOCAL)
+                               ovs_dp_detach_port(vport);
+       }
 
-error_unlock:
-               rcu_read_unlock();
-               vport_unlock();
+       list_del_rcu(&dp->list_node);
 
-               if (err)
-                       return err;
-       } else {
-               if (port.port >= DP_MAX_PORTS)
-                       return -EINVAL;
-               if (!dp->ports[port.port])
-                       return -ENOENT;
-       }
+       /* OVSP_LOCAL is datapath internal port. We need to make sure that
+        * all ports in datapath are destroyed first before freeing datapath.
+        */
+       ovs_dp_detach_port(ovs_vport_ovsl(dp, OVSP_LOCAL));
 
-       return put_port(dp->ports[port.port], uport);
+       /* RCU destroy the flow table */
+       call_rcu(&dp->rcu, destroy_dp_rcu);
 }
 
-static int do_list_ports(struct datapath *dp, struct odp_port __user *uports,
-                        int n_ports)
+static int ovs_dp_cmd_del(struct sk_buff *skb, struct genl_info *info)
 {
-       int idx = 0;
-       if (n_ports) {
-               struct vport *p;
-
-               list_for_each_entry_rcu (p, &dp->port_list, node) {
-                       if (put_port(p, &uports[idx]))
-                               return -EFAULT;
-                       if (idx++ >= n_ports)
-                               break;
-               }
-       }
-       return idx;
-}
+       struct sk_buff *reply;
+       struct datapath *dp;
+       int err;
 
-static int list_ports(struct datapath *dp, struct odp_portvec __user *upv)
-{
-       struct odp_portvec pv;
-       int retval;
+       reply = ovs_dp_cmd_alloc_info(info);
+       if (!reply)
+               return -ENOMEM;
 
-       if (copy_from_user(&pv, upv, sizeof pv))
-               return -EFAULT;
+       ovs_lock();
+       dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
+       err = PTR_ERR(dp);
+       if (IS_ERR(dp))
+               goto err_unlock_free;
 
-       retval = do_list_ports(dp, (struct odp_port __user *)pv.ports,
-                              pv.n_ports);
-       if (retval < 0)
-               return retval;
+       err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
+                                  info->snd_seq, 0, OVS_DP_CMD_DEL);
+       BUG_ON(err < 0);
 
-       return put_user(retval, &upv->n_ports);
-}
+       __dp_destroy(dp);
 
-static int get_listen_mask(const struct file *f)
-{
-       return (long)f->private_data;
-}
+       ovs_unlock();
+       ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
+       return 0;
 
-static void set_listen_mask(struct file *f, int listen_mask)
-{
-       f->private_data = (void*)(long)listen_mask;
+err_unlock_free:
+       ovs_unlock();
+       kfree_skb(reply);
+       return err;
 }
 
-static long openvswitch_ioctl(struct file *f, unsigned int cmd,
-                          unsigned long argp)
+static int ovs_dp_cmd_set(struct sk_buff *skb, struct genl_info *info)
 {
-       int dp_idx = iminor(f->f_dentry->d_inode);
+       struct sk_buff *reply;
        struct datapath *dp;
-       int drop_frags, listeners, port_no;
-       unsigned int sflow_probability;
        int err;
 
-       /* Handle commands with special locking requirements up front. */
-       switch (cmd) {
-       case ODP_DP_CREATE:
-               err = create_dp(dp_idx, (char __user *)argp);
-               goto exit;
-
-       case ODP_DP_DESTROY:
-               err = destroy_dp(dp_idx);
-               goto exit;
-
-       case ODP_VPORT_ATTACH:
-               err = attach_port(dp_idx, (struct odp_port __user *)argp);
-               goto exit;
+       reply = ovs_dp_cmd_alloc_info(info);
+       if (!reply)
+               return -ENOMEM;
 
-       case ODP_VPORT_DETACH:
-               err = get_user(port_no, (int __user *)argp);
-               if (!err)
-                       err = detach_port(dp_idx, port_no);
-               goto exit;
+       ovs_lock();
+       dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
+       err = PTR_ERR(dp);
+       if (IS_ERR(dp))
+               goto err_unlock_free;
 
-       case ODP_VPORT_MOD:
-               err = vport_user_mod((struct odp_port __user *)argp);
-               goto exit;
+       ovs_dp_change(dp, info->attrs);
 
-       case ODP_VPORT_STATS_GET:
-               err = vport_user_stats_get((struct odp_vport_stats_req __user *)argp);
-               goto exit;
+       err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
+                                  info->snd_seq, 0, OVS_DP_CMD_NEW);
+       BUG_ON(err < 0);
 
-       case ODP_VPORT_STATS_SET:
-               err = vport_user_stats_set((struct odp_vport_stats_req __user *)argp);
-               goto exit;
+       ovs_unlock();
+       ovs_notify(&dp_datapath_genl_family, &ovs_dp_datapath_multicast_group, reply, info);
+       return 0;
 
-       case ODP_VPORT_ETHER_GET:
-               err = vport_user_ether_get((struct odp_vport_ether __user *)argp);
-               goto exit;
+err_unlock_free:
+       ovs_unlock();
+       kfree_skb(reply);
+       return err;
+}
 
-       case ODP_VPORT_ETHER_SET:
-               err = vport_user_ether_set((struct odp_vport_ether __user *)argp);
-               goto exit;
+static int ovs_dp_cmd_get(struct sk_buff *skb, struct genl_info *info)
+{
+       struct sk_buff *reply;
+       struct datapath *dp;
+       int err;
 
-       case ODP_VPORT_MTU_GET:
-               err = vport_user_mtu_get((struct odp_vport_mtu __user *)argp);
-               goto exit;
+       reply = ovs_dp_cmd_alloc_info(info);
+       if (!reply)
+               return -ENOMEM;
 
-       case ODP_VPORT_MTU_SET:
-               err = vport_user_mtu_set((struct odp_vport_mtu __user *)argp);
-               goto exit;
+       rcu_read_lock();
+       dp = lookup_datapath(sock_net(skb->sk), info->userhdr, info->attrs);
+       if (IS_ERR(dp)) {
+               err = PTR_ERR(dp);
+               goto err_unlock_free;
        }
+       err = ovs_dp_cmd_fill_info(dp, reply, info->snd_portid,
+                                  info->snd_seq, 0, OVS_DP_CMD_NEW);
+       BUG_ON(err < 0);
+       rcu_read_unlock();
 
-       dp = get_dp_locked(dp_idx);
-       err = -ENODEV;
-       if (!dp)
-               goto exit;
+       return genlmsg_reply(reply, info);
 
-       switch (cmd) {
-       case ODP_DP_STATS:
-               err = get_dp_stats(dp, (struct odp_stats __user *)argp);
-               break;
+err_unlock_free:
+       rcu_read_unlock();
+       kfree_skb(reply);
+       return err;
+}
 
-       case ODP_GET_DROP_FRAGS:
-               err = put_user(dp->drop_frags, (int __user *)argp);
-               break;
+static int ovs_dp_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
+{
+       struct ovs_net *ovs_net = net_generic(sock_net(skb->sk), ovs_net_id);
+       struct datapath *dp;
+       int skip = cb->args[0];
+       int i = 0;
 
-       case ODP_SET_DROP_FRAGS:
-               err = get_user(drop_frags, (int __user *)argp);
-               if (err)
-                       break;
-               err = -EINVAL;
-               if (drop_frags != 0 && drop_frags != 1)
+       rcu_read_lock();
+       list_for_each_entry_rcu(dp, &ovs_net->dps, list_node) {
+               if (i >= skip &&
+                   ovs_dp_cmd_fill_info(dp, skb, NETLINK_CB(cb->skb).portid,
+                                        cb->nlh->nlmsg_seq, NLM_F_MULTI,
+                                        OVS_DP_CMD_NEW) < 0)
                        break;
-               dp->drop_frags = drop_frags;
-               err = 0;
-               break;
+               i++;
+       }
+       rcu_read_unlock();
 
-       case ODP_GET_LISTEN_MASK:
-               err = put_user(get_listen_mask(f), (int __user *)argp);
-               break;
+       cb->args[0] = i;
 
-       case ODP_SET_LISTEN_MASK:
-               err = get_user(listeners, (int __user *)argp);
-               if (err)
-                       break;
-               err = -EINVAL;
-               if (listeners & ~ODPL_ALL)
-                       break;
-               err = 0;
-               set_listen_mask(f, listeners);
-               break;
+       return skb->len;
+}
 
-       case ODP_GET_SFLOW_PROBABILITY:
-               err = put_user(dp->sflow_probability, (unsigned int __user *)argp);
-               break;
+static const struct nla_policy datapath_policy[OVS_DP_ATTR_MAX + 1] = {
+       [OVS_DP_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
+       [OVS_DP_ATTR_UPCALL_PID] = { .type = NLA_U32 },
+       [OVS_DP_ATTR_USER_FEATURES] = { .type = NLA_U32 },
+};
 
-       case ODP_SET_SFLOW_PROBABILITY:
-               err = get_user(sflow_probability, (unsigned int __user *)argp);
-               if (!err)
-                       dp->sflow_probability = sflow_probability;
-               break;
+static struct genl_ops dp_datapath_genl_ops[] = {
+       { .cmd = OVS_DP_CMD_NEW,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = datapath_policy,
+         .doit = ovs_dp_cmd_new
+       },
+       { .cmd = OVS_DP_CMD_DEL,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = datapath_policy,
+         .doit = ovs_dp_cmd_del
+       },
+       { .cmd = OVS_DP_CMD_GET,
+         .flags = 0,               /* OK for unprivileged users. */
+         .policy = datapath_policy,
+         .doit = ovs_dp_cmd_get,
+         .dumpit = ovs_dp_cmd_dump
+       },
+       { .cmd = OVS_DP_CMD_SET,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = datapath_policy,
+         .doit = ovs_dp_cmd_set,
+       },
+};
+
+static struct genl_family dp_datapath_genl_family = {
+       .id = GENL_ID_GENERATE,
+       .hdrsize = sizeof(struct ovs_header),
+       .name = OVS_DATAPATH_FAMILY,
+       .version = OVS_DATAPATH_VERSION,
+       .maxattr = OVS_DP_ATTR_MAX,
+       .netnsok = true,
+       .parallel_ops = true,
+       .ops = dp_datapath_genl_ops,
+       .n_ops = ARRAY_SIZE(dp_datapath_genl_ops),
+       .mcgrps = &ovs_dp_datapath_multicast_group,
+       .n_mcgrps = 1,
+};
 
-       case ODP_VPORT_QUERY:
-               err = query_port(dp, (struct odp_port __user *)argp);
-               break;
+/* Called with ovs_mutex or RCU read lock. */
+static int ovs_vport_cmd_fill_info(struct vport *vport, struct sk_buff *skb,
+                                  u32 portid, u32 seq, u32 flags, u8 cmd)
+{
+       struct ovs_header *ovs_header;
+       struct ovs_vport_stats vport_stats;
+       int err;
 
-       case ODP_VPORT_LIST:
-               err = list_ports(dp, (struct odp_portvec __user *)argp);
-               break;
+       ovs_header = genlmsg_put(skb, portid, seq, &dp_vport_genl_family,
+                                flags, cmd);
+       if (!ovs_header)
+               return -EMSGSIZE;
 
-       case ODP_FLOW_FLUSH:
-               err = flush_flows(dp);
-               break;
+       ovs_header->dp_ifindex = get_dpifindex(vport->dp);
 
-       case ODP_FLOW_PUT:
-               err = put_flow(dp, (struct odp_flow_put __user *)argp);
-               break;
+       if (nla_put_u32(skb, OVS_VPORT_ATTR_PORT_NO, vport->port_no) ||
+           nla_put_u32(skb, OVS_VPORT_ATTR_TYPE, vport->ops->type) ||
+           nla_put_string(skb, OVS_VPORT_ATTR_NAME, vport->ops->get_name(vport)))
+               goto nla_put_failure;
 
-       case ODP_FLOW_DEL:
-               err = del_flow(dp, (struct odp_flow __user *)argp);
-               break;
+       ovs_vport_get_stats(vport, &vport_stats);
+       if (nla_put(skb, OVS_VPORT_ATTR_STATS, sizeof(struct ovs_vport_stats),
+                   &vport_stats))
+               goto nla_put_failure;
 
-       case ODP_FLOW_GET:
-               err = do_flowvec_ioctl(dp, argp, do_query_flows);
-               break;
+       if (ovs_vport_get_upcall_portids(vport, skb))
+               goto nla_put_failure;
 
-       case ODP_FLOW_LIST:
-               err = do_flowvec_ioctl(dp, argp, do_list_flows);
-               break;
+       err = ovs_vport_get_options(vport, skb);
+       if (err == -EMSGSIZE)
+               goto error;
 
-       case ODP_EXECUTE:
-               err = execute_packet(dp, (struct odp_execute __user *)argp);
-               break;
+       return genlmsg_end(skb, ovs_header);
 
-       default:
-               err = -ENOIOCTLCMD;
-               break;
-       }
-       mutex_unlock(&dp->mutex);
-exit:
+nla_put_failure:
+       err = -EMSGSIZE;
+error:
+       genlmsg_cancel(skb, ovs_header);
        return err;
 }
 
-static int dp_has_packet_of_interest(struct datapath *dp, int listeners)
+static struct sk_buff *ovs_vport_cmd_alloc_info(void)
 {
-       int i;
-       for (i = 0; i < DP_N_QUEUES; i++) {
-               if (listeners & (1 << i) && !skb_queue_empty(&dp->queues[i]))
-                       return 1;
-       }
-       return 0;
+       return nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
 }
 
-#ifdef CONFIG_COMPAT
-static int compat_list_ports(struct datapath *dp, struct compat_odp_portvec __user *upv)
+/* Called with ovs_mutex, only via ovs_dp_notify_wq(). */
+struct sk_buff *ovs_vport_cmd_build_info(struct vport *vport, u32 portid,
+                                        u32 seq, u8 cmd)
 {
-       struct compat_odp_portvec pv;
+       struct sk_buff *skb;
        int retval;
 
-       if (copy_from_user(&pv, upv, sizeof pv))
-               return -EFAULT;
+       skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
 
-       retval = do_list_ports(dp, compat_ptr(pv.ports), pv.n_ports);
-       if (retval < 0)
-               return retval;
+       retval = ovs_vport_cmd_fill_info(vport, skb, portid, seq, 0, cmd);
+       BUG_ON(retval < 0);
 
-       return put_user(retval, &upv->n_ports);
+       return skb;
 }
 
-static int compat_get_flow(struct odp_flow *flow, const struct compat_odp_flow __user *compat)
+/* Called with ovs_mutex or RCU read lock. */
+static struct vport *lookup_vport(struct net *net,
+                                 struct ovs_header *ovs_header,
+                                 struct nlattr *a[OVS_VPORT_ATTR_MAX + 1])
 {
-       compat_uptr_t actions;
-
-       if (!access_ok(VERIFY_READ, compat, sizeof(struct compat_odp_flow)) ||
-           __copy_from_user(&flow->stats, &compat->stats, sizeof(struct odp_flow_stats)) ||
-           __copy_from_user(&flow->key, &compat->key, sizeof(struct odp_flow_key)) ||
-           __get_user(actions, &compat->actions) ||
-           __get_user(flow->actions_len, &compat->actions_len) ||
-           __get_user(flow->flags, &compat->flags))
-               return -EFAULT;
+       struct datapath *dp;
+       struct vport *vport;
 
-       flow->actions = (struct nlattr __force *)compat_ptr(actions);
-       return 0;
+       if (a[OVS_VPORT_ATTR_NAME]) {
+               vport = ovs_vport_locate(net, nla_data(a[OVS_VPORT_ATTR_NAME]));
+               if (!vport)
+                       return ERR_PTR(-ENODEV);
+               if (ovs_header->dp_ifindex &&
+                   ovs_header->dp_ifindex != get_dpifindex(vport->dp))
+                       return ERR_PTR(-ENODEV);
+               return vport;
+       } else if (a[OVS_VPORT_ATTR_PORT_NO]) {
+               u32 port_no = nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]);
+
+               if (port_no >= DP_MAX_PORTS)
+                       return ERR_PTR(-EFBIG);
+
+               dp = get_dp(net, ovs_header->dp_ifindex);
+               if (!dp)
+                       return ERR_PTR(-ENODEV);
+
+               vport = ovs_vport_ovsl_rcu(dp, port_no);
+               if (!vport)
+                       return ERR_PTR(-ENODEV);
+               return vport;
+       } else
+               return ERR_PTR(-EINVAL);
 }
 
-static int compat_put_flow(struct datapath *dp, struct compat_odp_flow_put __user *ufp)
+static int ovs_vport_cmd_new(struct sk_buff *skb, struct genl_info *info)
 {
-       struct odp_flow_stats stats;
-       struct odp_flow_put fp;
-       int error;
+       struct nlattr **a = info->attrs;
+       struct ovs_header *ovs_header = info->userhdr;
+       struct vport_parms parms;
+       struct sk_buff *reply;
+       struct vport *vport;
+       struct datapath *dp;
+       u32 port_no;
+       int err;
 
-       if (compat_get_flow(&fp.flow, &ufp->flow) ||
-           get_user(fp.flags, &ufp->flags))
-               return -EFAULT;
+       if (!a[OVS_VPORT_ATTR_NAME] || !a[OVS_VPORT_ATTR_TYPE] ||
+           !a[OVS_VPORT_ATTR_UPCALL_PID])
+               return -EINVAL;
 
-       error = do_put_flow(dp, &fp, &stats);
-       if (error)
-               return error;
+       port_no = a[OVS_VPORT_ATTR_PORT_NO]
+               ? nla_get_u32(a[OVS_VPORT_ATTR_PORT_NO]) : 0;
+       if (port_no >= DP_MAX_PORTS)
+               return -EFBIG;
 
-       if (copy_to_user(&ufp->flow.stats, &stats,
-                        sizeof(struct odp_flow_stats)))
-               return -EFAULT;
+       reply = ovs_vport_cmd_alloc_info();
+       if (!reply)
+               return -ENOMEM;
 
-       return 0;
-}
+       ovs_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       err = -ENODEV;
+       if (!dp)
+               goto exit_unlock_free;
 
-static int compat_answer_query(struct datapath *dp, struct sw_flow *flow,
-                              u32 query_flags,
-                              struct compat_odp_flow __user *ufp)
-{
-       compat_uptr_t actions;
+       if (port_no) {
+               vport = ovs_vport_ovsl(dp, port_no);
+               err = -EBUSY;
+               if (vport)
+                       goto exit_unlock_free;
+       } else {
+               for (port_no = 1; ; port_no++) {
+                       if (port_no >= DP_MAX_PORTS) {
+                               err = -EFBIG;
+                               goto exit_unlock_free;
+                       }
+                       vport = ovs_vport_ovsl(dp, port_no);
+                       if (!vport)
+                               break;
+               }
+       }
 
-       if (get_user(actions, &ufp->actions))
-               return -EFAULT;
+       parms.name = nla_data(a[OVS_VPORT_ATTR_NAME]);
+       parms.type = nla_get_u32(a[OVS_VPORT_ATTR_TYPE]);
+       parms.options = a[OVS_VPORT_ATTR_OPTIONS];
+       parms.dp = dp;
+       parms.port_no = port_no;
+       parms.upcall_portids = a[OVS_VPORT_ATTR_UPCALL_PID];
 
-       return do_answer_query(dp, flow, query_flags, &ufp->stats,
-                              compat_ptr(actions), &ufp->actions_len);
-}
+       vport = new_vport(&parms);
+       err = PTR_ERR(vport);
+       if (IS_ERR(vport))
+               goto exit_unlock_free;
 
-static int compat_del_flow(struct datapath *dp, struct compat_odp_flow __user *ufp)
-{
-       struct sw_flow *flow;
-       struct odp_flow uf;
-       int error;
+       err = 0;
+       if (a[OVS_VPORT_ATTR_STATS])
+               ovs_vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
 
-       if (compat_get_flow(&uf, ufp))
-               return -EFAULT;
+       err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,
+                                     info->snd_seq, 0, OVS_VPORT_CMD_NEW);
+       BUG_ON(err < 0);
+       ovs_unlock();
 
-       flow = do_del_flow(dp, &uf.key);
-       if (IS_ERR(flow))
-               return PTR_ERR(flow);
+       ovs_notify(&dp_vport_genl_family, &ovs_dp_vport_multicast_group, reply, info);
+       return 0;
 
-       error = compat_answer_query(dp, flow, 0, ufp);
-       flow_deferred_free(flow);
-       return error;
+exit_unlock_free:
+       ovs_unlock();
+       kfree_skb(reply);
+       return err;
 }
 
-static int compat_query_flows(struct datapath *dp,
-                             struct compat_odp_flow __user *flows,
-                             u32 n_flows)
+static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info)
 {
-       struct tbl *table = get_table_protected(dp);
-       u32 i;
+       struct nlattr **a = info->attrs;
+       struct sk_buff *reply;
+       struct vport *vport;
+       int err;
 
-       for (i = 0; i < n_flows; i++) {
-               struct compat_odp_flow __user *ufp = &flows[i];
-               struct odp_flow uf;
-               struct tbl_node *flow_node;
-               int error;
+       reply = ovs_vport_cmd_alloc_info();
+       if (!reply)
+               return -ENOMEM;
 
-               if (compat_get_flow(&uf, ufp))
-                       return -EFAULT;
+       ovs_lock();
+       vport = lookup_vport(sock_net(skb->sk), info->userhdr, a);
+       err = PTR_ERR(vport);
+       if (IS_ERR(vport))
+               goto exit_unlock_free;
 
-               flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp);
-               if (!flow_node)
-                       error = put_user(ENOENT, &ufp->stats.error);
-               else
-                       error = compat_answer_query(dp, flow_cast(flow_node),
-                                                   uf.flags, ufp);
-               if (error)
-                       return -EFAULT;
+       if (a[OVS_VPORT_ATTR_TYPE] &&
+           nla_get_u32(a[OVS_VPORT_ATTR_TYPE]) != vport->ops->type) {
+               err = -EINVAL;
+               goto exit_unlock_free;
        }
-       return n_flows;
-}
 
-struct compat_list_flows_cbdata {
-       struct datapath *dp;
-       struct compat_odp_flow __user *uflows;
-       u32 n_flows;
-       u32 listed_flows;
-};
-
-static int compat_list_flow(struct tbl_node *node, void *cbdata_)
-{
-       struct sw_flow *flow = flow_cast(node);
-       struct compat_list_flows_cbdata *cbdata = cbdata_;
-       struct compat_odp_flow __user *ufp = &cbdata->uflows[cbdata->listed_flows++];
-       int error;
+       if (a[OVS_VPORT_ATTR_OPTIONS]) {
+               err = ovs_vport_set_options(vport, a[OVS_VPORT_ATTR_OPTIONS]);
+               if (err)
+                       goto exit_unlock_free;
+       }
 
-       if (copy_to_user(&ufp->key, &flow->key, sizeof flow->key))
-               return -EFAULT;
-       error = compat_answer_query(cbdata->dp, flow, 0, ufp);
-       if (error)
-               return error;
+       if (a[OVS_VPORT_ATTR_STATS])
+               ovs_vport_set_stats(vport, nla_data(a[OVS_VPORT_ATTR_STATS]));
 
-       if (cbdata->listed_flows >= cbdata->n_flows)
-               return cbdata->listed_flows;
-       return 0;
-}
 
-static int compat_list_flows(struct datapath *dp,
-                            struct compat_odp_flow __user *flows, u32 n_flows)
-{
-       struct compat_list_flows_cbdata cbdata;
-       int error;
+       if (a[OVS_VPORT_ATTR_UPCALL_PID]) {
+               err = ovs_vport_set_upcall_portids(vport,
+                                                  a[OVS_VPORT_ATTR_UPCALL_PID]);
+               if (err)
+                       goto exit_unlock_free;
+       }
 
-       if (!n_flows)
-               return 0;
+       err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,
+                                     info->snd_seq, 0, OVS_VPORT_CMD_NEW);
+       BUG_ON(err < 0);
+       ovs_unlock();
 
-       cbdata.dp = dp;
-       cbdata.uflows = flows;
-       cbdata.n_flows = n_flows;
-       cbdata.listed_flows = 0;
+       ovs_notify(&dp_vport_genl_family, &ovs_dp_vport_multicast_group, reply, info);
+       return 0;
 
-       error = tbl_foreach(get_table_protected(dp), compat_list_flow, &cbdata);
-       return error ? error : cbdata.listed_flows;
+exit_unlock_free:
+       ovs_unlock();
+       kfree_skb(reply);
+       return err;
 }
 
-static int compat_flowvec_ioctl(struct datapath *dp, unsigned long argp,
-                               int (*function)(struct datapath *,
-                                               struct compat_odp_flow __user *,
-                                               u32 n_flows))
+static int ovs_vport_cmd_del(struct sk_buff *skb, struct genl_info *info)
 {
-       struct compat_odp_flowvec __user *uflowvec;
-       struct compat_odp_flow __user *flows;
-       struct compat_odp_flowvec flowvec;
-       int retval;
-
-       uflowvec = compat_ptr(argp);
-       if (!access_ok(VERIFY_WRITE, uflowvec, sizeof *uflowvec) ||
-           copy_from_user(&flowvec, uflowvec, sizeof flowvec))
-               return -EFAULT;
-
-       if (flowvec.n_flows > INT_MAX / sizeof(struct compat_odp_flow))
-               return -EINVAL;
+       struct nlattr **a = info->attrs;
+       struct sk_buff *reply;
+       struct vport *vport;
+       int err;
 
-       flows = compat_ptr(flowvec.flows);
-       if (!access_ok(VERIFY_WRITE, flows,
-                      flowvec.n_flows * sizeof(struct compat_odp_flow)))
-               return -EFAULT;
+       reply = ovs_vport_cmd_alloc_info();
+       if (!reply)
+               return -ENOMEM;
 
-       retval = function(dp, flows, flowvec.n_flows);
-       return (retval < 0 ? retval
-               : retval == flowvec.n_flows ? 0
-               : put_user(retval, &uflowvec->n_flows));
-}
+       ovs_lock();
+       vport = lookup_vport(sock_net(skb->sk), info->userhdr, a);
+       err = PTR_ERR(vport);
+       if (IS_ERR(vport))
+               goto exit_unlock_free;
 
-static int compat_execute(struct datapath *dp, const struct compat_odp_execute __user *uexecute)
-{
-       struct odp_execute execute;
-       compat_uptr_t actions;
-       compat_uptr_t data;
+       if (vport->port_no == OVSP_LOCAL) {
+               err = -EINVAL;
+               goto exit_unlock_free;
+       }
 
-       if (!access_ok(VERIFY_READ, uexecute, sizeof(struct compat_odp_execute)) ||
-           __get_user(actions, &uexecute->actions) ||
-           __get_user(execute.actions_len, &uexecute->actions_len) ||
-           __get_user(data, &uexecute->data) ||
-           __get_user(execute.length, &uexecute->length))
-               return -EFAULT;
+       err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,
+                                     info->snd_seq, 0, OVS_VPORT_CMD_DEL);
+       BUG_ON(err < 0);
+       ovs_dp_detach_port(vport);
+       ovs_unlock();
 
-       execute.actions = (struct nlattr __force *)compat_ptr(actions);
-       execute.data = (const void __force *)compat_ptr(data);
+       ovs_notify(&dp_vport_genl_family, &ovs_dp_vport_multicast_group, reply, info);
+       return 0;
 
-       return do_execute(dp, &execute);
+exit_unlock_free:
+       ovs_unlock();
+       kfree_skb(reply);
+       return err;
 }
 
-static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned long argp)
+static int ovs_vport_cmd_get(struct sk_buff *skb, struct genl_info *info)
 {
-       int dp_idx = iminor(f->f_dentry->d_inode);
-       struct datapath *dp;
+       struct nlattr **a = info->attrs;
+       struct ovs_header *ovs_header = info->userhdr;
+       struct sk_buff *reply;
+       struct vport *vport;
        int err;
 
-       switch (cmd) {
-       case ODP_DP_DESTROY:
-       case ODP_FLOW_FLUSH:
-               /* Ioctls that don't need any translation at all. */
-               return openvswitch_ioctl(f, cmd, argp);
-
-       case ODP_DP_CREATE:
-       case ODP_VPORT_ATTACH:
-       case ODP_VPORT_DETACH:
-       case ODP_VPORT_MOD:
-       case ODP_VPORT_MTU_SET:
-       case ODP_VPORT_MTU_GET:
-       case ODP_VPORT_ETHER_SET:
-       case ODP_VPORT_ETHER_GET:
-       case ODP_VPORT_STATS_SET:
-       case ODP_VPORT_STATS_GET:
-       case ODP_DP_STATS:
-       case ODP_GET_DROP_FRAGS:
-       case ODP_SET_DROP_FRAGS:
-       case ODP_SET_LISTEN_MASK:
-       case ODP_GET_LISTEN_MASK:
-       case ODP_SET_SFLOW_PROBABILITY:
-       case ODP_GET_SFLOW_PROBABILITY:
-       case ODP_VPORT_QUERY:
-               /* Ioctls that just need their pointer argument extended. */
-               return openvswitch_ioctl(f, cmd, (unsigned long)compat_ptr(argp));
-       }
-
-       dp = get_dp_locked(dp_idx);
-       err = -ENODEV;
-       if (!dp)
-               goto exit;
-
-       switch (cmd) {
-       case ODP_VPORT_LIST32:
-               err = compat_list_ports(dp, compat_ptr(argp));
-               break;
-
-       case ODP_FLOW_PUT32:
-               err = compat_put_flow(dp, compat_ptr(argp));
-               break;
-
-       case ODP_FLOW_DEL32:
-               err = compat_del_flow(dp, compat_ptr(argp));
-               break;
-
-       case ODP_FLOW_GET32:
-               err = compat_flowvec_ioctl(dp, argp, compat_query_flows);
-               break;
+       reply = ovs_vport_cmd_alloc_info();
+       if (!reply)
+               return -ENOMEM;
 
-       case ODP_FLOW_LIST32:
-               err = compat_flowvec_ioctl(dp, argp, compat_list_flows);
-               break;
+       rcu_read_lock();
+       vport = lookup_vport(sock_net(skb->sk), ovs_header, a);
+       err = PTR_ERR(vport);
+       if (IS_ERR(vport))
+               goto exit_unlock_free;
+       err = ovs_vport_cmd_fill_info(vport, reply, info->snd_portid,
+                                     info->snd_seq, 0, OVS_VPORT_CMD_NEW);
+       BUG_ON(err < 0);
+       rcu_read_unlock();
 
-       case ODP_EXECUTE32:
-               err = compat_execute(dp, compat_ptr(argp));
-               break;
+       return genlmsg_reply(reply, info);
 
-       default:
-               err = -ENOIOCTLCMD;
-               break;
-       }
-       mutex_unlock(&dp->mutex);
-exit:
+exit_unlock_free:
+       rcu_read_unlock();
+       kfree_skb(reply);
        return err;
 }
-#endif
 
-/* Unfortunately this function is not exported so this is a verbatim copy
- * from net/core/datagram.c in 2.6.30. */
-static int skb_copy_and_csum_datagram(const struct sk_buff *skb, int offset,
-                                     u8 __user *to, int len,
-                                     __wsum *csump)
+static int ovs_vport_cmd_dump(struct sk_buff *skb, struct netlink_callback *cb)
 {
-       int start = skb_headlen(skb);
-       int pos = 0;
-       int i, copy = start - offset;
-
-       /* Copy header. */
-       if (copy > 0) {
-               int err = 0;
-               if (copy > len)
-                       copy = len;
-               *csump = csum_and_copy_to_user(skb->data + offset, to, copy,
-                                              *csump, &err);
-               if (err)
-                       goto fault;
-               if ((len -= copy) == 0)
-                       return 0;
-               offset += copy;
-               to += copy;
-               pos = copy;
-       }
+       struct ovs_header *ovs_header = genlmsg_data(nlmsg_data(cb->nlh));
+       struct datapath *dp;
+       int bucket = cb->args[0], skip = cb->args[1];
+       int i, j = 0;
 
-       for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
-               int end;
-
-               WARN_ON(start > offset + len);
-
-               end = start + skb_shinfo(skb)->frags[i].size;
-               if ((copy = end - offset) > 0) {
-                       __wsum csum2;
-                       int err = 0;
-                       u8  *vaddr;
-                       skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
-                       struct page *page = frag->page;
-
-                       if (copy > len)
-                               copy = len;
-                       vaddr = kmap(page);
-                       csum2 = csum_and_copy_to_user(vaddr +
-                                                       frag->page_offset +
-                                                       offset - start,
-                                                     to, copy, 0, &err);
-                       kunmap(page);
-                       if (err)
-                               goto fault;
-                       *csump = csum_block_add(*csump, csum2, pos);
-                       if (!(len -= copy))
-                               return 0;
-                       offset += copy;
-                       to += copy;
-                       pos += copy;
-               }
-               start = end;
+       rcu_read_lock();
+       dp = get_dp(sock_net(skb->sk), ovs_header->dp_ifindex);
+       if (!dp) {
+               rcu_read_unlock();
+               return -ENODEV;
        }
+       for (i = bucket; i < DP_VPORT_HASH_BUCKETS; i++) {
+               struct vport *vport;
 
-       if (skb_shinfo(skb)->frag_list) {
-               struct sk_buff *list = skb_shinfo(skb)->frag_list;
-
-               for (; list; list=list->next) {
-                       int end;
-
-                       WARN_ON(start > offset + len);
-
-                       end = start + list->len;
-                       if ((copy = end - offset) > 0) {
-                               __wsum csum2 = 0;
-                               if (copy > len)
-                                       copy = len;
-                               if (skb_copy_and_csum_datagram(list,
-                                                              offset - start,
-                                                              to, copy,
-                                                              &csum2))
-                                       goto fault;
-                               *csump = csum_block_add(*csump, csum2, pos);
-                               if ((len -= copy) == 0)
-                                       return 0;
-                               offset += copy;
-                               to += copy;
-                               pos += copy;
-                       }
-                       start = end;
+               j = 0;
+               hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node) {
+                       if (j >= skip &&
+                           ovs_vport_cmd_fill_info(vport, skb,
+                                                   NETLINK_CB(cb->skb).portid,
+                                                   cb->nlh->nlmsg_seq,
+                                                   NLM_F_MULTI,
+                                                   OVS_VPORT_CMD_NEW) < 0)
+                               goto out;
+
+                       j++;
                }
+               skip = 0;
        }
-       if (!len)
-               return 0;
+out:
+       rcu_read_unlock();
 
-fault:
-       return -EFAULT;
+       cb->args[0] = i;
+       cb->args[1] = j;
+
+       return skb->len;
 }
 
-static ssize_t openvswitch_read(struct file *f, char __user *buf,
-                               size_t nbytes, loff_t *ppos)
-{
-       int listeners = get_listen_mask(f);
-       int dp_idx = iminor(f->f_dentry->d_inode);
-       struct datapath *dp = get_dp_locked(dp_idx);
-       struct sk_buff *skb;
-       size_t copy_bytes, tot_copy_bytes;
-       int retval;
+static const struct nla_policy vport_policy[OVS_VPORT_ATTR_MAX + 1] = {
+       [OVS_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
+       [OVS_VPORT_ATTR_STATS] = { .len = sizeof(struct ovs_vport_stats) },
+       [OVS_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
+       [OVS_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
+       [OVS_VPORT_ATTR_UPCALL_PID] = { .type = NLA_U32 },
+       [OVS_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
+};
 
-       if (!dp)
-               return -ENODEV;
+static struct genl_ops dp_vport_genl_ops[] = {
+       { .cmd = OVS_VPORT_CMD_NEW,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = vport_policy,
+         .doit = ovs_vport_cmd_new
+       },
+       { .cmd = OVS_VPORT_CMD_DEL,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = vport_policy,
+         .doit = ovs_vport_cmd_del
+       },
+       { .cmd = OVS_VPORT_CMD_GET,
+         .flags = 0,               /* OK for unprivileged users. */
+         .policy = vport_policy,
+         .doit = ovs_vport_cmd_get,
+         .dumpit = ovs_vport_cmd_dump
+       },
+       { .cmd = OVS_VPORT_CMD_SET,
+         .flags = GENL_ADMIN_PERM, /* Requires CAP_NET_ADMIN privilege. */
+         .policy = vport_policy,
+         .doit = ovs_vport_cmd_set,
+       },
+};
 
-       if (nbytes == 0 || !listeners)
-               return 0;
+struct genl_family dp_vport_genl_family = {
+       .id = GENL_ID_GENERATE,
+       .hdrsize = sizeof(struct ovs_header),
+       .name = OVS_VPORT_FAMILY,
+       .version = OVS_VPORT_VERSION,
+       .maxattr = OVS_VPORT_ATTR_MAX,
+       .netnsok = true,
+       .parallel_ops = true,
+       .ops = dp_vport_genl_ops,
+       .n_ops = ARRAY_SIZE(dp_vport_genl_ops),
+       .mcgrps = &ovs_dp_vport_multicast_group,
+       .n_mcgrps = 1,
+};
 
-       for (;;) {
-               int i;
+static struct genl_family *dp_genl_families[] = {
+       &dp_datapath_genl_family,
+       &dp_vport_genl_family,
+       &dp_flow_genl_family,
+       &dp_packet_genl_family,
+};
 
-               for (i = 0; i < DP_N_QUEUES; i++) {
-                       if (listeners & (1 << i)) {
-                               skb = skb_dequeue(&dp->queues[i]);
-                               if (skb)
-                                       goto success;
-                       }
-               }
+static void dp_unregister_genl(int n_families)
+{
+       int i;
 
-               if (f->f_flags & O_NONBLOCK) {
-                       retval = -EAGAIN;
-                       goto error;
-               }
+       for (i = 0; i < n_families; i++)
+               genl_unregister_family(dp_genl_families[i]);
+}
 
-               wait_event_interruptible(dp->waitqueue,
-                                        dp_has_packet_of_interest(dp,
-                                                                  listeners));
+static int dp_register_genl(void)
+{
+       int err;
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(dp_genl_families); i++) {
 
-               if (signal_pending(current)) {
-                       retval = -ERESTARTSYS;
+               err = genl_register_family(dp_genl_families[i]);
+               if (err)
                        goto error;
-               }
-       }
-success:
-       mutex_unlock(&dp->mutex);
-
-       copy_bytes = tot_copy_bytes = min_t(size_t, skb->len, nbytes);
-
-       retval = 0;
-       if (skb->ip_summed == CHECKSUM_PARTIAL) {
-               if (copy_bytes == skb->len) {
-                       __wsum csum = 0;
-                       u16 csum_start, csum_offset;
-
-                       get_skb_csum_pointers(skb, &csum_start, &csum_offset);
-                       BUG_ON(csum_start >= skb_headlen(skb));
-                       retval = skb_copy_and_csum_datagram(skb, csum_start, buf + csum_start,
-                                                           copy_bytes - csum_start, &csum);
-                       if (!retval) {
-                               __sum16 __user *csump;
-
-                               copy_bytes = csum_start;
-                               csump = (__sum16 __user *)(buf + csum_start + csum_offset);
-
-                               BUG_ON((char __user *)csump + sizeof(__sum16) >
-                                       buf + nbytes);
-                               put_user(csum_fold(csum), csump);
-                       }
-               } else
-                       retval = skb_checksum_help(skb);
        }
 
-       if (!retval) {
-               struct iovec iov;
-
-               iov.iov_base = buf;
-               iov.iov_len = copy_bytes;
-               retval = skb_copy_datagram_iovec(skb, 0, &iov, iov.iov_len);
-       }
+       return 0;
 
-       if (!retval)
-               retval = tot_copy_bytes;
+error:
+       dp_unregister_genl(i);
+       return err;
+}
 
-       kfree_skb(skb);
-       return retval;
+static int __net_init ovs_init_net(struct net *net)
+{
+       struct ovs_net *ovs_net = net_generic(net, ovs_net_id);
 
-error:
-       mutex_unlock(&dp->mutex);
-       return retval;
+       INIT_LIST_HEAD(&ovs_net->dps);
+       INIT_WORK(&ovs_net->dp_notify_work, ovs_dp_notify_wq);
+       return 0;
 }
 
-static unsigned int openvswitch_poll(struct file *file, poll_table *wait)
+static void __net_exit ovs_exit_net(struct net *net)
 {
-       int dp_idx = iminor(file->f_dentry->d_inode);
-       struct datapath *dp = get_dp_locked(dp_idx);
-       unsigned int mask;
-
-       if (dp) {
-               mask = 0;
-               poll_wait(file, &dp->waitqueue, wait);
-               if (dp_has_packet_of_interest(dp, get_listen_mask(file)))
-                       mask |= POLLIN | POLLRDNORM;
-               mutex_unlock(&dp->mutex);
-       } else {
-               mask = POLLIN | POLLRDNORM | POLLHUP;
-       }
-       return mask;
+       struct datapath *dp, *dp_next;
+       struct ovs_net *ovs_net = net_generic(net, ovs_net_id);
+
+       ovs_lock();
+       list_for_each_entry_safe(dp, dp_next, &ovs_net->dps, list_node)
+               __dp_destroy(dp);
+       ovs_unlock();
+
+       cancel_work_sync(&ovs_net->dp_notify_work);
 }
 
-static struct file_operations openvswitch_fops = {
-       .read  = openvswitch_read,
-       .poll  = openvswitch_poll,
-       .unlocked_ioctl = openvswitch_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl = openvswitch_compat_ioctl,
-#endif
+static struct pernet_operations ovs_net_ops = {
+       .init = ovs_init_net,
+       .exit = ovs_exit_net,
+       .id   = &ovs_net_id,
+       .size = sizeof(struct ovs_net),
 };
 
-static int major;
+DEFINE_COMPAT_PNET_REG_FUNC(device);
 
 static int __init dp_init(void)
 {
-       struct sk_buff *dummy_skb;
        int err;
 
-       BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > sizeof(dummy_skb->cb));
+       BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
 
-       printk("Open vSwitch %s, built "__DATE__" "__TIME__"\n", VERSION BUILDNR);
+       pr_info("Open vSwitch switching datapath %s, built "__DATE__" "__TIME__"\n",
+               VERSION);
 
-       err = flow_init();
+       err = ovs_flow_init();
        if (err)
                goto error;
 
-       err = vport_init();
+       err = ovs_vport_init();
        if (err)
                goto error_flow_exit;
 
-       err = register_netdevice_notifier(&dp_device_notifier);
+       err = register_pernet_device(&ovs_net_ops);
        if (err)
                goto error_vport_exit;
 
-       major = register_chrdev(0, "openvswitch", &openvswitch_fops);
+       err = register_netdevice_notifier(&ovs_dp_device_notifier);
+       if (err)
+               goto error_netns_exit;
+
+       err = dp_register_genl();
        if (err < 0)
                goto error_unreg_notifier;
 
        return 0;
 
 error_unreg_notifier:
-       unregister_netdevice_notifier(&dp_device_notifier);
+       unregister_netdevice_notifier(&ovs_dp_device_notifier);
+error_netns_exit:
+       unregister_pernet_device(&ovs_net_ops);
 error_vport_exit:
-       vport_exit();
+       ovs_vport_exit();
 error_flow_exit:
-       flow_exit();
+       ovs_flow_exit();
 error:
        return err;
 }
 
 static void dp_cleanup(void)
 {
+       dp_unregister_genl(ARRAY_SIZE(dp_genl_families));
+       unregister_netdevice_notifier(&ovs_dp_device_notifier);
+       unregister_pernet_device(&ovs_net_ops);
        rcu_barrier();
-       unregister_chrdev(major, "openvswitch");
-       unregister_netdevice_notifier(&dp_device_notifier);
-       vport_exit();
-       flow_exit();
+       ovs_vport_exit();
+       ovs_flow_exit();
 }
 
 module_init(dp_init);
@@ -2052,3 +2149,4 @@ module_exit(dp_cleanup);
 
 MODULE_DESCRIPTION("Open vSwitch switching datapath");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(VERSION);