X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-bsd.c;h=ef1e649761087e25a7f50ac60185287ee1954749;hb=HEAD;hp=6ff6b3e95db97f98e7a0620d93f5bf737ea74ada;hpb=35bacb7fe3e00ce43518ff0a28bb8340e37be373;p=sliver-openvswitch.git diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index 6ff6b3e95..ef1e64976 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2011 Gaetano Catalli. - * Copyright (c) 2013 YAMAMOTO Takashi. + * Copyright (c) 2011, 2013 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. @@ -42,18 +42,22 @@ #include #if defined(__NetBSD__) #include +#include +#include #endif #include "rtbsd.h" #include "coverage.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" @@ -61,8 +65,8 @@ 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. */ @@ -73,12 +77,16 @@ struct netdev_rx_bsd { int fd; }; -static const struct netdev_rx_class netdev_rx_bsd_class; - struct netdev_bsd { struct netdev up; + + /* Never changes after initialization. */ + char *kernel_name; + + /* Protects all members below. */ + struct ovs_mutex mutex; + unsigned int cache_valid; - unsigned int change_seq; int ifindex; uint8_t etheraddr[ETH_ADDR_LEN]; @@ -93,8 +101,6 @@ struct netdev_bsd { /* Used for sending packets on non-tap devices. */ pcap_t *pcap; int fd; - - char *kernel_name; }; @@ -107,14 +113,6 @@ enum { VALID_CARRIER = 1 << 5 }; -/* An AF_INET socket (used for ioctl operations). */ -static int af_inet_sock = -1; - -#if defined(__NetBSD__) -/* AF_LINK socket used for netdev_bsd_get_stats and set_etheraddr */ -static int af_link_sock = -1; -#endif /* defined(__NetBSD__) */ - #define PCAP_SNAPLEN 2048 @@ -133,13 +131,11 @@ static int cache_notifier_refcount; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); -static int netdev_bsd_do_ioctl(const char *, struct ifreq *, unsigned long cmd, - const char *cmd_name); static void destroy_tap(int fd, const char *name); static int get_flags(const struct netdev *, int *flagsp); static int set_flags(const char *, int flags); static int do_set_addr(struct netdev *netdev, - int ioctl_nr, const char *ioctl_name, + 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 set_etheraddr(const char *netdev_name, int hwaddr_family, @@ -149,12 +145,17 @@ static int get_ifindex(const struct netdev *, int *ifindexp); static int ifr_get_flags(const struct ifreq *); static void ifr_set_flags(struct ifreq *, int flags); -static int netdev_bsd_init(void); +#ifdef __NetBSD__ +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) { - return netdev_class->init == netdev_bsd_init; + return netdev_class->run == netdev_bsd_run; } static struct netdev_bsd * @@ -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) { - netdev_rx_assert_class(rx, &netdev_rx_bsd_class); - 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 * @@ -177,36 +178,6 @@ netdev_get_kernel_name(const struct netdev *netdev) return netdev_bsd_cast(netdev)->kernel_name; } -/* Initialize the AF_INET socket used for ioctl operations */ -static int -netdev_bsd_init(void) -{ - static int status = -1; - - if (status >= 0) { /* already initialized */ - return status; - } - - af_inet_sock = socket(AF_INET, SOCK_DGRAM, 0); - status = af_inet_sock >= 0 ? 0 : errno; - if (status) { - VLOG_ERR("failed to create inet socket: %s", ovs_strerror(status)); - return status; - } - -#if defined(__NetBSD__) - af_link_sock = socket(AF_LINK, SOCK_DGRAM, 0); - status = af_link_sock >= 0 ? 0 : errno; - if (status) { - VLOG_ERR("failed to create link socket: %s", ovs_strerror(status)); - close(af_inet_sock); - af_inet_sock = -1; - } -#endif /* defined(__NetBSD__) */ - - return status; -} - /* * Perform periodic work needed by netdev. In BSD netdevs it checks for any * interface status changes, and eventually calls all the user callbacks. @@ -227,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, @@ -253,8 +215,9 @@ 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); } } else { /* @@ -270,7 +233,8 @@ 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); } @@ -302,12 +266,17 @@ cache_notifier_unref(void) return 0; } -/* Allocate a netdev_bsd structure */ +static struct netdev * +netdev_bsd_alloc(void) +{ + struct netdev_bsd *netdev = xzalloc(sizeof *netdev); + return &netdev->up; +} + static int -netdev_bsd_create_system(const struct netdev_class *class, const char *name, - struct netdev **netdevp) +netdev_bsd_construct_system(struct netdev *netdev_) { - struct netdev_bsd *netdev; + struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); enum netdev_flags flags; int error; @@ -316,34 +285,26 @@ netdev_bsd_create_system(const struct netdev_class *class, const char *name, return error; } - netdev = xzalloc(sizeof *netdev); - netdev->change_seq = 1; - netdev_init(&netdev->up, name, class); + ovs_mutex_init(&netdev->mutex); netdev->tap_fd = -1; - netdev->kernel_name = xstrdup(name); + netdev->kernel_name = xstrdup(netdev_->name); /* Verify that the netdev really exists by attempting to read its flags */ - error = netdev_get_flags(&netdev->up, &flags); + error = netdev_get_flags(netdev_, &flags); if (error == ENXIO) { free(netdev->kernel_name); - netdev_uninit(&netdev->up, false); - free(netdev); cache_notifier_unref(); return error; } - *netdevp = &netdev->up; return 0; } -/* - * Allocate a netdev_bsd structure with 'tap' class. - */ static int -netdev_bsd_create_tap(const struct netdev_class *class, const char *name, - struct netdev **netdevp) +netdev_bsd_construct_tap(struct netdev *netdev_) { - struct netdev_bsd *netdev = NULL; + struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); + const char *name = netdev_->name; int error = 0; struct ifreq ifr; char *kernel_name = NULL; @@ -353,15 +314,12 @@ netdev_bsd_create_tap(const struct netdev_class *class, const char *name, goto error; } - /* allocate the device structure and set the internal flag */ - netdev = xzalloc(sizeof *netdev); - memset(&ifr, 0, sizeof(ifr)); /* Create a tap device by opening /dev/tap. The TAPGIFNAME ioctl is used * 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)); @@ -379,8 +337,8 @@ netdev_bsd_create_tap(const struct netdev_class *class, const char *name, /* Change the name of the tap device */ #if defined(SIOCSIFNAME) ifr.ifr_data = (void *)name; - if (ioctl(af_inet_sock, SIOCSIFNAME, &ifr) == -1) { - error = errno; + error = af_inet_ioctl(SIOCSIFNAME, &ifr); + if (error) { destroy_tap(netdev->tap_fd, ifr.ifr_name); goto error_unref_notifier; } @@ -403,30 +361,26 @@ netdev_bsd_create_tap(const struct netdev_class *class, const char *name, /* Turn device UP */ ifr_set_flags(&ifr, IFF_UP); strncpy(ifr.ifr_name, kernel_name, sizeof ifr.ifr_name); - if (ioctl(af_inet_sock, SIOCSIFFLAGS, &ifr) == -1) { - error = errno; + error = af_inet_ioctl(SIOCSIFFLAGS, &ifr); + if (error) { destroy_tap(netdev->tap_fd, kernel_name); goto error_unref_notifier; } - /* initialize the device structure and - * link the structure to its netdev */ - netdev_init(&netdev->up, name, class); netdev->kernel_name = kernel_name; - *netdevp = &netdev->up; return 0; error_unref_notifier: + ovs_mutex_destroy(&netdev->mutex); cache_notifier_unref(); error: - free(netdev); free(kernel_name); return error; } static void -netdev_bsd_destroy(struct netdev *netdev_) +netdev_bsd_destruct(struct netdev *netdev_) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); @@ -439,6 +393,14 @@ netdev_bsd_destroy(struct netdev *netdev_) pcap_close(netdev->pcap); } free(netdev->kernel_name); + ovs_mutex_destroy(&netdev->mutex); +} + +static void +netdev_bsd_dealloc(struct netdev *netdev_) +{ + struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); + free(netdev); } @@ -511,46 +473,51 @@ error: return error; } +static struct netdev_rxq * +netdev_bsd_rxq_alloc(void) +{ + struct netdev_rxq_bsd *rxq = xzalloc(sizeof *rxq); + return &rxq->up; +} + static int -netdev_bsd_rx_open(struct netdev *netdev_, struct netdev_rx **rxp) +netdev_bsd_rxq_construct(struct netdev_rxq *rxq_) { + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); + struct netdev *netdev_ = rxq->up.netdev; struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); - - struct netdev_rx_bsd *rx; - pcap_t *pcap; - int fd; + int error; if (!strcmp(netdev_get_type(netdev_), "tap")) { - pcap = NULL; - fd = netdev->tap_fd; + rxq->pcap_handle = NULL; + rxq->fd = netdev->tap_fd; + error = 0; } else { - int error = netdev_bsd_open_pcap(netdev_get_kernel_name(netdev_), - &pcap, &fd); - if (error) { - return error; - } - - netdev_bsd_changed(netdev); + ovs_mutex_lock(&netdev->mutex); + error = netdev_bsd_open_pcap(netdev_get_kernel_name(netdev_), + &rxq->pcap_handle, &rxq->fd); + ovs_mutex_unlock(&netdev->mutex); } - rx = xmalloc(sizeof *rx); - netdev_rx_init(&rx->up, netdev_, &netdev_rx_bsd_class); - rx->pcap_handle = pcap; - rx->fd = fd; - - *rxp = &rx->up; - return 0; + return error; } static void -netdev_rx_bsd_destroy(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); } - free(rx); +} + +static void +netdev_bsd_rxq_dealloc(struct netdev_rxq *rxq_) +{ + struct netdev_rxq_bsd *rxq = netdev_rxq_bsd_cast(rxq_); + + free(rxq); } /* The recv callback of the netdev class returns the number of bytes of the @@ -598,23 +565,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 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 = ofpbuf_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 */ + ofpbuf_set_size(buffer, ofpbuf_size(buffer) + arg.retval); + return 0; } if (ret == -1) { if (errno == EINTR) { @@ -622,66 +590,87 @@ 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 ofpbuf *buffer) { + size_t size = ofpbuf_tailroom(buffer); + for (;;) { - ssize_t retval = read(rx->fd, data, size); + ssize_t retval = read(rxq->fd, ofpbuf_data(buffer), size); if (retval >= 0) { - return retval; + ofpbuf_set_size(buffer, ofpbuf_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_rx_bsd_recv(struct netdev_rx *rx_, void *data, size_t size) +netdev_bsd_rxq_recv(struct netdev_rxq *rxq_, struct ofpbuf **packet, 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 ofpbuf *buffer; + 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; + } + + buffer = ofpbuf_new_with_headroom(VLAN_ETH_HEADER_LEN + mtu, DP_NETDEV_HEADROOM); + + retval = (rxq->pcap_handle + ? netdev_rxq_bsd_recv_pcap(rxq, buffer) + : netdev_rxq_bsd_recv_tap(rxq, buffer)); + + if (retval) { + ofpbuf_delete(buffer); + } else { + dp_packet_pad(buffer); + packet[0] = buffer; + *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_rx_bsd_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_rx_bsd_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; @@ -692,19 +681,22 @@ netdev_rx_bsd_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_, struct ofpbuf *pkt, bool may_steal) { struct netdev_bsd *dev = netdev_bsd_cast(netdev_); const char *name = netdev_get_name(netdev_); + const void *data = ofpbuf_data(pkt); + size_t size = ofpbuf_size(pkt); + int error; + ovs_mutex_lock(&dev->mutex); if (dev->tap_fd < 0 && !dev->pcap) { - int error = netdev_bsd_open_pcap(name, &dev->pcap, &dev->fd); - if (error) { - return error; - } + error = netdev_bsd_open_pcap(name, &dev->pcap, &dev->fd); + } else { + error = 0; } - for (;;) { + while (!error) { ssize_t retval; if (dev->tap_fd >= 0) { retval = write(dev->tap_fd, data, size); @@ -714,19 +706,28 @@ netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) if (retval < 0) { if (errno == EINTR) { continue; - } else if (errno != EAGAIN) { - VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s", - name, ovs_strerror(errno)); + } else { + error = errno; + if (error != EAGAIN) { + VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: " + "%s", name, ovs_strerror(error)); + } } - return errno; } else if (retval != size) { - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of " - "%zu) on %s", retval, size, name); - return EMSGSIZE; + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"d bytes of " + "%"PRIuSIZE") on %s", retval, size, name); + error = EMSGSIZE; } else { - return 0; + break; } } + + ovs_mutex_unlock(&dev->mutex); + if (may_steal) { + ofpbuf_delete(pkt); + } + + return error; } /* @@ -739,6 +740,7 @@ netdev_bsd_send_wait(struct netdev *netdev_) { struct netdev_bsd *dev = netdev_bsd_cast(netdev_); + ovs_mutex_lock(&dev->mutex); if (dev->tap_fd >= 0) { /* TAP device always accepts packets. */ poll_immediate_wake(); @@ -748,6 +750,7 @@ netdev_bsd_send_wait(struct netdev *netdev_) /* We haven't even tried to send a packet yet. */ poll_immediate_wake(); } + ovs_mutex_unlock(&dev->mutex); } /* @@ -759,8 +762,9 @@ netdev_bsd_set_etheraddr(struct netdev *netdev_, const uint8_t mac[ETH_ADDR_LEN]) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); - int error; + int error = 0; + ovs_mutex_lock(&netdev->mutex); if (!(netdev->cache_valid & VALID_ETHERADDR) || !eth_addr_equals(netdev->etheraddr, mac)) { error = set_etheraddr(netdev_get_kernel_name(netdev_), AF_LINK, @@ -768,11 +772,11 @@ 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); + netdev_change_seq_changed(netdev_); } - } else { - error = 0; } + ovs_mutex_unlock(&netdev->mutex); + return error; } @@ -785,18 +789,22 @@ netdev_bsd_get_etheraddr(const struct netdev *netdev_, uint8_t mac[ETH_ADDR_LEN]) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); + int error = 0; + ovs_mutex_lock(&netdev->mutex); if (!(netdev->cache_valid & VALID_ETHERADDR)) { - int error = get_etheraddr(netdev_get_kernel_name(netdev_), - netdev->etheraddr); - if (error) { - return error; + error = get_etheraddr(netdev_get_kernel_name(netdev_), + netdev->etheraddr); + if (!error) { + netdev->cache_valid |= VALID_ETHERADDR; } - netdev->cache_valid |= VALID_ETHERADDR; } - memcpy(mac, netdev->etheraddr, ETH_ADDR_LEN); + if (!error) { + memcpy(mac, netdev->etheraddr, ETH_ADDR_LEN); + } + ovs_mutex_unlock(&netdev->mutex); - return 0; + return error; } /* @@ -808,30 +816,37 @@ static int netdev_bsd_get_mtu(const struct netdev *netdev_, int *mtup) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); + int error = 0; + ovs_mutex_lock(&netdev->mutex); if (!(netdev->cache_valid & VALID_MTU)) { struct ifreq ifr; - int error; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev_), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr, SIOCGIFMTU, "SIOCGIFMTU"); - if (error) { - return error; + if (!error) { + netdev->mtu = ifr.ifr_mtu; + netdev->cache_valid |= VALID_MTU; } - netdev->mtu = ifr.ifr_mtu; - netdev->cache_valid |= VALID_MTU; } + if (!error) { + *mtup = netdev->mtu; + } + ovs_mutex_unlock(&netdev->mutex); - *mtup = netdev->mtu; return 0; } static int -netdev_bsd_get_ifindex(const struct netdev *netdev) +netdev_bsd_get_ifindex(const struct netdev *netdev_) { + struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int ifindex, error; - error = get_ifindex(netdev, &ifindex); + ovs_mutex_lock(&netdev->mutex); + error = get_ifindex(netdev_, &ifindex); + ovs_mutex_unlock(&netdev->mutex); + return error ? -error : ifindex; } @@ -839,7 +854,9 @@ static int netdev_bsd_get_carrier(const struct netdev *netdev_, bool *carrier) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); + int error = 0; + ovs_mutex_lock(&netdev->mutex); if (!(netdev->cache_valid & VALID_CARRIER)) { struct ifmediareq ifmr; @@ -847,28 +864,31 @@ netdev_bsd_get_carrier(const struct netdev *netdev_, bool *carrier) strncpy(ifmr.ifm_name, netdev_get_kernel_name(netdev_), sizeof ifmr.ifm_name); - if (ioctl(af_inet_sock, SIOCGIFMEDIA, &ifmr) == -1) { - VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", - netdev_get_name(netdev_), ovs_strerror(errno)); - return errno; - } - - netdev->carrier = (ifmr.ifm_status & IFM_ACTIVE) == IFM_ACTIVE; - netdev->cache_valid |= VALID_CARRIER; + error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); + if (!error) { + netdev->carrier = (ifmr.ifm_status & IFM_ACTIVE) == IFM_ACTIVE; + netdev->cache_valid |= VALID_CARRIER; - /* If the interface doesn't report whether the media is active, - * just assume it is active. */ - if ((ifmr.ifm_status & IFM_AVALID) == 0) { - netdev->carrier = true; + /* If the interface doesn't report whether the media is active, + * just assume it is active. */ + if ((ifmr.ifm_status & IFM_AVALID) == 0) { + netdev->carrier = true; + } + } else { + VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", + netdev_get_name(netdev_), ovs_strerror(error)); } } - *carrier = netdev->carrier; + if (!error) { + *carrier = netdev->carrier; + } + ovs_mutex_unlock(&netdev->mutex); - return 0; + return error; } 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 @@ -896,6 +916,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) @@ -931,7 +996,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; } } @@ -939,19 +1004,16 @@ netdev_bsd_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) return 0; #elif defined(__NetBSD__) struct ifdatareq ifdr; - int saved_errno; - int ret; + int error; memset(&ifdr, 0, sizeof(ifdr)); strncpy(ifdr.ifdr_name, netdev_get_kernel_name(netdev_), sizeof(ifdr.ifdr_name)); - ret = ioctl(af_link_sock, SIOCGIFDATA, &ifdr); - saved_errno = errno; - if (ret == -1) { - return saved_errno; + error = af_link_ioctl(SIOCGIFDATA, &ifdr); + if (!error) { + convert_stats(netdev_, stats, &ifdr.ifdr_data); } - convert_stats(stats, &ifdr.ifdr_data); - return 0; + return error; #else #error not implemented #endif @@ -1055,10 +1117,11 @@ netdev_bsd_get_features(const struct netdev *netdev, /* We make two SIOCGIFMEDIA ioctl calls. The first to determine the * number of supported modes, and a second with a buffer to retrieve * them. */ - if (ioctl(af_inet_sock, SIOCGIFMEDIA, &ifmr) == -1) { + error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); + if (error) { VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", - netdev_get_name(netdev), ovs_strerror(errno)); - return errno; + netdev_get_name(netdev), ovs_strerror(error)); + return error; } media_list = xcalloc(ifmr.ifm_count, sizeof(int)); @@ -1071,10 +1134,10 @@ netdev_bsd_get_features(const struct netdev *netdev, goto cleanup; } - if (ioctl(af_inet_sock, SIOCGIFMEDIA, &ifmr) == -1) { + error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); + if (error) { VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", - netdev_get_name(netdev), ovs_strerror(errno)); - error = errno; + netdev_get_name(netdev), ovs_strerror(error)); goto cleanup; } @@ -1108,33 +1171,35 @@ netdev_bsd_get_in4(const struct netdev *netdev_, struct in_addr *in4, struct in_addr *netmask) { struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); + int error = 0; + ovs_mutex_lock(&netdev->mutex); if (!(netdev->cache_valid & VALID_IN4)) { - const struct sockaddr_in *sin; struct ifreq ifr; - int error; ifr.ifr_addr.sa_family = AF_INET; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev_), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr, SIOCGIFADDR, "SIOCGIFADDR"); - if (error) { - return error; - } + if (!error) { + const struct sockaddr_in *sin; - sin = (struct sockaddr_in *) &ifr.ifr_addr; - netdev->in4 = sin->sin_addr; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev_), &ifr, - SIOCGIFNETMASK, "SIOCGIFNETMASK"); - if (error) { - return error; + sin = (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, + SIOCGIFNETMASK, "SIOCGIFNETMASK"); + if (!error) { + *netmask = sin->sin_addr; + } } - netdev->netmask = sin->sin_addr; - netdev->cache_valid |= VALID_IN4; } - *in4 = netdev->in4; - *netmask = netdev->netmask; + if (!error) { + *in4 = netdev->in4; + *netmask = netdev->netmask; + } + ovs_mutex_unlock(&netdev->mutex); - return in4->s_addr == INADDR_ANY ? EADDRNOTAVAIL : 0; + return error ? error : in4->s_addr == INADDR_ANY ? EADDRNOTAVAIL : 0; } /* @@ -1149,6 +1214,7 @@ netdev_bsd_set_in4(struct netdev *netdev_, struct in_addr addr, struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int error; + ovs_mutex_lock(&netdev->mutex); error = do_set_addr(netdev_, SIOCSIFADDR, "SIOCSIFADDR", addr); if (!error) { if (addr.s_addr != INADDR_ANY) { @@ -1160,8 +1226,10 @@ 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); + return error; } @@ -1200,9 +1268,10 @@ netdev_bsd_get_in6(const struct netdev *netdev_, struct in6_addr *in6) } #if defined(__NetBSD__) -static struct netdev * -find_netdev_by_kernel_name(const char *kernel_name) +static char * +netdev_bsd_kernel_name_to_ovs_name(const char *kernel_name) { + char *ovs_name = NULL; struct shash device_shash; struct shash_node *node; @@ -1213,24 +1282,14 @@ find_netdev_by_kernel_name(const char *kernel_name) struct netdev_bsd * const dev = netdev_bsd_cast(netdev); if (!strcmp(dev->kernel_name, kernel_name)) { - shash_destroy(&device_shash); - return &dev->up; + free(ovs_name); + ovs_name = xstrdup(netdev_get_name(&dev->up)); } + netdev_close(netdev); } shash_destroy(&device_shash); - return NULL; -} - -static const char * -netdev_bsd_convert_kernel_name_to_ovs_name(const char *kernel_name) -{ - const struct netdev * const netdev = - find_netdev_by_kernel_name(kernel_name); - if (netdev == NULL) { - return NULL; - } - return netdev_get_name(netdev); + return ovs_name ? ovs_name : xstrdup(kernel_name); } #endif @@ -1315,12 +1374,7 @@ netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED, char *kernel_name; kernel_name = xmemdup0(sdl->sdl_data, sdl->sdl_nlen); - name = netdev_bsd_convert_kernel_name_to_ovs_name(kernel_name); - if (name == NULL) { - ifname = xstrdup(kernel_name); - } else { - ifname = xstrdup(name); - } + ifname = netdev_bsd_kernel_name_to_ovs_name(kernel_name); free(kernel_name); } RT_ADVANCE(cp, sa); @@ -1341,6 +1395,63 @@ netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED, #endif } +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) +{ +#if defined(__NetBSD__) + const struct rt_msghdr *rtm; + size_t needed; + char *buf; + const char *cp; + const char *ep; + int mib[6]; + int error; + + buf = NULL; + mib[0] = CTL_NET; + mib[1] = PF_ROUTE; + mib[2] = 0; + mib[3] = AF_INET; + mib[4] = NET_RT_FLAGS; + mib[5] = RTF_LLINFO; + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) { + error = errno; + goto error; + } + buf = xmalloc(needed); + if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1) { + error = errno; + goto error; + } + ep = buf + needed; + for (cp = buf; cp < ep; cp += rtm->rtm_msglen) { + const struct sockaddr_inarp *sina; + const struct sockaddr_dl *sdl; + + rtm = (const void *)cp; + sina = (const void *)(rtm + 1); + if (ip != sina->sin_addr.s_addr) { + continue; + } + sdl = (const void *) + ((const char *)(const void *)sina + RT_ROUNDUP(sina->sin_len)); + if (sdl->sdl_alen == ETH_ADDR_LEN) { + memcpy(mac, &sdl->sdl_data[sdl->sdl_nlen], ETH_ADDR_LEN); + error = 0; + goto error; + } + } + error = ENXIO; +error: + free(buf); + return error; +#else + return EOPNOTSUPP; +#endif +} + static void make_in4_sockaddr(struct sockaddr *sa, struct in_addr addr) { @@ -1356,11 +1467,12 @@ make_in4_sockaddr(struct sockaddr *sa, struct in_addr addr) static int do_set_addr(struct netdev *netdev, - int ioctl_nr, const char *ioctl_name, struct in_addr addr) + unsigned long ioctl_nr, const char *ioctl_name, + struct in_addr addr) { struct ifreq ifr; make_in4_sockaddr(&ifr.ifr_addr, addr); - return netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev), &ifr, ioctl_nr, + return af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev), &ifr, ioctl_nr, ioctl_name); } @@ -1377,6 +1489,9 @@ nd_to_iff_flags(enum netdev_flags nd) iff |= IFF_PPROMISC; #endif } + if (nd & NETDEV_LOOPBACK) { + iff |= IFF_LOOPBACK; + } return iff; } @@ -1390,6 +1505,9 @@ iff_to_nd_flags(int iff) if (iff & IFF_PROMISC) { nd |= NETDEV_PROMISC; } + if (iff & IFF_LOOPBACK) { + nd |= NETDEV_LOOPBACK; + } return nd; } @@ -1397,7 +1515,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; @@ -1407,135 +1524,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); + 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 */ \ + \ + 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_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", - - netdev_bsd_init, - netdev_bsd_run, - netdev_bsd_wait, - netdev_bsd_create_system, - netdev_bsd_destroy, - NULL, /* get_config */ - NULL, /* set_config */ - NULL, /* get_tunnel_config */ - - netdev_bsd_rx_open, - - 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, /* dump_queue */ - 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 */ - NULL, /* arp_lookup */ - - netdev_bsd_update_flags, - - netdev_bsd_change_seq -}; - -const struct netdev_class netdev_tap_class = { - "tap", - - netdev_bsd_init, - netdev_bsd_run, - netdev_bsd_wait, - netdev_bsd_create_tap, - netdev_bsd_destroy, - NULL, /* get_config */ - NULL, /* set_config */ - NULL, /* get_tunnel_config */ - - netdev_bsd_rx_open, - - 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, /* dump_queue */ - 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 */ - NULL, /* arp_lookup */ - - netdev_bsd_update_flags, - - netdev_bsd_change_seq -}; - -static const struct netdev_rx_class netdev_rx_bsd_class = { - netdev_rx_bsd_destroy, - netdev_rx_bsd_recv, - netdev_rx_bsd_wait, - netdev_rx_bsd_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 @@ -1546,7 +1619,7 @@ destroy_tap(int fd, const char *name) close(fd); strcpy(ifr.ifr_name, name); /* XXX What to do if this call fails? */ - ioctl(af_inet_sock, SIOCIFDESTROY, &ifr); + af_inet_ioctl(SIOCIFDESTROY, &ifr); } static int @@ -1555,7 +1628,7 @@ get_flags(const struct netdev *netdev, int *flags) struct ifreq ifr; int error; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev), &ifr, SIOCGIFFLAGS, "SIOCGIFFLAGS"); *flags = ifr_get_flags(&ifr); @@ -1570,7 +1643,7 @@ set_flags(const char *name, int flags) ifr_set_flags(&ifr, flags); - return netdev_bsd_do_ioctl(name, &ifr, SIOCSIFFLAGS, "SIOCSIFFLAGS"); + return af_inet_ifreq_ioctl(name, &ifr, SIOCSIFFLAGS, "SIOCSIFFLAGS"); } static int @@ -1628,23 +1701,25 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family 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); ifr.ifr_addr.sa_family = hwaddr_family; ifr.ifr_addr.sa_len = hwaddr_len; memcpy(ifr.ifr_addr.sa_data, mac, hwaddr_len); - if (ioctl(af_inet_sock, SIOCSIFLLADDR, &ifr) < 0) { + error = af_inet_ioctl(SIOCSIFLLADDR, &ifr); + if (error) { VLOG_ERR("ioctl(SIOCSIFLLADDR) on %s device failed: %s", - netdev_name, ovs_strerror(errno)); - return errno; + netdev_name, ovs_strerror(error)); + return error; } return 0; #elif defined(__NetBSD__) struct if_laddrreq req; struct sockaddr_dl *sdl; struct sockaddr_storage oldaddr; - int ret; + int error; /* * get the old address, add new one, and then remove old one. @@ -1660,9 +1735,10 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, req.addr.ss_family = hwaddr_family; sdl = (struct sockaddr_dl *)&req.addr; sdl->sdl_alen = hwaddr_len; - ret = ioctl(af_link_sock, SIOCGLIFADDR, &req); - if (ret == -1) { - return errno; + + error = af_link_ioctl(SIOCGLIFADDR, &req); + if (error) { + return error; } if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], mac, hwaddr_len)) { return 0; @@ -1677,37 +1753,20 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, sdl->sdl_alen = hwaddr_len; sdl->sdl_family = hwaddr_family; memcpy(sdl->sdl_data, mac, hwaddr_len); - ret = ioctl(af_link_sock, SIOCALIFADDR, &req); - if (ret == -1) { - return errno; + 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)); req.addr = oldaddr; - ret = ioctl(af_link_sock, SIOCDLIFADDR, &req); - if (ret == -1) { - return errno; - } - return 0; + return af_link_ioctl(SIOCDLIFADDR, &req); #else #error not implemented #endif } -static int -netdev_bsd_do_ioctl(const char *name, struct ifreq *ifr, unsigned long cmd, - const char *cmd_name) -{ - strncpy(ifr->ifr_name, name, sizeof ifr->ifr_name); - if (ioctl(af_inet_sock, cmd, ifr) == -1) { - VLOG_DBG_RL(&rl, "%s: ioctl(%s) failed: %s", name, cmd_name, - ovs_strerror(errno)); - return errno; - } - return 0; -} - static int ifr_get_flags(const struct ifreq *ifr) { @@ -1726,3 +1785,25 @@ ifr_set_flags(struct ifreq *ifr, int flags) ifr->ifr_flagshigh = flags >> 16; #endif } + +/* Calls ioctl() on an AF_LINK sock, passing the specified 'command' and + * 'arg'. Returns 0 if successful, otherwise a positive errno value. */ +int +af_link_ioctl(unsigned long command, const void *arg) +{ + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int sock; + + if (ovsthread_once_start(&once)) { + sock = socket(AF_LINK, SOCK_DGRAM, 0); + if (sock < 0) { + sock = -errno; + VLOG_ERR("failed to create link socket: %s", ovs_strerror(errno)); + } + ovsthread_once_done(&once); + } + + return (sock < 0 ? -sock + : ioctl(sock, command, arg) == -1 ? errno + : 0); +}