netdev-vport: Merge in netdev-patch and netdev-tunnel.

The only real difference between netdev-patch and netdev-tunnel is in their
parse_config() implementation.  That's a lot of extra code to maintain, for
questionable benefit.  This commit merges them into the netdev-vport code,
which was heretofore merely a collection of helper functions.

9 files changed, 418 insertions, 670 deletions

diff --git a/lib/automake.mk b/lib/automake.mk
index efb84c5a0..c502a3bdf 100644
--- a/lib/automake.mk
+++ b/lib/automake.mk
@@ -176,8 +176,6 @@ if HAVE_NETLINK
 lib_libopenvswitch_a_SOURCES += \
 	lib/dpif-linux.c \
 	lib/netdev-linux.c \
-	lib/netdev-patch.c \
-	lib/netdev-tunnel.c \
 	lib/netdev-vport.c \
 	lib/netdev-vport.h \
 	lib/netlink-protocol.h \
diff --git a/lib/netdev-patch.c b/lib/netdev-patch.c
deleted file mode 100644
index 5a0eea715..000000000
--- a/lib/netdev-patch.c
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (c) 2010 Nicira Networks.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or apatched to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <config.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include "netdev-provider.h"
-#include "netdev-vport.h"
-#include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
-#include "packets.h"
-#include "socket-util.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(netdev_patch)
-
-struct netdev_dev_patch {
-    struct netdev_dev netdev_dev;
-};
-
-struct netdev_patch {
-    struct netdev netdev;
-};
-
-static struct netdev_dev_patch *
-netdev_dev_patch_cast(const struct netdev_dev *netdev_dev)
-{
-    netdev_dev_assert_class(netdev_dev, &netdev_patch_class);
-    return CONTAINER_OF(netdev_dev, struct netdev_dev_patch, netdev_dev);
-}
-
-static struct netdev_patch *
-netdev_patch_cast(const struct netdev *netdev)
-{
-    netdev_assert_class(netdev, &netdev_patch_class);
-    return CONTAINER_OF(netdev, struct netdev_patch, netdev);
-}
-
-static int
-parse_config(const char *name, const struct shash *args,
-             const char **peerp)
-{
-    const char *peer;
-
-    peer = shash_find_data(args, "peer");
-    if (!peer) {
-        VLOG_WARN("%s: patch type requires valid 'peer' argument", name);
-        return EINVAL;
-    }
-
-    if (shash_count(args) > 1) {
-        VLOG_WARN("%s: patch type takes only a 'peer' argument", name);
-        return EINVAL;
-    }
-
-    if (strlen(peer) >= IFNAMSIZ) {
-        VLOG_WARN("%s: patch 'peer' arg too long", name);
-        return EINVAL;
-    }
-
-    if (!strcmp(name, peer)) {
-        VLOG_WARN("%s: patch peer must not be self", name);
-        return EINVAL;
-    }
-
-    *peerp = peer;
-
-    return 0;
-}
-
-static int
-netdev_patch_create(const struct netdev_class *class OVS_UNUSED,
-                    const char *name, const struct shash *args,
-                    struct netdev_dev **netdev_devp)
-{
-    int err;
-    struct odp_vport_add ova;
-    const char *peer;
-    struct netdev_dev_patch *netdev_dev;
-
-    err = parse_config(name, args, &peer);
-    if (err) {
-        return err;
-    }
-
-    ovs_strlcpy(ova.port_type, "patch", sizeof ova.port_type);
-    ovs_strlcpy(ova.devname, name, sizeof ova.devname);
-    ova.config = (char *)peer;
-
-    err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    if (err == EBUSY) {
-        VLOG_WARN("%s: destroying existing device", name);
-
-        err = netdev_vport_do_ioctl(ODP_VPORT_DEL, ova.devname);
-        if (err) {
-            return err;
-        }
-
-        err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    }
-
-    if (err) {
-        return err;
-    }
-
-    netdev_dev = xmalloc(sizeof *netdev_dev);
-    netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_patch_class);
-
-    *netdev_devp = &netdev_dev->netdev_dev;
-    return 0;
-}
-
-static int
-netdev_patch_reconfigure(struct netdev_dev *netdev_dev_, const struct shash *args)
-{
-    const char *name = netdev_dev_get_name(netdev_dev_);
-    struct odp_vport_mod ovm;
-    const char *peer;
-    int err;
-
-    err = parse_config(name, args, &peer);
-    if (err) {
-        return err;
-    }
-
-    ovs_strlcpy(ovm.devname, name, sizeof ovm.devname);
-    ovm.config = (char *)peer;
-
-    return netdev_vport_do_ioctl(ODP_VPORT_MOD, &ovm);
-}
-
-static void
-netdev_patch_destroy(struct netdev_dev *netdev_dev_)
-{
-    struct netdev_dev_patch *netdev_dev = netdev_dev_patch_cast(netdev_dev_);
-
-    netdev_vport_do_ioctl(ODP_VPORT_DEL, (char *)netdev_dev_get_name(netdev_dev_));
-    free(netdev_dev);
-}
-
-static int
-netdev_patch_open(struct netdev_dev *netdev_dev_, int ethertype OVS_UNUSED,
-                struct netdev **netdevp)
-{
-    struct netdev_patch *netdev;
-
-    netdev = xmalloc(sizeof *netdev);
-    netdev_init(&netdev->netdev, netdev_dev_);
-
-    *netdevp = &netdev->netdev;
-    return 0;
-}
-
-static void
-netdev_patch_close(struct netdev *netdev_)
-{
-    struct netdev_patch *netdev = netdev_patch_cast(netdev_);
-    free(netdev);
-}
-
-const struct netdev_class netdev_patch_class = {
-    "patch",
-
-    NULL,                       /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
-
-    netdev_patch_create,
-    netdev_patch_destroy,
-    netdev_patch_reconfigure,
-
-    netdev_patch_open,
-    netdev_patch_close,
-
-    NULL,                       /* enumerate */
-
-    NULL,                       /* recv */
-    NULL,                       /* recv_wait */
-    NULL,                       /* drain */
-
-    NULL,                       /* send */
-    NULL,                       /* send_wait */
-
-    netdev_vport_set_etheraddr,
-    netdev_vport_get_etheraddr,
-    netdev_vport_get_mtu,
-    NULL,                       /* get_ifindex */
-    netdev_vport_get_carrier,
-    netdev_vport_get_stats,
-    netdev_vport_set_stats,
-
-    NULL,                       /* get_features */
-    NULL,                       /* set_advertisements */
-    NULL,                       /* get_vlan_vid */
-
-    NULL,                       /* set_policing */
-    NULL,                       /* get_qos_types */
-    NULL,                       /* get_qos_capabilities */
-    NULL,                       /* get_qos */
-    NULL,                       /* set_qos */
-    NULL,                       /* get_queue */
-    NULL,                       /* set_queue */
-    NULL,                       /* delete_queue */
-    NULL,                       /* get_queue_stats */
-    NULL,                       /* dump_queues */
-    NULL,                       /* dump_queue_stats */
-
-    NULL,                       /* get_in4 */
-    NULL,                       /* set_in4 */
-    NULL,                       /* get_in6 */
-    NULL,                       /* add_router */
-    NULL,                       /* get_next_hop */
-    NULL,                       /* arp_lookup */
-
-    netdev_vport_update_flags,
-
-    netdev_vport_poll_add,
-    netdev_vport_poll_remove,
-};
diff --git a/lib/netdev-provider.h b/lib/netdev-provider.h
index 8502da6b6..d4ff6200f 100644
--- a/lib/netdev-provider.h
+++ b/lib/netdev-provider.h
@@ -546,11 +546,11 @@ struct netdev_class {
     void (*poll_remove)(struct netdev_notifier *notifier);
 };
 
