datapath: Convert ODP_EXECUTE to use Netlink framing.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/Modules.mk b/datapath/Modules.mk
index 01c1a71..c4afae2 100644 (file)
--- a/datapath/Modules.mk
+++ b/datapath/Modules.mk
@@ -35,7 +35,6 @@ openvswitch_headers = \
        dp_sysfs.h \
        flow.h \
        loop_counter.h \
-       odp-compat.h \
        table.h \
        tunnel.h \
        vport.h \

diff --git a/datapath/datapath.c b/datapath/datapath.c
index ea998ed..d4d6811 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -50,7 +50,6 @@
 #include "actions.h"
 #include "flow.h"
 #include "loop_counter.h"
-#include "odp-compat.h"
 #include "table.h"
 #include "vport-internal_dev.h"
 
@@ -668,93 +667,94 @@ static int expand_table(struct datapath *dp)
        return 0;
 }
 
-static int do_execute(struct datapath *dp, const struct odp_execute *execute)
+static const struct nla_policy execute_policy[ODP_PACKET_ATTR_MAX + 1] = {
+       [ODP_PACKET_ATTR_PACKET] = { .type = NLA_UNSPEC },
+       [ODP_PACKET_ATTR_ACTIONS] = { .type = NLA_NESTED },
+};
+
+static int execute_packet(const struct odp_upcall __user *uodp_upcall)
 {
+       struct nlattr *a[ODP_PACKET_ATTR_MAX + 1];
+       struct odp_upcall *odp_upcall;
+       struct sk_buff *skb, *packet;
+       unsigned int actions_len;
+       struct nlattr *actions;
        struct sw_flow_key key;
-       struct sk_buff *skb;
-       struct sw_flow_actions *actions;
+       struct datapath *dp;
        struct ethhdr *eth;
        bool is_frag;
+       u32 len;
        int err;
 
-       err = -EINVAL;
-       if (execute->length < ETH_HLEN || execute->length > 65535)
-               goto error;
+       if (get_user(len, &uodp_upcall->len))
+               return -EFAULT;
+       if (len < sizeof(struct odp_upcall))
+               return -EINVAL;
 
-       actions = flow_actions_alloc(execute->actions_len);
-       if (IS_ERR(actions)) {
-               err = PTR_ERR(actions);
-               goto error;
-       }
+       skb = alloc_skb(len, GFP_KERNEL);
+       if (!skb)
+               return -ENOMEM;
 
        err = -EFAULT;
-       if (copy_from_user(actions->actions,
-           (struct nlattr __user __force *)execute->actions, execute->actions_len))
-               goto error_free_actions;
+       if (copy_from_user(__skb_put(skb, len), uodp_upcall, len))
+               goto exit_free_skb;
+
+       odp_upcall = (struct odp_upcall *)skb->data;
+       err = -EINVAL;
+       if (odp_upcall->len != len)
+               goto exit_free_skb;
 
-       err = validate_actions(actions->actions, execute->actions_len);
+       __skb_pull(skb, sizeof(struct odp_upcall));
+       err = nla_parse(a, ODP_PACKET_ATTR_MAX, (struct nlattr *)skb->data,
+                       skb->len, execute_policy);
        if (err)
-               goto error_free_actions;
+               goto exit_free_skb;
 
-       err = -ENOMEM;
-       skb = alloc_skb(execute->length, GFP_KERNEL);
-       if (!skb)
-               goto error_free_actions;
+       err = -EINVAL;
+       if (!a[ODP_PACKET_ATTR_PACKET] || !a[ODP_PACKET_ATTR_ACTIONS] ||
+           nla_len(a[ODP_PACKET_ATTR_PACKET]) < ETH_HLEN)
+               goto exit_free_skb;
 
-       err = -EFAULT;
-       if (copy_from_user(skb_put(skb, execute->length),
-                          (const void __user __force *)execute->data,
-                          execute->length))
-               goto error_free_skb;
+       actions = nla_data(a[ODP_PACKET_ATTR_ACTIONS]);
+       actions_len = nla_len(a[ODP_PACKET_ATTR_ACTIONS]);
+       err = validate_actions(actions, actions_len);
+       if (err)
+               goto exit_free_skb;
+
+       packet = skb_clone(skb, GFP_KERNEL);
+       err = -ENOMEM;
+       if (!packet)
+               goto exit_free_skb;
+       packet->data = nla_data(a[ODP_PACKET_ATTR_PACKET]);
+       packet->len = nla_len(a[ODP_PACKET_ATTR_PACKET]);
 
-       skb_reset_mac_header(skb);
-       eth = eth_hdr(skb);
+       skb_reset_mac_header(packet);
+       eth = eth_hdr(packet);
 
        /* 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;
+               packet->protocol = eth->h_proto;
        else
-               skb->protocol = htons(ETH_P_802_2);
+               packet->protocol = htons(ETH_P_802_2);
 
-       err = flow_extract(skb, -1, &key, &is_frag);
+       err = flow_extract(packet, -1, &key, &is_frag);
        if (err)
-               goto error_free_skb;
+               goto exit_free_skb;
 
        rcu_read_lock();
-       err = execute_actions(dp, skb, &key, actions->actions, actions->actions_len);
+       dp = get_dp(odp_upcall->dp_idx);
+       err = -ENODEV;
+       if (dp)
+               err = execute_actions(dp, packet, &key, actions, actions_len);
        rcu_read_unlock();
 
-       kfree(actions);
-       return err;
-
-error_free_skb:
+exit_free_skb:
        kfree_skb(skb);
-error_free_actions:
-       kfree(actions);
-error:
        return err;
 }
 
-static int execute_packet(const struct odp_execute __user *executep)
-{
-       struct odp_execute execute;
-       struct datapath *dp;
-       int error;
-
-       if (copy_from_user(&execute, executep, sizeof(execute)))
-               return -EFAULT;
-
-       dp = get_dp_locked(execute.dp_idx);
-       if (!dp)
-               return -ENODEV;
-       error = do_execute(dp, &execute);
-       mutex_unlock(&dp->mutex);
-
-       return error;
-}
-
 static void get_dp_stats(struct datapath *dp, struct odp_stats *stats)
 {
        int i;
@@ -2036,7 +2036,7 @@ static long openvswitch_ioctl(struct file *f, unsigned int cmd,
                goto exit;
 
        case ODP_EXECUTE:
-               err = execute_packet((struct odp_execute __user *)argp);
+               err = execute_packet((struct odp_upcall __user *)argp);
                goto exit;
        }
 
@@ -2081,34 +2081,6 @@ static int dp_has_packet_of_interest(struct datapath *dp, int listeners)
 }
 
 #ifdef CONFIG_COMPAT
-static int compat_execute(const struct compat_odp_execute __user *uexecute)
-{
-       struct odp_execute execute;
-       compat_uptr_t actions;
-       compat_uptr_t data;
-       struct datapath *dp;
-       int error;
-
-       if (!access_ok(VERIFY_READ, uexecute, sizeof(struct compat_odp_execute)) ||
-           __get_user(execute.dp_idx, &uexecute->dp_idx) ||
-           __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;
-
-       execute.actions = (struct nlattr __force *)compat_ptr(actions);
-       execute.data = (const void __force *)compat_ptr(data);
-
-       dp = get_dp_locked(execute.dp_idx);
-       if (!dp)
-               return -ENODEV;
-       error = do_execute(dp, &execute);
-       mutex_unlock(&dp->mutex);
-
-       return error;
-}
-
 static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned long argp)
 {
        switch (cmd) {
@@ -2133,12 +2105,10 @@ static long openvswitch_compat_ioctl(struct file *f, unsigned int cmd, unsigned
        case ODP_FLOW_DUMP:
        case ODP_SET_LISTEN_MASK:
        case ODP_GET_LISTEN_MASK:
+       case ODP_EXECUTE:
                /* Ioctls that just need their pointer argument extended. */
                return openvswitch_ioctl(f, cmd, (unsigned long)compat_ptr(argp));
 
-       case ODP_EXECUTE32:
-               return compat_execute(compat_ptr(argp));
-
        default:
                return -ENOIOCTLCMD;
        }

