X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-bsd.c;h=585ca7f764460ac76101ed67f2c813c67fff25d0;hb=48f8613f26a90e133ff3fce2fe16053dcaabc957;hp=3eb29ea6a2d35284cf3e0685fe3b95051fa1cdd7;hpb=7ba19d412a0e8dc762a86f7ccbbdf4e39133cc71;p=sliver-openvswitch.git diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 3eb29ea6a..585ca7f76 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -47,6 +47,7 @@ #endif #include "rtbsd.h" +#include "connectivity.h" #include "coverage.h" #include "dynamic-string.h" #include "fatal-signal.h" @@ -55,8 +56,9 @@ #include "ovs-thread.h" #include "packets.h" #include "poll-loop.h" -#include "socket-util.h" +#include "seq.h" #include "shash.h" +#include "socket-util.h" #include "svec.h" #include "util.h" #include "vlog.h" @@ -86,7 +88,6 @@ struct netdev_bsd { struct ovs_mutex mutex; unsigned int cache_valid; - unsigned int change_seq; int ifindex; uint8_t etheraddr[ETH_ADDR_LEN]; @@ -197,15 +198,6 @@ netdev_bsd_wait(void) rtbsd_notifier_wait(); } -static void -netdev_bsd_changed(struct netdev_bsd *dev) -{ - dev->change_seq++; - if (!dev->change_seq) { - dev->change_seq++; - } -} - /* Invalidate cache in case of interface status change. */ static void netdev_bsd_cache_cb(const struct rtbsd_change *change, @@ -223,7 +215,7 @@ netdev_bsd_cache_cb(const struct rtbsd_change *change, if (is_netdev_bsd_class(netdev_class)) { dev = netdev_bsd_cast(base_dev); dev->cache_valid = 0; - netdev_bsd_changed(dev); + seq_change(connectivity_seq_get()); } netdev_close(base_dev); } @@ -241,7 +233,7 @@ netdev_bsd_cache_cb(const struct rtbsd_change *change, struct netdev *netdev = node->data; dev = netdev_bsd_cast(netdev); dev->cache_valid = 0; - netdev_bsd_changed(dev); + seq_change(connectivity_seq_get()); netdev_close(netdev); } shash_destroy(&device_shash); @@ -294,7 +286,6 @@ netdev_bsd_construct_system(struct netdev *netdev_) } ovs_mutex_init(&netdev->mutex); - netdev->change_seq = 1; netdev->tap_fd = -1; netdev->kernel_name = xstrdup(netdev_->name); @@ -329,7 +320,6 @@ netdev_bsd_construct_tap(struct netdev *netdev_) * to retrieve the name of the tap device. */ ovs_mutex_init(&netdev->mutex); netdev->tap_fd = open("/dev/tap", O_RDWR); - netdev->change_seq = 1; if (netdev->tap_fd < 0) { error = errno; VLOG_WARN("opening \"/dev/tap\" failed: %s", ovs_strerror(error)); @@ -506,9 +496,6 @@ netdev_bsd_rx_construct(struct netdev_rx *rx_) ovs_mutex_lock(&netdev->mutex); error = netdev_bsd_open_pcap(netdev_get_kernel_name(netdev_), &rx->pcap_handle, &rx->fd); - if (!error) { - netdev_bsd_changed(netdev); - } ovs_mutex_unlock(&netdev->mutex); } @@ -581,20 +568,21 @@ proc_pkt(u_char *args_, const struct pcap_pkthdr *hdr, const u_char *packet) * from rx->pcap. */ static int -netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) +netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, struct ofpbuf *buffer) { struct pcap_arg arg; int ret; /* prepare the pcap argument to store the packet */ - arg.size = size; - arg.data = data; + arg.size = ofpbuf_tailroom(buffer); + arg.data = buffer->data; for (;;) { ret = pcap_dispatch(rx->pcap_handle, 1, proc_pkt, (u_char *) &arg); if (ret > 0) { - return arg.retval; /* arg.retval < 0 is handled in the caller */ + buffer->size += arg.retval; + return 0; } if (ret == -1) { if (errno == EINTR) { @@ -602,7 +590,7 @@ netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) } } - return -EAGAIN; + return EAGAIN; } } @@ -612,30 +600,33 @@ netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) * 'rx->fd' is initialized with the tap file descriptor. */ static int -netdev_rx_bsd_recv_tap(struct netdev_rx_bsd *rx, void *data, size_t size) +netdev_rx_bsd_recv_tap(struct netdev_rx_bsd *rx, struct ofpbuf *buffer) { + size_t size = ofpbuf_tailroom(buffer); + for (;;) { - ssize_t retval = read(rx->fd, data, size); + ssize_t retval = read(rx->fd, buffer->data, size); if (retval >= 0) { - return retval; + buffer->size += retval; + return 0; } else if (errno != EINTR) { if (errno != EAGAIN) { VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s", ovs_strerror(errno), netdev_rx_get_name(&rx->up)); } - return -errno; + return errno; } } } static int -netdev_bsd_rx_recv(struct netdev_rx *rx_, void *data, size_t size) +netdev_bsd_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer) { struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); return (rx->pcap_handle - ? netdev_rx_bsd_recv_pcap(rx, data, size) - : netdev_rx_bsd_recv_tap(rx, data, size)); + ? netdev_rx_bsd_recv_pcap(rx, buffer) + : netdev_rx_bsd_recv_tap(rx, buffer)); } /* @@ -702,8 +693,8 @@ netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) } } } else if (retval != size) { - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of " - "%zu) on %s", retval, size, name); + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"d bytes of " + "%"PRIuSIZE") on %s", retval, size, name); error = EMSGSIZE; } else { break; @@ -756,7 +747,7 @@ netdev_bsd_set_etheraddr(struct netdev *netdev_, if (!error) { netdev->cache_valid |= VALID_ETHERADDR; memcpy(netdev->etheraddr, mac, ETH_ADDR_LEN); - netdev_bsd_changed(netdev); + seq_change(connectivity_seq_get()); } } ovs_mutex_unlock(&netdev->mutex); @@ -872,7 +863,7 @@ netdev_bsd_get_carrier(const struct netdev *netdev_, bool *carrier) } static void -convert_stats(struct netdev_stats *stats, const struct if_data *ifd) +convert_stats_system(struct netdev_stats *stats, const struct if_data *ifd) { /* * note: UINT64_MAX means unsupported @@ -900,6 +891,51 @@ convert_stats(struct netdev_stats *stats, const struct if_data *ifd) stats->tx_window_errors = UINT64_MAX; } +static void +convert_stats_tap(struct netdev_stats *stats, const struct if_data *ifd) +{ + /* + * Similar to convert_stats_system but swapping rx and tx + * because 'ifd' is stats for the network interface side of the + * tap device and what the caller wants is one for the character + * device side. + * + * note: UINT64_MAX means unsupported + */ + stats->rx_packets = ifd->ifi_opackets; + stats->tx_packets = ifd->ifi_ipackets; + stats->rx_bytes = ifd->ifi_ibytes; + stats->tx_bytes = ifd->ifi_obytes; + stats->rx_errors = ifd->ifi_oerrors; + stats->tx_errors = ifd->ifi_ierrors; + stats->rx_dropped = UINT64_MAX; + stats->tx_dropped = ifd->ifi_iqdrops; + stats->multicast = ifd->ifi_omcasts; + stats->collisions = UINT64_MAX; + stats->rx_length_errors = UINT64_MAX; + stats->rx_over_errors = UINT64_MAX; + stats->rx_crc_errors = UINT64_MAX; + stats->rx_frame_errors = UINT64_MAX; + stats->rx_fifo_errors = UINT64_MAX; + stats->rx_missed_errors = UINT64_MAX; + stats->tx_aborted_errors = UINT64_MAX; + stats->tx_carrier_errors = UINT64_MAX; + stats->tx_fifo_errors = UINT64_MAX; + stats->tx_heartbeat_errors = UINT64_MAX; + stats->tx_window_errors = UINT64_MAX; +} + +static void +convert_stats(const struct netdev *netdev, struct netdev_stats *stats, + const struct if_data *ifd) +{ + if (netdev_bsd_cast(netdev)->tap_fd == -1) { + convert_stats_system(stats, ifd); + } else { + convert_stats_tap(stats, ifd); + } +} + /* Retrieves current device stats for 'netdev'. */ static int netdev_bsd_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) @@ -935,7 +971,7 @@ netdev_bsd_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) netdev_get_name(netdev_), ovs_strerror(errno)); return errno; } else if (!strcmp(ifmd.ifmd_name, netdev_get_name(netdev_))) { - convert_stats(stats, &ifmd.ifmd_data); + convert_stats(netdev, stats, &ifdr.ifdr_data); break; } } @@ -950,7 +986,7 @@ netdev_bsd_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) sizeof(ifdr.ifdr_name)); error = af_link_ioctl(SIOCGIFDATA, &ifdr); if (!error) { - convert_stats(stats, &ifdr.ifdr_data); + convert_stats(netdev_, stats, &ifdr.ifdr_data); } return error; #else @@ -1165,7 +1201,7 @@ netdev_bsd_set_in4(struct netdev *netdev_, struct in_addr addr, netdev->netmask = mask; } } - netdev_bsd_changed(netdev); + seq_change(connectivity_seq_get()); } ovs_mutex_unlock(&netdev->mutex); @@ -1454,7 +1490,6 @@ static int netdev_bsd_update_flags(struct netdev *netdev_, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flagsp) { - struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int old_flags, new_flags; int error; @@ -1464,148 +1499,91 @@ netdev_bsd_update_flags(struct netdev *netdev_, enum netdev_flags off, new_flags = (old_flags & ~nd_to_iff_flags(off)) | nd_to_iff_flags(on); if (new_flags != old_flags) { error = set_flags(netdev_get_kernel_name(netdev_), new_flags); - netdev_bsd_changed(netdev); + seq_change(connectivity_seq_get()); } } return error; } -static unsigned int -netdev_bsd_change_seq(const struct netdev *netdev) -{ - return netdev_bsd_cast(netdev)->change_seq; +/* Linux has also different GET_STATS, SET_STATS, + * GET_STATUS) + */ +#define NETDEV_BSD_CLASS(NAME, CONSTRUCT, \ + GET_FEATURES) \ +{ \ + NAME, \ + \ + NULL, /* init */ \ + netdev_bsd_run, \ + netdev_bsd_wait, \ + netdev_bsd_alloc, \ + CONSTRUCT, \ + netdev_bsd_destruct, \ + netdev_bsd_dealloc, \ + NULL, /* get_config */ \ + NULL, /* set_config */ \ + NULL, /* get_tunnel_config */ \ + \ + netdev_bsd_send, \ + netdev_bsd_send_wait, \ + \ + netdev_bsd_set_etheraddr, \ + netdev_bsd_get_etheraddr, \ + netdev_bsd_get_mtu, \ + NULL, /* set_mtu */ \ + netdev_bsd_get_ifindex, \ + netdev_bsd_get_carrier, \ + NULL, /* get_carrier_resets */ \ + NULL, /* set_miimon_interval */ \ + netdev_bsd_get_stats, \ + NULL, /* set_stats */ \ + \ + GET_FEATURES, \ + NULL, /* set_advertisement */ \ + NULL, /* set_policing */ \ + NULL, /* get_qos_type */ \ + NULL, /* get_qos_capabilities */ \ + NULL, /* get_qos */ \ + NULL, /* set_qos */ \ + NULL, /* get_queue */ \ + NULL, /* set_queue */ \ + NULL, /* delete_queue */ \ + NULL, /* get_queue_stats */ \ + NULL, /* queue_dump_start */ \ + NULL, /* queue_dump_next */ \ + NULL, /* queue_dump_done */ \ + NULL, /* dump_queue_stats */ \ + \ + netdev_bsd_get_in4, \ + netdev_bsd_set_in4, \ + netdev_bsd_get_in6, \ + NULL, /* add_router */ \ + netdev_bsd_get_next_hop, \ + NULL, /* get_status */ \ + netdev_bsd_arp_lookup, /* arp_lookup */ \ + \ + netdev_bsd_update_flags, \ + \ + netdev_bsd_rx_alloc, \ + netdev_bsd_rx_construct, \ + netdev_bsd_rx_destruct, \ + netdev_bsd_rx_dealloc, \ + netdev_bsd_rx_recv, \ + netdev_bsd_rx_wait, \ + netdev_bsd_rx_drain, \ } - -const struct netdev_class netdev_bsd_class = { - "system", - - NULL, /* init */ - netdev_bsd_run, - netdev_bsd_wait, - netdev_bsd_alloc, - netdev_bsd_construct_system, - netdev_bsd_destruct, - netdev_bsd_dealloc, - NULL, /* get_config */ - NULL, /* set_config */ - NULL, /* get_tunnel_config */ - - netdev_bsd_send, - netdev_bsd_send_wait, - - netdev_bsd_set_etheraddr, - netdev_bsd_get_etheraddr, - netdev_bsd_get_mtu, - NULL, /* set_mtu */ - netdev_bsd_get_ifindex, - netdev_bsd_get_carrier, - NULL, /* get_carrier_resets */ - NULL, /* set_miimon_interval */ - netdev_bsd_get_stats, - NULL, /* set_stats */ - - netdev_bsd_get_features, - NULL, /* set_advertisement */ - NULL, /* set_policing */ - NULL, /* get_qos_type */ - NULL, /* get_qos_capabilities */ - NULL, /* get_qos */ - NULL, /* set_qos */ - NULL, /* get_queue */ - NULL, /* set_queue */ - NULL, /* delete_queue */ - NULL, /* get_queue_stats */ - NULL, /* queue_dump_start */ - NULL, /* queue_dump_next */ - NULL, /* queue_dump_done */ - NULL, /* dump_queue_stats */ - - netdev_bsd_get_in4, - netdev_bsd_set_in4, - netdev_bsd_get_in6, - NULL, /* add_router */ - netdev_bsd_get_next_hop, - NULL, /* get_status */ - netdev_bsd_arp_lookup, /* arp_lookup */ - - netdev_bsd_update_flags, - - netdev_bsd_change_seq, - - netdev_bsd_rx_alloc, - netdev_bsd_rx_construct, - netdev_bsd_rx_destruct, - netdev_bsd_rx_dealloc, - netdev_bsd_rx_recv, - netdev_bsd_rx_wait, - netdev_bsd_rx_drain, -}; - -const struct netdev_class netdev_tap_class = { - "tap", - - NULL, /* init */ - netdev_bsd_run, - netdev_bsd_wait, - netdev_bsd_alloc, - netdev_bsd_construct_tap, - netdev_bsd_destruct, - netdev_bsd_dealloc, - NULL, /* get_config */ - NULL, /* set_config */ - NULL, /* get_tunnel_config */ - - netdev_bsd_send, - netdev_bsd_send_wait, - - netdev_bsd_set_etheraddr, - netdev_bsd_get_etheraddr, - netdev_bsd_get_mtu, - NULL, /* set_mtu */ - netdev_bsd_get_ifindex, - netdev_bsd_get_carrier, - NULL, /* get_carrier_resets */ - NULL, /* set_miimon_interval */ - netdev_bsd_get_stats, - NULL, /* set_stats */ - - netdev_bsd_get_features, - NULL, /* set_advertisement */ - NULL, /* set_policing */ - NULL, /* get_qos_type */ - NULL, /* get_qos_capabilities */ - NULL, /* get_qos */ - NULL, /* set_qos */ - NULL, /* get_queue */ - NULL, /* set_queue */ - NULL, /* delete_queue */ - NULL, /* get_queue_stats */ - NULL, /* queue_dump_start */ - NULL, /* queue_dump_next */ - NULL, /* queue_dump_done */ - NULL, /* dump_queue_stats */ - - netdev_bsd_get_in4, - netdev_bsd_set_in4, - netdev_bsd_get_in6, - NULL, /* add_router */ - netdev_bsd_get_next_hop, - NULL, /* get_status */ - netdev_bsd_arp_lookup, /* arp_lookup */ - - netdev_bsd_update_flags, - - netdev_bsd_change_seq, - - netdev_bsd_rx_alloc, - netdev_bsd_rx_construct, - netdev_bsd_rx_destruct, - netdev_bsd_rx_dealloc, - netdev_bsd_rx_recv, - netdev_bsd_rx_wait, - netdev_bsd_rx_drain, -}; +const struct netdev_class netdev_bsd_class = + NETDEV_BSD_CLASS( + "system", + netdev_bsd_construct_system, + netdev_bsd_get_features); + +const struct netdev_class netdev_tap_class = + NETDEV_BSD_CLASS( + "tap", + netdev_bsd_construct_tap, + netdev_bsd_get_features); static void