X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fdatapath.c;h=ffa22e240500b381c15fff2fad3755e65647eef4;hb=c19e653509deb3f1002c4ed99714e16549ec74e9;hp=f9af82998a0d8e49ffc12f69b871344605dd1993;hpb=f632c8fc817ff5597007a795b51574bddd32563a;p=sliver-openvswitch.git

diff --git a/datapath/datapath.c b/datapath/datapath.c
index f9af82998..ffa22e240 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -41,6 +41,7 @@
 #include <linux/rculist.h>
 #include <linux/dmi.h>
 #include <net/inet_ecn.h>
+#include <net/genetlink.h>
 #include <linux/compat.h>
 
 #include "openvswitch/datapath-protocol.h"
@@ -68,7 +69,7 @@ EXPORT_SYMBOL(dp_ioctl_hook);
 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 struct vport *new_vport(const struct vport_parms *);
 
 /* Must be called with rcu_read_lock or dp_mutex. */
 struct datapath *get_dp(int dp_idx)
@@ -207,8 +208,9 @@ static struct kobj_type dp_ktype = {
 
 static int create_dp(int dp_idx, const char __user *devnamep)
 {
-	struct odp_port internal_dev_port;
+	struct vport_parms parms;
 	char devname[IFNAMSIZ];
+	struct vport *vport;
 	struct datapath *dp;
 	int err;
 	int i;
@@ -223,7 +225,7 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 			goto err;
 		}
 	} else {
-		snprintf(devname, sizeof devname, "of%d", dp_idx);
+		snprintf(devname, sizeof(devname), "of%d", dp_idx);
 	}
 
 	rtnl_lock();
@@ -240,7 +242,7 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 		goto err_put_module;
 
 	err = -ENOMEM;
-	dp = kzalloc(sizeof *dp, GFP_KERNEL);
+	dp = kzalloc(sizeof(*dp), GFP_KERNEL);
 	if (dp == NULL)
 		goto err_put_module;
 	INIT_LIST_HEAD(&dp->port_list);
@@ -263,11 +265,14 @@ static int create_dp(int dp_idx, const char __user *devnamep)
 		goto err_free_dp;
 
 	/* 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) {
+	parms.name = devname;
+	parms.type = ODP_VPORT_TYPE_INTERNAL;
+	parms.options = NULL;
+	parms.dp = dp;
+	parms.port_no = ODPP_LOCAL;
+	vport = new_vport(&parms);
+	if (IS_ERR(vport)) {
+		err = PTR_ERR(vport);
 		if (err == -EBUSY)
 			err = -EEXIST;
 
@@ -354,74 +359,24 @@ out:
 }
 
 /* Called with RTNL lock and dp->mutex. */
-static int new_vport(struct datapath *dp, struct odp_port *odp_port, int port_no)
+static struct vport *new_vport(const struct vport_parms *parms)
 {
-	struct vport_parms parms;
 	struct vport *vport;
 
-	parms.name = odp_port->devname;
-	parms.type = odp_port->type;
-	parms.config = odp_port->config;
-	parms.dp = dp;
-	parms.port_no = port_no;
-
 	vport_lock();
-	vport = vport_add(&parms);
-	vport_unlock();
-
-	if (IS_ERR(vport))
-		return PTR_ERR(vport);
-
-	rcu_assign_pointer(dp->ports[port_no], vport);
-	list_add_rcu(&vport->node, &dp->port_list);
-	dp->n_ports++;
-
-	dp_ifinfo_notify(RTM_NEWLINK, vport);
-
-	return 0;
-}
-
-static int attach_port(int dp_idx, struct odp_port __user *portp)
-{
-	struct datapath *dp;
-	struct odp_port port;
-	int port_no;
-	int err;
-
-	err = -EFAULT;
-	if (copy_from_user(&port, portp, sizeof port))
-		goto out;
-	port.devname[IFNAMSIZ - 1] = '\0';
-	port.type[VPORT_TYPE_SIZE - 1] = '\0';
+	vport = vport_add(parms);
+	if (!IS_ERR(vport)) {
+		struct datapath *dp = parms->dp;
 
-	rtnl_lock();
-	dp = get_dp_locked(dp_idx);
-	err = -ENODEV;
-	if (!dp)
-		goto out_unlock_rtnl;
-
-	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;
-
-got_port_no:
-	err = new_vport(dp, &port, port_no);
-	if (err)
-		goto out_unlock_dp;
-
-	set_internal_devs_mtu(dp);
-	dp_sysfs_add_if(get_vport_protected(dp, port_no));
+		rcu_assign_pointer(dp->ports[parms->port_no], vport);
+		list_add_rcu(&vport->node, &dp->port_list);
+		dp->n_ports++;
 
-	err = put_user(port_no, &portp->port);
+		dp_ifinfo_notify(RTM_NEWLINK, vport);
+	}
+	vport_unlock();
 
-out_unlock_dp:
-	mutex_unlock(&dp->mutex);
-out_unlock_rtnl:
-	rtnl_unlock();
-out:
-	return err;
+	return vport;
 }
 
 int dp_detach_port(struct vport *p)
@@ -447,37 +402,6 @@ int dp_detach_port(struct vport *p)
 	return err;
 }
 