+int netdev_register_provider(const struct netdev_class *);
+int netdev_unregister_provider(const char *type);
+
 extern const struct netdev_class netdev_linux_class;
 extern const struct netdev_class netdev_tap_class;
-extern const struct netdev_class netdev_patch_class;
-extern const struct netdev_class netdev_gre_class;
-extern const struct netdev_class netdev_capwap_class;
 
 #ifdef  __cplusplus
 }
diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c
deleted file mode 100644
index a2383a47e..000000000
--- a/lib/netdev-tunnel.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Copyright (c) 2010 Nicira Networks.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <config.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <net/if.h>
-#include <sys/ioctl.h>
-
-#include "netdev-provider.h"
-#include "netdev-vport.h"
-#include "openflow/openflow.h"
-#include "openvswitch/datapath-protocol.h"
-#include "openvswitch/tunnel.h"
-#include "packets.h"
-#include "socket-util.h"
-#include "vlog.h"
-
-VLOG_DEFINE_THIS_MODULE(netdev_tunnel)
-
-struct netdev_dev_tunnel {
-    struct netdev_dev netdev_dev;
-};
-
-struct netdev_tunnel {
-    struct netdev netdev;
-};
-
-static int netdev_tunnel_create(const struct netdev_class *, const char *name,
-                                const struct shash *args, struct netdev_dev **);
-
-static struct netdev_dev_tunnel *
-netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev)
-{
-    assert(netdev_dev_get_class(netdev_dev)->create == netdev_tunnel_create);
-    return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev);
-}
-
-static struct netdev_tunnel *
-netdev_tunnel_cast(const struct netdev *netdev)
-{
-    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
-    assert(netdev_dev_get_class(netdev_dev)->create == netdev_tunnel_create);
-    return CONTAINER_OF(netdev, struct netdev_tunnel, netdev);
-}
-
-static int
-parse_config(const char *name, const char *type, const struct shash *args,
-             struct tnl_port_config *config)
-{
-    struct shash_node *node;
-    bool ipsec_ip_set = false;
-    bool ipsec_mech_set = false;
-
-    memset(config, 0, sizeof *config);
-
-    config->flags |= TNL_F_PMTUD;
-    config->flags |= TNL_F_HDR_CACHE;
-
-    SHASH_FOR_EACH (node, args) {
-        if (!strcmp(node->name, "remote_ip")) {
-            struct in_addr in_addr;
-            if (lookup_ip(node->data, &in_addr)) {
-                VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
-            } else {
-                config->daddr = in_addr.s_addr;
-            }
-        } else if (!strcmp(node->name, "local_ip")) {
-            struct in_addr in_addr;
-            if (lookup_ip(node->data, &in_addr)) {
-                VLOG_WARN("%s: bad %s 'local_ip'", name, type);
-            } else {
-                config->saddr = in_addr.s_addr;
-            }
-        } else if (!strcmp(node->name, "key") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "flow")) {
-                config->flags |= TNL_F_IN_KEY_MATCH;
-                config->flags |= TNL_F_OUT_KEY_ACTION;
-            } else {
-                config->out_key = config->in_key = htonl(atoi(node->data));
-            }
-        } else if (!strcmp(node->name, "in_key") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "flow")) {
-                config->flags |= TNL_F_IN_KEY_MATCH;
-            } else {
-                config->in_key = htonl(atoi(node->data));
-            }
-        } else if (!strcmp(node->name, "out_key") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "flow")) {
-                config->flags |= TNL_F_OUT_KEY_ACTION;
-            } else {
-                config->out_key = htonl(atoi(node->data));
-            }
-        } else if (!strcmp(node->name, "tos")) {
-            if (!strcmp(node->data, "inherit")) {
-                config->flags |= TNL_F_TOS_INHERIT;
-            } else {
-                config->tos = atoi(node->data);
-            }
-        } else if (!strcmp(node->name, "ttl")) {
-            if (!strcmp(node->data, "inherit")) {
-                config->flags |= TNL_F_TTL_INHERIT;
-            } else {
-                config->ttl = atoi(node->data);
-            }
-        } else if (!strcmp(node->name, "csum") && !strcmp(type, "gre")) {
-            if (!strcmp(node->data, "true")) {
-                config->flags |= TNL_F_CSUM;
-            }
-        } else if (!strcmp(node->name, "pmtud")) {
-            if (!strcmp(node->data, "false")) {
-                config->flags &= ~TNL_F_PMTUD;
-            }
-        } else if (!strcmp(node->name, "header_cache")) {
-            if (!strcmp(node->data, "false")) {
-                config->flags &= ~TNL_F_HDR_CACHE;
-            }
-        } else if (!strcmp(node->name, "ipsec_local_ip")) {
-            ipsec_ip_set = true;
-        } else if (!strcmp(node->name, "ipsec_cert")
-                   || !strcmp(node->name, "ipsec_psk")) {
-            ipsec_mech_set = true;
-        } else {
-            VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->name);
-        }
-    }
-
-    /* IPsec doesn't work when header caching is enabled.  Disable it if
-     * the IPsec local IP address and authentication mechanism have been
-     * defined. */
-    if (ipsec_ip_set && ipsec_mech_set) {
-        VLOG_INFO("%s: header caching disabled due to use of IPsec", name);
-        config->flags &= ~TNL_F_HDR_CACHE;
-    }
-
-    if (!config->daddr) {
-        VLOG_WARN("%s: %s type requires valid 'remote_ip' argument", name, type);
-        return EINVAL;
-    }
-
-    return 0;
-}
-
-static int
-netdev_tunnel_create(const struct netdev_class *class, const char *name,
-                     const struct shash *args, struct netdev_dev **netdev_devp)
-{
-    int err;
-    struct odp_vport_add ova;
-    struct tnl_port_config port_config;
-    struct netdev_dev_tunnel *netdev_dev;
-
-    ovs_strlcpy(ova.port_type, class->type, sizeof ova.port_type);
-    ovs_strlcpy(ova.devname, name, sizeof ova.devname);
-    ova.config = &port_config;
-
-    err = parse_config(name, class->type, args, &port_config);
-    if (err) {
-        return err;
-    }
-
-    err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    if (err == EBUSY) {
-        VLOG_WARN("%s: destroying existing device", name);
-
-        err = netdev_vport_do_ioctl(ODP_VPORT_DEL, ova.devname);
-        if (err) {
-            return err;
-        }
-
-        err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
-    }
-
-    if (err) {
-        return err;
-    }
-
-    netdev_dev = xmalloc(sizeof *netdev_dev);
-
-    netdev_dev_init(&netdev_dev->netdev_dev, name, class);
-    *netdev_devp = &netdev_dev->netdev_dev;
-    return 0;
-}
-
-static int
-netdev_tunnel_reconfigure(struct netdev_dev *netdev_dev_, const struct shash *args)
-{
-    const char *name = netdev_dev_get_name(netdev_dev_);
-    struct odp_vport_mod ovm;
-    struct tnl_port_config port_config;
-    int err;
-
-    ovs_strlcpy(ovm.devname, name, sizeof ovm.devname);
-    ovm.config = &port_config;
-
-    err = parse_config(name, netdev_dev_get_class(netdev_dev_)->type, args,
-                       &port_config);
-    if (err) {
-        return err;
-    }
-
-    return netdev_vport_do_ioctl(ODP_VPORT_MOD, &ovm);
-}
-
-static void
-netdev_tunnel_destroy(struct netdev_dev *netdev_dev_)
-{
-    struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(netdev_dev_);
-
-    netdev_vport_do_ioctl(ODP_VPORT_DEL, (char *)netdev_dev_get_name(netdev_dev_));
-    free(netdev_dev);
-}
-
-static int
-netdev_tunnel_open(struct netdev_dev *netdev_dev_, int ethertype OVS_UNUSED,
-                struct netdev **netdevp)
-{
-    struct netdev_tunnel *netdev;
-
-    netdev = xmalloc(sizeof *netdev);
-    netdev_init(&netdev->netdev, netdev_dev_);
-
-    *netdevp = &netdev->netdev;
-    return 0;
-}
-
-static void
-netdev_tunnel_close(struct netdev *netdev_)
-{
-    struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
-    free(netdev);
-}
-
-const struct netdev_class netdev_gre_class = {
-    "gre",
-
-    NULL,                       /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
-
-    netdev_tunnel_create,
-    netdev_tunnel_destroy,
-    netdev_tunnel_reconfigure,
-
-    netdev_tunnel_open,
-    netdev_tunnel_close,
-
-    NULL,                       /* enumerate */
-
-    NULL,                       /* recv */
-    NULL,                       /* recv_wait */
-    NULL,                       /* drain */
-
-    NULL,                       /* send */
-    NULL,                       /* send_wait */
-
-    netdev_vport_set_etheraddr,
-    netdev_vport_get_etheraddr,
-    netdev_vport_get_mtu,
-    NULL,                       /* get_ifindex */
-    netdev_vport_get_carrier,
-    netdev_vport_get_stats,
-    netdev_vport_set_stats,
-
-    NULL,                       /* get_features */
-    NULL,                       /* set_advertisements */
-    NULL,                       /* get_vlan_vid */
-
-    NULL,                       /* set_policing */
-    NULL,                       /* get_qos_types */
-    NULL,                       /* get_qos_capabilities */
-    NULL,                       /* get_qos */
-    NULL,                       /* set_qos */
-    NULL,                       /* get_queue */
-    NULL,                       /* set_queue */
-    NULL,                       /* delete_queue */
-    NULL,                       /* get_queue_stats */
-    NULL,                       /* dump_queues */
-    NULL,                       /* dump_queue_stats */
-
-    NULL,                       /* get_in4 */
-    NULL,                       /* set_in4 */
-    NULL,                       /* get_in6 */
-    NULL,                       /* add_router */
-    NULL,                       /* get_next_hop */
-    NULL,                       /* arp_lookup */
-
-    netdev_vport_update_flags,
-
-    netdev_vport_poll_add,
-    netdev_vport_poll_remove,
-};
-
-const struct netdev_class netdev_capwap_class = {
-    "capwap",
-
-    NULL,                       /* init */
-    NULL,                       /* run */
-    NULL,                       /* wait */
-
-    netdev_tunnel_create,
-    netdev_tunnel_destroy,
-    netdev_tunnel_reconfigure,
-
-    netdev_tunnel_open,
-    netdev_tunnel_close,
-
-    NULL,                       /* enumerate */
-
-    NULL,                       /* recv */
-    NULL,                       /* recv_wait */
-    NULL,                       /* drain */
-
-    NULL,                       /* send */
-    NULL,                       /* send_wait */
-
-    netdev_vport_set_etheraddr,
-    netdev_vport_get_etheraddr,
-    netdev_vport_get_mtu,
-    NULL,                       /* get_ifindex */
-    netdev_vport_get_carrier,
-    netdev_vport_get_stats,
-    netdev_vport_set_stats,
-
-    NULL,                       /* get_features */
-    NULL,                       /* set_advertisements */
-    NULL,                       /* get_vlan_vid */
-
-    NULL,                       /* set_policing */
-    NULL,                       /* get_qos_types */
-    NULL,                       /* get_qos_capabilities */
-    NULL,                       /* get_qos */
-    NULL,                       /* set_qos */
-    NULL,                       /* get_queue */
-    NULL,                       /* set_queue */
-    NULL,                       /* delete_queue */
-    NULL,                       /* get_queue_stats */
-    NULL,                       /* dump_queues */
-    NULL,                       /* dump_queue_stats */
-
-    NULL,                       /* get_in4 */
-    NULL,                       /* set_in4 */
-    NULL,                       /* get_in6 */
-    NULL,                       /* add_router */
-    NULL,                       /* get_next_hop */
-    NULL,                       /* arp_lookup */
-
-    netdev_vport_update_flags,
-
-    netdev_vport_poll_add,
-    netdev_vport_poll_remove,
-};
diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 35092d25c..1ef9114c7 100644
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -15,13 +15,19 @@
  */
 
 #include <config.h>