diff --git a/datapath/odp-compat.h b/datapath/odp-compat.h
deleted file mode 100644 (file)
index b18c31a..0000000
--- a/datapath/odp-compat.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2010, 2011 Nicira Networks.
- * Distributed under the terms of the GNU GPL version 2.
- *
- * Significant portions of this file may be copied from parts of the Linux
- * kernel, by Linus Torvalds and others.
- */
-
-#ifndef ODP_COMPAT_H
-#define ODP_COMPAT_H 1
-
-/* 32-bit ioctl compatibility definitions for datapath protocol. */
-
-#ifdef CONFIG_COMPAT
-#include "openvswitch/datapath-protocol.h"
-#include <linux/compat.h>
-
-#define ODP_EXECUTE32          _IOR('O', 18, struct compat_odp_execute)
-
-struct compat_odp_execute {
-       uint32_t dp_idx;
-
-       compat_uptr_t actions;
-       u32 actions_len;
-
-       compat_uptr_t data;
-       u32 length;
-};
-#endif /* CONFIG_COMPAT */
-
-#endif /* odp-compat.h */

diff --git a/datapath/vport.h b/datapath/vport.h
index 56817e8..87d5615 100644 (file)
--- a/datapath/vport.h
+++ b/datapath/vport.h
@@ -16,7 +16,6 @@
 
 #include "datapath.h"
 #include "openvswitch/datapath-protocol.h"
