X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-tunnel.c;h=9a7c3581df03b1103314ae88877f44f1531191e9;hb=ea7655d9f9d38a3af7250de8ba0b89115b5f4a5e;hp=ffefde4a99309c334de9535f28e458dfb12014e2;hpb=45febc101ff0a024ac937a0f92e49f72715697de;p=sliver-openvswitch.git diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c index ffefde4a9..9a7c3581d 100644 --- a/lib/netdev-tunnel.c +++ b/lib/netdev-tunnel.c @@ -41,7 +41,6 @@ VLOG_DEFINE_THIS_MODULE(netdev_tunnel); struct netdev_dev_tunnel { struct netdev_dev netdev_dev; uint8_t hwaddr[ETH_ADDR_LEN]; - int mtu; struct netdev_stats stats; enum netdev_flags flags; int sockfd; @@ -55,14 +54,15 @@ struct netdev_dev_tunnel { struct netdev_tunnel { struct netdev netdev; - bool listening; -}; +} ; + +static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); static struct shash tunnel_netdev_devs = SHASH_INITIALIZER(&tunnel_netdev_devs); static int netdev_tunnel_create(const struct netdev_class *, const char *, struct netdev_dev **); -static void netdev_tunnel_poll_notify(const struct netdev *); +static void netdev_tunnel_update_seq(struct netdev_dev_tunnel *); static bool is_tunnel_class(const struct netdev_class *class) @@ -73,7 +73,7 @@ is_tunnel_class(const struct netdev_class *class) static struct netdev_dev_tunnel * netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev) { - assert(is_tunnel_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_tunnel_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev); } @@ -81,7 +81,7 @@ static struct netdev_tunnel * netdev_tunnel_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_tunnel_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_tunnel_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev, struct netdev_tunnel, netdev); } @@ -89,19 +89,18 @@ static int netdev_tunnel_create(const struct netdev_class *class, const char *name, struct netdev_dev **netdev_devp) { - static unsigned int n = 0xaa550000; + static unsigned int n = 0; struct netdev_dev_tunnel *netdev_dev; int error; netdev_dev = xzalloc(sizeof *netdev_dev); netdev_dev_init(&netdev_dev->netdev_dev, name, class); - netdev_dev->hwaddr[0] = 0x55; - netdev_dev->hwaddr[1] = 0xaa; - netdev_dev->hwaddr[2] = n >> 24; + netdev_dev->hwaddr[0] = 0xfe; + netdev_dev->hwaddr[1] = 0xff; + netdev_dev->hwaddr[2] = 0xff; netdev_dev->hwaddr[3] = n >> 16; netdev_dev->hwaddr[4] = n >> 8; netdev_dev->hwaddr[5] = n; - netdev_dev->mtu = 1500; netdev_dev->flags = 0; netdev_dev->change_seq = 1; memset(&netdev_dev->remote_addr, 0, sizeof(netdev_dev->remote_addr)); @@ -148,12 +147,10 @@ netdev_tunnel_destroy(struct netdev_dev *netdev_dev_) static int netdev_tunnel_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) { - struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(netdev_dev_); struct netdev_tunnel *netdev; netdev = xmalloc(sizeof *netdev); netdev_init(&netdev->netdev, netdev_dev_); - netdev->listening = false; *netdevp = &netdev->netdev; return 0; @@ -167,16 +164,16 @@ netdev_tunnel_close(struct netdev *netdev_) } static int -netdev_tunnel_get_config(struct netdev_dev *dev_, struct shash *args) +netdev_tunnel_get_config(struct netdev_dev *dev_, struct smap *args) { struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(dev_); if (netdev_dev->valid_remote_ip) - shash_add(args, "remote_ip", - xasprintf(IP_FMT, IP_ARGS(&netdev_dev->remote_addr.sin_addr))); + smap_add_format(args, "remote_ip", IP_FMT, + IP_ARGS(netdev_dev->remote_addr.sin_addr.s_addr)); if (netdev_dev->valid_remote_port) - shash_add(args, "remote_port", - xasprintf("%"PRIu16, ntohs(netdev_dev->remote_addr.sin_port))); + smap_add_format(args, "remote_port", "%"PRIu16, + ntohs(netdev_dev->remote_addr.sin_port)); return 0; } @@ -192,19 +189,20 @@ netdev_tunnel_connect(struct netdev_dev_tunnel *dev) return errno; } dev->connected = true; + netdev_tunnel_update_seq(dev); VLOG_DBG("%s: connected to (%s, %d)", netdev_dev_get_name(&dev->netdev_dev), inet_ntoa(dev->remote_addr.sin_addr), ntohs(dev->remote_addr.sin_port)); return 0; } static int -netdev_tunnel_set_config(struct netdev_dev *dev_, const struct shash *args) +netdev_tunnel_set_config(struct netdev_dev *dev_, const struct smap *args) { struct netdev_dev_tunnel *netdev_dev = netdev_dev_tunnel_cast(dev_); struct shash_node *node; VLOG_DBG("tunnel_set_config(%s)", netdev_dev_get_name(dev_)); - SHASH_FOR_EACH(node, args) { + SMAP_FOR_EACH(node, args) { VLOG_DBG("arg: %s->%s", node->name, (char*)node->data); if (!strcmp(node->name, "remote_ip")) { struct in_addr addr; @@ -226,11 +224,8 @@ netdev_tunnel_set_config(struct netdev_dev *dev_, const struct shash *args) } static int -netdev_tunnel_listen(struct netdev *netdev_) +netdev_tunnel_listen(struct netdev *netdev_ OVS_UNUSED) { - struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_); - VLOG_DBG("tunnel_listen(%s)", netdev_get_name(netdev_)); - netdev->listening = true; return 0; } @@ -244,14 +239,23 @@ netdev_tunnel_recv(struct netdev *netdev_, void *buffer, size_t size) for (;;) { ssize_t retval; retval = recv(dev->sockfd, buffer, size, MSG_TRUNC); - VLOG_DBG("%s: recv(%x, %d, MSG_TRUNC) = %d", - netdev_get_name(netdev_), buffer, size, retval); + VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIu64", MSG_TRUNC) = %"PRId64, + netdev_get_name(netdev_), (uintptr_t)buffer, size, retval); if (retval >= 0) { - return retval <= size ? retval : -EMSGSIZE; + dev->stats.rx_packets++; + dev->stats.rx_bytes += retval; + if (retval <= size) { + return retval; + } else { + dev->stats.rx_errors++; + dev->stats.rx_length_errors++; + return -EMSGSIZE; + } } else if (errno != EINTR) { if (errno != EAGAIN) { - VLOG_WARN("error receiveing Ethernet packet on %s: %s", - strerror(errno), netdev_get_name(netdev_)); + VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s", + netdev_get_name(netdev_), strerror(errno)); + dev->stats.rx_errors++; } return -errno; } @@ -274,19 +278,28 @@ netdev_tunnel_send(struct netdev *netdev_, const void *buffer, size_t size) struct netdev_dev_tunnel *dev = netdev_dev_tunnel_cast(netdev_get_dev(netdev_)); if (!dev->connected) - return -EAGAIN; + return EAGAIN; for (;;) { ssize_t retval; retval = send(dev->sockfd, buffer, size, 0); - VLOG_DBG("%s: send(%x, %d) = %d", netdev_get_name(netdev_), buffer, size, retval); + VLOG_DBG("%s: send(%"PRIxPTR", %"PRIu64") = %"PRId64, + netdev_get_name(netdev_), (uintptr_t)buffer, size, retval); if (retval >= 0) { - return retval; + dev->stats.tx_packets++; + dev->stats.tx_bytes += retval; + if (retval != size) { + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRId64" bytes of " + "%"PRIu64") on %s", retval, size, netdev_get_name(netdev_)); + dev->stats.tx_errors++; + } + return 0; } else if (errno != EINTR) { if (errno != EAGAIN) { - VLOG_WARN("error sending Ethernet packet on %s: %s", - strerror(errno), netdev_get_name(netdev_)); + VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s", + netdev_get_name(netdev_), strerror(errno)); + dev->stats.tx_errors++; } - return -errno; + return errno; } } } @@ -304,7 +317,22 @@ netdev_tunnel_send_wait(struct netdev *netdev_) static int netdev_tunnel_drain(struct netdev *netdev_) { - struct netdev_tunnel *netdev = netdev_tunnel_cast(netdev_); + struct netdev_dev_tunnel *dev = + netdev_dev_tunnel_cast(netdev_get_dev(netdev_)); + char buffer[128]; + int error; + + if (!dev->connected) + return 0; + for (;;) { + error = recv(dev->sockfd, buffer, 128, MSG_TRUNC); + if (error) { + if (error == -EAGAIN) + break; + else if (error != -EMSGSIZE) + return error; + } + } return 0; } @@ -317,7 +345,7 @@ netdev_tunnel_set_etheraddr(struct netdev *netdev, if (!eth_addr_equals(dev->hwaddr, mac)) { memcpy(dev->hwaddr, mac, ETH_ADDR_LEN); - netdev_tunnel_poll_notify(netdev); + netdev_tunnel_update_seq(dev); } return 0; @@ -334,35 +362,6 @@ netdev_tunnel_get_etheraddr(const struct netdev *netdev, return 0; } -static int -netdev_tunnel_get_mtu(const struct netdev *netdev, int *mtup) -{ - const struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev)); - - *mtup = dev->mtu; - return 0; -} - -static int -netdev_tunnel_set_mtu(const struct netdev *netdev, int mtu) -{ - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev)); - - dev->mtu = mtu; - return 0; -} - -static int -netdev_tunnel_get_carrier(const struct netdev *netdev, bool *carrier) -{ - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev)); - VLOG_DBG("tunnel_get_carrier(%s)", netdev_get_name(netdev)); - *carrier = dev->connected; - return 0; -} static int netdev_tunnel_get_stats(const struct netdev *netdev, struct netdev_stats *stats) @@ -396,11 +395,12 @@ netdev_tunnel_update_flags(struct netdev *netdev, return EINVAL; } + // XXX should we actually do something with this flags? *old_flagsp = dev->flags; dev->flags |= on; dev->flags &= ~off; if (*old_flagsp != dev->flags) { - netdev_tunnel_poll_notify(netdev); + netdev_tunnel_update_seq(dev); } return 0; } @@ -414,11 +414,8 @@ netdev_tunnel_change_seq(const struct netdev *netdev) /* Helper functions. */ static void -netdev_tunnel_poll_notify(const struct netdev *netdev) +netdev_tunnel_update_seq(struct netdev_dev_tunnel *dev) { - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev)); - dev->change_seq++; if (!dev->change_seq) { dev->change_seq++; @@ -427,10 +424,9 @@ netdev_tunnel_poll_notify(const struct netdev *netdev) static void netdev_tunnel_get_port(struct unixctl_conn *conn, - int argc, const char *argv[], void *aux OVS_UNUSED) + int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED) { struct netdev_dev_tunnel *tunnel_dev; - uint16_t port; char buf[6]; tunnel_dev = shash_find_data(&tunnel_netdev_devs, argv[1]); @@ -443,12 +439,50 @@ netdev_tunnel_get_port(struct unixctl_conn *conn, unixctl_command_reply(conn, buf); } +static void +netdev_tunnel_get_tx_bytes(struct unixctl_conn *conn, + int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED) +{ + struct netdev_dev_tunnel *tunnel_dev; + char buf[128]; + + tunnel_dev = shash_find_data(&tunnel_netdev_devs, argv[1]); + if (!tunnel_dev) { + unixctl_command_reply_error(conn, "no such tunnel netdev"); + return; + } + + sprintf(buf, "%"PRIu64, tunnel_dev->stats.tx_bytes); + unixctl_command_reply(conn, buf); +} + +static void +netdev_tunnel_get_rx_bytes(struct unixctl_conn *conn, + int argc OVS_UNUSED, const char *argv[], void *aux OVS_UNUSED) +{ + struct netdev_dev_tunnel *tunnel_dev; + char buf[128]; + + tunnel_dev = shash_find_data(&tunnel_netdev_devs, argv[1]); + if (!tunnel_dev) { + unixctl_command_reply_error(conn, "no such tunnel netdev"); + return; + } + + sprintf(buf, "%"PRIu64, tunnel_dev->stats.rx_bytes); + unixctl_command_reply(conn, buf); +} + static int netdev_tunnel_init(void) { unixctl_command_register("netdev-tunnel/get-port", "NAME", 1, 1, netdev_tunnel_get_port, NULL); + unixctl_command_register("netdev-tunnel/get-tx-bytes", "NAME", + 1, 1, netdev_tunnel_get_tx_bytes, NULL); + unixctl_command_register("netdev-tunnel/get-rx-bytes", "NAME", + 1, 1, netdev_tunnel_get_rx_bytes, NULL); return 0; } @@ -462,6 +496,7 @@ const struct netdev_class netdev_tunnel_class = { netdev_tunnel_destroy, netdev_tunnel_get_config, netdev_tunnel_set_config, + NULL, /* get_tunnel_config */ netdev_tunnel_open, netdev_tunnel_close, @@ -476,10 +511,10 @@ const struct netdev_class netdev_tunnel_class = { netdev_tunnel_set_etheraddr, netdev_tunnel_get_etheraddr, - netdev_tunnel_get_mtu, - netdev_tunnel_set_mtu, + NULL, /* get_mtu */ + NULL, /* set_mtu */ NULL, /* get_ifindex */ - netdev_tunnel_get_carrier, /* get_carrier */ + NULL, /* get_carrier */ NULL, /* get_carrier_resets */ NULL, /* get_miimon */ netdev_tunnel_get_stats,