-static int detach_port(int dp_idx, int port_no)
-{
-	struct vport *p;
-	struct datapath *dp;
-	int err;
-
-	err = -EINVAL;
-	if (port_no < 0 || port_no >= DP_MAX_PORTS || port_no == ODPP_LOCAL)
-		goto out;
-
-	rtnl_lock();
-	dp = get_dp_locked(dp_idx);
-	err = -ENODEV;
-	if (!dp)
-		goto out_unlock_rtnl;
-
-	p = get_vport_protected(dp, port_no);
-	err = -ENOENT;
-	if (!p)
-		goto out_unlock_dp;
-
-	err = dp_detach_port(p);
-
-out_unlock_dp:
-	mutex_unlock(&dp->mutex);
-out_unlock_rtnl:
-	rtnl_unlock();
-out:
-	return err;
-}
-
 /* Must be called with rcu_read_lock. */
 void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
 {
@@ -491,7 +415,7 @@ void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
 	OVS_CB(skb)->vport = p;
 
 	if (!OVS_CB(skb)->flow) {
-		struct odp_flow_key key;
+		struct sw_flow_key key;
 		struct tbl_node *flow_node;
 		bool is_frag;
 
@@ -512,8 +436,15 @@ void dp_process_received_packet(struct vport *p, struct sk_buff *skb)
 		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);
+			struct dp_upcall_info upcall;
+
+			upcall.type = _ODPL_MISS_NR;
+			upcall.key = &key;
+			upcall.userdata = 0;
+			upcall.sample_pool = 0;
+			upcall.actions = NULL;
+			upcall.actions_len = 0;
+			dp_upcall(dp, skb, &upcall);
 			stats_counter_off = offsetof(struct dp_stats_percpu, n_missed);
 			goto out;
 		}
@@ -562,10 +493,26 @@ out:
 	local_bh_enable();
 }
 
+static void copy_and_csum_skb(struct sk_buff *skb, void *to)
+{
+	u16 csum_start, csum_offset;
+	__wsum csum;
+
+	get_skb_csum_pointers(skb, &csum_start, &csum_offset);
+	csum_start -= skb_headroom(skb);
+	BUG_ON(csum_start >= skb_headlen(skb));
+
+	skb_copy_bits(skb, 0, to, csum_start);
+
+	csum = skb_copy_and_csum_bits(skb, csum_start, to + csum_start,
+				      skb->len - csum_start, 0);
+	*(__sum16 *)(to + csum_start + csum_offset) = csum_fold(csum);
+}
+
 /* 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)
+static int queue_control_packets(struct datapath *dp, struct sk_buff *skb,
+				 const struct dp_upcall_info *upcall_info)
 {
 	struct sk_buff *nskb;
 	int port_no;
@@ -577,22 +524,61 @@ static int queue_control_packets(struct sk_buff *skb, struct sk_buff_head *queue
 		port_no = ODPP_LOCAL;
 
 	do {
-		struct odp_msg *header;
+		struct odp_packet *upcall;
+		struct sk_buff *user_skb; /* to be queued to userspace */
+		struct nlattr *nla;
+		unsigned int len;
 
 		nskb = skb->next;
 		skb->next = NULL;
 
-		err = skb_cow(skb, sizeof *header);
-		if (err)
+		len = sizeof(struct odp_packet);
+		len += nla_total_size(4); /* ODP_PACKET_ATTR_TYPE. */
+		len += nla_total_size(skb->len);
+		len += nla_total_size(FLOW_BUFSIZE);
+		if (upcall_info->userdata)
+			len += nla_total_size(8);
+		if (upcall_info->sample_pool)
+			len += nla_total_size(4);
+		if (upcall_info->actions_len)
+			len += nla_total_size(upcall_info->actions_len);
+
+		user_skb = alloc_skb(len, GFP_ATOMIC);
+		if (!user_skb)
 			goto err_kfree_skbs;
 
-		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);
+		upcall = (struct odp_packet *)__skb_put(user_skb, sizeof(*upcall));
+		upcall->dp_idx = dp->dp_idx;
 
+		nla_put_u32(user_skb, ODP_PACKET_ATTR_TYPE, upcall_info->type);
+
+		nla = nla_nest_start(user_skb, ODP_PACKET_ATTR_KEY);
+		flow_to_nlattrs(upcall_info->key, user_skb);
+		nla_nest_end(user_skb, nla);
+
+		if (upcall_info->userdata)
+			nla_put_u64(user_skb, ODP_PACKET_ATTR_USERDATA, upcall_info->userdata);
+		if (upcall_info->sample_pool)
+			nla_put_u32(user_skb, ODP_PACKET_ATTR_SAMPLE_POOL, upcall_info->sample_pool);
+		if (upcall_info->actions_len) {
+			const struct nlattr *actions = upcall_info->actions;
+			u32 actions_len = upcall_info->actions_len;
+
+			nla = nla_nest_start(user_skb, ODP_PACKET_ATTR_ACTIONS);
+			memcpy(__skb_put(user_skb, actions_len), actions, actions_len);
+			nla_nest_end(user_skb, nla);
+		}
+
+		nla = __nla_reserve(user_skb, ODP_PACKET_ATTR_PACKET, skb->len);
+		if (skb->ip_summed == CHECKSUM_PARTIAL)
+			copy_and_csum_skb(skb, nla_data(nla));
+		else
+			skb_copy_bits(skb, 0, nla_data(nla), skb->len);
+
+		upcall->len = user_skb->len;
+		skb_queue_tail(&dp->queues[upcall_info->type], user_skb);
+
+		kfree_skb(skb);
 		skb = nskb;
 	} while (skb);
 	return 0;
@@ -606,16 +592,16 @@ err_kfree_skbs:
 	return err;
 }
 
-int dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
-		      u64 arg)
+int dp_upcall(struct datapath *dp, struct sk_buff *skb, const struct dp_upcall_info *upcall_info)
 {
 	struct dp_stats_percpu *stats;
 	struct sk_buff_head *queue;
 	int err;
 
 	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];
+	BUG_ON(upcall_info->type >= DP_N_QUEUES);
+
+	queue = &dp->queues[upcall_info->type];
 	err = -ENOBUFS;
 	if (skb_queue_len(queue) >= DP_MAX_QUEUE_LEN)
 		goto err_kfree_skb;
@@ -639,7 +625,7 @@ int dp_output_control(struct datapath *dp, struct sk_buff *skb, int queue_no,
 		}
 	}
 
-	err = queue_control_packets(skb, queue, queue_no, arg);
+	err = queue_control_packets(dp, skb, upcall_info);
 	wake_up_interruptible(&dp->waitqueue);
 	return err;
 