-#include "odp-compat.h"
 
 struct vport;
 struct vport_parms;

diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 23cf4ef..0aa6cd6 100644 (file)
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -92,7 +92,7 @@
 #define ODP_FLOW_DUMP           _IOWR('O', 17, struct odp_flow)
 #define ODP_FLOW_FLUSH          _IO('O', 19)
 
-#define ODP_EXECUTE             _IOR('O', 18, struct odp_execute)
+#define ODP_EXECUTE             _IOR('O', 18, struct odp_upcall)
 
 /**
  * struct odp_datapath - header with basic information about a datapath.
@@ -350,14 +350,4 @@ enum odp_action_type {
 
 #define ODPAT_MAX (__ODPAT_MAX - 1)
 
-struct odp_execute {
-    uint32_t dp_idx;
-
-    struct nlattr *actions;
-    uint32_t actions_len;
-
-    const void *data;
-    uint32_t length;
-};
-
 #endif  /* openvswitch/datapath-protocol.h */

diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c
index ea2f424..c323494 100644 (file)
--- a/lib/dpif-linux.c
+++ b/lib/dpif-linux.c
@@ -683,18 +683,27 @@ dpif_linux_flow_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_)
 static int
 dpif_linux_execute(struct dpif *dpif_,
                    const struct nlattr *actions, size_t actions_len,
-                   const struct ofpbuf *buf)
+                   const struct ofpbuf *packet)
 {
     struct dpif_linux *dpif = dpif_linux_cast(dpif_);
-    struct odp_execute execute;
-
-    memset(&execute, 0, sizeof execute);
-    execute.dp_idx = dpif->minor;
-    execute.actions = (struct nlattr *) actions;
-    execute.actions_len = actions_len;
-    execute.data = buf->data;
-    execute.length = buf->size;
-    return do_ioctl(dpif_, ODP_EXECUTE, &execute);
+    struct odp_upcall *execute;
+    struct ofpbuf *buf;
+    int error;
+
+    buf = ofpbuf_new(128 + actions_len + packet->size);
+
+    ofpbuf_reserve(buf, sizeof *execute);
+    nl_msg_put_unspec(buf, ODP_PACKET_ATTR_PACKET, packet->data, packet->size);
+    nl_msg_put_unspec(buf, ODP_PACKET_ATTR_ACTIONS, actions, actions_len);
+
+    execute = ofpbuf_push_uninit(buf, sizeof *execute);
+    execute->dp_idx = dpif->minor;
+    execute->len = buf->size;
+
+    error = do_ioctl(dpif_, ODP_EXECUTE, buf->data);
+
+    ofpbuf_delete(buf);
+    return error;
 }
 
 static int