X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-pltap.c;h=e9722244db1d63cf694fd57881eb744b7dae2279;hb=eced3be9ddbf20bddb4e10dfaa6f40558187ab1f;hp=b2cc3ecbabc49885285bbc5cf93e15a921fd5cee;hpb=7186aaa9dc9562a1090356ca428a58624f432748;p=sliver-openvswitch.git diff --git a/lib/netdev-pltap.c b/lib/netdev-pltap.c index b2cc3ecba..e9722244d 100644 --- a/lib/netdev-pltap.c +++ b/lib/netdev-pltap.c @@ -48,26 +48,32 @@ VLOG_DEFINE_THIS_MODULE(netdev_pltap); struct netdev_dev_pltap { struct netdev_dev netdev_dev; char *real_name; - char *error; struct netdev_stats stats; + enum netdev_flags new_flags; enum netdev_flags flags; int fd; struct sockaddr_in local_addr; int local_netmask; bool valid_local_ip; bool valid_local_netmask; - bool finalized; bool sync_flags_needed; struct list sync_list; 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); @@ -77,13 +83,17 @@ static struct shash pltap_netdev_devs = SHASH_INITIALIZER(&pltap_netdev_devs); static int netdev_pltap_create(const struct netdev_class *, const char *, struct netdev_dev **); -static struct shash pltap_creating = SHASH_INITIALIZER(&pltap_creating); - static void netdev_pltap_update_seq(struct netdev_dev_pltap *); static int get_flags(struct netdev_dev_pltap *dev, enum netdev_flags *flags); static bool -is_pltap_class(const struct netdev_class *class) +netdev_pltap_finalized(struct netdev_dev_pltap *dev) +{ + return dev->valid_local_ip && dev->valid_local_netmask; +} + +static bool +is_netdev_pltap_class(const struct netdev_class *class) { return class->create == netdev_pltap_create; } @@ -91,7 +101,7 @@ is_pltap_class(const struct netdev_class *class) static struct netdev_dev_pltap * netdev_dev_pltap_cast(const struct netdev_dev *netdev_dev) { - assert(is_pltap_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_netdev_pltap_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev_dev, struct netdev_dev_pltap, netdev_dev); } @@ -99,10 +109,17 @@ static struct netdev_pltap * netdev_pltap_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_pltap_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_netdev_pltap_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev, struct netdev_pltap, netdev); } +static struct netdev_rx_pltap* +netdev_rx_pltap_cast(const struct netdev_rx *rx) +{ + 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) { if (dev->sync_flags_needed) @@ -132,11 +149,9 @@ netdev_pltap_create(const struct netdev_class *class OVS_UNUSED, const char *nam netdev_dev = xzalloc(sizeof *netdev_dev); netdev_dev->real_name = xzalloc(IFNAMSIZ + 1); - netdev_dev->error = NULL; 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->finalized = false; netdev_dev->flags = 0; netdev_dev->sync_flags_needed = false; list_init(&netdev_dev->sync_list); @@ -175,6 +190,8 @@ netdev_pltap_destroy(struct netdev_dev *netdev_dev_) if (netdev_dev->fd != -1) close(netdev_dev->fd); + sync_done(netdev_dev); + shash_find_and_delete(&pltap_netdev_devs, netdev_dev_get_name(netdev_dev_)); free(netdev_dev); @@ -199,14 +216,60 @@ netdev_pltap_close(struct netdev *netdev_) free(netdev); } + +static int netdev_pltap_up(struct netdev_dev_pltap *dev); + +static int +netdev_pltap_rx_open(struct netdev *netdev_, struct netdev_rx **rxp) +{ + struct netdev_dev_pltap *netdev_dev = + netdev_dev_pltap_cast(netdev_get_dev(netdev_)); + struct netdev_rx_pltap *rx; + int err; + + rx = xmalloc(sizeof *rx); + netdev_rx_init(&rx->up, netdev_get_dev(netdev_), &netdev_rx_pltap_class); + rx->fd = netdev_dev->fd; + *rxp = &rx->up; + if (!netdev_pltap_finalized(netdev_dev)) + return 0; + err = netdev_pltap_up(netdev_dev); + if (err) { + free(rx); + *rxp = NULL; + return err; + } + return 0; +} + +static void +netdev_rx_pltap_destroy(struct netdev_rx *rx_) +{ + struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_); + free(rx); +} + static int vsys_transaction(const char *script, - const char *msg, char *reply, size_t reply_size) + const char **preply, char *format, ...) { + char *msg = NULL, *reply = NULL; + const size_t reply_size = 1024; int ifd = -1, ofd = -1, maxfd; size_t bytes_to_write, bytes_to_read, bytes_written = 0, bytes_read = 0; int error = 0; char *ofname = NULL, *ifname = NULL; + va_list args; + + va_start(args, format); + msg = xvasprintf(format, args); + va_end(args); + reply = (char*)xmalloc(reply_size); + if (!msg || !reply) { + VLOG_ERR("Out of memory"); + error = ENOMEM; + goto cleanup; + } ofname = xasprintf("/vsys/%s.out", script); ifname = xasprintf("/vsys/%s.in", script); @@ -288,12 +351,19 @@ static int vsys_transaction(const char *script, } if (bytes_read) { reply[bytes_read] = '\0'; - VLOG_ERR("%s returned: %s", script, reply); + if (preply) { + *preply = reply; + reply = NULL; /* prevent freeing the reply msg */ + } else { + VLOG_ERR("%s returned: %s", script, reply); + } error = EAGAIN; goto cleanup; } cleanup: + free(msg); + free(reply); free(ofname); free(ifname); close(ifd); @@ -302,101 +372,71 @@ cleanup: } static int -netdev_pltap_sync_flags(struct netdev_dev_pltap *dev) +netdev_pltap_up(struct netdev_dev_pltap *dev) { - int error = 0; - char *msg = NULL, *reply = NULL; - const size_t reply_size = 1024; - enum netdev_flags flags = 0; - - - if (dev->fd < 0 || !dev->finalized) { - /* pretend we have synchronized, we will do it later */ - sync_needed(dev); + if (!netdev_pltap_finalized(dev)) { return 0; } + + return vsys_transaction("vif_up", NULL, "%s\n"IP_FMT"\n%d\n", + dev->real_name, + IP_ARGS(dev->local_addr.sin_addr.s_addr), + dev->local_netmask); +} - error = get_flags(dev, &flags); - if (error) { - VLOG_ERR("get_flags(%s): %s", dev->real_name, strerror(error)); - goto cleanup; +static int +netdev_pltap_down(struct netdev_dev_pltap *dev) +{ + if (!netdev_pltap_finalized(dev)) { + return 0; } - VLOG_DBG("sync_flags(%s): current: %s %s", - dev->real_name, - (flags & NETDEV_UP ? "UP" : "-"), - (flags & NETDEV_PROMISC ? "PROMISC" : "-")); + + return vsys_transaction("vif_down", NULL, "%s\n", dev->real_name); +} - if ((dev->flags & NETDEV_PROMISC) ^ (flags & NETDEV_PROMISC)) { - msg = xasprintf("%s\n%s", - dev->real_name, - (dev->flags & NETDEV_PROMISC ? "" : "-\n")); - reply = (char*)xmalloc(reply_size); - if (!msg || !reply) { - VLOG_ERR("Out of memory\n"); - error = ENOMEM; - goto cleanup; - } - error = vsys_transaction("promisc", msg, reply, reply_size); - if (error) { - dev->error = reply; - reply = NULL; /* prevent free of reply msg */ - goto cleanup; - } - netdev_pltap_update_seq(dev); +static int +netdev_pltap_promisc(struct netdev_dev_pltap *dev, bool promisc) +{ + if (!netdev_pltap_finalized(dev)) { + return 0; } -cleanup: - - sync_done(dev); - free(msg); - free(reply); - - return error; + return vsys_transaction("promisc", NULL, "%s\n%s", + dev->real_name, + (promisc ? "" : "-\n")); } -static int -netdev_pltap_create_finalize(struct netdev_dev_pltap *dev) +static void +netdev_pltap_sync_flags(struct netdev_dev_pltap *dev) { - int error = 0; - char *msg = NULL, *reply = NULL; - const size_t reply_size = 1024; - if (dev->finalized) - return 0; - if (!dev->valid_local_ip || !dev->valid_local_netmask) - return 0; - - msg = xasprintf("%s\n"IP_FMT"\n%d\n", - dev->real_name, - IP_ARGS(&dev->local_addr.sin_addr), - dev->local_netmask); - reply = (char*)xmalloc(reply_size); - if (!msg || !reply) { - VLOG_ERR("Out of memory"); - error = ENOMEM; - goto cleanup; + if (dev->fd < 0 || !netdev_pltap_finalized(dev)) { + sync_done(dev); + return; } - error = vsys_transaction("vif_up", msg, reply, reply_size); - if (error) { - dev->error = reply; - reply = NULL; /* prevent free of reply msg */ - goto cleanup; + + VLOG_DBG("sync_flags(%s): current: %s %s target: %s %s", + dev->real_name, + (dev->flags & NETDEV_UP ? "UP" : "-"), + (dev->flags & NETDEV_PROMISC ? "PROMISC" : "-"), + (dev->new_flags & NETDEV_UP ? "UP" : "-"), + (dev->new_flags & NETDEV_PROMISC ? "PROMISC" : "-")); + + if ((dev->new_flags & NETDEV_UP) && !(dev->flags & NETDEV_UP)) { + (void) netdev_pltap_up(dev); + } else if (!(dev->new_flags & NETDEV_UP) && (dev->flags & NETDEV_UP)) { + (void) netdev_pltap_down(dev); } - dev->finalized = true; - error = netdev_pltap_sync_flags(dev); - if (error) { - goto cleanup; + + if ((dev->new_flags & NETDEV_PROMISC) ^ (dev->flags & NETDEV_PROMISC)) { + (void) netdev_pltap_promisc(dev, dev->new_flags & NETDEV_PROMISC); } - free(dev->error); - dev->error = NULL; - netdev_pltap_update_seq(dev); -cleanup: - free(msg); - free(reply); - return error; + netdev_pltap_update_seq(dev); + sync_done(dev); } + static int netdev_pltap_get_config(struct netdev_dev *dev_, struct smap *args) { @@ -404,11 +444,11 @@ netdev_pltap_get_config(struct netdev_dev *dev_, struct smap *args) if (netdev_dev->valid_local_ip) smap_add_format(args, "local_ip", IP_FMT, - IP_ARGS(&netdev_dev->local_addr.sin_addr)); + IP_ARGS(netdev_dev->local_addr.sin_addr.s_addr)); if (netdev_dev->valid_local_netmask) smap_add_format(args, "local_netmask", "%"PRIu32, ntohs(netdev_dev->local_netmask)); - return netdev_pltap_create_finalize(netdev_dev); + return 0; } static int @@ -437,30 +477,25 @@ netdev_pltap_set_config(struct netdev_dev *dev_, const struct smap *args) netdev_dev_get_name(dev_), node->name); } } - return netdev_pltap_create_finalize(netdev_dev); -} - -static int -netdev_pltap_listen(struct netdev *netdev_ OVS_UNUSED) -{ + if (netdev_pltap_finalized(netdev_dev)) { + netdev_dev->new_flags |= NETDEV_UP; + sync_needed(netdev_dev); + } return 0; } 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_)); + struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_); char prefix[4]; struct iovec iov[2] = { { .iov_base = prefix, .iov_len = 4 }, { .iov_base = buffer, .iov_len = size } }; - if (!dev->finalized) - return -EAGAIN; for (;;) { ssize_t retval; - retval = readv(dev->fd, iov, 2); + retval = readv(rx->fd, iov, 2); if (retval >= 0) { if (retval <= size) { return retval; @@ -470,7 +505,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_), strerror(errno)); } return -errno; } @@ -478,12 +513,13 @@ 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->finalized && dev->fd >= 0) { - poll_fd_wait(dev->fd, POLLIN); + struct netdev_rx_pltap *rx = netdev_rx_pltap_cast(rx_); + struct netdev_dev_pltap *netdev_dev = + netdev_dev_pltap_cast(rx->up.netdev_dev); + if (rx->fd >= 0 && netdev_pltap_finalized(netdev_dev)) { + poll_fd_wait(rx->fd, POLLIN); } } @@ -497,7 +533,7 @@ netdev_pltap_send(struct netdev *netdev_, const void *buffer, size_t size) { .iov_base = prefix, .iov_len = 4 }, { .iov_base = (char*) buffer, .iov_len = size } }; - if (dev->fd < 0 || !dev->finalized) + if (dev->fd < 0) return EAGAIN; for (;;) { ssize_t retval; @@ -523,23 +559,22 @@ netdev_pltap_send_wait(struct netdev *netdev_) { struct netdev_dev_pltap *dev = netdev_dev_pltap_cast(netdev_get_dev(netdev_)); - if (dev->finalized && dev->fd >= 0) { + 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 || !dev->finalized) - return 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; @@ -608,7 +643,7 @@ netdev_pltap_get_etheraddr(const struct netdev *netdev, { struct netdev_dev_pltap *dev = netdev_dev_pltap_cast(netdev_get_dev(netdev)); - if (dev->fd < 0 || !dev->finalized) + if (dev->fd < 0) return EAGAIN; return get_etheraddr(dev, mac); } @@ -629,26 +664,30 @@ 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 *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_dev_pltap *netdev_dev = + netdev_dev_pltap_cast(dev_); + int error = 0; if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) { return EINVAL; } - *old_flagsp = dev->flags; - dev->flags |= on; - dev->flags &= ~off; - if (*old_flagsp != dev->flags) { + if (netdev_pltap_finalized(netdev_dev)) { + error = get_flags(netdev_dev, &netdev_dev->flags); + } + *old_flagsp = netdev_dev->flags; + netdev_dev->new_flags |= on; + netdev_dev->new_flags &= ~off; + if (netdev_dev->flags != netdev_dev->new_flags) { /* we cannot sync here, since we may be in a signal handler */ - sync_needed(dev); + sync_needed(netdev_dev); } - return 0; + return error; } static unsigned int @@ -679,8 +718,8 @@ netdev_pltap_get_real_name(struct unixctl_conn *conn, unixctl_command_reply_error(conn, "no such pltap netdev"); return; } - if (pltap_dev->error) { - unixctl_command_reply_error(conn, pltap_dev->error); + if (pltap_dev->fd < 0) { + unixctl_command_reply_error(conn, "no real device attached"); return; } @@ -712,8 +751,10 @@ netdev_pltap_run(void) static void netdev_pltap_wait(void) { - if (!list_is_empty(&sync_list)) + if (!list_is_empty(&sync_list)) { + VLOG_DBG("netdev_pltap: scheduling sync"); poll_immediate_wake(); + } } const struct netdev_class netdev_pltap_class = { @@ -726,14 +767,12 @@ const struct netdev_class netdev_pltap_class = { netdev_pltap_destroy, 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, + netdev_pltap_rx_open, netdev_pltap_send, netdev_pltap_send_wait, @@ -776,3 +815,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, + +};