@@ -676,74 +662,75 @@ static int flush_flows(struct datapath *dp)
 
 static int validate_actions(const struct nlattr *actions, u32 actions_len)
 {
-        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) {
+	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:
+		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;
+			break;
+
+		case ODPAT_SET_DL_TCI:
 			if (nla_get_be16(a) & htons(VLAN_CFI_MASK))
 				return -EINVAL;
-                        break;
+			break;
 
-                case ODPAT_SET_NW_TOS:
-                        if (nla_get_u8(a) & INET_ECN_MASK)
-                                return -EINVAL;
-                        break;
+		case ODPAT_SET_NW_TOS:
+			if (nla_get_u8(a) & INET_ECN_MASK)
+				return -EINVAL;
+			break;
 
-                default:
-                        return -EOPNOTSUPP;
-                }
-        }
+		default:
+			return -EOPNOTSUPP;
+		}
+	}
 
-        if (rem > 0)
-                return -EINVAL;
+	if (rem > 0)
+		return -EINVAL;
 
-        return 0;
+	return 0;
 }
 
 static struct sw_flow_actions *get_actions(const struct odp_flow *flow)
@@ -824,15 +811,21 @@ static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf,
 		       struct odp_flow_stats *stats)
 {
 	struct tbl_node *flow_node;
+	struct sw_flow_key key;
 	struct sw_flow *flow;
 	struct tbl *table;
 	struct sw_flow_actions *acts = NULL;
 	int error;
 	u32 hash;
 
-	hash = flow_hash(&uf->flow.key);
+	error = flow_copy_from_user(&key, (const struct nlattr __force __user *)uf->flow.key,
+				    uf->flow.key_len);
+	if (error)
+		return error;
+
+	hash = flow_hash(&key);
 	table = get_table_protected(dp);
-	flow_node = tbl_lookup(table, &uf->flow.key, hash, flow_cmp);
+	flow_node = tbl_lookup(table, &key, hash, flow_cmp);
 	if (!flow_node) {
 		/* No such flow. */
 		error = -ENOENT;
@@ -853,7 +846,7 @@ static int do_put_flow(struct datapath *dp, struct odp_flow_put *uf,
 			error = PTR_ERR(flow);
 			goto error;
 		}
-		flow->key = uf->flow.key;
+		flow->key = key;
 		clear_stats(flow);
 
 		/* Obtain actions. */
@@ -982,13 +975,18 @@ static int answer_query(struct datapath *dp, struct sw_flow *flow,
 			       &ufp->stats, actions, &ufp->actions_len);
 }
 
-static struct sw_flow *do_del_flow(struct datapath *dp, struct odp_flow_key *key)
+static struct sw_flow *do_del_flow(struct datapath *dp, const struct nlattr __user *key, u32 key_len)
 {
 	struct tbl *table = get_table_protected(dp);
 	struct tbl_node *flow_node;
+	struct sw_flow_key swkey;
 	int error;
 
-	flow_node = tbl_lookup(table, key, flow_hash(key), flow_cmp);
+	error = flow_copy_from_user(&swkey, key, key_len);
+	if (error)
+		return ERR_PTR(error);
+
+	flow_node = tbl_lookup(table, &swkey, flow_hash(&swkey), flow_cmp);
 	if (!flow_node)
 		return ERR_PTR(-ENOENT);
 
@@ -1009,10 +1007,10 @@ static int del_flow(struct datapath *dp, struct odp_flow __user *ufp)
 	struct odp_flow uf;
 	int error;
 
-	if (copy_from_user(&uf, ufp, sizeof uf))
+	if (copy_from_user(&uf, ufp, sizeof(uf)))
 		return -EFAULT;
 
-	flow = do_del_flow(dp, &uf.key);
+	flow = do_del_flow(dp, (const struct nlattr __force __user *)uf.key, uf.key_len);
 	if (IS_ERR(flow))
 		return PTR_ERR(flow);
 
@@ -1028,14 +1026,19 @@ static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec
 
 	for (i = 0; i < flowvec->n_flows; i++) {
 		struct odp_flow __user *ufp = (struct odp_flow __user __force *)&flowvec->flows[i];
+		struct sw_flow_key key;
 		struct odp_flow uf;
 		struct tbl_node *flow_node;
 		int error;
 
-		if (copy_from_user(&uf, ufp, sizeof uf))
+		if (copy_from_user(&uf, ufp, sizeof(uf)))
 			return -EFAULT;
 
-		flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp);
+		error = flow_copy_from_user(&key, (const struct nlattr __force __user *)uf.key, uf.key_len);
+		if (error)
+			return error;
+
+		flow_node = tbl_lookup(table, &uf.key, flow_hash(&key), flow_cmp);
 		if (!flow_node)
 			error = put_user(ENOENT, &ufp->stats.error);
 		else
@@ -1046,48 +1049,6 @@ static int do_query_flows(struct datapath *dp, const struct odp_flowvec *flowvec
 	return flowvec->n_flows;
 }
 
-struct list_flows_cbdata {
-	struct datapath *dp;
-	struct odp_flow __user *uflows;
-	u32 n_flows;
-	u32 listed_flows;
-};
-
-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 __force*)flowvec->flows;
-	cbdata.n_flows = flowvec->n_flows;
-	cbdata.listed_flows = 0;
-
-	error = tbl_foreach(get_table_protected(dp), list_flow, &cbdata);
-	return error ? error : cbdata.listed_flows;
-}
-
 static int do_flowvec_ioctl(struct datapath *dp, unsigned long argp,
 			    int (*function)(struct datapath *,
 					    const struct odp_flowvec *))
@@ -1097,7 +1058,7 @@ static int do_flowvec_ioctl(struct datapath *dp, unsigned long argp,
 	int retval;
 
 	uflowvec = (struct odp_flowvec __user *)argp;
-	if (copy_from_user(&flowvec, uflowvec, sizeof flowvec))
+	if (copy_from_user(&flowvec, uflowvec, sizeof(flowvec)))
 		return -EFAULT;
 
 	if (flowvec.n_flows > INT_MAX / sizeof(struct odp_flow))
@@ -1109,9 +1070,57 @@ static int do_flowvec_ioctl(struct datapath *dp, unsigned long argp,
 		: put_user(retval, &uflowvec->n_flows));
 }
 
