[ovs-dev] [PATCH v3 2/5] dpif-netlink: break out code to add compat and non-compat vports
Thadeu Lima de Souza Cascardo
cascardo at redhat.com
Wed Jun 22 15:47:39 UTC 2016
The vport type for adding tunnels is now compatibility code and any new features
from tunnels must configure the tunnel as an interface using the tunnel metadata
support.
In order to be able to add those tunnels, we need to add code to create the
tunnels and add them as NETDEV vports. And when there is no support to create
them, we need to use the compatibility code and add them as tunnel vports.
When removing those tunnels, we need to remove the interfaces as well, and
detecting the right type might be important, at least to distinguish the tunnel
vports that we should remove and the interfaces that we shouldn't.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at redhat.com>
---
lib/dpif-netlink.c | 195 +++++++++++++++++++++++++++++++++++++++--------------
1 file changed, 144 insertions(+), 51 deletions(-)
diff --git a/lib/dpif-netlink.c b/lib/dpif-netlink.c
index 9bff3a8..b624118 100644
--- a/lib/dpif-netlink.c
+++ b/lib/dpif-netlink.c
@@ -780,10 +780,8 @@ get_vport_type(const struct dpif_netlink_vport *vport)
}
static enum ovs_vport_type
-netdev_to_ovs_vport_type(const struct netdev *netdev)
+netdev_to_ovs_vport_type(const char *type)
{
- const char *type = netdev_get_type(netdev);
-
if (!strcmp(type, "tap") || !strcmp(type, "system")) {
return OVS_VPORT_TYPE_NETDEV;
} else if (!strcmp(type, "internal")) {
@@ -804,19 +802,14 @@ netdev_to_ovs_vport_type(const struct netdev *netdev)
}
static int
-dpif_netlink_port_add__(struct dpif_netlink *dpif, struct netdev *netdev,
+dpif_netlink_port_add__(struct dpif_netlink *dpif, const char *name,
+ enum ovs_vport_type type,
+ struct ofpbuf *options,
odp_port_t *port_nop)
OVS_REQ_WRLOCK(dpif->upcall_lock)
{
- const struct netdev_tunnel_config *tnl_cfg;
- char namebuf[NETDEV_VPORT_NAME_BUFSIZE];
- const char *name = netdev_vport_get_dpif_port(netdev,
- namebuf, sizeof namebuf);
- const char *type = netdev_get_type(netdev);
struct dpif_netlink_vport request, reply;
struct ofpbuf *buf;
- uint64_t options_stub[64 / 8];
- struct ofpbuf options;
struct nl_sock **socksp = NULL;
uint32_t *upcall_pids;
int error = 0;
@@ -831,52 +824,19 @@ dpif_netlink_port_add__(struct dpif_netlink *dpif, struct netdev *netdev,
dpif_netlink_vport_init(&request);
request.cmd = OVS_VPORT_CMD_NEW;
request.dp_ifindex = dpif->dp_ifindex;
- request.type = netdev_to_ovs_vport_type(netdev);
- if (request.type == OVS_VPORT_TYPE_UNSPEC) {
- VLOG_WARN_RL(&error_rl, "%s: cannot create port `%s' because it has "
- "unsupported type `%s'",
- dpif_name(&dpif->dpif), name, type);
- vport_del_socksp(dpif, socksp);
- return EINVAL;
- }
+ request.type = type;
request.name = name;
- if (request.type == OVS_VPORT_TYPE_NETDEV) {
-#ifdef _WIN32
- /* XXX : Map appropiate Windows handle */
-#else
- netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false);
-#endif
- }
-
- tnl_cfg = netdev_get_tunnel_config(netdev);
- if (tnl_cfg && (tnl_cfg->dst_port != 0 || tnl_cfg->exts)) {
- ofpbuf_use_stack(&options, options_stub, sizeof options_stub);
- if (tnl_cfg->dst_port) {
- nl_msg_put_u16(&options, OVS_TUNNEL_ATTR_DST_PORT,
- ntohs(tnl_cfg->dst_port));
- }
- if (tnl_cfg->exts) {
- size_t ext_ofs;
- int i;
-
- ext_ofs = nl_msg_start_nested(&options, OVS_TUNNEL_ATTR_EXTENSION);
- for (i = 0; i < 32; i++) {
- if (tnl_cfg->exts & (1 << i)) {
- nl_msg_put_flag(&options, i);
- }
- }
- nl_msg_end_nested(&options, ext_ofs);
- }
- request.options = options.data;
- request.options_len = options.size;
- }
-
request.port_no = *port_nop;
upcall_pids = vport_socksp_to_pids(socksp, dpif->n_handlers);
request.n_upcall_pids = socksp ? dpif->n_handlers : 1;
request.upcall_pids = upcall_pids;
+ if (options) {
+ request.options = options->data;
+ request.options_len = options->size;
+ }
+
error = dpif_netlink_vport_transact(&request, &reply, &buf);
if (!error) {
*port_nop = reply.port_no;
@@ -916,6 +876,127 @@ exit:
}
static int
+dpif_netlink_port_add_compat(struct dpif_netlink *dpif, struct netdev *netdev,
+ odp_port_t *port_nop)
+ OVS_REQ_WRLOCK(dpif->upcall_lock)
+{
+ const struct netdev_tunnel_config *tnl_cfg;
+ char namebuf[NETDEV_VPORT_NAME_BUFSIZE];
+ const char *name = netdev_vport_get_dpif_port(netdev,
+ namebuf, sizeof namebuf);
+ const char *type = netdev_get_type(netdev);
+ uint64_t options_stub[64 / 8];
+ struct ofpbuf options;
+ enum ovs_vport_type ovs_type;
+
+ ovs_type = netdev_to_ovs_vport_type(netdev_get_type(netdev));
+ if (ovs_type == OVS_VPORT_TYPE_UNSPEC) {
+ VLOG_WARN_RL(&error_rl, "%s: cannot create port `%s' because it has "
+ "unsupported type `%s'",
+ dpif_name(&dpif->dpif), name, type);
+ return EINVAL;
+ }
+
+ if (ovs_type == OVS_VPORT_TYPE_NETDEV) {
+#ifdef _WIN32
+ /* XXX : Map appropiate Windows handle */
+#else
+ netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false);
+#endif
+ }
+
+ tnl_cfg = netdev_get_tunnel_config(netdev);
+ if (tnl_cfg && (tnl_cfg->dst_port != 0 || tnl_cfg->exts)) {
+ ofpbuf_use_stack(&options, options_stub, sizeof options_stub);
+ if (tnl_cfg->dst_port) {
+ nl_msg_put_u16(&options, OVS_TUNNEL_ATTR_DST_PORT,
+ ntohs(tnl_cfg->dst_port));
+ }
+ if (tnl_cfg->exts) {
+ size_t ext_ofs;
+ int i;
+
+ ext_ofs = nl_msg_start_nested(&options, OVS_TUNNEL_ATTR_EXTENSION);
+ for (i = 0; i < 32; i++) {
+ if (tnl_cfg->exts & (1 << i)) {
+ nl_msg_put_flag(&options, i);
+ }
+ }
+ nl_msg_end_nested(&options, ext_ofs);
+ }
+ return dpif_netlink_port_add__(dpif, name, ovs_type, &options, port_nop);
+ } else {
+ return dpif_netlink_port_add__(dpif, name, ovs_type, NULL, port_nop);
+ }
+
+}
+
+static int
+dpif_netlink_port_query__(const struct dpif_netlink *dpif, odp_port_t port_no,
+ const char *port_name, struct dpif_port *dpif_port);
+
+static int
+dpif_netlink_port_create(struct netdev *netdev)
+{
+ switch (netdev_to_ovs_vport_type(netdev_get_type(netdev))) {
+ case OVS_VPORT_TYPE_VXLAN:
+ case OVS_VPORT_TYPE_GRE:
+ case OVS_VPORT_TYPE_GENEVE:
+ case OVS_VPORT_TYPE_NETDEV:
+ case OVS_VPORT_TYPE_INTERNAL:
+ case OVS_VPORT_TYPE_LISP:
+ case OVS_VPORT_TYPE_STT:
+ case OVS_VPORT_TYPE_UNSPEC:
+ case __OVS_VPORT_TYPE_MAX:
+ default:
+ return EOPNOTSUPP;
+ }
+ return 0;
+}
+
+static int
+dpif_netlink_port_destroy(const char *name OVS_UNUSED, const char *type)
+{
+ switch (netdev_to_ovs_vport_type(type)) {
+ case OVS_VPORT_TYPE_VXLAN:
+ case OVS_VPORT_TYPE_GRE:
+ case OVS_VPORT_TYPE_GENEVE:
+ case OVS_VPORT_TYPE_NETDEV:
+ case OVS_VPORT_TYPE_INTERNAL:
+ case OVS_VPORT_TYPE_LISP:
+ case OVS_VPORT_TYPE_STT:
+ case OVS_VPORT_TYPE_UNSPEC:
+ case __OVS_VPORT_TYPE_MAX:
+ default:
+ return EOPNOTSUPP;
+ }
+ return 0;
+}
+
+static int
+dpif_netlink_port_create_and_add(struct dpif_netlink *dpif, struct netdev *netdev,
+ odp_port_t *port_nop)
+ OVS_REQ_WRLOCK(dpif->upcall_lock)
+{
+ int error;
+ char namebuf[NETDEV_VPORT_NAME_BUFSIZE];
+ const char *name = netdev_vport_get_dpif_port(netdev,
+ namebuf, sizeof namebuf);
+
+ error = dpif_netlink_port_create(netdev);
+ if (error) {
+ return error;
+ }
+
+ error = dpif_netlink_port_add__(dpif, name, OVS_VPORT_TYPE_NETDEV, NULL, port_nop);
+ if (error) {
+ VLOG_DBG("failed to add port, destroying: %d", error);
+ dpif_netlink_port_destroy(name, netdev_get_type(netdev));
+ }
+ return error;
+}
+
+static int
dpif_netlink_port_add(struct dpif *dpif_, struct netdev *netdev,
odp_port_t *port_nop)
{
@@ -923,7 +1004,10 @@ dpif_netlink_port_add(struct dpif *dpif_, struct netdev *netdev,
int error;
fat_rwlock_wrlock(&dpif->upcall_lock);
- error = dpif_netlink_port_add__(dpif, netdev, port_nop);
+ error = dpif_netlink_port_create_and_add(dpif, netdev, port_nop);
+ if (error == EOPNOTSUPP) {
+ error = dpif_netlink_port_add_compat(dpif, netdev, port_nop);
+ }
fat_rwlock_unlock(&dpif->upcall_lock);
return error;
@@ -935,6 +1019,12 @@ dpif_netlink_port_del__(struct dpif_netlink *dpif, odp_port_t port_no)
{
struct dpif_netlink_vport vport;
int error;
+ struct dpif_port dpif_port;
+
+ error = dpif_netlink_port_query__(dpif, port_no, NULL, &dpif_port);
+ if (error) {
+ return error;
+ }
dpif_netlink_vport_init(&vport);
vport.cmd = OVS_VPORT_CMD_DEL;
@@ -944,6 +1034,9 @@ dpif_netlink_port_del__(struct dpif_netlink *dpif, odp_port_t port_no)
vport_del_channels(dpif, port_no);
+ dpif_netlink_port_destroy(dpif_port.name, dpif_port.type);
+ dpif_port_destroy(&dpif_port);
+
return error;
}
--
2.7.4
More information about the dev
mailing list