struct netdev_tunnel {
struct netdev up;
+
+ /* Protects all members below. */
+ struct ovs_mutex mutex;
+
uint8_t hwaddr[ETH_ADDR_LEN];
struct netdev_stats stats;
enum netdev_flags flags;
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
-static struct shash tunnel_netdevs = SHASH_INITIALIZER(&tunnel_netdevs);
+static struct ovs_mutex tunnel_netdevs_mutex = OVS_MUTEX_INITIALIZER;
+static struct shash tunnel_netdevs OVS_GUARDED_BY(tunnel_netdevs_mutex)
+ = SHASH_INITIALIZER(&tunnel_netdevs);
static int netdev_tunnel_construct(struct netdev *netdevp_);
static void netdev_tunnel_update_seq(struct netdev_tunnel *);
static int
netdev_tunnel_construct(struct netdev *netdev_)
{
- static unsigned int n = 0;
+ static atomic_uint next_n = ATOMIC_VAR_INIT(0);
struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+ unsigned int n;
+ atomic_add(&next_n, 1, &n);
+
+ ovs_mutex_init(&netdev->mutex);
netdev->hwaddr[0] = 0xfe;
netdev->hwaddr[1] = 0xff;
netdev->hwaddr[2] = 0xff;
netdev->connected = false;
- netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0, &netdev->local_addr, 0);
+ netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0,
+ (struct sockaddr_storage *)&netdev->local_addr, 0);
if (netdev->sockfd < 0) {
return netdev->sockfd;
}
{
struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+ ovs_mutex_lock(&tunnel_netdevs_mutex);
+
if (netdev->sockfd != -1)
close(netdev->sockfd);
shash_find_and_delete(&tunnel_netdevs,
netdev_get_name(netdev_));
+
+ ovs_mutex_destroy(&netdev->mutex);
+ ovs_mutex_unlock(&tunnel_netdevs_mutex);
}
static void
{
struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
+ ovs_mutex_lock(&netdev->mutex);
if (netdev->valid_remote_ip)
smap_add_format(args, "remote_ip", IP_FMT,
IP_ARGS(netdev->remote_addr.sin_addr.s_addr));
if (netdev->valid_remote_port)
smap_add_format(args, "remote_port", "%"PRIu16,
ntohs(netdev->remote_addr.sin_port));
+ ovs_mutex_unlock(&netdev->mutex);
return 0;
}
static int
netdev_tunnel_connect(struct netdev_tunnel *dev)
+ OVS_REQUIRES(dev->mutex)
{
char buf[1024];
if (dev->sockfd < 0)
{
struct netdev_tunnel *netdev = netdev_tunnel_cast(dev_);
struct shash_node *node;
+ int error;
+ ovs_mutex_lock(&netdev->mutex);
VLOG_DBG("tunnel_set_config(%s)", netdev_get_name(dev_));
SMAP_FOR_EACH(node, args) {
VLOG_DBG("arg: %s->%s", node->name, (char*)node->data);
netdev_get_name(dev_), node->name);
}
}
- return netdev_tunnel_connect(netdev);
+ error = netdev_tunnel_connect(netdev);
+ ovs_mutex_unlock(&netdev->mutex);
+ return error;
}
static struct netdev_rx *
{
struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
struct netdev *netdev_ = rx->up.netdev;
- struct netdev_tunnel *netdev =
- netdev_tunnel_cast(netdev_);
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+
+ ovs_mutex_lock(&netdev->mutex);
rx->fd = netdev->sockfd;
+ ovs_mutex_unlock(&netdev->mutex);
return 0;
}
}
static int
-netdev_tunnel_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_tunnel_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
{
+ size_t size = ofpbuf_tailroom(buffer);
struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
struct netdev_tunnel *netdev =
netdev_tunnel_cast(rx_->netdev);
if (!netdev->connected)
- return -EAGAIN;
+ return EAGAIN;
for (;;) {
ssize_t retval;
- retval = recv(rx->fd, buffer, size, MSG_TRUNC);
- VLOG_DBG("%s: recv(%"PRIxPTR", %zu, MSG_TRUNC) = %zd",
- netdev_rx_get_name(rx_), (uintptr_t)buffer, size, retval);
+ retval = recv(rx->fd, buffer->data, size, MSG_TRUNC);
+ VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIuSIZE", MSG_TRUNC) = %"PRIdSIZE,
+ netdev_rx_get_name(rx_), (uintptr_t)buffer->data, size, retval);
if (retval >= 0) {
- netdev->stats.rx_packets++;
- netdev->stats.rx_bytes += retval;
+ netdev->stats.rx_packets++;
+ netdev->stats.rx_bytes += retval;
if (retval <= size) {
- return retval;
+ buffer->size += retval;
+ return 0;
} else {
netdev->stats.rx_errors++;
netdev->stats.rx_length_errors++;
- return -EMSGSIZE;
+ return EMSGSIZE;
}
} else if (errno != EINTR) {
if (errno != EAGAIN) {
netdev_rx_get_name(rx_), ovs_strerror(errno));
netdev->stats.rx_errors++;
}
- return -errno;
+ return errno;
}
}
}
for (;;) {
ssize_t retval;
retval = send(dev->sockfd, buffer, size, 0);
- VLOG_DBG("%s: send(%"PRIxPTR", %zu) = %zd",
+ VLOG_DBG("%s: send(%"PRIxPTR", %"PRIuSIZE") = %"PRIdSIZE,
netdev_get_name(netdev_), (uintptr_t)buffer, size, retval);
if (retval >= 0) {
dev->stats.tx_packets++;
dev->stats.tx_bytes += retval;
if (retval != size) {
- VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of "
- "%zu) on %s", retval, size, netdev_get_name(netdev_));
+ VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIdSIZE" bytes of "
+ "%"PRIuSIZE") on %s", retval, size, netdev_get_name(netdev_));
dev->stats.tx_errors++;
}
return 0;
{
struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
+ ovs_mutex_lock(&dev->mutex);
if (!eth_addr_equals(dev->hwaddr, mac)) {
memcpy(dev->hwaddr, mac, ETH_ADDR_LEN);
netdev_tunnel_update_seq(dev);
}
+ ovs_mutex_unlock(&dev->mutex);
return 0;
}
{
const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
+ ovs_mutex_lock(&dev->mutex);
memcpy(mac, dev->hwaddr, ETH_ADDR_LEN);
+ ovs_mutex_unlock(&dev->mutex);
return 0;
}
{
const struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
+ ovs_mutex_lock(&dev->mutex);
*stats = dev->stats;
+ ovs_mutex_unlock(&dev->mutex);
return 0;
}
{
struct netdev_tunnel *dev = netdev_tunnel_cast(netdev);
+ ovs_mutex_lock(&dev->mutex);
dev->stats = *stats;
+ ovs_mutex_unlock(&dev->mutex);
return 0;
}
{
struct netdev_tunnel *netdev =
netdev_tunnel_cast(dev_);
+ int error = 0;
+ ovs_mutex_lock(&netdev->mutex);
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
- return EINVAL;
+ error = EINVAL;
+ goto out;
}
// XXX should we actually do something with these flags?
if (*old_flagsp != netdev->flags) {
netdev_tunnel_update_seq(netdev);
}
- return 0;
-}
-static unsigned int
-netdev_tunnel_change_seq(const struct netdev *netdev)
-{
- return netdev_tunnel_cast(netdev)->change_seq;
+out:
+ ovs_mutex_unlock(&netdev->mutex);
+ return error;
}
+
\f
/* Helper functions. */
static void
netdev_tunnel_update_seq(struct netdev_tunnel *dev)
+ OVS_REQUIRES(dev->mutex)
{
dev->change_seq++;
if (!dev->change_seq) {
struct netdev_tunnel *tunnel_dev;
char buf[6];
+ ovs_mutex_lock(&tunnel_netdevs_mutex);
tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
if (!tunnel_dev) {
unixctl_command_reply_error(conn, "no such tunnel netdev");
- return;
+ goto out;
}
+ ovs_mutex_lock(&tunnel_dev->mutex);
sprintf(buf, "%d", ntohs(tunnel_dev->local_addr.sin_port));
+ ovs_mutex_unlock(&tunnel_dev->mutex);
+
unixctl_command_reply(conn, buf);
+out:
+ ovs_mutex_unlock(&tunnel_netdevs_mutex);
}
static void
struct netdev_tunnel *tunnel_dev;
char buf[128];
+ ovs_mutex_lock(&tunnel_netdevs_mutex);
tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
if (!tunnel_dev) {
unixctl_command_reply_error(conn, "no such tunnel netdev");
- return;
+ goto out;
}
+ ovs_mutex_lock(&tunnel_dev->mutex);
sprintf(buf, "%"PRIu64, tunnel_dev->stats.tx_bytes);
+ ovs_mutex_unlock(&tunnel_dev->mutex);
unixctl_command_reply(conn, buf);
+out:
+ ovs_mutex_unlock(&tunnel_netdevs_mutex);
}
static void
struct netdev_tunnel *tunnel_dev;
char buf[128];
+ ovs_mutex_lock(&tunnel_netdevs_mutex);
tunnel_dev = shash_find_data(&tunnel_netdevs, argv[1]);
if (!tunnel_dev) {
unixctl_command_reply_error(conn, "no such tunnel netdev");
- return;
+ goto out;
}
sprintf(buf, "%"PRIu64, tunnel_dev->stats.rx_bytes);
unixctl_command_reply(conn, buf);
+out:
+ ovs_mutex_unlock(&tunnel_netdevs_mutex);
}
return 0;
}
+static void
+netdev_tunnel_run(void)
+{
+}
+
+static void
+netdev_tunnel_wait(void)
+{
+}
+
const struct netdev_class netdev_tunnel_class = {
"tunnel",
- netdev_tunnel_init, /* init */
- NULL, /* run */
- NULL, /* wait */
+ netdev_tunnel_init,
+ netdev_tunnel_run,
+ netdev_tunnel_wait,
netdev_tunnel_alloc,
netdev_tunnel_construct,
NULL, /* set_queue */
NULL, /* delete_queue */
NULL, /* get_queue_stats */
- NULL, /* dump_queues */
+ NULL, /* queue_dump_start */
+ NULL, /* queue_dump_next */
+ NULL, /* queue_dump_done */
NULL, /* dump_queue_stats */
NULL, /* get_in4 */
NULL, /* get_in6 */
NULL, /* add_router */
NULL, /* get_next_hop */
- NULL, /* get_drv_info */
+ NULL, /* get_status */
NULL, /* arp_lookup */
netdev_tunnel_update_flags,
- netdev_tunnel_change_seq,
-
netdev_tunnel_rx_alloc,
netdev_tunnel_rx_construct,
netdev_tunnel_rx_destruct,
git://git.onelab.eu / sliver-openvswitch.git / blobdiff