+static struct sw_flow *do_dump_flow(struct datapath *dp, u32 __user *state)
+{
+	struct tbl *table = get_table_protected(dp);
+	struct tbl_node *tbl_node;
+	u32 bucket, obj;
+
+	if (get_user(bucket, &state[0]) || get_user(obj, &state[1]))
+		return ERR_PTR(-EFAULT);
+
+	tbl_node = tbl_next(table, &bucket, &obj);
+
+	if (put_user(bucket, &state[0]) || put_user(obj, &state[1]))
+		return ERR_PTR(-EFAULT);
+
+	return tbl_node ? flow_cast(tbl_node) : NULL;
+}
+
+static int dump_flow(struct datapath *dp, struct odp_flow_dump __user *udumpp)
+{
+	struct odp_flow __user *uflowp;
+	struct nlattr __user *ukey;
+	struct sw_flow *flow;
+	u32 key_len;
+
+	flow = do_dump_flow(dp, udumpp->state);
+	if (IS_ERR(flow))
+		return PTR_ERR(flow);
+
+	if (get_user(uflowp, (struct odp_flow __user *__user*)&udumpp->flow))
+		return -EFAULT;
+
+	if (!flow)
+		return put_user(ODPFF_EOF, &uflowp->flags);
+
+	if (put_user(0, &uflowp->flags) ||
+	    get_user(ukey, (struct nlattr __user * __user*)&uflowp->key) ||
+	    get_user(key_len, &uflowp->key_len))
+		return -EFAULT;
+
+	key_len = flow_copy_to_user(ukey, &flow->key, key_len);
+	if (key_len < 0)
+		return key_len;
+	if (put_user(key_len, &uflowp->key_len))
+		return -EFAULT;
+
+	return answer_query(dp, flow, 0, uflowp);
+}
+
 static int do_execute(struct datapath *dp, const struct odp_execute *execute)
 {
-	struct odp_flow_key key;
+	struct sw_flow_key key;
 	struct sk_buff *skb;
 	struct sw_flow_actions *actions;
 	struct ethhdr *eth;
@@ -1182,7 +1191,7 @@ static int execute_packet(struct datapath *dp, const struct odp_execute __user *
 {
 	struct odp_execute execute;
 
-	if (copy_from_user(&execute, executep, sizeof execute))
+	if (copy_from_user(&execute, executep, sizeof(execute)))
 		return -EFAULT;
 
 	return do_execute(dp, &execute);
@@ -1219,7 +1228,7 @@ static int get_dp_stats(struct datapath *dp, struct odp_stats __user *statsp)
 	}
 	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;
+	return copy_to_user(statsp, &stats, sizeof(stats)) ? -EFAULT : 0;
 }
 
 /* MTU of the dp pseudo-device: ETH_DATA_LEN or the minimum of the ports */
@@ -1263,95 +1272,408 @@ void set_internal_devs_mtu(const struct datapath *dp)
 	}
 }
 
-static int put_port(const struct vport *p, struct odp_port __user *uop)
+static int get_listen_mask(const struct file *f)
 {
-	struct odp_port op;
+	return (long)f->private_data;
+}
+
+static void set_listen_mask(struct file *f, int listen_mask)
+{
+	f->private_data = (void*)(long)listen_mask;
+}
+
+static const struct nla_policy vport_policy[ODP_VPORT_ATTR_MAX + 1] = {
+	[ODP_VPORT_ATTR_NAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ - 1 },
+	[ODP_VPORT_ATTR_PORT_NO] = { .type = NLA_U32 },
+	[ODP_VPORT_ATTR_TYPE] = { .type = NLA_U32 },
+	[ODP_VPORT_ATTR_STATS] = { .len = sizeof(struct rtnl_link_stats64) },
+	[ODP_VPORT_ATTR_ADDRESS] = { .len = ETH_ALEN },
+	[ODP_VPORT_ATTR_MTU] = { .type = NLA_U32 },
+	[ODP_VPORT_ATTR_OPTIONS] = { .type = NLA_NESTED },
+};
+
+static int copy_vport_to_user(void __user *dst, struct vport *vport, uint32_t total_len)
+{
+	struct odp_vport *odp_vport;
+	struct sk_buff *skb;
+	struct nlattr *nla;
+	int ifindex, iflink;
+	int err;
 
-	memset(&op, 0, sizeof op);
+	skb = alloc_skb(NLMSG_GOODSIZE, GFP_KERNEL);
+	err = -ENOMEM;
+	if (!skb)
+		goto exit;
 
 	rcu_read_lock();
-	strncpy(op.devname, vport_get_name(p), sizeof op.devname);
-	strncpy(op.type, vport_get_type(p), sizeof op.type);
-	vport_get_config(p, op.config);
+	odp_vport = (struct odp_vport*)__skb_put(skb, sizeof(struct odp_vport));
+	odp_vport->dp_idx = vport->dp->dp_idx;
+	odp_vport->total_len = total_len;
+
+	NLA_PUT_U32(skb, ODP_VPORT_ATTR_PORT_NO, vport->port_no);
+	NLA_PUT_U32(skb, ODP_VPORT_ATTR_TYPE, vport_get_type(vport));
+	NLA_PUT_STRING(skb, ODP_VPORT_ATTR_NAME, vport_get_name(vport));
+
+	nla = nla_reserve(skb, ODP_VPORT_ATTR_STATS, sizeof(struct rtnl_link_stats64));
+	if (!nla)
+		goto nla_put_failure;
+	if (vport_get_stats(vport, nla_data(nla)))
+		__skb_trim(skb, skb->len - nla->nla_len);
+
+	NLA_PUT(skb, ODP_VPORT_ATTR_ADDRESS, ETH_ALEN, vport_get_addr(vport));
+
+	NLA_PUT_U32(skb, ODP_VPORT_ATTR_MTU, vport_get_mtu(vport));
+
+	err = vport_get_options(vport, skb);
+
+	ifindex = vport_get_ifindex(vport);
+	if (ifindex > 0)
+		NLA_PUT_U32(skb, ODP_VPORT_ATTR_IFINDEX, ifindex);
+
+	iflink = vport_get_iflink(vport);
+	if (iflink > 0)
+		NLA_PUT_U32(skb, ODP_VPORT_ATTR_IFLINK, iflink);
+
+	err = -EMSGSIZE;
+	if (skb->len > total_len)
+		goto exit_unlock;
+
+	odp_vport->len = skb->len;
+	err = copy_to_user(dst, skb->data, skb->len) ? -EFAULT : 0;
+	goto exit_unlock;
+
+nla_put_failure:
+	err = -EMSGSIZE;
+exit_unlock:
 	rcu_read_unlock();
+	kfree_skb(skb);
+exit:
+	return err;
+}
+
+static struct sk_buff *copy_vport_from_user(struct odp_vport __user *uodp_vport,
+					    struct nlattr *a[ODP_VPORT_ATTR_MAX + 1])
+{
+	struct odp_vport *odp_vport;
+	struct sk_buff *skb;
+	u32 len;
+	int err;
+
+	if (get_user(len, &uodp_vport->len))
+		return ERR_PTR(-EFAULT);
+	if (len < sizeof(struct odp_vport))
+		return ERR_PTR(-EINVAL);
+
+	skb = alloc_skb(len, GFP_KERNEL);
+	if (!skb)
+		return ERR_PTR(-ENOMEM);
+
+	err = -EFAULT;
+	if (copy_from_user(__skb_put(skb, len), uodp_vport, len))
+		goto error_free_skb;
+
+	odp_vport = (struct odp_vport *)skb->data;
+	err = -EINVAL;
+	if (odp_vport->len != len)
+		goto error_free_skb;
+
+	err = nla_parse(a, ODP_VPORT_ATTR_MAX, (struct nlattr *)(skb->data + sizeof(struct odp_vport)),
+			skb->len - sizeof(struct odp_vport), vport_policy);
+	if (err)
+		goto error_free_skb;
 
-	op.port = p->port_no;
+	err = VERIFY_NUL_STRING(a[ODP_VPORT_ATTR_NAME], IFNAMSIZ - 1);
+	if (err)
+		goto error_free_skb;
+
+	return skb;
 
-	return copy_to_user(uop, &op, sizeof op) ? -EFAULT : 0;
+error_free_skb:
+	kfree_skb(skb);
+	return ERR_PTR(err);
 }
 
