VLOG_DEFINE_THIS_MODULE(netdev_pltap);
-struct netdev_dev_pltap {
- struct netdev_dev netdev_dev;
+/* Protects 'sync_list'. */
+static struct ovs_mutex sync_list_mutex = OVS_MUTEX_INITIALIZER;
+
+static struct list sync_list OVS_GUARDED_BY(sync_list_mutex)
+ = LIST_INITIALIZER(&sync_list);
+
+struct netdev_pltap {
+ struct netdev up;
+
+ /* In sync_list. */
+ struct list sync_list OVS_GUARDED_BY(sync_list_mutex);
+
+ /* Protects all members below. */
+ struct ovs_mutex mutex OVS_ACQ_AFTER(sync_list_mutex);
+
char *real_name;
struct netdev_stats stats;
enum netdev_flags new_flags;
bool valid_local_ip;
bool valid_local_netmask;
bool sync_flags_needed;
- struct list sync_list;
unsigned int change_seq;
};
-static struct list sync_list;
-struct netdev_pltap {
- struct netdev netdev;
+struct netdev_rx_pltap {
+ struct netdev_rx up;
+ int fd;
};
-static int af_inet_sock = -1;
-
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
-static struct shash pltap_netdev_devs = SHASH_INITIALIZER(&pltap_netdev_devs);
+/* Protects 'pltap_netdevs' */
+static struct ovs_mutex pltap_netdevs_mutex = OVS_MUTEX_INITIALIZER;
+static struct shash pltap_netdevs OVS_GUARDED_BY(pltap_netdevs_mutex)
+ = SHASH_INITIALIZER(&pltap_netdevs);
-static int netdev_pltap_create(const struct netdev_class *, const char *,
- struct netdev_dev **);
+static int netdev_pltap_construct(struct netdev *netdev_);
-static void netdev_pltap_update_seq(struct netdev_dev_pltap *);
-static int get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags);
+static void netdev_pltap_update_seq(struct netdev_pltap *)
+ OVS_REQUIRES(dev->mutex);
+static int get_flags(struct netdev_pltap *dev, enum netdev_flags *flags)
+ OVS_REQUIRES(dev->mutex);
static bool
-netdev_pltap_finalized(struct netdev_dev_pltap *dev)
+netdev_pltap_finalized(struct netdev_pltap *dev)
+ OVS_REQUIRES(dev->mutex)
{
return dev->valid_local_ip && dev->valid_local_netmask;
}
static bool
-is_pltap_class(const struct netdev_class *class)
+is_netdev_pltap_class(const struct netdev_class *class)
{
- return class->create == netdev_pltap_create;
+ return class->construct == netdev_pltap_construct;
}
-static struct netdev_dev_pltap *
-netdev_dev_pltap_cast(const struct netdev_dev *netdev_dev)
+static struct netdev_pltap *
+netdev_pltap_cast(const struct netdev *netdev)
{
- ovs_assert(is_pltap_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev_dev, struct netdev_dev_pltap, netdev_dev);
+ ovs_assert(is_netdev_pltap_class(netdev_get_class(netdev)));
+ return CONTAINER_OF(netdev, struct netdev_pltap, up);
}
-static struct netdev_pltap *
-netdev_pltap_cast(const struct netdev *netdev)
+static struct netdev_rx_pltap*
+netdev_rx_pltap_cast(const struct netdev_rx *rx)
{
- struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- ovs_assert(is_pltap_class(netdev_dev_get_class(netdev_dev)));
- return CONTAINER_OF(netdev, struct netdev_pltap, netdev);
+ ovs_assert(is_netdev_pltap_class(netdev_get_class(rx->netdev)));
+ return CONTAINER_OF(rx, struct netdev_rx_pltap, up);
}
-static void sync_needed(struct netdev_dev_pltap *dev)
+static void sync_needed(struct netdev_pltap *dev)
+ OVS_REQUIRES(dev->mutex, sync_list_mutex)
{
if (dev->sync_flags_needed)
return;
dev->sync_flags_needed = true;
list_insert(&sync_list, &dev->sync_list);
-
}
-static void sync_done(struct netdev_dev_pltap *dev)
+static void sync_done(struct netdev_pltap *dev)
+ OVS_REQUIRES(dev->mutex, sync_list_mutex)
{
if (!dev->sync_flags_needed)
return;
dev->sync_flags_needed = false;
}
+static struct netdev *
+netdev_pltap_alloc(void)
+{
+ struct netdev_pltap *netdev = xzalloc(sizeof *netdev);
+ return &netdev->up;
+}
+
static int
-netdev_pltap_create(const struct netdev_class *class OVS_UNUSED, const char *name,
- struct netdev_dev **netdev_devp)
+netdev_pltap_construct(struct netdev *netdev_)
{
- struct netdev_dev_pltap *netdev_dev;
+ struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
int error;
- netdev_dev = xzalloc(sizeof *netdev_dev);
-
- netdev_dev->real_name = xzalloc(IFNAMSIZ + 1);
- memset(&netdev_dev->local_addr, 0, sizeof(netdev_dev->local_addr));
- netdev_dev->valid_local_ip = false;
- netdev_dev->valid_local_netmask = false;
- netdev_dev->flags = 0;
- netdev_dev->sync_flags_needed = false;
- list_init(&netdev_dev->sync_list);
+ ovs_mutex_init(&netdev->mutex);
+ netdev->real_name = xzalloc(IFNAMSIZ + 1);
+ memset(&netdev->local_addr, 0, sizeof(netdev->local_addr));
+ netdev->valid_local_ip = false;
+ netdev->valid_local_netmask = false;
+ netdev->flags = 0;
+ netdev->sync_flags_needed = false;
+ netdev->change_seq = 1;
/* Open tap device. */
- netdev_dev->fd = tun_alloc(IFF_TAP, netdev_dev->real_name);
- if (netdev_dev->fd < 0) {
+ netdev->fd = tun_alloc(IFF_TAP, netdev->real_name);
+ if (netdev->fd < 0) {
error = errno;
- VLOG_WARN("tun_alloc(IFF_TAP, %s) failed: %s", name, strerror(error));
- goto cleanup;
+ VLOG_WARN("tun_alloc(IFF_TAP, %s) failed: %s",
+ netdev_get_name(netdev_), ovs_strerror(error));
+ return error;
}
- VLOG_DBG("real_name = %s", netdev_dev->real_name);
+ VLOG_DBG("real_name = %s", netdev->real_name);
/* Make non-blocking. */
- error = set_nonblocking(netdev_dev->fd);
+ error = set_nonblocking(netdev->fd);
if (error) {
- goto cleanup;
+ return error;
}
- netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_pltap_class);
- shash_add(&pltap_netdev_devs, name, netdev_dev);
- *netdev_devp = &netdev_dev->netdev_dev;
+ ovs_mutex_lock(&pltap_netdevs_mutex);
+ shash_add(&pltap_netdevs, netdev_get_name(netdev_), netdev);
+ ovs_mutex_unlock(&pltap_netdevs_mutex);
return 0;
-
-cleanup:
- free(netdev_dev);
- return error;
}
static void
-netdev_pltap_destroy(struct netdev_dev *netdev_dev_)
+netdev_pltap_destruct(struct netdev *netdev_)
{
- struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(netdev_dev_);
+ struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
- if (netdev_dev->fd != -1)
- close(netdev_dev->fd);
+ ovs_mutex_lock(&pltap_netdevs_mutex);
+ if (netdev->fd != -1)
+ close(netdev->fd);
+
+ if (netdev->sync_flags_needed) {
+ ovs_mutex_lock(&sync_list_mutex);
+ (void) list_remove(&netdev->sync_list);
+ ovs_mutex_unlock(&sync_list_mutex);
+ }
- sync_done(netdev_dev);
+ shash_find_and_delete(&pltap_netdevs,
+ netdev_get_name(netdev_));
+ ovs_mutex_unlock(&pltap_netdevs_mutex);
+ ovs_mutex_destroy(&netdev->mutex);
+}
- shash_find_and_delete(&pltap_netdev_devs,
- netdev_dev_get_name(netdev_dev_));
- free(netdev_dev);
+static void
+netdev_pltap_dealloc(struct netdev *netdev_)
+{
+ struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
+ free(netdev);
+}
+
+static int netdev_pltap_up(struct netdev_pltap *dev) OVS_REQUIRES(dev->mutex);
+
+static struct netdev_rx *
+netdev_pltap_rx_alloc(void)
+{
+ struct netdev_rx_pltap *rx = xzalloc(sizeof *rx);
+ return &rx->up;
}
static int
-netdev_pltap_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
+netdev_pltap_rx_construct(struct netdev_rx *rx_)
{
- struct netdev_pltap *netdev;
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+ struct netdev *netdev_ = rx->up.netdev;
+ struct netdev_pltap *netdev =
+ netdev_pltap_cast(netdev_);
+ int error = 0;
- netdev = xmalloc(sizeof *netdev);
- netdev_init(&netdev->netdev, netdev_dev_);
+ ovs_mutex_lock(&netdev->mutex);
+ rx->fd = netdev->fd;
+ if (!netdev_pltap_finalized(netdev))
+ goto out;
+ error = netdev_pltap_up(netdev);
+ if (error) {
+ goto out;
+ }
+out:
+ ovs_mutex_unlock(&netdev->mutex);
+ return error;
+}
- *netdevp = &netdev->netdev;
- return 0;
+static void
+netdev_pltap_rx_destruct(struct netdev_rx *rx_ OVS_UNUSED)
+{
}
static void
-netdev_pltap_close(struct netdev *netdev_)
+netdev_pltap_rx_dealloc(struct netdev_rx *rx_)
{
- struct netdev_pltap *netdev = netdev_pltap_cast(netdev_);
- free(netdev);
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+
+ free(rx);
}
static int vsys_transaction(const char *script,
ofd = open(ofname, O_RDONLY | O_NONBLOCK);
if (ofd < 0) {
- VLOG_ERR("Cannot open %s: %s", ofname, strerror(errno));
+ VLOG_ERR("Cannot open %s: %s", ofname, ovs_strerror(errno));
error = errno;
goto cleanup;
}
ifd = open(ifname, O_WRONLY | O_NONBLOCK);
if (ifd < 0) {
- VLOG_ERR("Cannot open %s: %s", ifname, strerror(errno));
+ VLOG_ERR("Cannot open %s: %s", ifname, ovs_strerror(errno));
error = errno;
goto cleanup;
}
if (select(maxfd + 1, &readset, &writeset, &errorset, NULL) < 0) {
if (errno == EINTR)
continue;
- VLOG_ERR("selec error: %s", strerror(errno));
+ VLOG_ERR("selec error: %s", ovs_strerror(errno));
error = errno;
goto cleanup;
}
ssize_t n = write(ifd, msg + bytes_written, bytes_to_write);
if (n < 0) {
if (errno != EAGAIN && errno != EINTR) {
- VLOG_ERR("write on %s: %s", ifname, strerror(errno));
+ VLOG_ERR("write on %s: %s", ifname, ovs_strerror(errno));
error = errno;
goto cleanup;
}
ssize_t n = read(ofd, reply + bytes_read, bytes_to_read);
if (n < 0) {
if (errno != EAGAIN && errno != EINTR) {
- VLOG_ERR("read on %s: %s", ofname, strerror(errno));
+ VLOG_ERR("read on %s: %s", ofname, ovs_strerror(errno));
error = errno;
goto cleanup;
}
}
static int
-netdev_pltap_up(struct netdev_dev_pltap *dev)
+netdev_pltap_up(struct netdev_pltap *dev)
+ OVS_REQUIRES(dev->mutex)
{
if (!netdev_pltap_finalized(dev)) {
return 0;
}
static int
-netdev_pltap_down(struct netdev_dev_pltap *dev)
+netdev_pltap_down(struct netdev_pltap *dev)
+ OVS_REQUIRES(dev->mutex)
{
if (!netdev_pltap_finalized(dev)) {
return 0;
}
static int
-netdev_pltap_promisc(struct netdev_dev_pltap *dev, bool promisc)
+netdev_pltap_promisc(struct netdev_pltap *dev, bool promisc)
+ OVS_REQUIRES(dev-mutex)
{
if (!netdev_pltap_finalized(dev)) {
return 0;
}
static void
-netdev_pltap_sync_flags(struct netdev_dev_pltap *dev)
+netdev_pltap_sync_flags(struct netdev_pltap *dev)
+ OVS_REQUIRES(sync_list_mutex)
{
+ ovs_mutex_lock(&dev->mutex);
+
if (dev->fd < 0 || !netdev_pltap_finalized(dev)) {
- sync_done(dev);
- return;
+ goto out;
}
VLOG_DBG("sync_flags(%s): current: %s %s target: %s %s",
}
netdev_pltap_update_seq(dev);
+
+out:
sync_done(dev);
+ ovs_mutex_unlock(&dev->mutex);
}
static int
-netdev_pltap_get_config(struct netdev_dev *dev_, struct smap *args)
+netdev_pltap_get_config(const struct netdev *dev_, struct smap *args)
{
- struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(dev_);
+ struct netdev_pltap *netdev = netdev_pltap_cast(dev_);
- if (netdev_dev->valid_local_ip)
+ ovs_mutex_lock(&netdev->mutex);
+ if (netdev->valid_local_ip)
smap_add_format(args, "local_ip", IP_FMT,
- IP_ARGS(netdev_dev->local_addr.sin_addr.s_addr));
- if (netdev_dev->valid_local_netmask)
+ IP_ARGS(netdev->local_addr.sin_addr.s_addr));
+ if (netdev->valid_local_netmask)
smap_add_format(args, "local_netmask", "%"PRIu32,
- ntohs(netdev_dev->local_netmask));
+ ntohs(netdev->local_netmask));
+ ovs_mutex_unlock(&netdev->mutex);
return 0;
}
static int
-netdev_pltap_set_config(struct netdev_dev *dev_, const struct smap *args)
+netdev_pltap_set_config(struct netdev *dev_, const struct smap *args)
{
- struct netdev_dev_pltap *netdev_dev = netdev_dev_pltap_cast(dev_);
+ struct netdev_pltap *netdev = netdev_pltap_cast(dev_);
struct shash_node *node;
- VLOG_DBG("pltap_set_config(%s)", netdev_dev_get_name(dev_));
+ ovs_mutex_lock(&sync_list_mutex);
+ ovs_mutex_lock(&netdev->mutex);
+ VLOG_DBG("pltap_set_config(%s)", netdev_get_name(dev_));
SMAP_FOR_EACH(node, args) {
VLOG_DBG("arg: %s->%s", node->name, (char*)node->data);
if (!strcmp(node->name, "local_ip")) {
if (lookup_ip(node->data, &addr)) {
VLOG_WARN("%s: bad 'local_ip'", node->name);
} else {
- netdev_dev->local_addr.sin_addr = addr;
- netdev_dev->valid_local_ip = true;
+ netdev->local_addr.sin_addr = addr;
+ netdev->valid_local_ip = true;
}
} else if (!strcmp(node->name, "local_netmask")) {
- netdev_dev->local_netmask = atoi(node->data);
+ netdev->local_netmask = atoi(node->data);
// XXX check valididy
- netdev_dev->valid_local_netmask = true;
+ netdev->valid_local_netmask = true;
} else {
VLOG_WARN("%s: unknown argument '%s'",
- netdev_dev_get_name(dev_), node->name);
+ netdev_get_name(dev_), node->name);
}
}
- if (netdev_pltap_finalized(netdev_dev)) {
- netdev_dev->new_flags |= NETDEV_UP;
- sync_needed(netdev_dev);
+ if (netdev_pltap_finalized(netdev)) {
+ netdev->new_flags |= NETDEV_UP;
+ sync_needed(netdev);
}
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&sync_list_mutex);
return 0;
}
static int
-netdev_pltap_listen(struct netdev *netdev_ OVS_UNUSED)
+netdev_pltap_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
- if (!netdev_pltap_finalized(dev))
- return 0;
- return netdev_pltap_up(dev);
-}
-
-static int
-netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size)
-{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
- char prefix[4];
+ size_t size = ofpbuf_tailroom(buffer);
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+ struct tun_pi pi;
struct iovec iov[2] = {
- { .iov_base = prefix, .iov_len = 4 },
- { .iov_base = buffer, .iov_len = size }
+ { .iov_base = &pi, .iov_len = sizeof(pi) },
+ { .iov_base = buffer->data, .iov_len = size }
};
for (;;) {
ssize_t retval;
- retval = readv(dev->fd, iov, 2);
+ retval = readv(rx->fd, iov, 2);
if (retval >= 0) {
if (retval <= size) {
- return retval;
+ buffer->size += retval;
+ return 0;
} else {
- return -EMSGSIZE;
+ return EMSGSIZE;
}
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s",
- netdev_get_name(netdev_), strerror(errno));
+ netdev_rx_get_name(rx_), ovs_strerror(errno));
}
- return -errno;
+ return errno;
}
}
}
static void
-netdev_pltap_recv_wait(struct netdev *netdev_)
+netdev_pltap_rx_wait(struct netdev_rx *rx_)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
- if (dev->fd >= 0 && netdev_pltap_finalized(dev)) {
- poll_fd_wait(dev->fd, POLLIN);
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
+ struct netdev_pltap *netdev =
+ netdev_pltap_cast(rx->up.netdev);
+ if (rx->fd >= 0 && netdev_pltap_finalized(netdev)) {
+ poll_fd_wait(rx->fd, POLLIN);
}
}
static int
netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
- char prefix[4] = { 0, 0, 8, 6 };
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev_);
+ struct tun_pi pi = { 0, 0x86 };
struct iovec iov[2] = {
- { .iov_base = prefix, .iov_len = 4 },
+ { .iov_base = &pi, .iov_len = sizeof(pi) },
{ .iov_base = (char*) buffer, .iov_len = size }
};
if (dev->fd < 0)
retval = writev(dev->fd, iov, 2);
if (retval >= 0) {
if (retval != size + 4) {
- VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of %zu) on %s",
+ VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIdSIZE" bytes of %"PRIuSIZE") on %s",
retval, size + 4, netdev_get_name(netdev_));
}
return 0;
} else if (errno != EINTR) {
if (errno != EAGAIN) {
VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s",
- netdev_get_name(netdev_), strerror(errno));
+ netdev_get_name(netdev_), ovs_strerror(errno));
}
return errno;
}
static void
netdev_pltap_send_wait(struct netdev *netdev_)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev_);
if (dev->fd >= 0 && netdev_pltap_finalized(dev)) {
poll_fd_wait(dev->fd, POLLOUT);
}
}
static int
-netdev_pltap_drain(struct netdev *netdev_)
+netdev_pltap_rx_drain(struct netdev_rx *rx_)
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev_));
+ struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_);
char buffer[128];
int error;
- if (dev->fd < 0)
+ if (rx->fd < 0)
return EAGAIN;
for (;;) {
- error = recv(dev->fd, buffer, 128, MSG_TRUNC);
+ error = recv(rx->fd, buffer, 128, MSG_TRUNC);
if (error) {
if (error == -EAGAIN)
break;
// XXX from netdev-linux.c
static int
-get_etheraddr(struct netdev_dev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
+get_etheraddr(struct netdev_pltap *dev, uint8_t ea[ETH_ADDR_LEN])
+ OVS_REQUIRES(dev->mutex)
{
struct ifreq ifr;
int hwaddr_family;
+ int error;
memset(&ifr, 0, sizeof ifr);
ovs_strzcpy(ifr.ifr_name, dev->real_name, sizeof ifr.ifr_name);
- if (ioctl(af_inet_sock, SIOCGIFHWADDR, &ifr) < 0) {
- /* ENODEV probably means that a vif disappeared asynchronously and
- * hasn't been removed from the database yet, so reduce the log level
- * to INFO for that case. */
- VLOG(errno == ENODEV ? VLL_INFO : VLL_ERR,
- "ioctl(SIOCGIFHWADDR) on %s device failed: %s",
- dev->real_name, strerror(errno));
- return errno;
+ error = af_inet_ifreq_ioctl(dev->real_name, &ifr,
+ SIOCGIFHWADDR, "SIOCGIFHWADDR");
+ if (error) {
+ return error;
}
hwaddr_family = ifr.ifr_hwaddr.sa_family;
if (hwaddr_family != AF_UNSPEC && hwaddr_family != ARPHRD_ETHER) {
}
static int
-get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags)
+get_flags(struct netdev_pltap *dev, enum netdev_flags *flags)
+ OVS_REQUIRES(dev->mutex)
{
struct ifreq ifr;
+ int error;
- memset(&ifr, 0, sizeof ifr);
- ovs_strzcpy(ifr.ifr_name, dev->real_name, sizeof ifr.ifr_name);
- if (ioctl(af_inet_sock, SIOCGIFFLAGS, &ifr) < 0)
- return errno;
+ error = af_inet_ifreq_ioctl(dev->real_name, &ifr,
+ SIOCGIFFLAGS, "SIOCGIFFLAGS");
+ if (error) {
+ return error;
+ }
*flags = 0;
if (ifr.ifr_flags & IFF_UP)
*flags |= NETDEV_UP;
netdev_pltap_get_etheraddr(const struct netdev *netdev,
uint8_t mac[ETH_ADDR_LEN])
{
- struct netdev_dev_pltap *dev =
- netdev_dev_pltap_cast(netdev_get_dev(netdev));
- if (dev->fd < 0)
- return EAGAIN;
- return get_etheraddr(dev, mac);
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev);
+ int error = 0;
+
+ ovs_mutex_lock(&dev->mutex);
+ if (dev->fd < 0) {
+ error = EAGAIN;
+ goto out;
+ }
+ error = get_etheraddr(dev, mac);
+
+out:
+ ovs_mutex_unlock(&dev->mutex);
+ return error;
}
static int
-netdev_pltap_update_flags(struct netdev_dev *dev_,
+netdev_pltap_update_flags(struct netdev *dev_,
enum netdev_flags off, enum netdev_flags on,
enum netdev_flags *old_flagsp)
{
- struct netdev_dev_pltap *netdev_dev =
- netdev_dev_pltap_cast(dev_);
+ struct netdev_pltap *netdev =
+ netdev_pltap_cast(dev_);
int error = 0;
+ ovs_mutex_lock(&sync_list_mutex);
+ ovs_mutex_lock(&netdev->mutex);
if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) {
- return EINVAL;
+ error = EINVAL;
+ goto out;
}
- if (netdev_pltap_finalized(netdev_dev)) {
- error = get_flags(netdev_dev, &netdev_dev->flags);
+ if (netdev_pltap_finalized(netdev)) {
+ error = get_flags(netdev, &netdev->flags);
}
- *old_flagsp = netdev_dev->flags;
- netdev_dev->new_flags |= on;
- netdev_dev->new_flags &= ~off;
- if (netdev_dev->flags != netdev_dev->new_flags) {
+ *old_flagsp = netdev->flags;
+ netdev->new_flags |= on;
+ netdev->new_flags &= ~off;
+ if (netdev->flags != netdev->new_flags) {
/* we cannot sync here, since we may be in a signal handler */
- sync_needed(netdev_dev);
+ sync_needed(netdev);
}
+out:
+ ovs_mutex_unlock(&netdev->mutex);
+ ovs_mutex_unlock(&sync_list_mutex);
return error;
}
static unsigned int
netdev_pltap_change_seq(const struct netdev *netdev)
{
- return netdev_dev_pltap_cast(netdev_get_dev(netdev))->change_seq;
+ struct netdev_pltap *dev =
+ netdev_pltap_cast(netdev);
+ unsigned int change_seq;
+
+ ovs_mutex_lock(&dev->mutex);
+ change_seq = dev->change_seq;
+ ovs_mutex_unlock(&dev->mutex);
+
+ return change_seq;
}
\f
/* Helper functions. */
static void
-netdev_pltap_update_seq(struct netdev_dev_pltap *dev)
+netdev_pltap_update_seq(struct netdev_pltap *dev)
+ OVS_REQUIRES(dev->mutex)
{
dev->change_seq++;
if (!dev->change_seq) {
netdev_pltap_get_real_name(struct unixctl_conn *conn,
int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED)
{
- struct netdev_dev_pltap *pltap_dev;
+ struct netdev_pltap *pltap_dev;
- pltap_dev = shash_find_data(&pltap_netdev_devs, argv[1]);
+ ovs_mutex_lock(&pltap_netdevs_mutex);
+ pltap_dev = shash_find_data(&pltap_netdevs, argv[1]);
if (!pltap_dev) {
unixctl_command_reply_error(conn, "no such pltap netdev");
- return;
+ goto out;
}
if (pltap_dev->fd < 0) {
unixctl_command_reply_error(conn, "no real device attached");
- return;
+ goto out;
}
unixctl_command_reply(conn, pltap_dev->real_name);
+
+out:
+ ovs_mutex_unlock(&pltap_netdevs_mutex);
}
static int
netdev_pltap_init(void)
{
- list_init(&sync_list);
- af_inet_sock = socket(AF_INET, SOCK_DGRAM, 0);
- if (af_inet_sock < 0) {
- VLOG_ERR("failed to create inet socket: %s", strerror(errno));
- }
unixctl_command_register("netdev-pltap/get-tapname", "port",
1, 1, netdev_pltap_get_real_name, NULL);
return 0;
static void
netdev_pltap_run(void)
{
- struct netdev_dev_pltap *iter, *next;
+ struct netdev_pltap *iter, *next;
+ ovs_mutex_lock(&sync_list_mutex);
LIST_FOR_EACH_SAFE(iter, next, sync_list, &sync_list) {
netdev_pltap_sync_flags(iter);
}
+ ovs_mutex_unlock(&sync_list_mutex);
}
static void
netdev_pltap_wait(void)
{
+ ovs_mutex_lock(&sync_list_mutex);
if (!list_is_empty(&sync_list)) {
VLOG_DBG("netdev_pltap: scheduling sync");
poll_immediate_wake();
}
+ ovs_mutex_unlock(&sync_list_mutex);
}
const struct netdev_class netdev_pltap_class = {
netdev_pltap_run,
netdev_pltap_wait,
- netdev_pltap_create,
- netdev_pltap_destroy,
+ netdev_pltap_alloc,
+ netdev_pltap_construct,
+ netdev_pltap_destruct,
+ netdev_pltap_dealloc,
netdev_pltap_get_config,
netdev_pltap_set_config,
- NULL, /* get_tunnel_config */
-
- netdev_pltap_open,
- netdev_pltap_close,
-
- netdev_pltap_listen,
- netdev_pltap_recv,
- netdev_pltap_recv_wait,
- netdev_pltap_drain,
+ NULL, /* get_tunnel_config */
netdev_pltap_send,
netdev_pltap_send_wait,
netdev_pltap_set_etheraddr,
netdev_pltap_get_etheraddr,
- NULL, /* get_mtu */
- NULL, /* set_mtu */
+ NULL, /* get_mtu */
+ NULL, /* set_mtu */
NULL, /* get_ifindex */
- NULL, /* get_carrier */
+ NULL, /* get_carrier */
NULL, /* get_carrier_resets */
NULL, /* get_miimon */
netdev_pltap_get_stats,
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 */
netdev_pltap_update_flags,
- netdev_pltap_change_seq
+ netdev_pltap_rx_alloc,
+ netdev_pltap_rx_construct,
+ netdev_pltap_rx_destruct,
+ netdev_pltap_rx_dealloc,
+ netdev_pltap_rx_recv,
+ netdev_pltap_rx_wait,
+ netdev_pltap_rx_drain,
};