2010-05-17 15:04:10 -07:00
|
|
|
|
/*
|
2012-05-02 15:21:36 -07:00
|
|
|
|
* Copyright (c) 2010, 2011, 2012 Nicira, Inc.
|
2010-05-17 15:04:10 -07:00
|
|
|
|
*
|
|
|
|
|
* 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
|
|
|
|
|
*
|
2010-09-24 10:55:57 -07:00
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
2010-05-17 15:04:10 -07:00
|
|
|
|
* 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>
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
|
|
|
|
#include "netdev-vport.h"
|
|
|
|
|
|
2010-05-17 15:04:10 -07:00
|
|
|
|
#include <errno.h>
|
|
|
|
|
#include <fcntl.h>
|
2010-12-21 16:26:21 -08:00
|
|
|
|
#include <sys/socket.h>
|
2011-10-05 10:50:58 -07:00
|
|
|
|
#include <linux/openvswitch.h>
|
2010-12-21 16:26:21 -08:00
|
|
|
|
#include <linux/rtnetlink.h>
|
2010-10-06 15:35:53 -07:00
|
|
|
|
#include <net/if.h>
|
2010-05-17 15:04:10 -07:00
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
|
|
2010-12-10 10:42:42 -08:00
|
|
|
|
#include "byte-order.h"
|
2011-03-11 15:18:30 -08:00
|
|
|
|
#include "daemon.h"
|
|
|
|
|
#include "dirs.h"
|
2011-01-26 12:28:59 -08:00
|
|
|
|
#include "dpif-linux.h"
|
2010-12-21 16:26:21 -08:00
|
|
|
|
#include "hash.h"
|
|
|
|
|
#include "hmap.h"
|
2010-05-17 15:04:10 -07:00
|
|
|
|
#include "list.h"
|
2011-04-28 11:13:53 -07:00
|
|
|
|
#include "netdev-linux.h"
|
2010-10-06 15:35:53 -07:00
|
|
|
|
#include "netdev-provider.h"
|
2010-12-21 16:26:21 -08:00
|
|
|
|
#include "netlink.h"
|
2011-08-25 14:06:54 -07:00
|
|
|
|
#include "netlink-notifier.h"
|
2010-12-21 16:26:21 -08:00
|
|
|
|
#include "netlink-socket.h"
|
|
|
|
|
#include "ofpbuf.h"
|
2010-10-06 15:35:53 -07:00
|
|
|
|
#include "openvswitch/tunnel.h"
|
|
|
|
|
#include "packets.h"
|
2011-01-12 14:55:18 -08:00
|
|
|
|
#include "route-table.h"
|
2010-05-17 15:04:10 -07:00
|
|
|
|
#include "shash.h"
|
|
|
|
|
#include "socket-util.h"
|
2011-10-11 12:24:41 -07:00
|
|
|
|
#include "unaligned.h"
|
2010-05-17 15:04:10 -07:00
|
|
|
|
#include "vlog.h"
|
|
|
|
|
|
2010-10-19 14:47:01 -07:00
|
|
|
|
VLOG_DEFINE_THIS_MODULE(netdev_vport);
|
2010-07-16 11:02:49 -07:00
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
struct netdev_dev_vport {
|
|
|
|
|
struct netdev_dev netdev_dev;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct ofpbuf *options;
|
2011-04-01 10:17:52 -07:00
|
|
|
|
int dp_ifindex; /* -1 if unknown. */
|
|
|
|
|
uint32_t port_no; /* UINT32_MAX if unknown. */
|
2011-05-26 14:28:11 -07:00
|
|
|
|
unsigned int change_seq;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct netdev_vport {
|
|
|
|
|
struct netdev netdev;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct vport_class {
|
2011-08-18 10:35:40 -07:00
|
|
|
|
enum ovs_vport_type type;
|
2010-12-03 14:41:38 -08:00
|
|
|
|
struct netdev_class netdev_class;
|
2010-12-29 16:02:22 -08:00
|
|
|
|
int (*parse_config)(const char *name, const char *type,
|
2012-05-22 03:47:36 -07:00
|
|
|
|
const struct smap *args, struct ofpbuf *options);
|
2010-12-29 16:02:22 -08:00
|
|
|
|
int (*unparse_config)(const char *name, const char *type,
|
2011-01-26 12:28:59 -08:00
|
|
|
|
const struct nlattr *options, size_t options_len,
|
2012-05-22 03:47:36 -07:00
|
|
|
|
struct smap *args);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
};
|
|
|
|
|
|
2010-05-17 15:04:10 -07:00
|
|
|
|
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int netdev_vport_create(const struct netdev_class *, const char *,
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
struct netdev_dev **);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static void netdev_vport_poll_notify(const struct netdev *);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
static int tnl_port_config_from_nlattr(const struct nlattr *options,
|
|
|
|
|
size_t options_len,
|
2011-08-18 10:35:40 -07:00
|
|
|
|
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1]);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
2011-01-05 11:51:15 -08:00
|
|
|
|
static const char *netdev_vport_get_tnl_iface(const struct netdev *netdev);
|
2010-12-21 16:26:21 -08:00
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static bool
|
|
|
|
|
is_vport_class(const struct netdev_class *class)
|
2010-05-17 15:04:10 -07:00
|
|
|
|
{
|
2010-10-06 15:35:53 -07:00
|
|
|
|
return class->create == netdev_vport_create;
|
|
|
|
|
}
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
/* If 'netdev' is a vport netdev, returns an ofpbuf that contains Netlink
|
2011-08-18 10:35:40 -07:00
|
|
|
|
* options to include in OVS_VPORT_ATTR_OPTIONS for configuring that vport.
|
2011-01-26 12:28:59 -08:00
|
|
|
|
* Otherwise returns NULL. */
|
|
|
|
|
const struct ofpbuf *
|
|
|
|
|
netdev_vport_get_options(const struct netdev *netdev)
|
|
|
|
|
{
|
|
|
|
|
const struct netdev_dev *dev = netdev_get_dev(netdev);
|
|
|
|
|
|
|
|
|
|
return (is_vport_class(netdev_dev_get_class(dev))
|
|
|
|
|
? netdev_dev_vport_cast(dev)->options
|
|
|
|
|
: NULL);
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
enum ovs_vport_type
|
2011-01-26 12:28:59 -08:00
|
|
|
|
netdev_vport_get_vport_type(const struct netdev *netdev)
|
2010-10-06 15:35:53 -07:00
|
|
|
|
{
|
2010-12-03 14:41:38 -08:00
|
|
|
|
const struct netdev_dev *dev = netdev_get_dev(netdev);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
const struct netdev_class *class = netdev_dev_get_class(dev);
|
|
|
|
|
|
|
|
|
|
return (is_vport_class(class) ? vport_class_cast(class)->type
|
2011-08-18 10:35:40 -07:00
|
|
|
|
: class == &netdev_internal_class ? OVS_VPORT_TYPE_INTERNAL
|
2011-10-31 10:54:30 -07:00
|
|
|
|
: (class == &netdev_linux_class ||
|
|
|
|
|
class == &netdev_tap_class) ? OVS_VPORT_TYPE_NETDEV
|
2011-08-18 10:35:40 -07:00
|
|
|
|
: OVS_VPORT_TYPE_UNSPEC);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
netdev_vport_get_netdev_type(const struct dpif_linux_vport *vport)
|
|
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
|
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
|
switch (vport->type) {
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case OVS_VPORT_TYPE_UNSPEC:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
break;
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case OVS_VPORT_TYPE_NETDEV:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return "system";
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case OVS_VPORT_TYPE_INTERNAL:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return "internal";
|
2010-12-03 14:41:38 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case OVS_VPORT_TYPE_PATCH:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return "patch";
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case OVS_VPORT_TYPE_GRE:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (tnl_port_config_from_nlattr(vport->options, vport->options_len,
|
|
|
|
|
a)) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2011-08-18 10:35:40 -07:00
|
|
|
|
return (nl_attr_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]) & TNL_F_IPSEC
|
2011-01-26 12:28:59 -08:00
|
|
|
|
? "ipsec_gre" : "gre");
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case OVS_VPORT_TYPE_CAPWAP:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return "capwap";
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
case __OVS_VPORT_TYPE_MAX:
|
2011-01-26 12:28:59 -08:00
|
|
|
|
break;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
|
VLOG_WARN_RL(&rl, "dp%d: port `%s' has unsupported type %u",
|
2011-01-21 17:01:56 -08:00
|
|
|
|
vport->dp_ifindex, vport->name, (unsigned int) vport->type);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return "unknown";
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2010-12-03 14:41:38 -08:00
|
|
|
|
netdev_vport_create(const struct netdev_class *netdev_class, const char *name,
|
|
|
|
|
struct netdev_dev **netdev_devp)
|
2010-10-06 15:35:53 -07:00
|
|
|
|
{
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
struct netdev_dev_vport *dev;
|
2010-12-29 16:02:22 -08:00
|
|
|
|
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
dev = xmalloc(sizeof *dev);
|
|
|
|
|
netdev_dev_init(&dev->netdev_dev, name, netdev_class);
|
|
|
|
|
dev->options = NULL;
|
|
|
|
|
dev->dp_ifindex = -1;
|
|
|
|
|
dev->port_no = UINT32_MAX;
|
|
|
|
|
dev->change_seq = 1;
|
2010-12-29 16:02:22 -08:00
|
|
|
|
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
*netdev_devp = &dev->netdev_dev;
|
|
|
|
|
route_table_register();
|
2010-12-29 16:02:22 -08:00
|
|
|
|
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
return 0;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static void
|
|
|
|
|
netdev_vport_destroy(struct netdev_dev *netdev_dev_)
|
|
|
|
|
{
|
|
|
|
|
struct netdev_dev_vport *netdev_dev = netdev_dev_vport_cast(netdev_dev_);
|
|
|
|
|
|
2012-04-23 13:22:10 -07:00
|
|
|
|
ofpbuf_delete(netdev_dev->options);
|
2011-01-12 14:55:18 -08:00
|
|
|
|
route_table_unregister();
|
2010-10-06 15:35:53 -07:00
|
|
|
|
free(netdev_dev);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
2011-08-05 14:15:32 -07:00
|
|
|
|
netdev_vport_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
|
2010-10-06 15:35:53 -07:00
|
|
|
|
{
|
|
|
|
|
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);
|
|
|
|
|
}
|
|
|
|
|
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
static int
|
2012-05-22 03:47:36 -07:00
|
|
|
|
netdev_vport_get_config(struct netdev_dev *dev_, struct smap *args)
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
{
|
|
|
|
|
const struct netdev_class *netdev_class = netdev_dev_get_class(dev_);
|
|
|
|
|
const struct vport_class *vport_class = vport_class_cast(netdev_class);
|
|
|
|
|
struct netdev_dev_vport *dev = netdev_dev_vport_cast(dev_);
|
|
|
|
|
const char *name = netdev_dev_get_name(dev_);
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
if (!dev->options) {
|
|
|
|
|
struct dpif_linux_vport reply;
|
|
|
|
|
struct ofpbuf *buf;
|
|
|
|
|
|
|
|
|
|
error = dpif_linux_vport_get(name, &reply, &buf);
|
|
|
|
|
if (error) {
|
|
|
|
|
VLOG_ERR_RL(&rl, "%s: vport query failed (%s)",
|
|
|
|
|
name, strerror(error));
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
dev->options = ofpbuf_clone_data(reply.options, reply.options_len);
|
|
|
|
|
dev->dp_ifindex = reply.dp_ifindex;
|
|
|
|
|
dev->port_no = reply.port_no;
|
|
|
|
|
ofpbuf_delete(buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
error = vport_class->unparse_config(name, netdev_class->type,
|
|
|
|
|
dev->options->data,
|
|
|
|
|
dev->options->size,
|
|
|
|
|
args);
|
|
|
|
|
if (error) {
|
|
|
|
|
VLOG_ERR_RL(&rl, "%s: failed to parse kernel config (%s)",
|
|
|
|
|
name, strerror(error));
|
|
|
|
|
}
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2012-05-22 03:47:36 -07:00
|
|
|
|
netdev_vport_set_config(struct netdev_dev *dev_, const struct smap *args)
|
2010-10-06 15:35:53 -07:00
|
|
|
|
{
|
2010-12-03 14:41:38 -08:00
|
|
|
|
const struct netdev_class *netdev_class = netdev_dev_get_class(dev_);
|
|
|
|
|
const struct vport_class *vport_class = vport_class_cast(netdev_class);
|
|
|
|
|
struct netdev_dev_vport *dev = netdev_dev_vport_cast(dev_);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
const char *name = netdev_dev_get_name(dev_);
|
|
|
|
|
struct ofpbuf *options;
|
2010-12-03 14:41:38 -08:00
|
|
|
|
int error;
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
options = ofpbuf_new(64);
|
|
|
|
|
error = vport_class->parse_config(name, netdev_dev_get_type(dev_),
|
|
|
|
|
args, options);
|
|
|
|
|
if (!error
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
&& (!dev->options
|
|
|
|
|
|| options->size != dev->options->size
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|| memcmp(options->data, dev->options->data, options->size))) {
|
|
|
|
|
struct dpif_linux_vport vport;
|
|
|
|
|
|
|
|
|
|
dpif_linux_vport_init(&vport);
|
2011-08-18 10:35:40 -07:00
|
|
|
|
vport.cmd = OVS_VPORT_CMD_SET;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
vport.name = name;
|
|
|
|
|
vport.options = options->data;
|
|
|
|
|
vport.options_len = options->size;
|
|
|
|
|
error = dpif_linux_vport_transact(&vport, NULL, NULL);
|
2010-12-03 14:41:38 -08:00
|
|
|
|
if (!error || error == ENODEV) {
|
|
|
|
|
/* Either reconfiguration succeeded or this vport is not installed
|
|
|
|
|
* in the kernel (e.g. it hasn't been added to a dpif yet with
|
|
|
|
|
* dpif_port_add()). */
|
2011-01-26 12:28:59 -08:00
|
|
|
|
ofpbuf_delete(dev->options);
|
|
|
|
|
dev->options = options;
|
|
|
|
|
options = NULL;
|
|
|
|
|
error = 0;
|
2010-12-03 14:41:38 -08:00
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
ofpbuf_delete(options);
|
|
|
|
|
|
2010-12-03 14:41:38 -08:00
|
|
|
|
return error;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-04-01 10:17:52 -07:00
|
|
|
|
static int
|
|
|
|
|
netdev_vport_send(struct netdev *netdev, const void *data, size_t size)
|
|
|
|
|
{
|
|
|
|
|
struct netdev_dev *dev_ = netdev_get_dev(netdev);
|
|
|
|
|
struct netdev_dev_vport *dev = netdev_dev_vport_cast(dev_);
|
|
|
|
|
|
|
|
|
|
if (dev->dp_ifindex == -1) {
|
|
|
|
|
const char *name = netdev_get_name(netdev);
|
|
|
|
|
struct dpif_linux_vport reply;
|
|
|
|
|
struct ofpbuf *buf;
|
|
|
|
|
int error;
|
|
|
|
|
|
|
|
|
|
error = dpif_linux_vport_get(name, &reply, &buf);
|
|
|
|
|
if (error) {
|
|
|
|
|
VLOG_ERR_RL(&rl, "%s: failed to query vport for send (%s)",
|
|
|
|
|
name, strerror(error));
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
dev->dp_ifindex = reply.dp_ifindex;
|
|
|
|
|
dev->port_no = reply.port_no;
|
|
|
|
|
ofpbuf_delete(buf);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dpif_linux_vport_send(dev->dp_ifindex, dev->port_no, data, size);
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2010-05-17 15:04:10 -07:00
|
|
|
|
netdev_vport_set_etheraddr(struct netdev *netdev,
|
|
|
|
|
const uint8_t mac[ETH_ADDR_LEN])
|
|
|
|
|
{
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct dpif_linux_vport vport;
|
|
|
|
|
int error;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
dpif_linux_vport_init(&vport);
|
2011-08-18 10:35:40 -07:00
|
|
|
|
vport.cmd = OVS_VPORT_CMD_SET;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
vport.name = netdev_get_name(netdev);
|
|
|
|
|
vport.address = mac;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
error = dpif_linux_vport_transact(&vport, NULL, NULL);
|
|
|
|
|
if (!error) {
|
|
|
|
|
netdev_vport_poll_notify(netdev);
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return error;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2010-05-17 15:04:10 -07:00
|
|
|
|
netdev_vport_get_etheraddr(const struct netdev *netdev,
|
|
|
|
|
uint8_t mac[ETH_ADDR_LEN])
|
|
|
|
|
{
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct dpif_linux_vport reply;
|
|
|
|
|
struct ofpbuf *buf;
|
|
|
|
|
int error;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
error = dpif_linux_vport_get(netdev_get_name(netdev), &reply, &buf);
|
|
|
|
|
if (!error) {
|
|
|
|
|
if (reply.address) {
|
|
|
|
|
memcpy(mac, reply.address, ETH_ADDR_LEN);
|
|
|
|
|
} else {
|
|
|
|
|
error = EOPNOTSUPP;
|
|
|
|
|
}
|
|
|
|
|
ofpbuf_delete(buf);
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return error;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-10-11 12:24:41 -07:00
|
|
|
|
/* Copies 'src' into 'dst', performing format conversion in the process.
|
|
|
|
|
*
|
|
|
|
|
* 'src' is allowed to be misaligned. */
|
2011-09-15 19:36:17 -07:00
|
|
|
|
static void
|
|
|
|
|
netdev_stats_from_ovs_vport_stats(struct netdev_stats *dst,
|
|
|
|
|
const struct ovs_vport_stats *src)
|
|
|
|
|
{
|
2011-10-11 12:24:41 -07:00
|
|
|
|
dst->rx_packets = get_unaligned_u64(&src->rx_packets);
|
|
|
|
|
dst->tx_packets = get_unaligned_u64(&src->tx_packets);
|
|
|
|
|
dst->rx_bytes = get_unaligned_u64(&src->rx_bytes);
|
|
|
|
|
dst->tx_bytes = get_unaligned_u64(&src->tx_bytes);
|
|
|
|
|
dst->rx_errors = get_unaligned_u64(&src->rx_errors);
|
|
|
|
|
dst->tx_errors = get_unaligned_u64(&src->tx_errors);
|
|
|
|
|
dst->rx_dropped = get_unaligned_u64(&src->rx_dropped);
|
|
|
|
|
dst->tx_dropped = get_unaligned_u64(&src->tx_dropped);
|
2011-09-15 19:36:17 -07:00
|
|
|
|
dst->multicast = 0;
|
|
|
|
|
dst->collisions = 0;
|
|
|
|
|
dst->rx_length_errors = 0;
|
|
|
|
|
dst->rx_over_errors = 0;
|
|
|
|
|
dst->rx_crc_errors = 0;
|
|
|
|
|
dst->rx_frame_errors = 0;
|
|
|
|
|
dst->rx_fifo_errors = 0;
|
|
|
|
|
dst->rx_missed_errors = 0;
|
|
|
|
|
dst->tx_aborted_errors = 0;
|
|
|
|
|
dst->tx_carrier_errors = 0;
|
|
|
|
|
dst->tx_fifo_errors = 0;
|
|
|
|
|
dst->tx_heartbeat_errors = 0;
|
|
|
|
|
dst->tx_window_errors = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Copies 'src' into 'dst', performing format conversion in the process. */
|
|
|
|
|
static void
|
|
|
|
|
netdev_stats_to_ovs_vport_stats(struct ovs_vport_stats *dst,
|
|
|
|
|
const struct netdev_stats *src)
|
|
|
|
|
{
|
2011-10-11 12:24:41 -07:00
|
|
|
|
dst->rx_packets = src->rx_packets;
|
|
|
|
|
dst->tx_packets = src->tx_packets;
|
|
|
|
|
dst->rx_bytes = src->rx_bytes;
|
|
|
|
|
dst->tx_bytes = src->tx_bytes;
|
|
|
|
|
dst->rx_errors = src->rx_errors;
|
|
|
|
|
dst->tx_errors = src->tx_errors;
|
|
|
|
|
dst->rx_dropped = src->rx_dropped;
|
|
|
|
|
dst->tx_dropped = src->tx_dropped;
|
2011-09-15 19:36:17 -07:00
|
|
|
|
}
|
|
|
|
|
|
2010-05-17 15:04:10 -07:00
|
|
|
|
int
|
|
|
|
|
netdev_vport_get_stats(const struct netdev *netdev, struct netdev_stats *stats)
|
|
|
|
|
{
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct dpif_linux_vport reply;
|
|
|
|
|
struct ofpbuf *buf;
|
|
|
|
|
int error;
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
error = dpif_linux_vport_get(netdev_get_name(netdev), &reply, &buf);
|
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
} else if (!reply.stats) {
|
|
|
|
|
ofpbuf_delete(buf);
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-15 19:36:17 -07:00
|
|
|
|
netdev_stats_from_ovs_vport_stats(stats, reply.stats);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
|
ofpbuf_delete(buf);
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-06-09 12:54:34 -07:00
|
|
|
|
int
|
|
|
|
|
netdev_vport_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
|
|
|
|
|
{
|
2011-09-15 19:36:17 -07:00
|
|
|
|
struct ovs_vport_stats rtnl_stats;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct dpif_linux_vport vport;
|
2010-06-09 12:54:34 -07:00
|
|
|
|
int err;
|
|
|
|
|
|
2011-09-15 19:36:17 -07:00
|
|
|
|
netdev_stats_to_ovs_vport_stats(&rtnl_stats, stats);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
|
dpif_linux_vport_init(&vport);
|
2011-08-18 10:35:40 -07:00
|
|
|
|
vport.cmd = OVS_VPORT_CMD_SET;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
vport.name = netdev_get_name(netdev);
|
|
|
|
|
vport.stats = &rtnl_stats;
|
|
|
|
|
|
|
|
|
|
err = dpif_linux_vport_transact(&vport, NULL, NULL);
|
2010-06-09 12:54:34 -07:00
|
|
|
|
|
|
|
|
|
/* If the vport layer doesn't know about the device, that doesn't mean it
|
|
|
|
|
* doesn't exist (after all were able to open it when netdev_open() was
|
|
|
|
|
* called), it just means that it isn't attached and we'll be getting
|
|
|
|
|
* stats a different way. */
|
|
|
|
|
if (err == ENODEV) {
|
|
|
|
|
err = EOPNOTSUPP;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-05 11:51:15 -08:00
|
|
|
|
static int
|
2012-05-22 03:47:36 -07:00
|
|
|
|
netdev_vport_get_drv_info(const struct netdev *netdev, struct smap *smap)
|
2011-01-05 11:51:15 -08:00
|
|
|
|
{
|
|
|
|
|
const char *iface = netdev_vport_get_tnl_iface(netdev);
|
|
|
|
|
|
|
|
|
|
if (iface) {
|
2011-01-19 14:50:01 -08:00
|
|
|
|
struct netdev *egress_netdev;
|
|
|
|
|
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add(smap, "tunnel_egress_iface", iface);
|
2011-01-19 14:50:01 -08:00
|
|
|
|
|
2011-08-05 14:18:06 -07:00
|
|
|
|
if (!netdev_open(iface, "system", &egress_netdev)) {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add(smap, "tunnel_egress_iface_carrier",
|
|
|
|
|
netdev_get_carrier(egress_netdev) ? "up" : "down");
|
2011-01-19 14:50:01 -08:00
|
|
|
|
netdev_close(egress_netdev);
|
|
|
|
|
}
|
2011-01-05 11:51:15 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2010-05-17 15:04:10 -07:00
|
|
|
|
netdev_vport_update_flags(struct netdev *netdev OVS_UNUSED,
|
|
|
|
|
enum netdev_flags off, enum netdev_flags on OVS_UNUSED,
|
|
|
|
|
enum netdev_flags *old_flagsp)
|
|
|
|
|
{
|
|
|
|
|
if (off & (NETDEV_UP | NETDEV_PROMISC)) {
|
|
|
|
|
return EOPNOTSUPP;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*old_flagsp = NETDEV_UP | NETDEV_PROMISC;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-05-26 14:28:11 -07:00
|
|
|
|
static unsigned int
|
|
|
|
|
netdev_vport_change_seq(const struct netdev *netdev)
|
|
|
|
|
{
|
|
|
|
|
return netdev_dev_vport_cast(netdev_get_dev(netdev))->change_seq;
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-21 16:26:21 -08:00
|
|
|
|
static void
|
|
|
|
|
netdev_vport_run(void)
|
|
|
|
|
{
|
2011-01-12 14:55:18 -08:00
|
|
|
|
route_table_run();
|
2010-12-21 16:26:21 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
netdev_vport_wait(void)
|
|
|
|
|
{
|
2011-01-12 14:55:18 -08:00
|
|
|
|
route_table_wait();
|
2010-12-21 16:26:21 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* get_tnl_iface() implementation. */
|
|
|
|
|
static const char *
|
|
|
|
|
netdev_vport_get_tnl_iface(const struct netdev *netdev)
|
|
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
|
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
|
2011-05-06 11:27:05 -07:00
|
|
|
|
ovs_be32 route;
|
2010-12-21 16:26:21 -08:00
|
|
|
|
struct netdev_dev_vport *ndv;
|
2011-01-30 17:52:19 -08:00
|
|
|
|
static char name[IFNAMSIZ];
|
2010-12-21 16:26:21 -08:00
|
|
|
|
|
|
|
|
|
ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (tnl_port_config_from_nlattr(ndv->options->data, ndv->options->size,
|
|
|
|
|
a)) {
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2011-08-18 10:35:40 -07:00
|
|
|
|
route = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
|
2010-12-21 16:26:21 -08:00
|
|
|
|
|
2011-01-30 17:52:19 -08:00
|
|
|
|
if (route_table_get_name(route, name)) {
|
|
|
|
|
return name;
|
2010-12-21 16:26:21 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
|
|
|
|
/* Helper functions. */
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static void
|
2010-05-17 15:04:10 -07:00
|
|
|
|
netdev_vport_poll_notify(const struct netdev *netdev)
|
|
|
|
|
{
|
2011-05-26 14:28:11 -07:00
|
|
|
|
struct netdev_dev_vport *ndv;
|
|
|
|
|
|
|
|
|
|
ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
|
2010-05-17 15:04:10 -07:00
|
|
|
|
|
2011-05-26 14:28:11 -07:00
|
|
|
|
ndv->change_seq++;
|
|
|
|
|
if (!ndv->change_seq) {
|
|
|
|
|
ndv->change_seq++;
|
|
|
|
|
}
|
2010-05-17 15:04:10 -07:00
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
|
|
|
|
/* Code specific to individual vport types. */
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
static void
|
2012-05-22 03:47:36 -07:00
|
|
|
|
set_key(const struct smap *args, const char *name, uint16_t type,
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct ofpbuf *options)
|
|
|
|
|
{
|
|
|
|
|
const char *s;
|
|
|
|
|
|
2012-05-22 03:47:36 -07:00
|
|
|
|
s = smap_get(args, name);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (!s) {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
s = smap_get(args, "key");
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (!s) {
|
|
|
|
|
s = "0";
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!strcmp(s, "flow")) {
|
|
|
|
|
/* This is the default if no attribute is present. */
|
|
|
|
|
} else {
|
|
|
|
|
nl_msg_put_be64(options, type, htonll(strtoull(s, NULL, 0)));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2010-12-29 16:02:22 -08:00
|
|
|
|
parse_tunnel_config(const char *name, const char *type,
|
2012-05-22 03:47:36 -07:00
|
|
|
|
const struct smap *args, struct ofpbuf *options)
|
2010-10-06 15:35:53 -07:00
|
|
|
|
{
|
2010-12-01 17:23:33 -08:00
|
|
|
|
bool is_gre = false;
|
|
|
|
|
bool is_ipsec = false;
|
2012-05-22 03:47:36 -07:00
|
|
|
|
struct smap_node *node;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
bool ipsec_mech_set = false;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
ovs_be32 daddr = htonl(0);
|
2011-10-24 12:27:36 -07:00
|
|
|
|
ovs_be32 saddr = htonl(0);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
uint32_t flags;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
2011-04-29 17:05:58 -07:00
|
|
|
|
flags = TNL_F_DF_DEFAULT | TNL_F_PMTUD | TNL_F_HDR_CACHE;
|
2010-12-01 17:23:33 -08:00
|
|
|
|
if (!strcmp(type, "gre")) {
|
|
|
|
|
is_gre = true;
|
|
|
|
|
} else if (!strcmp(type, "ipsec_gre")) {
|
|
|
|
|
is_gre = true;
|
|
|
|
|
is_ipsec = true;
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags |= TNL_F_IPSEC;
|
|
|
|
|
flags &= ~TNL_F_HDR_CACHE;
|
2010-12-01 17:23:33 -08:00
|
|
|
|
}
|
|
|
|
|
|
2012-05-22 03:47:36 -07:00
|
|
|
|
SMAP_FOR_EACH (node, args) {
|
|
|
|
|
if (!strcmp(node->key, "remote_ip")) {
|
2010-10-06 15:35:53 -07:00
|
|
|
|
struct in_addr in_addr;
|
2012-05-22 03:47:36 -07:00
|
|
|
|
if (lookup_ip(node->value, &in_addr)) {
|
2010-12-03 14:41:38 -08:00
|
|
|
|
VLOG_WARN("%s: bad %s 'remote_ip'", name, type);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
} else {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
daddr = in_addr.s_addr;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "local_ip")) {
|
2010-10-06 15:35:53 -07:00
|
|
|
|
struct in_addr in_addr;
|
2012-05-22 03:47:36 -07:00
|
|
|
|
if (lookup_ip(node->value, &in_addr)) {
|
2010-12-03 14:41:38 -08:00
|
|
|
|
VLOG_WARN("%s: bad %s 'local_ip'", name, type);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
} else {
|
2011-10-24 12:27:36 -07:00
|
|
|
|
saddr = in_addr.s_addr;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "tos")) {
|
|
|
|
|
if (!strcmp(node->value, "inherit")) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags |= TNL_F_TOS_INHERIT;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
} else {
|
2012-05-21 12:18:19 -07:00
|
|
|
|
char *endptr;
|
|
|
|
|
int tos;
|
2012-05-22 03:47:36 -07:00
|
|
|
|
tos = strtol(node->value, &endptr, 0);
|
2012-07-20 10:24:50 -07:00
|
|
|
|
if (*endptr == '\0' && tos == (tos & IP_DSCP_MASK)) {
|
2012-05-21 12:18:19 -07:00
|
|
|
|
nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TOS, tos);
|
2012-07-20 10:24:50 -07:00
|
|
|
|
} else {
|
|
|
|
|
VLOG_WARN("%s: invalid TOS %s", name, node->value);
|
2012-05-21 12:18:19 -07:00
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "ttl")) {
|
|
|
|
|
if (!strcmp(node->value, "inherit")) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags |= TNL_F_TTL_INHERIT;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
} else {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
nl_msg_put_u8(options, OVS_TUNNEL_ATTR_TTL, atoi(node->value));
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "csum") && is_gre) {
|
|
|
|
|
if (!strcmp(node->value, "true")) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags |= TNL_F_CSUM;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "df_inherit")) {
|
|
|
|
|
if (!strcmp(node->value, "true")) {
|
2011-04-29 17:05:58 -07:00
|
|
|
|
flags |= TNL_F_DF_INHERIT;
|
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "df_default")) {
|
|
|
|
|
if (!strcmp(node->value, "false")) {
|
2011-04-29 17:05:58 -07:00
|
|
|
|
flags &= ~TNL_F_DF_DEFAULT;
|
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "pmtud")) {
|
|
|
|
|
if (!strcmp(node->value, "false")) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags &= ~TNL_F_PMTUD;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "header_cache")) {
|
|
|
|
|
if (!strcmp(node->value, "false")) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags &= ~TNL_F_HDR_CACHE;
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "peer_cert") && is_ipsec) {
|
|
|
|
|
if (smap_get(args, "certificate")) {
|
2010-12-15 23:44:41 -08:00
|
|
|
|
ipsec_mech_set = true;
|
|
|
|
|
} else {
|
2010-12-27 17:44:33 -08:00
|
|
|
|
const char *use_ssl_cert;
|
|
|
|
|
|
|
|
|
|
/* If the "use_ssl_cert" is true, then "certificate" and
|
|
|
|
|
* "private_key" will be pulled from the SSL table. The
|
|
|
|
|
* use of this option is strongly discouraged, since it
|
|
|
|
|
* will like be removed when multiple SSL configurations
|
|
|
|
|
* are supported by OVS.
|
|
|
|
|
*/
|
2012-05-22 03:47:36 -07:00
|
|
|
|
use_ssl_cert = smap_get(args, "use_ssl_cert");
|
2010-12-27 17:44:33 -08:00
|
|
|
|
if (!use_ssl_cert || strcmp(use_ssl_cert, "true")) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: 'peer_cert' requires 'certificate' argument",
|
|
|
|
|
name);
|
2010-12-27 17:44:33 -08:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
ipsec_mech_set = true;
|
2010-12-15 23:44:41 -08:00
|
|
|
|
}
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "psk") && is_ipsec) {
|
2010-10-06 15:35:53 -07:00
|
|
|
|
ipsec_mech_set = true;
|
2010-12-21 16:26:21 -08:00
|
|
|
|
} else if (is_ipsec
|
2012-05-22 03:47:36 -07:00
|
|
|
|
&& (!strcmp(node->key, "certificate")
|
|
|
|
|
|| !strcmp(node->key, "private_key")
|
|
|
|
|
|| !strcmp(node->key, "use_ssl_cert"))) {
|
2010-12-15 23:44:41 -08:00
|
|
|
|
/* Ignore options not used by the netdev. */
|
2012-05-22 03:47:36 -07:00
|
|
|
|
} else if (!strcmp(node->key, "key") ||
|
|
|
|
|
!strcmp(node->key, "in_key") ||
|
|
|
|
|
!strcmp(node->key, "out_key")) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
/* Handled separately below. */
|
2010-10-06 15:35:53 -07:00
|
|
|
|
} else {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
VLOG_WARN("%s: unknown %s argument '%s'", name, type, node->key);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2010-12-15 23:44:41 -08:00
|
|
|
|
if (is_ipsec) {
|
2012-07-02 18:30:21 -07:00
|
|
|
|
static pid_t pid = 0;
|
2012-07-08 13:04:27 -07:00
|
|
|
|
if (pid <= 0) {
|
2012-07-02 18:30:21 -07:00
|
|
|
|
char *file_name = xasprintf("%s/%s", ovs_rundir(),
|
|
|
|
|
"ovs-monitor-ipsec.pid");
|
|
|
|
|
pid = read_pidfile(file_name);
|
|
|
|
|
free(file_name);
|
|
|
|
|
}
|
|
|
|
|
|
2011-03-14 13:15:25 -07:00
|
|
|
|
if (pid < 0) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",
|
|
|
|
|
name);
|
2011-03-14 13:15:25 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
2011-03-11 15:18:30 -08:00
|
|
|
|
|
2012-05-22 03:47:36 -07:00
|
|
|
|
if (smap_get(args, "peer_cert") && smap_get(args, "psk")) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: cannot define both 'peer_cert' and 'psk'", name);
|
2010-12-15 23:44:41 -08:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!ipsec_mech_set) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: IPsec requires an 'peer_cert' or psk' argument",
|
|
|
|
|
name);
|
2010-12-15 23:44:41 -08:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|
|
|
|
|
|
2011-08-24 15:12:06 +09:00
|
|
|
|
set_key(args, "in_key", OVS_TUNNEL_ATTR_IN_KEY, options);
|
|
|
|
|
set_key(args, "out_key", OVS_TUNNEL_ATTR_OUT_KEY, options);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
|
if (!daddr) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: %s type requires valid 'remote_ip' argument",
|
|
|
|
|
name, type);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
2011-08-18 10:35:40 -07:00
|
|
|
|
nl_msg_put_be32(options, OVS_TUNNEL_ATTR_DST_IPV4, daddr);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
2011-10-24 12:27:36 -07:00
|
|
|
|
if (saddr) {
|
|
|
|
|
if (ip_is_multicast(daddr)) {
|
|
|
|
|
VLOG_WARN("%s: remote_ip is multicast, ignoring local_ip", name);
|
|
|
|
|
} else {
|
|
|
|
|
nl_msg_put_be32(options, OVS_TUNNEL_ATTR_SRC_IPV4, saddr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
nl_msg_put_u32(options, OVS_TUNNEL_ATTR_FLAGS, flags);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
static int
|
|
|
|
|
tnl_port_config_from_nlattr(const struct nlattr *options, size_t options_len,
|
2011-08-18 10:35:40 -07:00
|
|
|
|
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1])
|
|
|
|
|
{
|
|
|
|
|
static const struct nl_policy ovs_tunnel_policy[] = {
|
|
|
|
|
[OVS_TUNNEL_ATTR_FLAGS] = { .type = NL_A_U32 },
|
|
|
|
|
[OVS_TUNNEL_ATTR_DST_IPV4] = { .type = NL_A_BE32 },
|
|
|
|
|
[OVS_TUNNEL_ATTR_SRC_IPV4] = { .type = NL_A_BE32, .optional = true },
|
|
|
|
|
[OVS_TUNNEL_ATTR_IN_KEY] = { .type = NL_A_BE64, .optional = true },
|
|
|
|
|
[OVS_TUNNEL_ATTR_OUT_KEY] = { .type = NL_A_BE64, .optional = true },
|
|
|
|
|
[OVS_TUNNEL_ATTR_TOS] = { .type = NL_A_U8, .optional = true },
|
|
|
|
|
[OVS_TUNNEL_ATTR_TTL] = { .type = NL_A_U8, .optional = true },
|
2011-01-26 12:28:59 -08:00
|
|
|
|
};
|
|
|
|
|
struct ofpbuf buf;
|
|
|
|
|
|
|
|
|
|
ofpbuf_use_const(&buf, options, options_len);
|
2011-08-18 10:35:40 -07:00
|
|
|
|
if (!nl_policy_parse(&buf, 0, ovs_tunnel_policy,
|
|
|
|
|
a, ARRAY_SIZE(ovs_tunnel_policy))) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static uint64_t
|
|
|
|
|
get_be64_or_zero(const struct nlattr *a)
|
|
|
|
|
{
|
|
|
|
|
return a ? ntohll(nl_attr_get_be64(a)) : 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-10-06 15:35:53 -07:00
|
|
|
|
static int
|
2010-12-29 16:02:22 -08:00
|
|
|
|
unparse_tunnel_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
|
2011-01-26 12:28:59 -08:00
|
|
|
|
const struct nlattr *options, size_t options_len,
|
2012-05-22 03:47:36 -07:00
|
|
|
|
struct smap *args)
|
2010-12-29 16:02:22 -08:00
|
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
|
struct nlattr *a[OVS_TUNNEL_ATTR_MAX + 1];
|
2011-01-26 12:28:59 -08:00
|
|
|
|
ovs_be32 daddr;
|
|
|
|
|
uint32_t flags;
|
|
|
|
|
int error;
|
2010-12-29 16:02:22 -08:00
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
error = tnl_port_config_from_nlattr(options, options_len, a);
|
|
|
|
|
if (error) {
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
flags = nl_attr_get_u32(a[OVS_TUNNEL_ATTR_FLAGS]);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (!(flags & TNL_F_HDR_CACHE) == !(flags & TNL_F_IPSEC)) {
|
2010-12-29 16:02:22 -08:00
|
|
|
|
smap_add(args, "header_cache",
|
2011-01-26 12:28:59 -08:00
|
|
|
|
flags & TNL_F_HDR_CACHE ? "true" : "false");
|
2010-12-29 16:02:22 -08:00
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
daddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_DST_IPV4]);
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add_format(args, "remote_ip", IP_FMT, IP_ARGS(&daddr));
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
if (a[OVS_TUNNEL_ATTR_SRC_IPV4]) {
|
|
|
|
|
ovs_be32 saddr = nl_attr_get_be32(a[OVS_TUNNEL_ATTR_SRC_IPV4]);
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add_format(args, "local_ip", IP_FMT, IP_ARGS(&saddr));
|
2010-12-29 16:02:22 -08:00
|
|
|
|
}
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
if (!a[OVS_TUNNEL_ATTR_IN_KEY] && !a[OVS_TUNNEL_ATTR_OUT_KEY]) {
|
2010-12-29 16:02:22 -08:00
|
|
|
|
smap_add(args, "key", "flow");
|
|
|
|
|
} else {
|
2011-08-18 10:35:40 -07:00
|
|
|
|
uint64_t in_key = get_be64_or_zero(a[OVS_TUNNEL_ATTR_IN_KEY]);
|
|
|
|
|
uint64_t out_key = get_be64_or_zero(a[OVS_TUNNEL_ATTR_OUT_KEY]);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
|
|
|
|
|
if (in_key && in_key == out_key) {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add_format(args, "key", "%"PRIu64, in_key);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
} else {
|
2011-08-18 10:35:40 -07:00
|
|
|
|
if (!a[OVS_TUNNEL_ATTR_IN_KEY]) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
smap_add(args, "in_key", "flow");
|
|
|
|
|
} else if (in_key) {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add_format(args, "in_key", "%"PRIu64, in_key);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
}
|
2010-12-29 16:02:22 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
if (!a[OVS_TUNNEL_ATTR_OUT_KEY]) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
smap_add(args, "out_key", "flow");
|
|
|
|
|
} else if (out_key) {
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add_format(args, "out_key", "%"PRIu64, out_key);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
}
|
2010-12-29 16:02:22 -08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (flags & TNL_F_TTL_INHERIT) {
|
2012-09-25 13:22:08 -07:00
|
|
|
|
smap_add(args, "ttl", "inherit");
|
2011-08-18 10:35:40 -07:00
|
|
|
|
} else if (a[OVS_TUNNEL_ATTR_TTL]) {
|
|
|
|
|
int ttl = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TTL]);
|
2012-09-25 13:22:08 -07:00
|
|
|
|
smap_add_format(args, "ttl", "%d", ttl);
|
2011-01-26 12:28:59 -08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (flags & TNL_F_TOS_INHERIT) {
|
2010-12-29 16:02:22 -08:00
|
|
|
|
smap_add(args, "tos", "inherit");
|
2011-08-18 10:35:40 -07:00
|
|
|
|
} else if (a[OVS_TUNNEL_ATTR_TOS]) {
|
|
|
|
|
int tos = nl_attr_get_u8(a[OVS_TUNNEL_ATTR_TOS]);
|
2012-05-22 03:47:36 -07:00
|
|
|
|
smap_add_format(args, "tos", "0x%x", tos);
|
2010-12-29 16:02:22 -08:00
|
|
|
|
}
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (flags & TNL_F_CSUM) {
|
2010-12-29 16:02:22 -08:00
|
|
|
|
smap_add(args, "csum", "true");
|
|
|
|
|
}
|
2011-04-29 17:05:58 -07:00
|
|
|
|
if (flags & TNL_F_DF_INHERIT) {
|
|
|
|
|
smap_add(args, "df_inherit", "true");
|
|
|
|
|
}
|
|
|
|
|
if (!(flags & TNL_F_DF_DEFAULT)) {
|
|
|
|
|
smap_add(args, "df_default", "false");
|
|
|
|
|
}
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (!(flags & TNL_F_PMTUD)) {
|
2010-12-29 16:02:22 -08:00
|
|
|
|
smap_add(args, "pmtud", "false");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
parse_patch_config(const char *name, const char *type OVS_UNUSED,
|
2012-05-22 03:47:36 -07:00
|
|
|
|
const struct smap *args, struct ofpbuf *options)
|
2010-10-06 15:35:53 -07:00
|
|
|
|
{
|
|
|
|
|
const char *peer;
|
|
|
|
|
|
2012-05-22 03:47:36 -07:00
|
|
|
|
peer = smap_get(args, "peer");
|
2010-10-06 15:35:53 -07:00
|
|
|
|
if (!peer) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: patch type requires valid 'peer' argument", name);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-05-22 03:47:36 -07:00
|
|
|
|
if (smap_count(args) > 1) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: patch type takes only a 'peer' argument", name);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-26 12:28:59 -08:00
|
|
|
|
if (strlen(peer) >= IFNAMSIZ) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: patch 'peer' arg too long", name);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!strcmp(name, peer)) {
|
2011-03-14 13:45:43 -07:00
|
|
|
|
VLOG_ERR("%s: patch peer must not be self", name);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
return EINVAL;
|
|
|
|
|
}
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
nl_msg_put_string(options, OVS_PATCH_ATTR_PEER, peer);
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
2010-12-29 16:02:22 -08:00
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
unparse_patch_config(const char *name OVS_UNUSED, const char *type OVS_UNUSED,
|
2011-01-26 12:28:59 -08:00
|
|
|
|
const struct nlattr *options, size_t options_len,
|
2012-05-22 03:47:36 -07:00
|
|
|
|
struct smap *args)
|
2010-12-29 16:02:22 -08:00
|
|
|
|
{
|
2011-08-18 10:35:40 -07:00
|
|
|
|
static const struct nl_policy ovs_patch_policy[] = {
|
|
|
|
|
[OVS_PATCH_ATTR_PEER] = { .type = NL_A_STRING,
|
2011-01-26 12:28:59 -08:00
|
|
|
|
.max_len = IFNAMSIZ,
|
|
|
|
|
.optional = false }
|
|
|
|
|
};
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
struct nlattr *a[ARRAY_SIZE(ovs_patch_policy)];
|
2011-01-26 12:28:59 -08:00
|
|
|
|
struct ofpbuf buf;
|
|
|
|
|
|
|
|
|
|
ofpbuf_use_const(&buf, options, options_len);
|
2011-08-18 10:35:40 -07:00
|
|
|
|
if (!nl_policy_parse(&buf, 0, ovs_patch_policy,
|
|
|
|
|
a, ARRAY_SIZE(ovs_patch_policy))) {
|
2011-01-26 12:28:59 -08:00
|
|
|
|
return EINVAL;
|
2010-12-29 16:02:22 -08:00
|
|
|
|
}
|
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
smap_add(args, "peer", nl_attr_get_string(a[OVS_PATCH_ATTR_PEER]));
|
2010-12-29 16:02:22 -08:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
2011-01-05 11:51:15 -08:00
|
|
|
|
#define VPORT_FUNCTIONS(GET_STATUS) \
|
2011-01-30 17:52:19 -08:00
|
|
|
|
NULL, \
|
2010-12-21 16:26:21 -08:00
|
|
|
|
netdev_vport_run, \
|
|
|
|
|
netdev_vport_wait, \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
\
|
|
|
|
|
netdev_vport_create, \
|
|
|
|
|
netdev_vport_destroy, \
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
netdev_vport_get_config, \
|
2010-12-29 16:02:22 -08:00
|
|
|
|
netdev_vport_set_config, \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
\
|
|
|
|
|
netdev_vport_open, \
|
|
|
|
|
netdev_vport_close, \
|
|
|
|
|
\
|
2011-08-05 14:15:32 -07:00
|
|
|
|
NULL, /* listen */ \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
NULL, /* recv */ \
|
|
|
|
|
NULL, /* recv_wait */ \
|
|
|
|
|
NULL, /* drain */ \
|
|
|
|
|
\
|
2011-04-01 10:17:52 -07:00
|
|
|
|
netdev_vport_send, /* send */ \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
NULL, /* send_wait */ \
|
|
|
|
|
\
|
|
|
|
|
netdev_vport_set_etheraddr, \
|
|
|
|
|
netdev_vport_get_etheraddr, \
|
2011-09-15 10:41:15 -07:00
|
|
|
|
NULL, /* get_mtu */ \
|
|
|
|
|
NULL, /* set_mtu */ \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
NULL, /* get_ifindex */ \
|
2010-10-27 15:29:16 -07:00
|
|
|
|
NULL, /* get_carrier */ \
|
2011-10-14 12:49:57 -07:00
|
|
|
|
NULL, /* get_carrier_resets */ \
|
2011-01-07 16:22:34 -08:00
|
|
|
|
NULL, /* get_miimon */ \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
netdev_vport_get_stats, \
|
|
|
|
|
netdev_vport_set_stats, \
|
|
|
|
|
\
|
|
|
|
|
NULL, /* get_features */ \
|
|
|
|
|
NULL, /* set_advertisements */ \
|
|
|
|
|
\
|
|
|
|
|
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 */ \
|
2011-01-05 11:51:15 -08:00
|
|
|
|
GET_STATUS, \
|
2010-10-06 15:35:53 -07:00
|
|
|
|
NULL, /* arp_lookup */ \
|
|
|
|
|
\
|
|
|
|
|
netdev_vport_update_flags, \
|
|
|
|
|
\
|
2011-05-26 14:28:11 -07:00
|
|
|
|
netdev_vport_change_seq
|
2010-10-06 15:35:53 -07:00
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
netdev_vport_register(void)
|
|
|
|
|
{
|
2010-12-03 14:41:38 -08:00
|
|
|
|
static const struct vport_class vport_classes[] = {
|
2011-08-18 10:35:40 -07:00
|
|
|
|
{ OVS_VPORT_TYPE_GRE,
|
2012-03-22 10:58:32 -07:00
|
|
|
|
{ "gre", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
parse_tunnel_config, unparse_tunnel_config },
|
2011-01-23 20:01:30 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
{ OVS_VPORT_TYPE_GRE,
|
2012-03-22 10:58:32 -07:00
|
|
|
|
{ "ipsec_gre", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
parse_tunnel_config, unparse_tunnel_config },
|
2011-01-23 20:01:30 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
{ OVS_VPORT_TYPE_CAPWAP,
|
2012-03-22 10:58:32 -07:00
|
|
|
|
{ "capwap", VPORT_FUNCTIONS(netdev_vport_get_drv_info) },
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
parse_tunnel_config, unparse_tunnel_config },
|
2011-01-23 20:01:30 -08:00
|
|
|
|
|
2011-08-18 10:35:40 -07:00
|
|
|
|
{ OVS_VPORT_TYPE_PATCH,
|
2011-01-23 20:01:30 -08:00
|
|
|
|
{ "patch", VPORT_FUNCTIONS(NULL) },
|
netdev: Decouple creating and configuring network devices.
Until now, each call to netdev_open() for a particular network device
had to either specify a set of network device arguments that was either
empty or (for devices that already existed) equal to the existing device's
configuration. Unfortunately, the definition of "equality" in the latter
case was mostly done in terms of strict equality of string-to-string maps,
which caused problems in cases where, for example, one set of arguments
specified the default value of an optional argument explicitly and the
other omitted it.
The netdev interface does have provisions for defining equality other ways,
but this had only been done in one case that was especially problematic in
practice. One way to solve this particular problem would be to carefully
define equality in all the problematic cases.
This commit takes another approach based on the realization that there is
really no need to do any comparisons. Instead, it removes configuration
at netdev_open() time entirely, because almost all of netdev_open()'s
callers are not interested in creating and configuring a netdev. Most of
them just want to open a configured device and use it. Therefore, this
commit stops providing any configuration arguments to netdev_open() and the
provider functions that it calls. Instead, a caller that does want to
configure a device does so after it opens it, by calling
netdev_set_config().
This change allows us to simplify the netdev interface a bit. There is no
longer any need to implement argument comparisons. As a result, there is
also no need for "struct netdev_dev" to keep track of configuration at all.
Instead, the network devices that have configuration keep track of it in
their own internal form.
This new interface does mean that it becomes possible to accidentally
create and try to use an unconfigured netdev that requires configuration.
Bug #6677.
Reported-by: Paul Ingram <paul@nicira.com>
2011-08-08 12:49:17 -07:00
|
|
|
|
parse_patch_config, unparse_patch_config }
|
2010-12-03 14:41:38 -08:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(vport_classes); i++) {
|
|
|
|
|
netdev_register_provider(&vport_classes[i].netdev_class);
|
|
|
|
|
}
|
2010-10-06 15:35:53 -07:00
|
|
|
|
}
|