X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-pltap.c;h=0c492650a1e11f4e69e9ce2db8fa3742c3e9cb0c;hb=f196cf974f8df3afdeb56ea58d34e6a9e741663d;hp=62f23f3fda02321664eb89cb61fc3d3f7085916a;hpb=7fa0f73fb284b4406bcd085ee62552891b3fa6cd;p=sliver-openvswitch.git diff --git a/lib/netdev-pltap.c b/lib/netdev-pltap.c index 62f23f3fd..0c492650a 100644 --- a/lib/netdev-pltap.c +++ b/lib/netdev-pltap.c @@ -45,8 +45,8 @@ VLOG_DEFINE_THIS_MODULE(netdev_pltap); -struct netdev_dev_pltap { - struct netdev_dev netdev_dev; +struct netdev_pltap { + struct netdev up; char *real_name; struct netdev_stats stats; enum netdev_flags new_flags; @@ -61,52 +61,54 @@ struct netdev_dev_pltap { unsigned int change_seq; }; +static const struct netdev_rx_class netdev_rx_pltap_class; + 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); +static struct shash pltap_netdevs = SHASH_INITIALIZER(&pltap_netdevs); static int netdev_pltap_create(const struct netdev_class *, const char *, - struct netdev_dev **); + struct 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 *); +static int get_flags(struct netdev_pltap *dev, enum netdev_flags *flags); static bool -netdev_pltap_finalized(struct netdev_dev_pltap *dev) +netdev_pltap_finalized(struct netdev_pltap *dev) { 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; } -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); + netdev_rx_assert_class(rx, &netdev_rx_pltap_class); + 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) { if (dev->sync_flags_needed) return; @@ -116,7 +118,7 @@ static void sync_needed(struct netdev_dev_pltap *dev) } -static void sync_done(struct netdev_dev_pltap *dev) +static void sync_done(struct netdev_pltap *dev) { if (!dev->sync_flags_needed) return; @@ -127,79 +129,92 @@ static void sync_done(struct netdev_dev_pltap *dev) static int netdev_pltap_create(const struct netdev_class *class OVS_UNUSED, const char *name, - struct netdev_dev **netdev_devp) + struct netdev **netdevp) { - struct netdev_dev_pltap *netdev_dev; + struct netdev_pltap *netdev; int error; - netdev_dev = xzalloc(sizeof *netdev_dev); + netdev = xzalloc(sizeof *netdev); - 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); + 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; + list_init(&netdev->sync_list); /* 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)); + VLOG_WARN("tun_alloc(IFF_TAP, %s) failed: %s", name, ovs_strerror(error)); goto cleanup; } - 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; } - 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; + netdev_init(&netdev->up, name, &netdev_pltap_class); + shash_add(&pltap_netdevs, name, netdev); + *netdevp = &netdev->up; return 0; cleanup: - free(netdev_dev); + free(netdev); return error; } static void -netdev_pltap_destroy(struct netdev_dev *netdev_dev_) +netdev_pltap_destroy(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); + if (netdev->fd != -1) + close(netdev->fd); - sync_done(netdev_dev); + sync_done(netdev); - shash_find_and_delete(&pltap_netdev_devs, - netdev_dev_get_name(netdev_dev_)); - free(netdev_dev); + shash_find_and_delete(&pltap_netdevs, + netdev_get_name(netdev_)); + free(netdev); } -static int -netdev_pltap_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) -{ - struct netdev_pltap *netdev; - - netdev = xmalloc(sizeof *netdev); - netdev_init(&netdev->netdev, netdev_dev_); +static int netdev_pltap_up(struct netdev_pltap *dev); - *netdevp = &netdev->netdev; +static int +netdev_pltap_rx_open(struct netdev *netdev_, struct netdev_rx **rxp) +{ + struct netdev_pltap *netdev = + netdev_pltap_cast(netdev_); + struct netdev_rx_pltap *rx; + int err; + + rx = xmalloc(sizeof *rx); + netdev_rx_init(&rx->up, netdev_, &netdev_rx_pltap_class); + rx->fd = netdev->fd; + *rxp = &rx->up; + if (!netdev_pltap_finalized(netdev)) + return 0; + err = netdev_pltap_up(netdev); + if (err) { + free(rx); + *rxp = NULL; + return err; + } return 0; } static void -netdev_pltap_close(struct netdev *netdev_) +netdev_rx_pltap_destroy(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, @@ -234,13 +249,13 @@ 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; } @@ -263,7 +278,7 @@ static int vsys_transaction(const char *script, 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; } @@ -275,7 +290,7 @@ static int vsys_transaction(const char *script, 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; } @@ -290,7 +305,7 @@ static int vsys_transaction(const char *script, 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; } @@ -325,7 +340,7 @@ cleanup: } static int -netdev_pltap_up(struct netdev_dev_pltap *dev) +netdev_pltap_up(struct netdev_pltap *dev) { if (!netdev_pltap_finalized(dev)) { return 0; @@ -338,7 +353,7 @@ netdev_pltap_up(struct netdev_dev_pltap *dev) } static int -netdev_pltap_down(struct netdev_dev_pltap *dev) +netdev_pltap_down(struct netdev_pltap *dev) { if (!netdev_pltap_finalized(dev)) { return 0; @@ -348,7 +363,7 @@ netdev_pltap_down(struct netdev_dev_pltap *dev) } static int -netdev_pltap_promisc(struct netdev_dev_pltap *dev, bool promisc) +netdev_pltap_promisc(struct netdev_pltap *dev, bool promisc) { if (!netdev_pltap_finalized(dev)) { return 0; @@ -360,7 +375,7 @@ netdev_pltap_promisc(struct netdev_dev_pltap *dev, bool promisc) } static void -netdev_pltap_sync_flags(struct netdev_dev_pltap *dev) +netdev_pltap_sync_flags(struct netdev_pltap *dev) { if (dev->fd < 0 || !netdev_pltap_finalized(dev)) { @@ -391,26 +406,26 @@ netdev_pltap_sync_flags(struct netdev_dev_pltap *dev) 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) + 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)); 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_)); + 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")) { @@ -418,48 +433,37 @@ netdev_pltap_set_config(struct netdev_dev *dev_, const struct smap *args) 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); } return 0; } static int -netdev_pltap_listen(struct netdev *netdev_ OVS_UNUSED) -{ - 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) +netdev_rx_pltap_recv(struct netdev_rx *rx_, void *buffer, size_t size) { - struct netdev_dev_pltap *dev = - netdev_dev_pltap_cast(netdev_get_dev(netdev_)); - char prefix[4]; + 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 = &pi, .iov_len = sizeof(pi) }, { .iov_base = buffer, .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; @@ -469,7 +473,7 @@ netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size) } 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; } @@ -477,23 +481,24 @@ netdev_pltap_recv(struct netdev *netdev_, void *buffer, size_t size) } static void -netdev_pltap_recv_wait(struct netdev *netdev_) +netdev_rx_pltap_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) @@ -510,7 +515,7 @@ netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size) } 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; } @@ -520,25 +525,24 @@ netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size) 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_rx_pltap_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; @@ -559,7 +563,7 @@ netdev_pltap_set_etheraddr(struct netdev *netdevi OVS_UNUSED, // 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]) { struct ifreq ifr; int hwaddr_family; @@ -572,7 +576,7 @@ get_etheraddr(struct netdev_dev_pltap *dev, uint8_t ea[ETH_ADDR_LEN]) * to INFO for that case. */ VLOG(errno == ENODEV ? VLL_INFO : VLL_ERR, "ioctl(SIOCGIFHWADDR) on %s device failed: %s", - dev->real_name, strerror(errno)); + dev->real_name, ovs_strerror(errno)); return errno; } hwaddr_family = ifr.ifr_hwaddr.sa_family; @@ -585,7 +589,7 @@ get_etheraddr(struct netdev_dev_pltap *dev, uint8_t ea[ETH_ADDR_LEN]) } static int -get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags) +get_flags(struct netdev_pltap *dev, enum netdev_flags *flags) { struct ifreq ifr; @@ -605,8 +609,8 @@ static int 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)); + struct netdev_pltap *dev = + netdev_pltap_cast(netdev); if (dev->fd < 0) return EAGAIN; return get_etheraddr(dev, mac); @@ -628,27 +632,27 @@ netdev_pltap_set_stats(struct netdev *netdev OVS_UNUSED, const struct netdev_sta static int -netdev_pltap_update_flags(struct netdev *netdev, +netdev_pltap_update_flags(struct netdev *dev_, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flagsp) { - struct netdev_dev_pltap *dev = - netdev_dev_pltap_cast(netdev_get_dev(netdev)); + struct netdev_pltap *netdev = + netdev_pltap_cast(dev_); int error = 0; if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) { return EINVAL; } - if (netdev_pltap_finalized(dev)) { - error = get_flags(dev, &dev->flags); + if (netdev_pltap_finalized(netdev)) { + error = get_flags(netdev, &netdev->flags); } - *old_flagsp = dev->flags; - dev->new_flags |= on; - dev->new_flags &= ~off; - if (dev->flags != 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(dev); + sync_needed(netdev); } return error; @@ -657,13 +661,13 @@ netdev_pltap_update_flags(struct netdev *netdev, static unsigned int netdev_pltap_change_seq(const struct netdev *netdev) { - return netdev_dev_pltap_cast(netdev_get_dev(netdev))->change_seq; + return netdev_pltap_cast(netdev)->change_seq; } /* Helper functions. */ static void -netdev_pltap_update_seq(struct netdev_dev_pltap *dev) +netdev_pltap_update_seq(struct netdev_pltap *dev) { dev->change_seq++; if (!dev->change_seq) { @@ -675,9 +679,9 @@ static void 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]); + pltap_dev = shash_find_data(&pltap_netdevs, argv[1]); if (!pltap_dev) { unixctl_command_reply_error(conn, "no such pltap netdev"); return; @@ -696,7 +700,7 @@ 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)); + VLOG_ERR("failed to create inet socket: %s", ovs_strerror(errno)); } unixctl_command_register("netdev-pltap/get-tapname", "port", 1, 1, netdev_pltap_get_real_name, NULL); @@ -706,7 +710,7 @@ netdev_pltap_init(void) static void netdev_pltap_run(void) { - struct netdev_dev_pltap *iter, *next; + struct netdev_pltap *iter, *next; LIST_FOR_EACH_SAFE(iter, next, sync_list, &sync_list) { netdev_pltap_sync_flags(iter); } @@ -733,13 +737,7 @@ const struct netdev_class netdev_pltap_class = { 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, + netdev_pltap_rx_open, netdev_pltap_send, netdev_pltap_send_wait, @@ -782,3 +780,11 @@ const struct netdev_class netdev_pltap_class = { netdev_pltap_change_seq }; + +static const struct netdev_rx_class netdev_rx_pltap_class = { + netdev_rx_pltap_destroy, + netdev_rx_pltap_recv, + netdev_rx_pltap_wait, + netdev_rx_pltap_drain, + +};