-static int query_port(struct datapath *dp, struct odp_port __user *uport)
+
+/* Called without any locks (or with RTNL lock).
+ * Returns holding vport->dp->mutex.
+ */
+static struct vport *lookup_vport(struct odp_vport *odp_vport,
+				  struct nlattr *a[ODP_VPORT_ATTR_MAX + 1])
 {
-	struct odp_port port;
+	struct datapath *dp;
 	struct vport *vport;
 
-	if (copy_from_user(&port, uport, sizeof port))
-		return -EFAULT;
-
-	if (port.devname[0]) {
-		port.devname[IFNAMSIZ - 1] = '\0';
+	if (a[ODP_VPORT_ATTR_NAME]) {
+		int dp_idx, port_no;
 
+	retry:
 		vport_lock();
-		vport = vport_locate(port.devname);
+		vport = vport_locate(nla_data(a[ODP_VPORT_ATTR_NAME]));
+		if (!vport) {
+			vport_unlock();
+			return ERR_PTR(-ENODEV);
+		}
+		dp_idx = vport->dp->dp_idx;
+		port_no = vport->port_no;
 		vport_unlock();
 
-		if (!vport)
-			return -ENODEV;
-		if (vport->dp != dp)
-			return -ENOENT;
-	} else {
-		if (port.port >= DP_MAX_PORTS)
-			return -EINVAL;
+		dp = get_dp_locked(dp_idx);
+		if (!dp)
+			goto retry;
 
-		vport = get_vport_protected(dp, port.port);
-		if (!vport)
-			return -ENOENT;
-	}
+		vport = get_vport_protected(dp, port_no);
+		if (!vport ||
+		    strcmp(vport_get_name(vport), nla_data(a[ODP_VPORT_ATTR_NAME]))) {
+			mutex_unlock(&dp->mutex);
+			goto retry;
+		}
+
+		return vport;
+	} else if (a[ODP_VPORT_ATTR_PORT_NO]) {
+		u32 port_no = nla_get_u32(a[ODP_VPORT_ATTR_PORT_NO]);
+
+		if (port_no >= DP_MAX_PORTS)
+			return ERR_PTR(-EINVAL);
+
+		dp = get_dp_locked(odp_vport->dp_idx);
+		if (!dp)
+			return ERR_PTR(-ENODEV);
 
-	return put_port(vport, uport);
+		vport = get_vport_protected(dp, port_no);
+		if (!vport) {
+			mutex_unlock(&dp->mutex);
+			return ERR_PTR(-ENOENT);
+		}
+		return vport;
+	} else
+		return ERR_PTR(-EINVAL);
+}
+
+static int change_vport(struct vport *vport, struct nlattr *a[ODP_VPORT_ATTR_MAX + 1])
+{
+	int err = 0;
+	if (a[ODP_VPORT_ATTR_STATS])
+		err = vport_set_stats(vport, nla_data(a[ODP_VPORT_ATTR_STATS]));
+	if (!err && a[ODP_VPORT_ATTR_ADDRESS])
+		err = vport_set_addr(vport, nla_data(a[ODP_VPORT_ATTR_ADDRESS]));
+	if (!err && a[ODP_VPORT_ATTR_MTU])
+		err = vport_set_mtu(vport, nla_get_u32(a[ODP_VPORT_ATTR_MTU]));
+	return err;
 }
 
