X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fnetdev-bsd.c;h=edf04bfdc9982bee5240d864a03d83873222d2a5;hb=HEAD;hp=dd27d2dd0d261e01edabfaaeecb85ff5459297a0;hpb=34582733d9aad82bba60f4bf986b62d58412502a;p=cascardo%2Fovs.git diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index dd27d2dd0..edf04bfdc 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2011, 2013 Gaetano Catalli. - * Copyright (c) 2013 YAMAMOTO Takashi. + * Copyright (c) 2011, 2013, 2014 Gaetano Catalli. + * Copyright (c) 2013, 2014 YAMAMOTO Takashi. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -42,30 +43,30 @@ #include #if defined(__NetBSD__) #include -#include #include #endif #include "rtbsd.h" #include "coverage.h" +#include "dp-packet.h" +#include "dpif-netdev.h" #include "dynamic-string.h" #include "fatal-signal.h" -#include "ofpbuf.h" #include "openflow/openflow.h" #include "ovs-thread.h" #include "packets.h" #include "poll-loop.h" -#include "socket-util.h" #include "shash.h" +#include "socket-util.h" #include "svec.h" #include "util.h" -#include "vlog.h" +#include "openvswitch/vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_bsd); -struct netdev_rx_bsd { - struct netdev_rx up; +struct netdev_rxq_bsd { + struct netdev_rxq up; /* Packet capture descriptor for a system network device. * For a tap device this is NULL. */ @@ -86,10 +87,9 @@ struct netdev_bsd { struct ovs_mutex mutex; unsigned int cache_valid; - unsigned int change_seq; int ifindex; - uint8_t etheraddr[ETH_ADDR_LEN]; + struct eth_addr etheraddr; struct in_addr in4; struct in_addr netmask; struct in6_addr in6; @@ -137,9 +137,9 @@ static int set_flags(const char *, int flags); static int do_set_addr(struct netdev *netdev, unsigned long ioctl_nr, const char *ioctl_name, struct in_addr addr); -static int get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]); +static int get_etheraddr(const char *netdev_name, struct eth_addr *ea); static int set_etheraddr(const char *netdev_name, int hwaddr_family, - int hwaddr_len, const uint8_t[ETH_ADDR_LEN]); + int hwaddr_len, const struct eth_addr); static int get_ifindex(const struct netdev *, int *ifindexp); static int ifr_get_flags(const struct ifreq *); @@ -150,6 +150,7 @@ static int af_link_ioctl(unsigned long command, const void *arg); #endif static void netdev_bsd_run(void); +static int netdev_bsd_get_mtu(const struct netdev *netdev_, int *mtup); static bool is_netdev_bsd_class(const struct netdev_class *netdev_class) @@ -164,11 +165,11 @@ netdev_bsd_cast(const struct netdev *netdev) return CONTAINER_OF(netdev, struct netdev_bsd, up); } -static struct netdev_rx_bsd * -netdev_rx_bsd_cast(const struct netdev_rx *rx) +static struct netdev_rxq_bsd * +netdev_rxq_bsd_cast(const struct netdev_rxq *rxq) { - ovs_assert(is_netdev_bsd_class(netdev_get_class(rx->netdev))); - return CONTAINER_OF(rx, struct netdev_rx_bsd, up); + ovs_assert(is_netdev_bsd_class(netdev_get_class(rxq->netdev))); + return CONTAINER_OF(rxq, struct netdev_rxq_bsd, up); } static const char * @@ -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); + netdev_change_seq_changed(base_dev); } 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); + netdev_change_seq_changed(netdev); netdev_close(netdev); } shash_destroy(&device_shash); @@ -255,7 +247,7 @@ cache_notifier_ref(void) if (!cache_notifier_refcount) { ret = rtbsd_notifier_register(&netdev_bsd_cache_notifier, - netdev_bsd_cache_cb, NULL); + netdev_bsd_cache_cb, NULL); if (ret) { return ret; } @@ -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); @@ -303,6 +294,7 @@ netdev_bsd_construct_system(struct netdev *netdev_) if (error == ENXIO) { free(netdev->kernel_name); cache_notifier_unref(); + ovs_mutex_destroy(&netdev->mutex); return error; } @@ -329,7 +321,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)); @@ -370,7 +361,7 @@ netdev_bsd_construct_tap(struct netdev *netdev_) /* Turn device UP */ ifr_set_flags(&ifr, IFF_UP); - strncpy(ifr.ifr_name, kernel_name, sizeof ifr.ifr_name); + ovs_strlcpy(ifr.ifr_name, kernel_name, sizeof ifr.ifr_name); error = af_inet_ioctl(SIOCSIFFLAGS, &ifr); if (error) { destroy_tap(netdev->tap_fd, kernel_name); @@ -483,32 +474,29 @@ error: return error; } -static struct netdev_rx * -netdev_bsd_rx_alloc(void) +static struct netdev_rxq * +netdev_bsd_rxq_alloc(void) { - struct netdev_rx_bsd *rx = xzalloc(sizeof *rx); - return &rx->up; + struct netdev_rxq_bsd *rxq = xzalloc(sizeof *rxq); + return &rxq->up; } static int -netdev_bsd_rx_construct(struct netdev_rx *rx_) +netdev_bsd_rxq_construct(struct netdev_rxq *rxq_) { - struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); - struct netdev *netdev_ = rx->up.netdev; + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); + struct netdev *netdev_ = rxq->up.netdev; struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int error; if (!strcmp(netdev_get_type(netdev_), "tap")) { - rx->pcap_handle = NULL; - rx->fd = netdev->tap_fd; + rxq->pcap_handle = NULL; + rxq->fd = netdev->tap_fd; error = 0; } else { 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); - } + &rxq->pcap_handle, &rxq->fd); ovs_mutex_unlock(&netdev->mutex); } @@ -516,21 +504,21 @@ netdev_bsd_rx_construct(struct netdev_rx *rx_) } static void -netdev_bsd_rx_destruct(struct netdev_rx *rx_) +netdev_bsd_rxq_destruct(struct netdev_rxq *rxq_) { - struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); - if (rx->pcap_handle) { - pcap_close(rx->pcap_handle); + if (rxq->pcap_handle) { + pcap_close(rxq->pcap_handle); } } static void -netdev_bsd_rx_dealloc(struct netdev_rx *rx_) +netdev_bsd_rxq_dealloc(struct netdev_rxq *rxq_) { - struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); - free(rx); + free(rxq); } /* The recv callback of the netdev class returns the number of bytes of the @@ -561,7 +549,7 @@ struct pcap_arg { static void proc_pkt(u_char *args_, const struct pcap_pkthdr *hdr, const u_char *packet) { - struct pcap_arg *args = (struct pcap_arg *)args_; + struct pcap_arg *args = ALIGNED_CAST(struct pcap_arg *, args_); if (args->size < hdr->len) { VLOG_WARN_RL(&rl, "packet truncated"); @@ -578,23 +566,24 @@ proc_pkt(u_char *args_, const struct pcap_pkthdr *hdr, const u_char *packet) * This function attempts to receive a packet from the specified network * device. It is assumed that the network device is a system device or a tap * device opened as a system one. In this case the read operation is performed - * from rx->pcap. + * from rxq->pcap. */ static int -netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) +netdev_rxq_bsd_recv_pcap(struct netdev_rxq_bsd *rxq, struct dp_packet *buffer) { struct pcap_arg arg; int ret; /* prepare the pcap argument to store the packet */ - arg.size = size; - arg.data = data; + arg.size = dp_packet_tailroom(buffer); + arg.data = dp_packet_data(buffer); for (;;) { - ret = pcap_dispatch(rx->pcap_handle, 1, proc_pkt, (u_char *) &arg); + ret = pcap_dispatch(rxq->pcap_handle, 1, proc_pkt, (u_char *) &arg); if (ret > 0) { - return arg.retval; /* arg.retval < 0 is handled in the caller */ + dp_packet_set_size(buffer, dp_packet_size(buffer) + arg.retval); + return 0; } if (ret == -1) { if (errno == EINTR) { @@ -602,65 +591,89 @@ netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) } } - return -EAGAIN; + return EAGAIN; } } /* * This function attempts to receive a packet from the specified network * device. It is assumed that the network device is a tap device and - * 'rx->fd' is initialized with the tap file descriptor. + * 'rxq->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_rxq_bsd_recv_tap(struct netdev_rxq_bsd *rxq, struct dp_packet *buffer) { + size_t size = dp_packet_tailroom(buffer); + for (;;) { - ssize_t retval = read(rx->fd, data, size); + ssize_t retval = read(rxq->fd, dp_packet_data(buffer), size); if (retval >= 0) { - return retval; + dp_packet_set_size(buffer, dp_packet_size(buffer) + 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)); + ovs_strerror(errno), netdev_rxq_get_name(&rxq->up)); } - return -errno; + return errno; } } } static int -netdev_bsd_rx_recv(struct netdev_rx *rx_, void *data, size_t size) +netdev_bsd_rxq_recv(struct netdev_rxq *rxq_, struct dp_packet **packets, + int *c) { - struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); + struct netdev *netdev = rxq->up.netdev; + struct dp_packet *packet; + ssize_t retval; + int mtu; - return (rx->pcap_handle - ? netdev_rx_bsd_recv_pcap(rx, data, size) - : netdev_rx_bsd_recv_tap(rx, data, size)); + if (netdev_bsd_get_mtu(netdev, &mtu)) { + mtu = ETH_PAYLOAD_MAX; + } + + packet = dp_packet_new_with_headroom(VLAN_ETH_HEADER_LEN + mtu, + DP_NETDEV_HEADROOM); + retval = (rxq->pcap_handle + ? netdev_rxq_bsd_recv_pcap(rxq, packet) + : netdev_rxq_bsd_recv_tap(rxq, packet)); + + if (retval) { + dp_packet_delete(packet); + } else { + dp_packet_pad(packet); + dp_packet_rss_invalidate(packet); + packets[0] = packet; + *c = 1; + } + return retval; } /* * Registers with the poll loop to wake up from the next call to poll_block() - * when a packet is ready to be received with netdev_rx_recv() on 'rx'. + * when a packet is ready to be received with netdev_rxq_recv() on 'rxq'. */ static void -netdev_bsd_rx_wait(struct netdev_rx *rx_) +netdev_bsd_rxq_wait(struct netdev_rxq *rxq_) { - struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); - poll_fd_wait(rx->fd, POLLIN); + poll_fd_wait(rxq->fd, POLLIN); } -/* Discards all packets waiting to be received from 'rx'. */ +/* Discards all packets waiting to be received from 'rxq'. */ static int -netdev_bsd_rx_drain(struct netdev_rx *rx_) +netdev_bsd_rxq_drain(struct netdev_rxq *rxq_) { struct ifreq ifr; - struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); - strcpy(ifr.ifr_name, netdev_get_kernel_name(netdev_rx_get_netdev(rx_))); - if (ioctl(rx->fd, BIOCFLUSH, &ifr) == -1) { + strcpy(ifr.ifr_name, netdev_get_kernel_name(netdev_rxq_get_netdev(rxq_))); + if (ioctl(rxq->fd, BIOCFLUSH, &ifr) == -1) { VLOG_DBG_RL(&rl, "%s: ioctl(BIOCFLUSH) failed: %s", - netdev_rx_get_name(rx_), ovs_strerror(errno)); + netdev_rxq_get_name(rxq_), ovs_strerror(errno)); return errno; } return 0; @@ -671,11 +684,13 @@ netdev_bsd_rx_drain(struct netdev_rx *rx_) * system or a tap device. */ static int -netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) +netdev_bsd_send(struct netdev *netdev_, int qid OVS_UNUSED, + struct dp_packet **pkts, int cnt, bool may_steal) { struct netdev_bsd *dev = netdev_bsd_cast(netdev_); const char *name = netdev_get_name(netdev_); int error; + int i; ovs_mutex_lock(&dev->mutex); if (dev->tap_fd < 0 && !dev->pcap) { @@ -684,33 +699,45 @@ netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) error = 0; } - while (!error) { - ssize_t retval; - if (dev->tap_fd >= 0) { - retval = write(dev->tap_fd, data, size); - } else { - retval = pcap_inject(dev->pcap, data, size); - } - if (retval < 0) { - if (errno == EINTR) { - continue; + for (i = 0; i < cnt; i++) { + const void *data = dp_packet_data(pkts[i]); + size_t size = dp_packet_size(pkts[i]); + + while (!error) { + ssize_t retval; + if (dev->tap_fd >= 0) { + retval = write(dev->tap_fd, data, size); } else { - error = errno; - if (error != EAGAIN) { - VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: " - "%s", name, ovs_strerror(error)); + retval = pcap_inject(dev->pcap, data, size); + } + if (retval < 0) { + if (errno == EINTR) { + continue; + } else { + error = errno; + if (error != EAGAIN) { + VLOG_WARN_RL(&rl, "error sending Ethernet packet on" + " %s: %s", name, ovs_strerror(error)); + } } + } else if (retval != size) { + VLOG_WARN_RL(&rl, "sent partial Ethernet packet " + "(%"PRIuSIZE" bytes of " + "%"PRIuSIZE") on %s", retval, size, name); + error = EMSGSIZE; + } else { + break; } - } else if (retval != size) { - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"d bytes of " - "%"PRIuSIZE") on %s", retval, size, name); - error = EMSGSIZE; - } else { - break; } } ovs_mutex_unlock(&dev->mutex); + if (may_steal) { + for (i = 0; i < cnt; i++) { + dp_packet_delete(pkts[i]); + } + } + return error; } @@ -720,7 +747,7 @@ netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) * with netdev_send(). */ static void -netdev_bsd_send_wait(struct netdev *netdev_) +netdev_bsd_send_wait(struct netdev *netdev_, int qid OVS_UNUSED) { struct netdev_bsd *dev = netdev_bsd_cast(netdev_); @@ -743,7 +770,7 @@ netdev_bsd_send_wait(struct netdev *netdev_) */ static int netdev_bsd_set_etheraddr(struct netdev *netdev_, - const uint8_t mac[ETH_ADDR_LEN]) + const struct eth_addr mac) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int error = 0; @@ -755,8 +782,8 @@ netdev_bsd_set_etheraddr(struct netdev *netdev_, ETH_ADDR_LEN, mac); if (!error) { netdev->cache_valid |= VALID_ETHERADDR; - memcpy(netdev->etheraddr, mac, ETH_ADDR_LEN); - netdev_bsd_changed(netdev); + netdev->etheraddr = mac; + netdev_change_seq_changed(netdev_); } } ovs_mutex_unlock(&netdev->mutex); @@ -769,8 +796,7 @@ netdev_bsd_set_etheraddr(struct netdev *netdev_, * free the returned buffer. */ static int -netdev_bsd_get_etheraddr(const struct netdev *netdev_, - uint8_t mac[ETH_ADDR_LEN]) +netdev_bsd_get_etheraddr(const struct netdev *netdev_, struct eth_addr *mac) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int error = 0; @@ -778,13 +804,13 @@ netdev_bsd_get_etheraddr(const struct netdev *netdev_, ovs_mutex_lock(&netdev->mutex); if (!(netdev->cache_valid & VALID_ETHERADDR)) { error = get_etheraddr(netdev_get_kernel_name(netdev_), - netdev->etheraddr); + &netdev->etheraddr); if (!error) { netdev->cache_valid |= VALID_ETHERADDR; } } if (!error) { - memcpy(mac, netdev->etheraddr, ETH_ADDR_LEN); + *mac = netdev->etheraddr; } ovs_mutex_unlock(&netdev->mutex); @@ -818,7 +844,7 @@ netdev_bsd_get_mtu(const struct netdev *netdev_, int *mtup) } ovs_mutex_unlock(&netdev->mutex); - return 0; + return error; } static int @@ -845,8 +871,8 @@ netdev_bsd_get_carrier(const struct netdev *netdev_, bool *carrier) struct ifmediareq ifmr; memset(&ifmr, 0, sizeof(ifmr)); - strncpy(ifmr.ifm_name, netdev_get_kernel_name(netdev_), - sizeof ifmr.ifm_name); + ovs_strlcpy(ifmr.ifm_name, netdev_get_kernel_name(netdev_), + sizeof ifmr.ifm_name); error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); if (!error) { @@ -872,7 +898,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 +926,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 rxq 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 +1006,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, &ifmd.ifmd_data); break; } } @@ -946,11 +1017,11 @@ netdev_bsd_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) int error; memset(&ifdr, 0, sizeof(ifdr)); - strncpy(ifdr.ifdr_name, netdev_get_kernel_name(netdev_), - sizeof(ifdr.ifdr_name)); + ovs_strlcpy(ifdr.ifdr_name, netdev_get_kernel_name(netdev_), + 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 @@ -1051,7 +1122,7 @@ netdev_bsd_get_features(const struct netdev *netdev, /* XXX Look into SIOCGIFCAP instead of SIOCGIFMEDIA */ memset(&ifmr, 0, sizeof(ifmr)); - strncpy(ifmr.ifm_name, netdev_get_name(netdev), sizeof ifmr.ifm_name); + ovs_strlcpy(ifmr.ifm_name, netdev_get_name(netdev), sizeof ifmr.ifm_name); /* We make two SIOCGIFMEDIA ioctl calls. The first to determine the * number of supported modes, and a second with a buffer to retrieve @@ -1122,7 +1193,7 @@ netdev_bsd_get_in4(const struct netdev *netdev_, struct in_addr *in4, if (!error) { const struct sockaddr_in *sin; - sin = (struct sockaddr_in *) &ifr.ifr_addr; + sin = ALIGNED_CAST(struct sockaddr_in *, &ifr.ifr_addr); netdev->in4 = sin->sin_addr; netdev->cache_valid |= VALID_IN4; error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr, @@ -1165,7 +1236,7 @@ netdev_bsd_set_in4(struct netdev *netdev_, struct in_addr addr, netdev->netmask = mask; } } - netdev_bsd_changed(netdev); + netdev_change_seq_changed(netdev_); } ovs_mutex_unlock(&netdev->mutex); @@ -1190,7 +1261,7 @@ netdev_bsd_get_in6(const struct netdev *netdev_, struct in6_addr *in6) for (ifa = head; ifa; ifa = ifa->ifa_next) { if (ifa->ifa_addr->sa_family == AF_INET6 && !strcmp(ifa->ifa_name, netdev_name)) { - sin6 = (struct sockaddr_in6 *)ifa->ifa_addr; + sin6 = ALIGNED_CAST(struct sockaddr_in6 *, ifa->ifa_addr); if (sin6) { memcpy(&netdev->in6, &sin6->sin6_addr, sin6->sin6_len); netdev->cache_valid |= VALID_IN6; @@ -1302,14 +1373,14 @@ netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED, if ((i == RTA_GATEWAY) && sa->sa_family == AF_INET) { const struct sockaddr_in * const sin = - (const struct sockaddr_in *)sa; + ALIGNED_CAST(const struct sockaddr_in *, sa); *next_hop = sin->sin_addr; gateway = true; } if ((i == RTA_IFP) && sa->sa_family == AF_LINK) { const struct sockaddr_dl * const sdl = - (const struct sockaddr_dl *)sa; + ALIGNED_CAST(const struct sockaddr_dl *, sa); char *kernel_name; kernel_name = xmemdup0(sdl->sdl_data, sdl->sdl_nlen); @@ -1337,7 +1408,7 @@ netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED, static int netdev_bsd_arp_lookup(const struct netdev *netdev OVS_UNUSED, ovs_be32 ip OVS_UNUSED, - uint8_t mac[ETH_ADDR_LEN] OVS_UNUSED) + struct eth_addr *mac OVS_UNUSED) { #if defined(__NetBSD__) const struct rt_msghdr *rtm; @@ -1454,7 +1525,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 +1534,95 @@ 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); + netdev_change_seq_changed(netdev_); } } 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 */ \ + NULL, /* build header */ \ + NULL, /* push header */ \ + NULL, /* pop header */ \ + NULL, /* get_numa_id */ \ + NULL, /* set_multiq */ \ + \ + 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, \ + \ + 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_rxq_alloc, \ + netdev_bsd_rxq_construct, \ + netdev_bsd_rxq_destruct, \ + netdev_bsd_rxq_dealloc, \ + netdev_bsd_rxq_recv, \ + netdev_bsd_rxq_wait, \ + netdev_bsd_rxq_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 @@ -1661,7 +1678,7 @@ get_ifindex(const struct netdev *netdev_, int *ifindexp) } static int -get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]) +get_etheraddr(const char *netdev_name, struct eth_addr *ea) { struct ifaddrs *head; struct ifaddrs *ifa; @@ -1676,7 +1693,7 @@ get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]) for (ifa = head; ifa; ifa = ifa->ifa_next) { if (ifa->ifa_addr->sa_family == AF_LINK) { if (!strcmp(ifa->ifa_name, netdev_name)) { - sdl = (struct sockaddr_dl *)ifa->ifa_addr; + sdl = ALIGNED_CAST(struct sockaddr_dl *, ifa->ifa_addr); if (sdl) { memcpy(ea, LLADDR(sdl), sdl->sdl_alen); freeifaddrs(head); @@ -1694,17 +1711,17 @@ get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]) static int set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, int hwaddr_len OVS_UNUSED, - const uint8_t mac[ETH_ADDR_LEN] OVS_UNUSED) + const struct eth_addr mac OVS_UNUSED) { #if defined(__FreeBSD__) struct ifreq ifr; int error; memset(&ifr, 0, sizeof ifr); - strncpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name); + ovs_strlcpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name); ifr.ifr_addr.sa_family = hwaddr_family; ifr.ifr_addr.sa_len = hwaddr_len; - memcpy(ifr.ifr_addr.sa_data, mac, hwaddr_len); + memcpy(ifr.ifr_addr.sa_data, &mac, hwaddr_len); error = af_inet_ioctl(SIOCSIFLLADDR, &ifr); if (error) { VLOG_ERR("ioctl(SIOCSIFLLADDR) on %s device failed: %s", @@ -1727,7 +1744,7 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, return EOPNOTSUPP; } memset(&req, 0, sizeof(req)); - strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); + ovs_strlcpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); req.addr.ss_len = sizeof(req.addr); req.addr.ss_family = hwaddr_family; sdl = (struct sockaddr_dl *)&req.addr; @@ -1737,26 +1754,26 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, if (error) { return error; } - if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], mac, hwaddr_len)) { + if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], &mac, hwaddr_len)) { return 0; } oldaddr = req.addr; memset(&req, 0, sizeof(req)); - strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); + ovs_strlcpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); req.flags = IFLR_ACTIVE; sdl = (struct sockaddr_dl *)&req.addr; sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data) + hwaddr_len; sdl->sdl_alen = hwaddr_len; sdl->sdl_family = hwaddr_family; - memcpy(sdl->sdl_data, mac, hwaddr_len); + memcpy(sdl->sdl_data, &mac, hwaddr_len); error = af_link_ioctl(SIOCALIFADDR, &req); if (error) { return error; } memset(&req, 0, sizeof(req)); - strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); + ovs_strlcpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); req.addr = oldaddr; return af_link_ioctl(SIOCDLIFADDR, &req); #else @@ -1768,7 +1785,7 @@ static int ifr_get_flags(const struct ifreq *ifr) { #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH - return (ifr->ifr_flagshigh << 16) | ifr->ifr_flags; + return (ifr->ifr_flagshigh << 16) | (ifr->ifr_flags & 0xffff); #else return ifr->ifr_flags; #endif @@ -1777,12 +1794,15 @@ ifr_get_flags(const struct ifreq *ifr) static void ifr_set_flags(struct ifreq *ifr, int flags) { - ifr->ifr_flags = flags; #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH + ifr->ifr_flags = flags & 0xffff; ifr->ifr_flagshigh = flags >> 16; +#else + ifr->ifr_flags = flags; #endif } +#if defined(__NetBSD__) /* Calls ioctl() on an AF_LINK sock, passing the specified 'command' and * 'arg'. Returns 0 if successful, otherwise a positive errno value. */ int @@ -1804,3 +1824,4 @@ af_link_ioctl(unsigned long command, const void *arg) : ioctl(sock, command, arg) == -1 ? errno : 0); } +#endif