+
+#include "netdev-vport.h"
+
 #include <errno.h>
 #include <fcntl.h>
+#include <net/if.h>
 #include <sys/ioctl.h>
 
 #include "list.h"
-#include "netdev-vport.h"
+#include "netdev-provider.h"
 #include "openvswitch/datapath-protocol.h"
+#include "openvswitch/tunnel.h"
+#include "packets.h"
 #include "shash.h"
 #include "socket-util.h"
 #include "vlog.h"
@@ -34,28 +40,179 @@ struct netdev_vport_notifier {
     struct shash_node *shash_node;
 };
 
+struct netdev_dev_vport {
+    struct netdev_dev netdev_dev;
+};
+
+struct netdev_vport {
+    struct netdev netdev;
+};
+
+struct vport_info {
+    const char *devname;
+    const char *type;
+    void *config;
+};
+
+struct vport_class {
+    const struct netdev_class netdev_class;
+    int (*parse_config)(struct vport_info *port, const struct shash *args);
+};
+
 static struct shash netdev_vport_notifiers =
                                     SHASH_INITIALIZER(&netdev_vport_notifiers);
 
 static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
 
-int
-netdev_vport_do_ioctl(int cmd, void *arg)
+static int netdev_vport_do_ioctl(int cmd, void *arg);
+static int netdev_vport_create(const struct netdev_class *, const char *,
+                               const struct shash *, struct netdev_dev **);
+static void netdev_vport_poll_notify(const struct netdev *);
+
+static bool
+is_vport_class(const struct netdev_class *class)
 {
-    static int ioctl_fd = -1;
+    return class->create == netdev_vport_create;
+}
 