-static int do_list_ports(struct datapath *dp, struct odp_port __user *uports,
-			 int n_ports)
+static int attach_vport(struct odp_vport __user *uodp_vport)
 {
-	int idx = 0;
-	if (n_ports) {
-		struct vport *p;
+	struct nlattr *a[ODP_VPORT_ATTR_MAX + 1];
+	struct odp_vport *odp_vport;
+	struct vport_parms parms;
+	struct vport *vport;
+	struct sk_buff *skb;
+	struct datapath *dp;
+	u32 port_no;
+	int err;
+
+	skb = copy_vport_from_user(uodp_vport, a);
+	err = PTR_ERR(skb);
+	if (IS_ERR(skb))
+		goto exit;
+	odp_vport = (struct odp_vport *)skb->data;
+
+	err = -EINVAL;
+	if (!a[ODP_VPORT_ATTR_NAME] || !a[ODP_VPORT_ATTR_TYPE])
+		goto exit_kfree_skb;
+
+	rtnl_lock();
+
+	dp = get_dp_locked(odp_vport->dp_idx);
+	err = -ENODEV;
+	if (!dp)
+		goto exit_unlock_rtnl;
+
+	if (a[ODP_VPORT_ATTR_PORT_NO]) {
+		port_no = nla_get_u32(a[ODP_VPORT_ATTR_PORT_NO]);
 
-		list_for_each_entry_rcu (p, &dp->port_list, node) {
-			if (put_port(p, &uports[idx]))
-				return -EFAULT;
-			if (idx++ >= n_ports)
+		err = -EFBIG;
+		if (port_no >= DP_MAX_PORTS)
+			goto exit_unlock_dp;
+
+		vport = get_vport_protected(dp, port_no);
+		err = -EBUSY;
+		if (vport)
+			goto exit_unlock_dp;
+	} else {
+		for (port_no = 1; ; port_no++) {
+			if (port_no >= DP_MAX_PORTS) {
+				err = -EFBIG;
+				goto exit_unlock_dp;
+			}
+			vport = get_vport_protected(dp, port_no);
+			if (!vport)
 				break;
 		}
 	}
-	return idx;
+
+	parms.name = nla_data(a[ODP_VPORT_ATTR_NAME]);
+	parms.type = nla_get_u32(a[ODP_VPORT_ATTR_TYPE]);
+	parms.options = a[ODP_VPORT_ATTR_OPTIONS];
+	parms.dp = dp;
+	parms.port_no = port_no;
+
+	vport = new_vport(&parms);
+	err = PTR_ERR(vport);
+	if (IS_ERR(vport))
+		goto exit_unlock_dp;
+
+ 	set_internal_devs_mtu(dp);
+ 	dp_sysfs_add_if(vport);
+
+	err = change_vport(vport, a);
+	if (err) {
+		dp_detach_port(vport);
+		goto exit_unlock_dp;
+	}
+
+	err = copy_vport_to_user(uodp_vport, vport, odp_vport->total_len);
+
+exit_unlock_dp:
+	mutex_unlock(&dp->mutex);
+exit_unlock_rtnl:
+	rtnl_unlock();
+exit_kfree_skb:
+	kfree_skb(skb);
+exit:
+	return err;
 }
 
-static int list_ports(struct datapath *dp, struct odp_portvec __user *upv)
+static int set_vport(unsigned int cmd, struct odp_vport __user *uodp_vport)
 {
-	struct odp_portvec pv;
-	int retval;
+	struct nlattr *a[ODP_VPORT_ATTR_MAX + 1];
+	struct vport *vport;
+	struct sk_buff *skb;
+	int err;
 
-	if (copy_from_user(&pv, upv, sizeof pv))
-		return -EFAULT;
+	skb = copy_vport_from_user(uodp_vport, a);
+	err = PTR_ERR(skb);
+	if (IS_ERR(skb))
+		goto exit;
+
+	rtnl_lock();
+	vport = lookup_vport((struct odp_vport *)skb->data, a);
+	err = PTR_ERR(vport);
+	if (IS_ERR(vport))
+		goto exit_free;
 
-	retval = do_list_ports(dp, (struct odp_port __user __force *)pv.ports,
-			       pv.n_ports);
-	if (retval < 0)
-		return retval;
+	err = 0;
+	if (a[ODP_VPORT_ATTR_OPTIONS])
+		err = vport_set_options(vport, a[ODP_VPORT_ATTR_OPTIONS]);
+	if (!err)
+		err = change_vport(vport, a);
 
-	return put_user(retval, &upv->n_ports);
+	mutex_unlock(&vport->dp->mutex);
+exit_free:
+	kfree_skb(skb);
+	rtnl_unlock();
+exit:
+	return err;
 }
 
-static int get_listen_mask(const struct file *f)
+static int del_vport(unsigned int cmd, struct odp_vport __user *uodp_vport)
 {
-	return (long)f->private_data;
+	struct nlattr *a[ODP_VPORT_ATTR_MAX + 1];
+	struct datapath *dp;
+	struct vport *vport;
+	struct sk_buff *skb;
+	int err;
+
+	skb = copy_vport_from_user(uodp_vport, a);
+	err = PTR_ERR(skb);
+	if (IS_ERR(skb))
+		goto exit;
+
+	rtnl_lock();
+	vport = lookup_vport((struct odp_vport *)skb->data, a);
+	err = PTR_ERR(vport);
+	if (IS_ERR(vport))
+		goto exit_free;
+	dp = vport->dp;
+
+	err = -EINVAL;
+	if (vport->port_no == ODPP_LOCAL)
+		goto exit_free;
+
+	err = dp_detach_port(vport);
+	mutex_unlock(&dp->mutex);
+exit_free:
+	kfree_skb(skb);
+	rtnl_unlock();
+exit:
+	return err;
 }
 
-static void set_listen_mask(struct file *f, int listen_mask)
+static int get_vport(struct odp_vport __user *uodp_vport)
 {
-	f->private_data = (void*)(long)listen_mask;
+	struct nlattr *a[ODP_VPORT_ATTR_MAX + 1];
+	struct odp_vport *odp_vport;
+	struct vport *vport;
+	struct sk_buff *skb;
+	int err;
+
+	skb = copy_vport_from_user(uodp_vport, a);
+	err = PTR_ERR(skb);
+	if (IS_ERR(skb))
+		goto exit;
+	odp_vport = (struct odp_vport *)skb->data;
+
+	vport = lookup_vport(odp_vport, a);
+	err = PTR_ERR(vport);
+	if (IS_ERR(vport))
+		goto exit_free;
+
+	err = copy_vport_to_user(uodp_vport, vport, odp_vport->total_len);
+	mutex_unlock(&vport->dp->mutex);
+exit_free:
+	kfree_skb(skb);
+exit:
+	return err;
+}
+
+static int dump_vport(struct odp_vport __user *uodp_vport)
+{
+	struct nlattr *a[ODP_VPORT_ATTR_MAX + 1];
+	struct odp_vport *odp_vport;
+	struct sk_buff *skb;
+	struct datapath *dp;
+	u32 port_no;
+	int err;
+
+	skb = copy_vport_from_user(uodp_vport, a);
+	err = PTR_ERR(skb);
+	if (IS_ERR(skb))
+		goto exit;
+	odp_vport = (struct odp_vport *)skb->data;
+
+	dp = get_dp_locked(odp_vport->dp_idx);
+	err = -ENODEV;
+	if (!dp)
+		goto exit_free;
+
+	port_no = 0;
+	if (a[ODP_VPORT_ATTR_PORT_NO])
+		port_no = nla_get_u32(a[ODP_VPORT_ATTR_PORT_NO]);
+	for (; port_no < DP_MAX_PORTS; port_no++) {
+		struct vport *vport = get_vport_protected(dp, port_no);
+		if (vport) {
+			err = copy_vport_to_user(uodp_vport, vport, odp_vport->total_len);
+			goto exit_unlock_dp;
+		}
+	}
+	err = -ENODEV;
+
+exit_unlock_dp:
+	mutex_unlock(&dp->mutex);
+exit_free:
+	kfree_skb(skb);
+exit:
+	return err;
 }
 
 static long openvswitch_ioctl(struct file *f, unsigned int cmd,
@@ -1359,7 +1681,7 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
 {
 	int dp_idx = iminor(f->f_dentry->d_inode);
 	struct datapath *dp;
-	int drop_frags, listeners, port_no;
+	int drop_frags, listeners;
 	unsigned int sflow_probability;
 	int err;
 
@@ -1373,42 +1695,24 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
 		err = destroy_dp(dp_idx);
 		goto exit;
 
-	case ODP_VPORT_ATTACH:
-		err = attach_port(dp_idx, (struct odp_port __user *)argp);
-		goto exit;
-
-	case ODP_VPORT_DETACH:
-		err = get_user(port_no, (int __user *)argp);
-		if (!err)
-			err = detach_port(dp_idx, port_no);
-		goto exit;
-
-	case ODP_VPORT_MOD:
-		err = vport_user_mod((struct odp_port __user *)argp);
-		goto exit;
-
-	case ODP_VPORT_STATS_GET:
-		err = vport_user_stats_get((struct odp_vport_stats_req __user *)argp);
-		goto exit;
-
-	case ODP_VPORT_STATS_SET:
-		err = vport_user_stats_set((struct odp_vport_stats_req __user *)argp);
+	case ODP_VPORT_NEW:
+		err = attach_vport((struct odp_vport __user *)argp);
 		goto exit;
 
-	case ODP_VPORT_ETHER_GET:
-		err = vport_user_ether_get((struct odp_vport_ether __user *)argp);
+	case ODP_VPORT_GET:
+		err = get_vport((struct odp_vport __user *)argp);
 		goto exit;
 
-	case ODP_VPORT_ETHER_SET:
-		err = vport_user_ether_set((struct odp_vport_ether __user *)argp);
+	case ODP_VPORT_DEL:
+		err = del_vport(cmd, (struct odp_vport __user *)argp);
 		goto exit;
 
-	case ODP_VPORT_MTU_GET:
-		err = vport_user_mtu_get((struct odp_vport_mtu __user *)argp);
+	case ODP_VPORT_SET:
+		err = set_vport(cmd, (struct odp_vport __user *)argp);
 		goto exit;
 
-	case ODP_VPORT_MTU_SET:
-		err = vport_user_mtu_set((struct odp_vport_mtu __user *)argp);
+	case ODP_VPORT_DUMP:
+		err = dump_vport((struct odp_vport __user *)argp);
 		goto exit;
 	}
 
@@ -1462,14 +1766,6 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
 			dp->sflow_probability = sflow_probability;
 		break;
 
-	case ODP_VPORT_QUERY:
-		err = query_port(dp, (struct odp_port __user *)argp);
-		break;
-
-	case ODP_VPORT_LIST:
-		err = list_ports(dp, (struct odp_portvec __user *)argp);
-		break;
-
 	case ODP_FLOW_FLUSH:
 		err = flush_flows(dp);
 		break;
@@ -1486,8 +1782,8 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
 		err = do_flowvec_ioctl(dp, argp, do_query_flows);
 		break;
 
-	case ODP_FLOW_LIST:
-		err = do_flowvec_ioctl(dp, argp, do_list_flows);
+	case ODP_FLOW_DUMP:
+		err = dump_flow(dp, (struct odp_flow_dump __user *)argp);
 		break;
 
 	case ODP_EXECUTE:
@@ -1514,33 +1810,20 @@ static int dp_has_packet_of_interest(struct datapath *dp, int listeners)
 }
 
 #ifdef CONFIG_COMPAT
-static int compat_list_ports(struct datapath *dp, struct compat_odp_portvec __user *upv)
-{
-	struct compat_odp_portvec pv;
-	int retval;
-
-	if (copy_from_user(&pv, upv, sizeof pv))
-		return -EFAULT;
-
-	retval = do_list_ports(dp, compat_ptr(pv.ports), pv.n_ports);
-	if (retval < 0)
-		return retval;
-
-	return put_user(retval, &upv->n_ports);
-}
-
 static int compat_get_flow(struct odp_flow *flow, const struct compat_odp_flow __user *compat)
 {
-	compat_uptr_t actions;
+	compat_uptr_t key, 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(key, &compat->key) ||
+	    __get_user(flow->key_len, &compat->key_len) ||
 	    __get_user(actions, &compat->actions) ||
 	    __get_user(flow->actions_len, &compat->actions_len) ||
 	    __get_user(flow->flags, &compat->flags))
 		return -EFAULT;
 
+	flow->key = (struct nlattr __force *)compat_ptr(key);
 	flow->actions = (struct nlattr __force *)compat_ptr(actions);
 	return 0;
 }
@@ -1588,7 +1871,7 @@ static int compat_del_flow(struct datapath *dp, struct compat_odp_flow __user *u
 	if (compat_get_flow(&uf, ufp))
 		return -EFAULT;
 
-	flow = do_del_flow(dp, &uf.key);
+	flow = do_del_flow(dp, (const struct nlattr __force __user *)uf.key, uf.key_len);
 	if (IS_ERR(flow))
 		return PTR_ERR(flow);
 
@@ -1608,12 +1891,17 @@ static int compat_query_flows(struct datapath *dp,
 		struct compat_odp_flow __user *ufp = &flows[i];
 		struct odp_flow uf;
 		struct tbl_node *flow_node;
+		struct sw_flow_key key;
 		int error;
 
 		if (compat_get_flow(&uf, ufp))
 			return -EFAULT;
 
-		flow_node = tbl_lookup(table, &uf.key, flow_hash(&uf.key), flow_cmp);
+		error = flow_copy_from_user(&key, (const struct nlattr __force __user *) uf.key, uf.key_len);
+		if (error)
+			return error;
+
+		flow_node = tbl_lookup(table, &key, flow_hash(&key), flow_cmp);
 		if (!flow_node)
 			error = put_user(ENOENT, &ufp->stats.error);
 		else
@@ -1625,47 +1913,37 @@ static int compat_query_flows(struct datapath *dp,
 	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_)
+static int compat_dump_flow(struct datapath *dp, struct compat_odp_flow_dump __user *udumpp)
 {
-	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;
+	struct compat_odp_flow __user *uflowp;
+	compat_uptr_t compat_ufp;
+	struct sw_flow *flow;
+	compat_uptr_t ukey;
+	u32 key_len;
 
-	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;
+	flow = do_dump_flow(dp, udumpp->state);
+	if (IS_ERR(flow))
+		return PTR_ERR(flow);
 
-	if (cbdata->listed_flows >= cbdata->n_flows)
-		return cbdata->listed_flows;
-	return 0;
-}
+	if (get_user(compat_ufp, &udumpp->flow))
+		return -EFAULT;
+	uflowp = compat_ptr(compat_ufp);
 
-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 (!flow)
+		return put_user(ODPFF_EOF, &uflowp->flags);
 
-	if (!n_flows)
-		return 0;
+	if (put_user(0, &uflowp->flags) ||
+	    get_user(ukey, &uflowp->key) ||
+	    get_user(key_len, &uflowp->key_len))
+		return -EFAULT;
 
-	cbdata.dp = dp;
-	cbdata.uflows = flows;
-	cbdata.n_flows = n_flows;
-	cbdata.listed_flows = 0;
+	key_len = flow_copy_to_user(compat_ptr(ukey), &flow->key, key_len);
+	if (key_len < 0)
+		return key_len;
+	if (put_user(key_len, &uflowp->key_len))
+		return -EFAULT;
 
-	error = tbl_foreach(get_table_protected(dp), compat_list_flow, &cbdata);
-	return error ? error : cbdata.listed_flows;
+	return compat_answer_query(dp, flow, 0, uflowp);
 }
 
 static int compat_flowvec_ioctl(struct datapath *dp, unsigned long argp,
@@ -1679,8 +1957,8 @@ static int compat_flowvec_ioctl(struct datapath *dp, unsigned long argp,
 	int retval;
 
 	uflowvec = compat_ptr(argp);
-	if (!access_ok(VERIFY_WRITE, uflowvec, sizeof *uflowvec) ||
-	    copy_from_user(&flowvec, uflowvec, sizeof flowvec))
+	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))
@@ -1729,15 +2007,11 @@ static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
 		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_VPORT_NEW:
+	case ODP_VPORT_DEL:
+	case ODP_VPORT_GET:
+	case ODP_VPORT_SET:
+	case ODP_VPORT_DUMP:
 	case ODP_DP_STATS:
 	case ODP_GET_DROP_FRAGS:
 	case ODP_SET_DROP_FRAGS:
@@ -1745,7 +2019,6 @@ static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
 	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));
 	}
