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;
int fd;
};
-static const struct netdev_rx_class netdev_rx_tunnel_class;
-
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_create(const struct netdev_class *, const char *,
- struct netdev **);
+static int netdev_tunnel_construct(struct netdev *netdevp_);
static void netdev_tunnel_update_seq(struct netdev_tunnel *);
static bool
is_netdev_tunnel_class(const struct netdev_class *class)
{
- return class->create == netdev_tunnel_create;
+ return class->construct == netdev_tunnel_construct;
}
static struct netdev_tunnel *
static struct netdev_rx_tunnel *
netdev_rx_tunnel_cast(const struct netdev_rx *rx)
{
- netdev_rx_assert_class(rx, &netdev_rx_tunnel_class);
+ ovs_assert(is_netdev_tunnel_class(netdev_get_class(rx->netdev)));
return CONTAINER_OF(rx, struct netdev_rx_tunnel, up);
}
+static struct netdev *
+netdev_tunnel_alloc(void)
+{
+ struct netdev_tunnel *netdev = xzalloc(sizeof *netdev);
+ return &netdev->up;
+}
+
static int
-netdev_tunnel_create(const struct netdev_class *class, const char *name,
- struct netdev **netdevp)
+netdev_tunnel_construct(struct netdev *netdev_)
{
- static unsigned int n = 0;
- struct netdev_tunnel *netdev;
- int error;
+ 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);
- netdev = xzalloc(sizeof *netdev);
- netdev_init(&netdev->up, name, class);
+ ovs_mutex_init(&netdev->mutex);
netdev->hwaddr[0] = 0xfe;
netdev->hwaddr[1] = 0xff;
netdev->hwaddr[2] = 0xff;
netdev->sockfd = inet_open_passive(SOCK_DGRAM, "", 0, &netdev->local_addr, 0);
if (netdev->sockfd < 0) {
- error = netdev->sockfd;
- goto error;
+ return netdev->sockfd;
}
- shash_add(&tunnel_netdevs, name, netdev);
+ shash_add(&tunnel_netdevs, netdev_get_name(netdev_), netdev);
n++;
- *netdevp = &netdev->up;
-
- VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d", name, netdev->sockfd, netdev->local_addr.sin_port);
+ VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d",
+ netdev_get_name(netdev_), netdev->sockfd, netdev->local_addr.sin_port);
return 0;
-error:
- free(netdev);
- return error;
}
static void
-netdev_tunnel_destroy(struct netdev *netdev_)
+netdev_tunnel_destruct(struct netdev *netdev_)
{
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
+netdev_tunnel_dealloc(struct netdev *netdev_)
+{
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
free(netdev);
}
{
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 *
+netdev_tunnel_rx_alloc(void)
+{
+ struct netdev_rx_tunnel *rx = xzalloc(sizeof *rx);
+ return &rx->up;
}
static int
-netdev_tunnel_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
+netdev_tunnel_rx_construct(struct netdev_rx *rx_)
{
- struct netdev_tunnel *netdev =
- netdev_tunnel_cast(netdev_);
- struct netdev_rx_tunnel *rx;
- rx = xmalloc(sizeof *rx);
- netdev_rx_init(&rx->up, netdev_, &netdev_rx_tunnel_class);
+ struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
+ struct netdev *netdev_ = rx->up.netdev;
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+
+ ovs_mutex_lock(&netdev->mutex);
rx->fd = netdev->sockfd;
- *rxp = &rx->up;
+ ovs_mutex_unlock(&netdev->mutex);
return 0;
}
static void
-netdev_rx_tunnel_destroy(struct netdev_rx *rx_)
+netdev_tunnel_rx_destruct(struct netdev_rx *rx_ OVS_UNUSED)
+{
+}
+
+static void
+netdev_tunnel_rx_dealloc(struct netdev_rx *rx_)
{
struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
+
free(rx);
}
static int
-netdev_rx_tunnel_recv(struct netdev_rx *rx_, void *buffer, size_t size)
+netdev_tunnel_rx_recv(struct netdev_rx *rx_, void *buffer, size_t size)
{
struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_);
struct netdev_tunnel *netdev =
}
static void
-netdev_rx_tunnel_wait(struct netdev_rx *rx_)
+netdev_tunnel_rx_wait(struct netdev_rx *rx_)
{
struct netdev_rx_tunnel *rx =
netdev_rx_tunnel_cast(rx_);
}
static int
-netdev_rx_tunnel_drain(struct netdev_rx *rx_)
+netdev_tunnel_rx_drain(struct netdev_rx *rx_)
{
struct netdev_tunnel *netdev =
netdev_tunnel_cast(rx_->netdev);
{
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;
+
+out:
+ ovs_mutex_unlock(&netdev->mutex);
+ return error;
}
static unsigned int
-netdev_tunnel_change_seq(const struct netdev *netdev)
+netdev_tunnel_change_seq(const struct netdev *netdev_)
{
- return netdev_tunnel_cast(netdev)->change_seq;
+ struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_);
+ unsigned int change_seq;
+
+
+ ovs_mutex_lock(&netdev->mutex);
+ change_seq = netdev->change_seq;
+ ovs_mutex_unlock(&netdev->mutex);
+ return change_seq;
}
\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_create,
- netdev_tunnel_destroy,
+ netdev_tunnel_init,
+ netdev_tunnel_run,
+ netdev_tunnel_wait,
+
+ netdev_tunnel_alloc,
+ netdev_tunnel_construct,
+ netdev_tunnel_destruct,
+ netdev_tunnel_dealloc,
netdev_tunnel_get_config,
netdev_tunnel_set_config,
NULL, /* get_tunnel_config */
- netdev_tunnel_rx_open,
-
netdev_tunnel_send,
netdev_tunnel_send_wait,
netdev_tunnel_update_flags,
- netdev_tunnel_change_seq
-};
-
+ netdev_tunnel_change_seq,
-static const struct netdev_rx_class netdev_rx_tunnel_class = {
- netdev_rx_tunnel_destroy,
- netdev_rx_tunnel_recv,
- netdev_rx_tunnel_wait,
- netdev_rx_tunnel_drain,
+ netdev_tunnel_rx_alloc,
+ netdev_tunnel_rx_construct,
+ netdev_tunnel_rx_destruct,
+ netdev_tunnel_rx_dealloc,
+ netdev_tunnel_rx_recv,
+ netdev_tunnel_rx_wait,
+ netdev_tunnel_rx_drain,
};
-
git://git.onelab.eu / sliver-openvswitch.git / blobdiff