-    if (ioctl_fd < 0) {
-        ioctl_fd = open("/dev/net/dp0", O_RDONLY | O_NONBLOCK);
-        if (ioctl_fd < 0) {
-            VLOG_ERR_RL(&rl, "failed to open ioctl fd: %s", strerror(errno));
-            return errno;
+static const struct vport_class *
+vport_class_cast(const struct netdev_class *class)
+{
+    assert(is_vport_class(class));
+    return CONTAINER_OF(class, struct vport_class, netdev_class);
+}
+
+static struct netdev_dev_vport *
+netdev_dev_vport_cast(const struct netdev_dev *netdev_dev)
+{
+    assert(is_vport_class(netdev_dev_get_class(netdev_dev)));
+    return CONTAINER_OF(netdev_dev, struct netdev_dev_vport, netdev_dev);
+}
+
+static struct netdev_vport *
+netdev_vport_cast(const struct netdev *netdev)
+{
+    struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
+    assert(is_vport_class(netdev_dev_get_class(netdev_dev)));
+    return CONTAINER_OF(netdev, struct netdev_vport, netdev);
+}
+
+static int
+netdev_vport_parse_config(const struct netdev_class *netdev_class,
+                          const char *name, const struct shash *args,
+                          void **configp)
+{
+    const struct vport_class *c = vport_class_cast(netdev_class);
+    if (c->parse_config) {
+        struct vport_info info;
+        int error;
+
+        info.devname = name;
+        info.type = netdev_class->type;
+        error = (c->parse_config)(&info, args);
+        *configp = info.config;
+        return error;
+    } else {
+        if (!shash_is_empty(args)) {
+            VLOG_WARN("%s: arguments for %s vports should be empty",
+                      name, netdev_class->type);
         }
+        *configp = NULL;
+        return 0;
     }
+}
 
-    return ioctl(ioctl_fd, cmd, arg) ? errno : 0;
+static int
+netdev_vport_create(const struct netdev_class *class, const char *name,
+                    const struct shash *args OVS_UNUSED,
+                    struct netdev_dev **netdev_devp)
+{
+    int err;
+    struct odp_vport_add ova;
+    struct netdev_dev_vport *netdev_dev;
+
+    ovs_strlcpy(ova.port_type, class->type, sizeof ova.port_type);
+    ovs_strlcpy(ova.devname, name, sizeof ova.devname);
+    err = netdev_vport_parse_config(class, name, args, &ova.config);
+    if (err) {
+        goto exit;
+    }
+
+    err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
+
+    if (err == EBUSY) {
+        VLOG_WARN("%s: destroying existing device", name);
+
+        err = netdev_vport_do_ioctl(ODP_VPORT_DEL, ova.devname);
+        if (err) {
+            goto exit;
+        }
+
+        err = netdev_vport_do_ioctl(ODP_VPORT_ADD, &ova);
+    }
+    if (err) {
+        goto exit;
+    }
+
+    netdev_dev = xmalloc(sizeof *netdev_dev);
+    netdev_dev_init(&netdev_dev->netdev_dev, name, class);
+
+    *netdev_devp = &netdev_dev->netdev_dev;
+
+exit:
+    free(ova.config);
+    return err;
 }
 
-int
+static void
+netdev_vport_destroy(struct netdev_dev *netdev_dev_)
+{
+    struct netdev_dev_vport *netdev_dev = netdev_dev_vport_cast(netdev_dev_);
+
+    free(netdev_dev);
+}
+
+static int
+netdev_vport_open(struct netdev_dev *netdev_dev_, int ethertype OVS_UNUSED,
+                struct netdev **netdevp)
+{
+    struct netdev_vport *netdev;
+
+    netdev = xmalloc(sizeof *netdev);
+    netdev_init(&netdev->netdev, netdev_dev_);
+
+    *netdevp = &netdev->netdev;
+    return 0;
+}
+
+static void
+netdev_vport_close(struct netdev *netdev_)
+{
+    struct netdev_vport *netdev = netdev_vport_cast(netdev_);
+    free(netdev);
+}
+
+static int
+netdev_vport_reconfigure(struct netdev_dev *netdev_dev,
+                         const struct shash *args)
+{
+    const char *name = netdev_dev_get_name(netdev_dev);
+    struct odp_vport_mod ovm;
+    int err;
+
+    ovs_strlcpy(ovm.devname, name, sizeof ovm.devname);
+    err = netdev_vport_parse_config(netdev_dev_get_class(netdev_dev), name,
+                                    args, &ovm.config);
+    if (err) {
+        return err;
+    }
+
+    err = netdev_vport_do_ioctl(ODP_VPORT_MOD, &ovm);
+    free(ovm.config);
+    return err;
+}
+
+static int
 netdev_vport_set_etheraddr(struct netdev *netdev,
                            const uint8_t mac[ETH_ADDR_LEN])
 {
@@ -76,7 +233,7 @@ netdev_vport_set_etheraddr(struct netdev *netdev,
     return 0;
 }
 
-int
+static int
 netdev_vport_get_etheraddr(const struct netdev *netdev,
                            uint8_t mac[ETH_ADDR_LEN])
 {
@@ -95,7 +252,7 @@ netdev_vport_get_etheraddr(const struct netdev *netdev,
     return 0;
 }
 
-int
+static int
 netdev_vport_get_mtu(const struct netdev *netdev, int *mtup)
 {
     struct odp_vport_mtu vport_mtu;
@@ -113,7 +270,7 @@ netdev_vport_get_mtu(const struct netdev *netdev, int *mtup)
     return 0;
 }
 
-int
+static int
 netdev_vport_get_carrier(const struct netdev *netdev OVS_UNUSED, bool *carrier)
 {
     *carrier = true;
@@ -192,7 +349,7 @@ netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
     return err;
 }
 
-int
+static int
 netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED,
                         enum netdev_flags off, enum netdev_flags on OVS_UNUSED,
                         enum netdev_flags *old_flagsp)
@@ -211,7 +368,7 @@ make_poll_name(const struct netdev *netdev)
     return xasprintf("%s:%s", netdev_get_type(netdev), netdev_get_name(netdev));
 }
 
-int
+static int
 netdev_vport_poll_add(struct netdev *netdev,
                       void (*cb)(struct netdev_notifier *), void *aux,
                       struct netdev_notifier **notifierp)
@@ -242,7 +399,7 @@ netdev_vport_poll_add(struct netdev *netdev,
     return 0;
 }
 
-void
+static void
 netdev_vport_poll_remove(struct netdev_notifier *notifier_)
 {
     struct netdev_vport_notifier *notifier =
@@ -258,8 +415,26 @@ netdev_vport_poll_remove(struct netdev_notifier *notifier_)
 
     free(notifier);
 }
+
+/* Helper functions. */
 
-void
+static int
+netdev_vport_do_ioctl(int cmd, void *arg)
+{
+    static int ioctl_fd = -1;
+
+    if (ioctl_fd < 0) {
+        ioctl_fd = open("/dev/net/dp0", O_RDONLY | O_NONBLOCK);
+        if (ioctl_fd < 0) {
+            VLOG_ERR_RL(&rl, "failed to open ioctl fd: %s", strerror(errno));
+            return errno;
+        }
+    }
+
+    return ioctl(ioctl_fd, cmd, arg) ? errno : 0;
+}
+
+static void
 netdev_vport_poll_notify(const struct netdev *netdev)
 {
     char *poll_name = make_poll_name(netdev);
@@ -277,3 +452,210 @@ netdev_vport_poll_notify(const struct netdev *netdev)
 
     free(poll_name);
 }
+
+/* Code specific to individual vport types. */
+
+static int
+parse_tunnel_config(struct vport_info *port, const struct shash *args)
+{
+    const char *name = port->devname;
+    bool is_gre = !strcmp(port->type, "gre");
+    struct tnl_port_config *config;
+    struct shash_node *node;
+    bool ipsec_ip_set = false;
+    bool ipsec_mech_set = false;
+
+    config = port->config = xzalloc(sizeof *config);
+    config->flags |= TNL_F_PMTUD;
+    config->flags |= TNL_F_HDR_CACHE;
+
+    SHASH_FOR_EACH (node, args) {
+        if (!strcmp(node->name, "remote_ip")) {
+            struct in_addr in_addr;
+            if (lookup_ip(node->data, &in_addr)) {
+                VLOG_WARN("%s: bad %s 'remote_ip'", name, port->type);
+            } else {
+                config->daddr = in_addr.s_addr;
+            }
+        } else if (!strcmp(node->name, "local_ip")) {
+            struct in_addr in_addr;
+            if (lookup_ip(node->data, &in_addr)) {
+                VLOG_WARN("%s: bad %s 'local_ip'", name, port->type);
+            } else {
+                config->saddr = in_addr.s_addr;
+            }
+        } else if (!strcmp(node->name, "key") && is_gre) {
+            if (!strcmp(node->data, "flow")) {
+                config->flags |= TNL_F_IN_KEY_MATCH;
+                config->flags |= TNL_F_OUT_KEY_ACTION;
+            } else {
+                config->out_key = config->in_key = htonl(atoi(node->data));
+            }
+        } else if (!strcmp(node->name, "in_key") && is_gre) {
+            if (!strcmp(node->data, "flow")) {
+                config->flags |= TNL_F_IN_KEY_MATCH;
+            } else {
+                config->in_key = htonl(atoi(node->data));
+            }
+        } else if (!strcmp(node->name, "out_key") && is_gre) {
+            if (!strcmp(node->data, "flow")) {
+                config->flags |= TNL_F_OUT_KEY_ACTION;
+            } else {
+                config->out_key = htonl(atoi(node->data));
+            }
+        } else if (!strcmp(node->name, "tos")) {
+            if (!strcmp(node->data, "inherit")) {
+                config->flags |= TNL_F_TOS_INHERIT;
+            } else {
+                config->tos = atoi(node->data);
+            }
+        } else if (!strcmp(node->name, "ttl")) {
+            if (!strcmp(node->data, "inherit")) {
+                config->flags |= TNL_F_TTL_INHERIT;
+            } else {
+                config->ttl = atoi(node->data);
+            }
+        } else if (!strcmp(node->name, "csum") && is_gre) {
+            if (!strcmp(node->data, "true")) {
+                config->flags |= TNL_F_CSUM;
+            }
+        } else if (!strcmp(node->name, "pmtud")) {
+            if (!strcmp(node->data, "false")) {
+                config->flags &= ~TNL_F_PMTUD;
+            }
+        } else if (!strcmp(node->name, "header_cache")) {
+            if (!strcmp(node->data, "false")) {
+                config->flags &= ~TNL_F_HDR_CACHE;
+            }
+        } else if (!strcmp(node->name, "ipsec_local_ip")) {
+            ipsec_ip_set = true;
+        } else if (!strcmp(node->name, "ipsec_cert")
+                   || !strcmp(node->name, "ipsec_psk")) {
+            ipsec_mech_set = true;
+        } else {
+            VLOG_WARN("%s: unknown %s argument '%s'",
+                      name, port->type, node->name);
+        }
+    }
+
+   /* IPsec doesn't work when header caching is enabled.  Disable it if the
+    * IPsec local IP address and authentication mechanism have been defined. */
+    if (ipsec_ip_set && ipsec_mech_set) {
+        VLOG_INFO("%s: header caching disabled due to use of IPsec", name);
+        config->flags &= ~TNL_F_HDR_CACHE;
+    }
+
+    if (!config->daddr) {
+        VLOG_WARN("%s: %s type requires valid 'remote_ip' argument",
+                  name, port->type);
+        return EINVAL;
+    }
+
+    return 0;
+}
+
+static int
+parse_patch_config(struct vport_info *port, const struct shash *args)
+{
+    const char *name = port->devname;
+    const char *peer;
+
+    peer = shash_find_data(args, "peer");
+    if (!peer) {
+        VLOG_WARN("%s: patch type requires valid 'peer' argument", name);
+        return EINVAL;
+    }
+
+    if (shash_count(args) > 1) {
+        VLOG_WARN("%s: patch type takes only a 'peer' argument", name);
+        return EINVAL;
+    }
+
+    if (strlen(peer) >= IFNAMSIZ) {
+        VLOG_WARN("%s: patch 'peer' arg too long", name);
+        return EINVAL;
+    }
+
+    if (!strcmp(name, peer)) {
+        VLOG_WARN("%s: patch peer must not be self", name);
+        return EINVAL;
+    }
+
+    port->config = xstrdup(peer);
+
+    return 0;
+}
+
+#define VPORT_FUNCTIONS                                     \
+    NULL,                       /* init */                  \
+    NULL,                       /* run */                   \
+    NULL,                       /* wait */                  \
+                                                            \
+    netdev_vport_create,                                    \
+    netdev_vport_destroy,                                   \
+    netdev_vport_reconfigure,                               \
+                                                            \
+    netdev_vport_open,                                      \
+    netdev_vport_close,                                     \
+                                                            \
+    NULL,                       /* enumerate */             \
+                                                            \
+    NULL,                       /* recv */                  \
+    NULL,                       /* recv_wait */             \
+    NULL,                       /* drain */                 \
+                                                            \
+    NULL,                       /* send */                  \
+    NULL,                       /* send_wait */             \
+                                                            \
+    netdev_vport_set_etheraddr,                             \
+    netdev_vport_get_etheraddr,                             \
+    netdev_vport_get_mtu,                                   \
+    NULL,                       /* get_ifindex */           \
+    netdev_vport_get_carrier,                               \
+    netdev_vport_get_stats,                                 \
+    netdev_vport_set_stats,                                 \
+                                                            \
+    NULL,                       /* get_features */          \
+    NULL,                       /* set_advertisements */    \
+    NULL,                       /* get_vlan_vid */          \
+                                                            \
+    NULL,                       /* set_policing */          \
+    NULL,                       /* get_qos_types */         \
+    NULL,                       /* get_qos_capabilities */  \
+    NULL,                       /* get_qos */               \
+    NULL,                       /* set_qos */               \
+    NULL,                       /* get_queue */             \
+    NULL,                       /* set_queue */             \
+    NULL,                       /* delete_queue */          \
+    NULL,                       /* get_queue_stats */       \
+    NULL,                       /* dump_queues */           \
+    NULL,                       /* dump_queue_stats */      \
+                                                            \
+    NULL,                       /* get_in4 */               \
+    NULL,                       /* set_in4 */               \
+    NULL,                       /* get_in6 */               \
+    NULL,                       /* add_router */            \
+    NULL,                       /* get_next_hop */          \
+    NULL,                       /* arp_lookup */            \
+                                                            \
+    netdev_vport_update_flags,                              \
+                                                            \
+    netdev_vport_poll_add,                                  \
+    netdev_vport_poll_remove,
+
+static const struct vport_class vport_gre_class
+        = { { "gre", VPORT_FUNCTIONS }, parse_tunnel_config };
+
+static const struct vport_class vport_capwap_class
+        = { { "capwap", VPORT_FUNCTIONS }, parse_tunnel_config };
+
+static const struct vport_class vport_patch_class
+        = { { "patch", VPORT_FUNCTIONS }, parse_patch_config };
+
+void
+netdev_vport_register(void)
+{
+    netdev_register_provider(&vport_gre_class.netdev_class);
+    netdev_register_provider(&vport_capwap_class.netdev_class);
+    netdev_register_provider(&vport_patch_class.netdev_class);
+}
diff --git a/lib/netdev-vport.h b/lib/netdev-vport.h
index b4016606f..0898ec0b7 100644
--- a/lib/netdev-vport.h
+++ b/lib/netdev-vport.h
@@ -17,27 +17,13 @@
 #ifndef NETDEV_VPORT_H
 #define NETDEV_VPORT_H 1
 
-#include "netdev-provider.h"
-#include "packets.h"
+struct netdev;
+struct netdev_stats;
+struct odp_port;
+struct shash;
 
-int netdev_vport_do_ioctl(int cmd, void *arg);
-
-int netdev_vport_set_etheraddr(struct netdev *,
-                               const uint8_t mac[ETH_ADDR_LEN]);
-int netdev_vport_get_etheraddr(const struct netdev *,
-                               uint8_t mac[ETH_ADDR_LEN]);
-int netdev_vport_get_mtu(const struct netdev *, int *mtup);
-int netdev_vport_get_carrier(const struct netdev *, bool *carrier);
+void netdev_vport_register(void);
 int netdev_vport_get_stats(const struct netdev *, struct netdev_stats *);
 int netdev_vport_set_stats(struct netdev *, const struct netdev_stats *);
-int netdev_vport_update_flags(struct netdev *, enum netdev_flags off,
-                              enum netdev_flags on,
-                              enum netdev_flags *old_flagsp);
-
-int netdev_vport_poll_add(struct netdev *,
-                          void (*cb)(struct netdev_notifier *), void *aux,
-                          struct netdev_notifier **);
-void netdev_vport_poll_remove(struct netdev_notifier *);
-void netdev_vport_poll_notify(const struct netdev *);
 
 #endif /* netdev-vport.h */
diff --git a/lib/netdev.c b/lib/netdev.c
index 6d997e0e2..993f27a88 100644
--- a/lib/netdev.c
+++ b/lib/netdev.c
@@ -31,6 +31,7 @@
 #include "hash.h"
 #include "list.h"
 #include "netdev-provider.h"
+#include "netdev-vport.h"
 #include "ofpbuf.h"
 #include "openflow/openflow.h"
 #include "packets.h"
@@ -41,16 +42,6 @@
 
 VLOG_DEFINE_THIS_MODULE(netdev)
 
-static const struct netdev_class *base_netdev_classes[] = {
-#ifdef HAVE_NETLINK
-    &netdev_linux_class,
-    &netdev_tap_class,
-    &netdev_patch_class,
-    &netdev_gre_class,
-    &netdev_capwap_class,
-#endif
-};
-
 static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes);
 
 /* All created network devices. */
@@ -70,17 +61,18 @@ void update_device_args(struct netdev_dev *, const struct shash *args);
 static void
 netdev_initialize(void)
 {
-    static int status = -1;
+    static bool inited;
 
-    if (status < 0) {
-        int i;
+    if (!inited) {
+        inited = true;
 
         fatal_signal_add_hook(close_all_netdevs, NULL, NULL, true);
 
-        status = 0;
-        for (i = 0; i < ARRAY_SIZE(base_netdev_classes); i++) {
-            netdev_register_provider(base_netdev_classes[i]);
-        }
+#ifdef HAVE_NETLINK
+        netdev_register_provider(&netdev_linux_class);
+        netdev_register_provider(&netdev_tap_class);
+        netdev_vport_register();
+#endif
     }
 }
 
@@ -121,8 +113,6 @@ netdev_wait(void)
 int
 netdev_register_provider(const struct netdev_class *new_class)
 {
-    struct netdev_class *new_provider;
-
     if (shash_find(&netdev_classes, new_class->type)) {
         VLOG_WARN("attempted to register duplicate netdev provider: %s",
                    new_class->type);
@@ -138,10 +128,7 @@ netdev_register_provider(const struct netdev_class *new_class)
         }
     }
 
-    new_provider = xmalloc(sizeof *new_provider);
-    memcpy(new_provider, new_class, sizeof *new_provider);
-
-    shash_add(&netdev_classes, new_class->type, new_provider);
+    shash_add(&netdev_classes, new_class->type, new_class);
 
     return 0;
 }
@@ -171,7 +158,6 @@ netdev_unregister_provider(const char *type)
     }
 
     shash_delete(&netdev_classes, del_node);
-    free(del_node->data);
 
     return 0;
 }
diff --git a/lib/netdev.h b/lib/netdev.h
index cd5c8c300..133d8ee65 100644
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -93,8 +93,6 @@ struct netdev_class;
 void netdev_run(void);
 void netdev_wait(void);
 
-int netdev_register_provider(const struct netdev_class *);
-int netdev_unregister_provider(const char *type);
 void netdev_enumerate_types(struct svec *types);
 
 /* Open and close. */
diff --git a/lib/vlog-modules.def b/lib/vlog-modules.def
index 7d614b412..e4f037f7f 100644
--- a/lib/vlog-modules.def
+++ b/lib/vlog-modules.def
@@ -41,8 +41,6 @@ VLOG_MODULE(lockfile)
 VLOG_MODULE(mac_learning)
 VLOG_MODULE(netdev)
 VLOG_MODULE(netdev_linux)
-VLOG_MODULE(netdev_patch)
-VLOG_MODULE(netdev_tunnel)
 VLOG_MODULE(netdev_vport)
 VLOG_MODULE(netflow)
 VLOG_MODULE(netlink)