@@ -1756,10 +2029,6 @@ static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
 		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;
@@ -1772,8 +2041,8 @@ static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
 		err = compat_flowvec_ioctl(dp, argp, compat_query_flows);
 		break;
 
-	case ODP_FLOW_LIST32:
-		err = compat_flowvec_ioctl(dp, argp, compat_list_flows);
+	case ODP_FLOW_DUMP32:
+		err = compat_dump_flow(dp, compat_ptr(argp));
 		break;
 
 	case ODP_EXECUTE32:
@@ -1790,100 +2059,6 @@ exit:
 }
 #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)
-{
-	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;
-	}
-
-	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;
-	}
-
-	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;
-		}
-	}
-	if (!len)
-		return 0;
-
-fault:
-	return -EFAULT;
-}
-
 static ssize_t openvswitch_read(struct file *f, char __user *buf,
 				size_t nbytes, loff_t *ppos)
 {
@@ -1891,7 +2066,7 @@ static ssize_t openvswitch_read(struct file *f, char __user *buf,
 	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;
+	struct iovec iov;
 	int retval;
 
 	if (!dp)
@@ -1928,44 +2103,11 @@ static ssize_t openvswitch_read(struct file *f, char __user *buf,
 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);
-			csum_start -= skb_headroom(skb);
-
-			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);
-	}
-
+	iov.iov_base = buf;
+	iov.iov_len = min_t(size_t, skb->len, nbytes);
+	retval = skb_copy_datagram_iovec(skb, 0, &iov, iov.iov_len);
 	if (!retval)
-		retval = tot_copy_bytes;
+		retval = skb->len;
 
 	kfree_skb(skb);
 	return retval;