#include <sys/ioctl.h>
#include "byte-order.h"
+#include "daemon.h"
+#include "dirs.h"
#include "dpif-linux.h"
#include "hash.h"
#include "hmap.h"
#include "list.h"
+#include "netdev-linux.h"
#include "netdev-provider.h"
#include "netlink.h"
#include "netlink-socket.h"
VLOG_DEFINE_THIS_MODULE(netdev_vport);
-struct netdev_vport_notifier {
- struct netdev_notifier notifier;
- struct list list_node;
- struct shash_node *shash_node;
-};
-
struct netdev_dev_vport {
struct netdev_dev netdev_dev;
struct ofpbuf *options;
+ int dp_ifindex; /* -1 if unknown. */
+ uint32_t port_no; /* UINT32_MAX if unknown. */
+ unsigned int change_seq;
};
struct netdev_vport {
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);
static int netdev_vport_create(const struct netdev_class *, const char *,
const struct vport_class *vport_class = vport_class_cast(netdev_class);
struct ofpbuf *options = NULL;
struct shash fetched_args;
+ int dp_ifindex;
+ uint32_t port_no;
int error;
shash_init(&fetched_args);
+ dp_ifindex = -1;
+ port_no = UINT32_MAX;
if (!shash_is_empty(args)) {
/* Parse the provided configuration. */
options = ofpbuf_new(64);
name, strerror(error));
} else {
options = ofpbuf_clone_data(reply.options, reply.options_len);
+ dp_ifindex = reply.dp_ifindex;
+ port_no = reply.port_no;
}
ofpbuf_delete(buf);
} else {
shash_is_empty(&fetched_args) ? args : &fetched_args,
netdev_class);
dev->options = options;
+ dev->dp_ifindex = dp_ifindex;
+ dev->port_no = port_no;
+ dev->change_seq = 1;
*netdev_devp = &dev->netdev_dev;
route_table_register();
return error;
}
+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);
+}
+
static int
netdev_vport_set_etheraddr(struct netdev *netdev,
const uint8_t mac[ETH_ADDR_LEN])
return EOPNOTSUPP;
}
- stats->rx_packets = reply.stats->rx_packets;
- stats->tx_packets = reply.stats->tx_packets;
- stats->rx_bytes = reply.stats->rx_bytes;
- stats->tx_bytes = reply.stats->tx_bytes;
- stats->rx_errors = reply.stats->rx_errors;
- stats->tx_errors = reply.stats->tx_errors;
- stats->rx_dropped = reply.stats->rx_dropped;
- stats->tx_dropped = reply.stats->tx_dropped;
- stats->multicast = reply.stats->multicast;
- stats->collisions = reply.stats->collisions;
- stats->rx_length_errors = reply.stats->rx_length_errors;
- stats->rx_over_errors = reply.stats->rx_over_errors;
- stats->rx_crc_errors = reply.stats->rx_crc_errors;
- stats->rx_frame_errors = reply.stats->rx_frame_errors;
- stats->rx_fifo_errors = reply.stats->rx_fifo_errors;
- stats->rx_missed_errors = reply.stats->rx_missed_errors;
- stats->tx_aborted_errors = reply.stats->tx_aborted_errors;
- stats->tx_carrier_errors = reply.stats->tx_carrier_errors;
- stats->tx_fifo_errors = reply.stats->tx_fifo_errors;
- stats->tx_heartbeat_errors = reply.stats->tx_heartbeat_errors;
- stats->tx_window_errors = reply.stats->tx_window_errors;
+ netdev_stats_from_rtnl_link_stats64(stats, reply.stats);
ofpbuf_delete(buf);
struct dpif_linux_vport vport;
int err;
- rtnl_stats.rx_packets = stats->rx_packets;
- rtnl_stats.tx_packets = stats->tx_packets;
- rtnl_stats.rx_bytes = stats->rx_bytes;
- rtnl_stats.tx_bytes = stats->tx_bytes;
- rtnl_stats.rx_errors = stats->rx_errors;
- rtnl_stats.tx_errors = stats->tx_errors;
- rtnl_stats.rx_dropped = stats->rx_dropped;
- rtnl_stats.tx_dropped = stats->tx_dropped;
- rtnl_stats.multicast = stats->multicast;
- rtnl_stats.collisions = stats->collisions;
- rtnl_stats.rx_length_errors = stats->rx_length_errors;
- rtnl_stats.rx_over_errors = stats->rx_over_errors;
- rtnl_stats.rx_crc_errors = stats->rx_crc_errors;
- rtnl_stats.rx_frame_errors = stats->rx_frame_errors;
- rtnl_stats.rx_fifo_errors = stats->rx_fifo_errors;
- rtnl_stats.rx_missed_errors = stats->rx_missed_errors;
- rtnl_stats.tx_aborted_errors = stats->tx_aborted_errors;
- rtnl_stats.tx_carrier_errors = stats->tx_carrier_errors;
- rtnl_stats.tx_fifo_errors = stats->tx_fifo_errors;
- rtnl_stats.tx_heartbeat_errors = stats->tx_heartbeat_errors;
- rtnl_stats.tx_window_errors = stats->tx_window_errors;
+ netdev_stats_to_rtnl_link_stats64(&rtnl_stats, stats);
dpif_linux_vport_init(&vport);
vport.cmd = ODP_VPORT_CMD_SET;
return 0;
}
-static char *
-make_poll_name(const struct netdev *netdev)
-{
- return xasprintf("%s:%s", netdev_get_type(netdev), netdev_get_name(netdev));
-}
-
-static int
-netdev_vport_poll_add(struct netdev *netdev,
- void (*cb)(struct netdev_notifier *), void *aux,
- struct netdev_notifier **notifierp)
-{
- char *poll_name = make_poll_name(netdev);
- struct netdev_vport_notifier *notifier;
- struct list *list;
- struct shash_node *shash_node;
-
- shash_node = shash_find_data(&netdev_vport_notifiers, poll_name);
- if (!shash_node) {
- list = xmalloc(sizeof *list);
- list_init(list);
- shash_node = shash_add(&netdev_vport_notifiers, poll_name, list);
- } else {
- list = shash_node->data;
- }
-
- notifier = xmalloc(sizeof *notifier);
- netdev_notifier_init(¬ifier->notifier, netdev, cb, aux);
- list_push_back(list, ¬ifier->list_node);
- notifier->shash_node = shash_node;
-
- *notifierp = ¬ifier->notifier;
- free(poll_name);
-
- return 0;
-}
-
-static void
-netdev_vport_poll_remove(struct netdev_notifier *notifier_)
+static unsigned int
+netdev_vport_change_seq(const struct netdev *netdev)
{
- struct netdev_vport_notifier *notifier =
- CONTAINER_OF(notifier_, struct netdev_vport_notifier, notifier);
-
- struct list *list;
-
- list = list_remove(¬ifier->list_node);
- if (list_is_empty(list)) {
- shash_delete(&netdev_vport_notifiers, notifier->shash_node);
- free(list);
- }
-
- free(notifier);
+ return netdev_dev_vport_cast(netdev_get_dev(netdev))->change_seq;
}
static void
netdev_vport_get_tnl_iface(const struct netdev *netdev)
{
struct nlattr *a[ODP_TUNNEL_ATTR_MAX + 1];
- uint32_t route;
+ ovs_be32 route;
struct netdev_dev_vport *ndv;
static char name[IFNAMSIZ];
static void
netdev_vport_poll_notify(const struct netdev *netdev)
{
- char *poll_name = make_poll_name(netdev);
- struct list *list = shash_find_data(&netdev_vport_notifiers,
- poll_name);
+ struct netdev_dev_vport *ndv;
- if (list) {
- struct netdev_vport_notifier *notifier;
+ ndv = netdev_dev_vport_cast(netdev_get_dev(netdev));
- LIST_FOR_EACH (notifier, list_node, list) {
- struct netdev_notifier *n = ¬ifier->notifier;
- n->cb(n);
- }
+ ndv->change_seq++;
+ if (!ndv->change_seq) {
+ ndv->change_seq++;
}
-
- free(poll_name);
}
\f
/* Code specific to individual vport types. */
ovs_be32 daddr = htonl(0);
uint32_t flags;
- flags = TNL_F_PMTUD | TNL_F_HDR_CACHE;
+ flags = TNL_F_DF_DEFAULT | TNL_F_PMTUD | TNL_F_HDR_CACHE;
if (!strcmp(type, "gre")) {
is_gre = true;
} else if (!strcmp(type, "ipsec_gre")) {
if (!strcmp(node->data, "true")) {
flags |= TNL_F_CSUM;
}
+ } else if (!strcmp(node->name, "df_inherit")) {
+ if (!strcmp(node->data, "true")) {
+ flags |= TNL_F_DF_INHERIT;
+ }
+ } else if (!strcmp(node->name, "df_default")) {
+ if (!strcmp(node->data, "false")) {
+ flags &= ~TNL_F_DF_DEFAULT;
+ }
} else if (!strcmp(node->name, "pmtud")) {
if (!strcmp(node->data, "false")) {
flags &= ~TNL_F_PMTUD;
*/
use_ssl_cert = shash_find_data(args, "use_ssl_cert");
if (!use_ssl_cert || strcmp(use_ssl_cert, "true")) {
- VLOG_WARN("%s: 'peer_cert' requires 'certificate' argument",
- name);
+ VLOG_ERR("%s: 'peer_cert' requires 'certificate' argument",
+ name);
return EINVAL;
}
ipsec_mech_set = true;
|| !strcmp(node->name, "private_key")
|| !strcmp(node->name, "use_ssl_cert"))) {
/* Ignore options not used by the netdev. */
- } else if (is_gre && (!strcmp(node->name, "key") &&
- !strcmp(node->name, "in_key") &&
+ } else if (is_gre && (!strcmp(node->name, "key") ||
+ !strcmp(node->name, "in_key") ||
!strcmp(node->name, "out_key"))) {
/* Handled separately below. */
} else {
}
if (is_ipsec) {
+ char *file_name = xasprintf("%s/%s", ovs_rundir(),
+ "ovs-monitor-ipsec.pid");
+ pid_t pid = read_pidfile(file_name);
+ free(file_name);
+ if (pid < 0) {
+ VLOG_ERR("%s: IPsec requires the ovs-monitor-ipsec daemon",
+ name);
+ return EINVAL;
+ }
+
if (shash_find(args, "peer_cert") && shash_find(args, "psk")) {
- VLOG_WARN("%s: cannot define both 'peer_cert' and 'psk'", name);
+ VLOG_ERR("%s: cannot define both 'peer_cert' and 'psk'", name);
return EINVAL;
}
if (!ipsec_mech_set) {
- VLOG_WARN("%s: IPsec requires an 'peer_cert' or psk' argument",
- name);
+ VLOG_ERR("%s: IPsec requires an 'peer_cert' or psk' argument",
+ name);
return EINVAL;
}
}
}
if (!daddr) {
- VLOG_WARN("%s: %s type requires valid 'remote_ip' argument",
- name, type);
+ VLOG_ERR("%s: %s type requires valid 'remote_ip' argument",
+ name, type);
return EINVAL;
}
nl_msg_put_be32(options, ODP_TUNNEL_ATTR_DST_IPV4, daddr);
if (flags & TNL_F_CSUM) {
smap_add(args, "csum", "true");
}
+ if (flags & TNL_F_DF_INHERIT) {
+ smap_add(args, "df_inherit", "true");
+ }
+ if (!(flags & TNL_F_DF_DEFAULT)) {
+ smap_add(args, "df_default", "false");
+ }
if (!(flags & TNL_F_PMTUD)) {
smap_add(args, "pmtud", "false");
}
peer = shash_find_data(args, "peer");
if (!peer) {
- VLOG_WARN("%s: patch type requires valid 'peer' argument", name);
+ VLOG_ERR("%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);
+ VLOG_ERR("%s: patch type takes only a 'peer' argument", name);
return EINVAL;
}
if (strlen(peer) >= IFNAMSIZ) {
- VLOG_WARN("%s: patch 'peer' arg too long", name);
+ VLOG_ERR("%s: patch 'peer' arg too long", name);
return EINVAL;
}
if (!strcmp(name, peer)) {
- VLOG_WARN("%s: patch peer must not be self", name);
+ VLOG_ERR("%s: patch peer must not be self", name);
return EINVAL;
}
NULL, /* recv_wait */ \
NULL, /* drain */ \
\
- NULL, /* send */ \
+ netdev_vport_send, /* send */ \
NULL, /* send_wait */ \
\
netdev_vport_set_etheraddr, \
\
netdev_vport_update_flags, \
\
- netdev_vport_poll_add, \
- netdev_vport_poll_remove,
+ netdev_vport_change_seq
void
netdev_vport_register(void)