X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-linux.c;h=9306100670d38015e374153ba2ad76a08d46b776;hb=bd3ad2c3508aaf7283f3ee041ecd3e5108471b21;hp=9b59bc9ad06e8718d9762bf57e22ef18a19cd7ab;hpb=33d82a56df179219ccc3581437ca6e0c2d6b42ee;p=sliver-openvswitch.git diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c index 9b59bc9ad..930610067 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,11 +18,11 @@ #include "netdev-linux.h" -#include #include #include #include #include +#include #include #include #include @@ -56,18 +56,19 @@ #include "hmap.h" #include "netdev-provider.h" #include "netdev-vport.h" -#include "netlink.h" #include "netlink-notifier.h" #include "netlink-socket.h" +#include "netlink.h" #include "ofpbuf.h" #include "openflow/openflow.h" #include "packets.h" #include "poll-loop.h" #include "rtnetlink-link.h" -#include "socket-util.h" #include "shash.h" +#include "socket-util.h" #include "sset.h" #include "timer.h" +#include "unaligned.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(netdev_linux); @@ -119,11 +120,6 @@ enum { VALID_DRVINFO = 1 << 7, VALID_FEATURES = 1 << 8, }; - -struct tap_state { - int fd; - bool opened; -}; /* Traffic control. */ @@ -139,6 +135,8 @@ struct tc { * Written only by TC implementation. */ }; +#define TC_INITIALIZER(TC, OPS) { OPS, HMAP_INITIALIZER(&(TC)->queues) } + /* One traffic control queue. * * Each TC implementation subclasses this with whatever additional data it @@ -146,6 +144,7 @@ struct tc { struct tc_queue { struct hmap_node hmap_node; /* In struct tc's "queues" hmap. */ unsigned int queue_id; /* OpenFlow queue ID. */ + long long int created; /* Time queue was created, in msecs. */ }; /* A particular kind of traffic control. Each implementation generally maps to @@ -311,7 +310,7 @@ static const struct tc_ops tc_ops_hfsc; static const struct tc_ops tc_ops_default; static const struct tc_ops tc_ops_other; -static const struct tc_ops *tcs[] = { +static const struct tc_ops *const tcs[] = { &tc_ops_htb, /* Hierarchy token bucket (see tc-htb(8)). */ &tc_ops_hfsc, /* Hierarchical fair service curve. */ &tc_ops_default, /* Default qdisc (see tc-pfifo_fast(8)). */ @@ -353,10 +352,9 @@ static void tc_put_rtab(struct ofpbuf *, uint16_t type, const struct tc_ratespec *rate); static int tc_calc_buffer(unsigned int Bps, int mtu, uint64_t burst_bytes); -struct netdev_dev_linux { - struct netdev_dev netdev_dev; +struct netdev_linux { + struct netdev up; - struct shash_node *shash_node; unsigned int cache_valid; unsigned int change_seq; @@ -386,41 +384,34 @@ struct netdev_dev_linux { enum netdev_features current; /* Cached from ETHTOOL_GSET. */ enum netdev_features advertised; /* Cached from ETHTOOL_GSET. */ enum netdev_features supported; /* Cached from ETHTOOL_GSET. */ - enum netdev_features peer; /* Cached from ETHTOOL_GSET. */ struct ethtool_drvinfo drvinfo; /* Cached from ETHTOOL_GDRVINFO. */ struct tc *tc; - union { - struct tap_state tap; - } state; + /* For devices of class netdev_tap_class only. */ + int tap_fd; }; -struct netdev_linux { - struct netdev netdev; +struct netdev_rx_linux { + struct netdev_rx up; + bool is_tap; int fd; }; -/* Sockets used for ioctl operations. */ -static int af_inet_sock = -1; /* AF_INET, SOCK_DGRAM. */ - -/* A Netlink routing socket that is not subscribed to any multicast groups. */ -static struct nl_sock *rtnl_sock; +static const struct netdev_rx_class netdev_rx_linux_class; /* This is set pretty low because we probably won't learn anything from the * additional log messages. */ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); -static int netdev_linux_init(void); +static void netdev_linux_run(void); static int netdev_linux_do_ethtool(const char *name, struct ethtool_cmd *, int cmd, const char *cmd_name); -static int netdev_linux_do_ioctl(const char *name, struct ifreq *, int cmd, - const char *cmd_name); static int netdev_linux_get_ipv4(const struct netdev *, struct in_addr *, int cmd, const char *cmd_name); -static int get_flags(const struct netdev_dev *, unsigned int *flags); -static int set_flags(struct netdev *, unsigned int flags); +static int get_flags(const struct netdev *, unsigned int *flags); +static int set_flags(const char *, unsigned int flags); static int do_get_ifindex(const char *netdev_name); static int get_ifindex(const struct netdev *, int *ifindexp); static int do_set_addr(struct netdev *netdev, @@ -437,52 +428,30 @@ static void netdev_linux_miimon_wait(void); static bool is_netdev_linux_class(const struct netdev_class *netdev_class) { - return netdev_class->init == netdev_linux_init; + return netdev_class->run == netdev_linux_run; } -static struct netdev_dev_linux * -netdev_dev_linux_cast(const struct netdev_dev *netdev_dev) +static bool +is_tap_netdev(const struct netdev *netdev) { - const struct netdev_class *netdev_class = netdev_dev_get_class(netdev_dev); - assert(is_netdev_linux_class(netdev_class)); - - return CONTAINER_OF(netdev_dev, struct netdev_dev_linux, netdev_dev); + return netdev_get_class(netdev) == &netdev_tap_class; } static struct netdev_linux * netdev_linux_cast(const struct netdev *netdev) { - struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - const struct netdev_class *netdev_class = netdev_dev_get_class(netdev_dev); - assert(is_netdev_linux_class(netdev_class)); + ovs_assert(is_netdev_linux_class(netdev_get_class(netdev))); - return CONTAINER_OF(netdev, struct netdev_linux, netdev); + return CONTAINER_OF(netdev, struct netdev_linux, up); } - -static int -netdev_linux_init(void) -{ - static int status = -1; - if (status < 0) { - /* Create AF_INET socket. */ - 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", strerror(status)); - } - /* Create rtnetlink socket. */ - if (!status) { - status = nl_sock_create(NETLINK_ROUTE, &rtnl_sock); - if (status) { - VLOG_ERR_RL(&rl, "failed to create rtnetlink socket: %s", - strerror(status)); - } - } - } - return status; +static struct netdev_rx_linux * +netdev_rx_linux_cast(const struct netdev_rx *rx) +{ + netdev_rx_assert_class(rx, &netdev_rx_linux_class); + return CONTAINER_OF(rx, struct netdev_rx_linux, up); } - + static void netdev_linux_run(void) { @@ -497,32 +466,9 @@ netdev_linux_wait(void) netdev_linux_miimon_wait(); } -static int -netdev_linux_get_drvinfo(struct netdev_dev_linux *netdev_dev) -{ - - int error; - - if (netdev_dev->cache_valid & VALID_DRVINFO) { - return 0; - } - - COVERAGE_INC(netdev_get_ethtool); - memset(&netdev_dev->drvinfo, 0, sizeof netdev_dev->drvinfo); - error = netdev_linux_do_ethtool(netdev_dev->netdev_dev.name, - (struct ethtool_cmd *)&netdev_dev->drvinfo, - ETHTOOL_GDRVINFO, - "ETHTOOL_GDRVINFO"); - if (!error) { - netdev_dev->cache_valid |= VALID_DRVINFO; - } - return error; -} - static void -netdev_dev_linux_changed(struct netdev_dev_linux *dev, - unsigned int ifi_flags, - unsigned int mask) +netdev_linux_changed(struct netdev_linux *dev, + unsigned int ifi_flags, unsigned int mask) { dev->change_seq++; if (!dev->change_seq) { @@ -538,12 +484,12 @@ netdev_dev_linux_changed(struct netdev_dev_linux *dev, } static void -netdev_dev_linux_update(struct netdev_dev_linux *dev, - const struct rtnetlink_link_change *change) +netdev_linux_update(struct netdev_linux *dev, + const struct rtnetlink_link_change *change) { if (change->nlmsg_type == RTM_NEWLINK) { /* Keep drv-info */ - netdev_dev_linux_changed(dev, change->ifi_flags, VALID_DRVINFO); + netdev_linux_changed(dev, change->ifi_flags, VALID_DRVINFO); /* Update netdev from rtnl-change msg. */ if (change->mtu) { @@ -563,7 +509,7 @@ netdev_dev_linux_update(struct netdev_dev_linux *dev, dev->get_ifindex_error = 0; } else { - netdev_dev_linux_changed(dev, change->ifi_flags, 0); + netdev_linux_changed(dev, change->ifi_flags, 0); } } @@ -571,31 +517,26 @@ static void netdev_linux_cache_cb(const struct rtnetlink_link_change *change, void *aux OVS_UNUSED) { - struct netdev_dev_linux *dev; if (change) { - struct netdev_dev *base_dev = netdev_dev_from_name(change->ifname); - if (base_dev) { - const struct netdev_class *netdev_class = - netdev_dev_get_class(base_dev); - - if (is_netdev_linux_class(netdev_class)) { - dev = netdev_dev_linux_cast(base_dev); - netdev_dev_linux_update(dev, change); - } + struct netdev *base_dev = netdev_from_name(change->ifname); + if (base_dev && is_netdev_linux_class(netdev_get_class(base_dev))) { + netdev_linux_update(netdev_linux_cast(base_dev), change); + netdev_close(base_dev); } } else { struct shash device_shash; struct shash_node *node; shash_init(&device_shash); - netdev_dev_get_devices(&netdev_linux_class, &device_shash); + netdev_get_devices(&netdev_linux_class, &device_shash); SHASH_FOR_EACH (node, &device_shash) { + struct netdev *netdev = node->data; + struct netdev_linux *dev = netdev_linux_cast(netdev); unsigned int flags; - dev = node->data; - - get_flags(&dev->netdev_dev, &flags); - netdev_dev_linux_changed(dev, flags, 0); + get_flags(&dev->up, &flags); + netdev_linux_changed(dev, flags, 0); + netdev_close(netdev); } shash_destroy(&device_shash); } @@ -605,7 +546,7 @@ static int cache_notifier_ref(void) { if (!cache_notifier_refcount) { - assert(!netdev_linux_cache_notifier); + ovs_assert(!netdev_linux_cache_notifier); netdev_linux_cache_notifier = rtnetlink_link_notifier_create(netdev_linux_cache_cb, NULL); @@ -622,9 +563,9 @@ cache_notifier_ref(void) static void cache_notifier_unref(void) { - assert(cache_notifier_refcount > 0); + ovs_assert(cache_notifier_refcount > 0); if (!--cache_notifier_refcount) { - assert(netdev_linux_cache_notifier); + ovs_assert(netdev_linux_cache_notifier); rtnetlink_link_notifier_destroy(netdev_linux_cache_notifier); netdev_linux_cache_notifier = NULL; } @@ -633,9 +574,9 @@ cache_notifier_unref(void) /* Creates system and internal devices. */ static int netdev_linux_create(const struct netdev_class *class, const char *name, - struct netdev_dev **netdev_devp) + struct netdev **netdevp) { - struct netdev_dev_linux *netdev_dev; + struct netdev_linux *netdev; int error; error = cache_notifier_ref(); @@ -643,12 +584,26 @@ netdev_linux_create(const struct netdev_class *class, const char *name, return error; } - netdev_dev = xzalloc(sizeof *netdev_dev); - netdev_dev->change_seq = 1; - netdev_dev_init(&netdev_dev->netdev_dev, name, class); - get_flags(&netdev_dev->netdev_dev, &netdev_dev->ifi_flags); + netdev = xzalloc(sizeof *netdev); + netdev->change_seq = 1; + netdev_init(&netdev->up, name, class); + error = get_flags(&netdev->up, &netdev->ifi_flags); + if (error == ENODEV) { + if (class != &netdev_internal_class) { + /* The device does not exist, so don't allow it to be opened. */ + netdev_uninit(&netdev->up, false); + cache_notifier_unref(); + free(netdev); + return ENODEV; + } else { + /* "Internal" netdevs have to be created as netdev objects before + * they exist in the kernel, because creating them in the kernel + * happens by passing a netdev object to dpif_port_add(). + * Therefore, ignore the error. */ + } + } - *netdev_devp = &netdev_dev->netdev_dev; + *netdevp = &netdev->up; return 0; } @@ -660,16 +615,15 @@ netdev_linux_create(const struct netdev_class *class, const char *name, * be unavailable to other reads for tap devices. */ static int netdev_linux_create_tap(const struct netdev_class *class OVS_UNUSED, - const char *name, struct netdev_dev **netdev_devp) + const char *name, struct netdev **netdevp) { - struct netdev_dev_linux *netdev_dev; - struct tap_state *state; + struct netdev_linux *netdev; static const char tap_dev[] = "/dev/net/tun"; struct ifreq ifr; int error; - netdev_dev = xzalloc(sizeof *netdev_dev); - state = &netdev_dev->state.tap; + netdev = xzalloc(sizeof *netdev); + netdev->change_seq = 1; error = cache_notifier_ref(); if (error) { @@ -677,171 +631,135 @@ netdev_linux_create_tap(const struct netdev_class *class OVS_UNUSED, } /* Open tap device. */ - state->fd = open(tap_dev, O_RDWR); - if (state->fd < 0) { + netdev->tap_fd = open(tap_dev, O_RDWR); + if (netdev->tap_fd < 0) { error = errno; - VLOG_WARN("opening \"%s\" failed: %s", tap_dev, strerror(error)); + VLOG_WARN("opening \"%s\" failed: %s", tap_dev, ovs_strerror(error)); goto error_unref_notifier; } /* Create tap device. */ ifr.ifr_flags = IFF_TAP | IFF_NO_PI; ovs_strzcpy(ifr.ifr_name, name, sizeof ifr.ifr_name); - if (ioctl(state->fd, TUNSETIFF, &ifr) == -1) { + if (ioctl(netdev->tap_fd, TUNSETIFF, &ifr) == -1) { VLOG_WARN("%s: creating tap device failed: %s", name, - strerror(errno)); + ovs_strerror(errno)); error = errno; - goto error_unref_notifier; + goto error_close; } /* Make non-blocking. */ - error = set_nonblocking(state->fd); + error = set_nonblocking(netdev->tap_fd); if (error) { - goto error_unref_notifier; + goto error_close; } - netdev_dev_init(&netdev_dev->netdev_dev, name, &netdev_tap_class); - *netdev_devp = &netdev_dev->netdev_dev; + netdev_init(&netdev->up, name, &netdev_tap_class); + *netdevp = &netdev->up; return 0; +error_close: + close(netdev->tap_fd); error_unref_notifier: cache_notifier_unref(); error: - free(netdev_dev); + free(netdev); return error; } static void -destroy_tap(struct netdev_dev_linux *netdev_dev) +netdev_linux_destroy(struct netdev *netdev_) { - struct tap_state *state = &netdev_dev->state.tap; - - if (state->fd >= 0) { - close(state->fd); - } -} - -/* Destroys the netdev device 'netdev_dev_'. */ -static void -netdev_linux_destroy(struct netdev_dev *netdev_dev_) -{ - struct netdev_dev_linux *netdev_dev = netdev_dev_linux_cast(netdev_dev_); - const struct netdev_class *class = netdev_dev_get_class(netdev_dev_); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (netdev_dev->tc && netdev_dev->tc->ops->tc_destroy) { - netdev_dev->tc->ops->tc_destroy(netdev_dev->tc); + if (netdev->tc && netdev->tc->ops->tc_destroy) { + netdev->tc->ops->tc_destroy(netdev->tc); } - if (class == &netdev_tap_class) { - destroy_tap(netdev_dev); + if (netdev_get_class(netdev_) == &netdev_tap_class + && netdev->tap_fd >= 0) + { + close(netdev->tap_fd); } - free(netdev_dev); + free(netdev); cache_notifier_unref(); } static int -netdev_linux_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) +netdev_linux_rx_open(struct netdev *netdev_, struct netdev_rx **rxp) { - struct netdev_linux *netdev; - enum netdev_flags flags; + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + bool is_tap = is_tap_netdev(netdev_); + struct netdev_rx_linux *rx; int error; + int fd; - /* Allocate network device. */ - netdev = xzalloc(sizeof *netdev); - netdev->fd = -1; - netdev_init(&netdev->netdev, netdev_dev_); + if (is_tap) { + fd = netdev->tap_fd; + } else { + struct sockaddr_ll sll; + int ifindex; + /* Result of tcpdump -dd inbound */ + static const struct sock_filter filt[] = { + { 0x28, 0, 0, 0xfffff004 }, /* ldh [0] */ + { 0x15, 0, 1, 0x00000004 }, /* jeq #4 jt 2 jf 3 */ + { 0x6, 0, 0, 0x00000000 }, /* ret #0 */ + { 0x6, 0, 0, 0x0000ffff } /* ret #65535 */ + }; + static const struct sock_fprog fprog = { + ARRAY_SIZE(filt), (struct sock_filter *) filt + }; - /* Verify that the device really exists, by attempting to read its flags. - * (The flags might be cached, in which case this won't actually do an - * ioctl.) - * - * Don't do this for "internal" netdevs, though, because those have to be - * created as netdev objects before they exist in the kernel, because - * creating them in the kernel happens by passing a netdev object to - * dpif_port_add(). */ - if (netdev_dev_get_class(netdev_dev_) != &netdev_internal_class) { - error = netdev_get_flags(&netdev->netdev, &flags); - if (error == ENODEV) { + /* Create file descriptor. */ + fd = socket(PF_PACKET, SOCK_RAW, 0); + if (fd < 0) { + error = errno; + VLOG_ERR("failed to create raw socket (%s)", ovs_strerror(error)); goto error; } - } - *netdevp = &netdev->netdev; - return 0; - -error: - netdev_uninit(&netdev->netdev, true); - return error; -} - -/* Closes and destroys 'netdev'. */ -static void -netdev_linux_close(struct netdev *netdev_) -{ - struct netdev_linux *netdev = netdev_linux_cast(netdev_); - - if (netdev->fd > 0 && strcmp(netdev_get_type(netdev_), "tap")) { - close(netdev->fd); - } - free(netdev); -} - -static int -netdev_linux_listen(struct netdev *netdev_) -{ - struct netdev_linux *netdev = netdev_linux_cast(netdev_); - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); - struct sockaddr_ll sll; - int ifindex; - int error; - int fd; - - if (netdev->fd >= 0) { - return 0; - } - - if (!strcmp(netdev_get_type(netdev_), "tap") - && !netdev_dev->state.tap.opened) { - netdev->fd = netdev_dev->state.tap.fd; - netdev_dev->state.tap.opened = true; - return 0; - } + /* Set non-blocking mode. */ + error = set_nonblocking(fd); + if (error) { + goto error; + } - /* Create file descriptor. */ - fd = socket(PF_PACKET, SOCK_RAW, 0); - if (fd < 0) { - error = errno; - VLOG_ERR("failed to create raw socket (%s)", strerror(error)); - goto error; - } + /* Get ethernet device index. */ + error = get_ifindex(&netdev->up, &ifindex); + if (error) { + goto error; + } - /* Set non-blocking mode. */ - error = set_nonblocking(fd); - if (error) { - goto error; - } + /* Bind to specific ethernet device. */ + memset(&sll, 0, sizeof sll); + sll.sll_family = AF_PACKET; + sll.sll_ifindex = ifindex; + sll.sll_protocol = (OVS_FORCE unsigned short int) htons(ETH_P_ALL); + if (bind(fd, (struct sockaddr *) &sll, sizeof sll) < 0) { + error = errno; + VLOG_ERR("%s: failed to bind raw socket (%s)", + netdev_get_name(netdev_), ovs_strerror(error)); + goto error; + } - /* Get ethernet device index. */ - error = get_ifindex(&netdev->netdev, &ifindex); - if (error) { - goto error; + /* Filter for only inbound packets. */ + error = setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &fprog, + sizeof fprog); + if (error) { + error = errno; + VLOG_ERR("%s: failed to attach filter (%s)", + netdev_get_name(netdev_), ovs_strerror(error)); + goto error; + } } - /* Bind to specific ethernet device. */ - memset(&sll, 0, sizeof sll); - sll.sll_family = AF_PACKET; - sll.sll_ifindex = ifindex; - sll.sll_protocol = (OVS_FORCE unsigned short int) htons(ETH_P_ALL); - if (bind(fd, (struct sockaddr *) &sll, sizeof sll) < 0) { - error = errno; - VLOG_ERR("%s: failed to bind raw socket (%s)", - netdev_get_name(netdev_), strerror(error)); - goto error; - } + rx = xmalloc(sizeof *rx); + netdev_rx_init(&rx->up, netdev_, &netdev_rx_linux_class); + rx->is_tap = is_tap; + rx->fd = fd; - netdev->fd = fd; + *rxp = &rx->up; return 0; error: @@ -851,63 +769,62 @@ error: return error; } -static int -netdev_linux_recv(struct netdev *netdev_, void *data, size_t size) +static void +netdev_rx_linux_destroy(struct netdev_rx *rx_) { - struct netdev_linux *netdev = netdev_linux_cast(netdev_); + struct netdev_rx_linux *rx = netdev_rx_linux_cast(rx_); - if (netdev->fd < 0) { - /* Device is not listening. */ - return -EAGAIN; + if (!rx->is_tap) { + close(rx->fd); } + free(rx); +} - for (;;) { - ssize_t retval; +static int +netdev_rx_linux_recv(struct netdev_rx *rx_, void *data, size_t size) +{ + struct netdev_rx_linux *rx = netdev_rx_linux_cast(rx_); + ssize_t retval; - retval = (netdev_->netdev_dev->netdev_class == &netdev_tap_class - ? read(netdev->fd, data, size) - : recv(netdev->fd, data, size, MSG_TRUNC)); - if (retval >= 0) { - return retval <= size ? retval : -EMSGSIZE; - } else if (errno != EINTR) { - if (errno != EAGAIN) { - VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s", - strerror(errno), netdev_get_name(netdev_)); - } - return -errno; + do { + retval = (rx->is_tap + ? read(rx->fd, data, size) + : recv(rx->fd, data, size, MSG_TRUNC)); + } while (retval < 0 && errno == EINTR); + + if (retval >= 0) { + return retval > size ? -EMSGSIZE : retval; + } else { + if (errno != EAGAIN) { + VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s", + ovs_strerror(errno), netdev_rx_get_name(rx_)); } + return -errno; } } -/* 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_recv() on 'netdev'. */ static void -netdev_linux_recv_wait(struct netdev *netdev_) +netdev_rx_linux_wait(struct netdev_rx *rx_) { - struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (netdev->fd >= 0) { - poll_fd_wait(netdev->fd, POLLIN); - } + struct netdev_rx_linux *rx = netdev_rx_linux_cast(rx_); + poll_fd_wait(rx->fd, POLLIN); } -/* Discards all packets waiting to be received from 'netdev'. */ static int -netdev_linux_drain(struct netdev *netdev_) +netdev_rx_linux_drain(struct netdev_rx *rx_) { - struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (netdev->fd < 0) { - return 0; - } else if (!strcmp(netdev_get_type(netdev_), "tap")) { + struct netdev_rx_linux *rx = netdev_rx_linux_cast(rx_); + if (rx->is_tap) { struct ifreq ifr; - int error = netdev_linux_do_ioctl(netdev_get_name(netdev_), &ifr, - SIOCGIFTXQLEN, "SIOCGIFTXQLEN"); + int error = af_inet_ifreq_ioctl(netdev_rx_get_name(rx_), &ifr, + SIOCGIFTXQLEN, "SIOCGIFTXQLEN"); if (error) { return error; } - drain_fd(netdev->fd, ifr.ifr_qlen); + drain_fd(rx->fd, ifr.ifr_qlen); return 0; } else { - return drain_rcvbuf(netdev->fd); + return drain_rcvbuf(rx->fd); } } @@ -923,11 +840,10 @@ netdev_linux_drain(struct netdev *netdev_) static int netdev_linux_send(struct netdev *netdev_, const void *data, size_t size) { - struct netdev_linux *netdev = netdev_linux_cast(netdev_); for (;;) { ssize_t retval; - if (netdev->fd < 0) { + if (!is_tap_netdev(netdev_)) { /* Use our AF_PACKET socket to send to this device. */ struct sockaddr_ll sll; struct msghdr msg; @@ -938,7 +854,7 @@ netdev_linux_send(struct netdev *netdev_, const void *data, size_t size) sock = af_packet_sock(); if (sock < 0) { - return sock; + return -sock; } error = get_ifindex(netdev_, &ifindex); @@ -965,11 +881,14 @@ netdev_linux_send(struct netdev *netdev_, const void *data, size_t size) retval = sendmsg(sock, &msg, 0); } else { - /* Use the netdev's own fd to send to this device. This is - * essential for tap devices, because packets sent to a tap device - * with an AF_PACKET socket will loop back to be *received* again - * on the tap device. */ - retval = write(netdev->fd, data, size); + /* Use the tap fd to send to this device. This is essential for + * tap devices, because packets sent to a tap device with an + * AF_PACKET socket will loop back to be *received* again on the + * tap device. This doesn't occur on other interface types + * because we attach a socket filter to the rx socket. */ + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + + retval = write(netdev->tap_fd, data, size); } if (retval < 0) { @@ -982,7 +901,7 @@ netdev_linux_send(struct netdev *netdev_, const void *data, size_t size) continue; } else if (errno != EAGAIN) { VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s", - netdev_get_name(netdev_), strerror(errno)); + netdev_get_name(netdev_), ovs_strerror(errno)); } return errno; } else if (retval != size) { @@ -1003,14 +922,9 @@ netdev_linux_send(struct netdev *netdev_, const void *data, size_t size) * expected to do additional queuing of packets. Thus, this function is * unlikely to ever be used. It is included for completeness. */ static void -netdev_linux_send_wait(struct netdev *netdev_) +netdev_linux_send_wait(struct netdev *netdev) { - struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (netdev->fd < 0) { - /* Nothing to do. */ - } else if (strcmp(netdev_get_type(netdev_), "tap")) { - poll_fd_wait(netdev->fd, POLLOUT); - } else { + if (is_tap_netdev(netdev)) { /* TAP device always accepts packets.*/ poll_immediate_wake(); } @@ -1022,42 +936,34 @@ static int netdev_linux_set_etheraddr(struct netdev *netdev_, const uint8_t mac[ETH_ADDR_LEN]) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + struct netdev_saved_flags *sf = NULL; int error; - bool up_again = false; - if (netdev_dev->cache_valid & VALID_ETHERADDR) { - if (netdev_dev->ether_addr_error) { - return netdev_dev->ether_addr_error; + if (netdev->cache_valid & VALID_ETHERADDR) { + if (netdev->ether_addr_error) { + return netdev->ether_addr_error; } - if (eth_addr_equals(netdev_dev->etheraddr, mac)) { + if (eth_addr_equals(netdev->etheraddr, mac)) { return 0; } - netdev_dev->cache_valid &= ~VALID_ETHERADDR; + netdev->cache_valid &= ~VALID_ETHERADDR; } /* Tap devices must be brought down before setting the address. */ - if (!strcmp(netdev_get_type(netdev_), "tap")) { - enum netdev_flags flags; - - if (!netdev_get_flags(netdev_, &flags) && (flags & NETDEV_UP)) { - netdev_turn_flags_off(netdev_, NETDEV_UP, false); - up_again = true; - } + if (is_tap_netdev(netdev_)) { + netdev_turn_flags_off(netdev_, NETDEV_UP, &sf); } error = set_etheraddr(netdev_get_name(netdev_), mac); if (!error || error == ENODEV) { - netdev_dev->ether_addr_error = error; - netdev_dev->cache_valid |= VALID_ETHERADDR; + netdev->ether_addr_error = error; + netdev->cache_valid |= VALID_ETHERADDR; if (!error) { - memcpy(netdev_dev->etheraddr, mac, ETH_ADDR_LEN); + memcpy(netdev->etheraddr, mac, ETH_ADDR_LEN); } } - if (up_again) { - netdev_turn_flags_on(netdev_, NETDEV_UP, false); - } + netdev_restore_flags(sf); return error; } @@ -1067,22 +973,21 @@ static int netdev_linux_get_etheraddr(const struct netdev *netdev_, uint8_t mac[ETH_ADDR_LEN]) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (!(netdev_dev->cache_valid & VALID_ETHERADDR)) { + if (!(netdev->cache_valid & VALID_ETHERADDR)) { int error = get_etheraddr(netdev_get_name(netdev_), - netdev_dev->etheraddr); + netdev->etheraddr); - netdev_dev->ether_addr_error = error; - netdev_dev->cache_valid |= VALID_ETHERADDR; + netdev->ether_addr_error = error; + netdev->cache_valid |= VALID_ETHERADDR; } - if (!netdev_dev->ether_addr_error) { - memcpy(mac, netdev_dev->etheraddr, ETH_ADDR_LEN); + if (!netdev->ether_addr_error) { + memcpy(mac, netdev->etheraddr, ETH_ADDR_LEN); } - return netdev_dev->ether_addr_error; + return netdev->ether_addr_error; } /* Returns the maximum size of transmitted (and received) packets on 'netdev', @@ -1091,24 +996,23 @@ netdev_linux_get_etheraddr(const struct netdev *netdev_, static int netdev_linux_get_mtu(const struct netdev *netdev_, int *mtup) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); - if (!(netdev_dev->cache_valid & VALID_MTU)) { + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + if (!(netdev->cache_valid & VALID_MTU)) { struct ifreq ifr; int error; - error = netdev_linux_do_ioctl(netdev_get_name(netdev_), &ifr, - SIOCGIFMTU, "SIOCGIFMTU"); + error = af_inet_ifreq_ioctl(netdev_get_name(netdev_), &ifr, + SIOCGIFMTU, "SIOCGIFMTU"); - netdev_dev->netdev_mtu_error = error; - netdev_dev->mtu = ifr.ifr_mtu; - netdev_dev->cache_valid |= VALID_MTU; + netdev->netdev_mtu_error = error; + netdev->mtu = ifr.ifr_mtu; + netdev->cache_valid |= VALID_MTU; } - if (!netdev_dev->netdev_mtu_error) { - *mtup = netdev_dev->mtu; + if (!netdev->netdev_mtu_error) { + *mtup = netdev->mtu; } - return netdev_dev->netdev_mtu_error; + return netdev->netdev_mtu_error; } /* Sets the maximum size of transmitted (MTU) for given device using linux @@ -1117,27 +1021,26 @@ netdev_linux_get_mtu(const struct netdev *netdev_, int *mtup) static int netdev_linux_set_mtu(const struct netdev *netdev_, int mtu) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct ifreq ifr; int error; - if (netdev_dev->cache_valid & VALID_MTU) { - if (netdev_dev->netdev_mtu_error) { - return netdev_dev->netdev_mtu_error; + if (netdev->cache_valid & VALID_MTU) { + if (netdev->netdev_mtu_error) { + return netdev->netdev_mtu_error; } - if (netdev_dev->mtu == mtu) { + if (netdev->mtu == mtu) { return 0; } - netdev_dev->cache_valid &= ~VALID_MTU; + netdev->cache_valid &= ~VALID_MTU; } ifr.ifr_mtu = mtu; - error = netdev_linux_do_ioctl(netdev_get_name(netdev_), &ifr, - SIOCSIFMTU, "SIOCSIFMTU"); + error = af_inet_ifreq_ioctl(netdev_get_name(netdev_), &ifr, + SIOCSIFMTU, "SIOCSIFMTU"); if (!error || error == ENODEV) { - netdev_dev->netdev_mtu_error = error; - netdev_dev->mtu = ifr.ifr_mtu; - netdev_dev->cache_valid |= VALID_MTU; + netdev->netdev_mtu_error = error; + netdev->mtu = ifr.ifr_mtu; + netdev->cache_valid |= VALID_MTU; } return error; } @@ -1156,13 +1059,12 @@ netdev_linux_get_ifindex(const struct netdev *netdev) static int netdev_linux_get_carrier(const struct netdev *netdev_, bool *carrier) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (netdev_dev->miimon_interval > 0) { - *carrier = netdev_dev->miimon; + if (netdev->miimon_interval > 0) { + *carrier = netdev->miimon; } else { - *carrier = (netdev_dev->ifi_flags & IFF_RUNNING) != 0; + *carrier = (netdev->ifi_flags & IFF_RUNNING) != 0; } return 0; @@ -1171,7 +1073,7 @@ netdev_linux_get_carrier(const struct netdev *netdev_, bool *carrier) static long long int netdev_linux_get_carrier_resets(const struct netdev *netdev) { - return netdev_dev_linux_cast(netdev_get_dev(netdev))->carrier_resets; + return netdev_linux_cast(netdev)->carrier_resets; } static int @@ -1183,7 +1085,7 @@ netdev_linux_do_miimon(const char *name, int cmd, const char *cmd_name, memset(&ifr, 0, sizeof ifr); memcpy(&ifr.ifr_data, data, sizeof *data); - error = netdev_linux_do_ioctl(name, &ifr, cmd, cmd_name); + error = af_inet_ifreq_ioctl(name, &ifr, cmd, cmd_name); memcpy(data, &ifr.ifr_data, sizeof *data); return error; @@ -1237,14 +1139,12 @@ static int netdev_linux_set_miimon_interval(struct netdev *netdev_, long long int interval) { - struct netdev_dev_linux *netdev_dev; - - netdev_dev = netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); interval = interval > 0 ? MAX(interval, 100) : 0; - if (netdev_dev->miimon_interval != interval) { - netdev_dev->miimon_interval = interval; - timer_set_expired(&netdev_dev->miimon_timer); + if (netdev->miimon_interval != interval) { + netdev->miimon_interval = interval; + timer_set_expired(&netdev->miimon_timer); } return 0; @@ -1257,22 +1157,25 @@ netdev_linux_miimon_run(void) struct shash_node *node; shash_init(&device_shash); - netdev_dev_get_devices(&netdev_linux_class, &device_shash); + netdev_get_devices(&netdev_linux_class, &device_shash); SHASH_FOR_EACH (node, &device_shash) { - struct netdev_dev_linux *dev = node->data; + struct netdev *netdev = node->data; + struct netdev_linux *dev = netdev_linux_cast(netdev); bool miimon; if (dev->miimon_interval <= 0 || !timer_expired(&dev->miimon_timer)) { + netdev_close(netdev); continue; } - netdev_linux_get_miimon(dev->netdev_dev.name, &miimon); + netdev_linux_get_miimon(dev->up.name, &miimon); if (miimon != dev->miimon) { dev->miimon = miimon; - netdev_dev_linux_changed(dev, dev->ifi_flags, 0); + netdev_linux_changed(dev, dev->ifi_flags, 0); } timer_set_duration(&dev->miimon_timer, dev->miimon_interval); + netdev_close(netdev); } shash_destroy(&device_shash); @@ -1285,13 +1188,15 @@ netdev_linux_miimon_wait(void) struct shash_node *node; shash_init(&device_shash); - netdev_dev_get_devices(&netdev_linux_class, &device_shash); + netdev_get_devices(&netdev_linux_class, &device_shash); SHASH_FOR_EACH (node, &device_shash) { - struct netdev_dev_linux *dev = node->data; + struct netdev *netdev = node->data; + struct netdev_linux *dev = netdev_linux_cast(netdev); if (dev->miimon_interval > 0) { timer_wait(&dev->miimon_timer); } + netdev_close(netdev); } shash_destroy(&device_shash); } @@ -1318,7 +1223,7 @@ check_for_working_netlink_stats(void) } else { VLOG_INFO("RTM_GETLINK failed (%s), obtaining netdev stats " "via proc (you are probably running a pre-2.6.19 " - "kernel)", strerror(error)); + "kernel)", ovs_strerror(error)); return false; } } @@ -1332,24 +1237,76 @@ swap_uint64(uint64_t *a, uint64_t *b) *b = tmp; } +/* Copies 'src' into 'dst', performing format conversion in the process. + * + * 'src' is allowed to be misaligned. */ +static void +netdev_stats_from_ovs_vport_stats(struct netdev_stats *dst, + const struct ovs_vport_stats *src) +{ + dst->rx_packets = get_unaligned_u64(&src->rx_packets); + dst->tx_packets = get_unaligned_u64(&src->tx_packets); + dst->rx_bytes = get_unaligned_u64(&src->rx_bytes); + dst->tx_bytes = get_unaligned_u64(&src->tx_bytes); + dst->rx_errors = get_unaligned_u64(&src->rx_errors); + dst->tx_errors = get_unaligned_u64(&src->tx_errors); + dst->rx_dropped = get_unaligned_u64(&src->rx_dropped); + dst->tx_dropped = get_unaligned_u64(&src->tx_dropped); + dst->multicast = 0; + dst->collisions = 0; + dst->rx_length_errors = 0; + dst->rx_over_errors = 0; + dst->rx_crc_errors = 0; + dst->rx_frame_errors = 0; + dst->rx_fifo_errors = 0; + dst->rx_missed_errors = 0; + dst->tx_aborted_errors = 0; + dst->tx_carrier_errors = 0; + dst->tx_fifo_errors = 0; + dst->tx_heartbeat_errors = 0; + dst->tx_window_errors = 0; +} + +static int +get_stats_via_vport__(const struct netdev *netdev, struct netdev_stats *stats) +{ + struct dpif_linux_vport reply; + struct ofpbuf *buf; + int error; + + error = dpif_linux_vport_get(netdev_get_name(netdev), &reply, &buf); + if (error) { + return error; + } else if (!reply.stats) { + ofpbuf_delete(buf); + return EOPNOTSUPP; + } + + netdev_stats_from_ovs_vport_stats(stats, reply.stats); + + ofpbuf_delete(buf); + + return 0; +} + static void get_stats_via_vport(const struct netdev *netdev_, struct netdev_stats *stats) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (!netdev_dev->vport_stats_error || - !(netdev_dev->cache_valid & VALID_VPORT_STAT_ERROR)) { + if (!netdev->vport_stats_error || + !(netdev->cache_valid & VALID_VPORT_STAT_ERROR)) { int error; - error = netdev_vport_get_stats(netdev_, stats); + error = get_stats_via_vport__(netdev_, stats); if (error && error != ENOENT) { VLOG_WARN_RL(&rl, "%s: obtaining netdev stats via vport failed " - "(%s)", netdev_get_name(netdev_), strerror(error)); + "(%s)", + netdev_get_name(netdev_), ovs_strerror(error)); } - netdev_dev->vport_stats_error = error; - netdev_dev->cache_valid |= VALID_VPORT_STAT_ERROR; + netdev->vport_stats_error = error; + netdev->cache_valid |= VALID_VPORT_STAT_ERROR; } } @@ -1357,11 +1314,13 @@ static int netdev_linux_sys_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) { - static int use_netlink_stats = -1; + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int use_netlink_stats; int error; - if (use_netlink_stats < 0) { + if (ovsthread_once_start(&once)) { use_netlink_stats = check_for_working_netlink_stats(); + ovsthread_once_done(&once); } if (use_netlink_stats) { @@ -1388,8 +1347,7 @@ static int netdev_linux_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct netdev_stats dev_stats; int error; @@ -1398,14 +1356,14 @@ netdev_linux_get_stats(const struct netdev *netdev_, error = netdev_linux_sys_get_stats(netdev_, &dev_stats); if (error) { - if (netdev_dev->vport_stats_error) { + if (netdev->vport_stats_error) { return error; } else { return 0; } } - if (netdev_dev->vport_stats_error) { + if (netdev->vport_stats_error) { /* stats not available from OVS then use ioctl stats. */ *stats = dev_stats; } else { @@ -1433,11 +1391,9 @@ netdev_linux_get_stats(const struct netdev *netdev_, /* Retrieves current device stats for 'netdev-tap' netdev or * netdev-internal. */ static int -netdev_tap_get_stats(const struct netdev *netdev_, - struct netdev_stats *stats) +netdev_tap_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct netdev_stats dev_stats; int error; @@ -1445,7 +1401,7 @@ netdev_tap_get_stats(const struct netdev *netdev_, error = netdev_linux_sys_get_stats(netdev_, &dev_stats); if (error) { - if (netdev_dev->vport_stats_error) { + if (netdev->vport_stats_error) { return error; } else { return 0; @@ -1458,7 +1414,7 @@ netdev_tap_get_stats(const struct netdev *netdev_, * them back here. This does not apply if we are getting stats from the * vport layer because it always tracks stats from the perspective of the * switch. */ - if (netdev_dev->vport_stats_error) { + if (netdev->vport_stats_error) { *stats = dev_stats; swap_uint64(&stats->rx_packets, &stats->tx_packets); swap_uint64(&stats->rx_bytes, &stats->tx_bytes); @@ -1492,152 +1448,182 @@ static int netdev_internal_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); get_stats_via_vport(netdev_, stats); - return netdev_dev->vport_stats_error; + return netdev->vport_stats_error; +} + +static int +netdev_internal_set_stats(struct netdev *netdev, + const struct netdev_stats *stats) +{ + struct ovs_vport_stats vport_stats; + struct dpif_linux_vport vport; + int err; + + vport_stats.rx_packets = stats->rx_packets; + vport_stats.tx_packets = stats->tx_packets; + vport_stats.rx_bytes = stats->rx_bytes; + vport_stats.tx_bytes = stats->tx_bytes; + vport_stats.rx_errors = stats->rx_errors; + vport_stats.tx_errors = stats->tx_errors; + vport_stats.rx_dropped = stats->rx_dropped; + vport_stats.tx_dropped = stats->tx_dropped; + + dpif_linux_vport_init(&vport); + vport.cmd = OVS_VPORT_CMD_SET; + vport.name = netdev_get_name(netdev); + vport.stats = &vport_stats; + + err = dpif_linux_vport_transact(&vport, NULL, NULL); + + /* If the vport layer doesn't know about the device, that doesn't mean it + * doesn't exist (after all were able to open it when netdev_open() was + * called), it just means that it isn't attached and we'll be getting + * stats a different way. */ + if (err == ENODEV) { + err = EOPNOTSUPP; + } + + return err; } static void -netdev_linux_read_features(struct netdev_dev_linux *netdev_dev) +netdev_linux_read_features(struct netdev_linux *netdev) { struct ethtool_cmd ecmd; uint32_t speed; int error; - if (netdev_dev->cache_valid & VALID_FEATURES) { + if (netdev->cache_valid & VALID_FEATURES) { return; } COVERAGE_INC(netdev_get_ethtool); memset(&ecmd, 0, sizeof ecmd); - error = netdev_linux_do_ethtool(netdev_dev->netdev_dev.name, &ecmd, + error = netdev_linux_do_ethtool(netdev->up.name, &ecmd, ETHTOOL_GSET, "ETHTOOL_GSET"); if (error) { goto out; } /* Supported features. */ - netdev_dev->supported = 0; + netdev->supported = 0; if (ecmd.supported & SUPPORTED_10baseT_Half) { - netdev_dev->supported |= NETDEV_F_10MB_HD; + netdev->supported |= NETDEV_F_10MB_HD; } if (ecmd.supported & SUPPORTED_10baseT_Full) { - netdev_dev->supported |= NETDEV_F_10MB_FD; + netdev->supported |= NETDEV_F_10MB_FD; } if (ecmd.supported & SUPPORTED_100baseT_Half) { - netdev_dev->supported |= NETDEV_F_100MB_HD; + netdev->supported |= NETDEV_F_100MB_HD; } if (ecmd.supported & SUPPORTED_100baseT_Full) { - netdev_dev->supported |= NETDEV_F_100MB_FD; + netdev->supported |= NETDEV_F_100MB_FD; } if (ecmd.supported & SUPPORTED_1000baseT_Half) { - netdev_dev->supported |= NETDEV_F_1GB_HD; + netdev->supported |= NETDEV_F_1GB_HD; } if (ecmd.supported & SUPPORTED_1000baseT_Full) { - netdev_dev->supported |= NETDEV_F_1GB_FD; + netdev->supported |= NETDEV_F_1GB_FD; } if (ecmd.supported & SUPPORTED_10000baseT_Full) { - netdev_dev->supported |= NETDEV_F_10GB_FD; + netdev->supported |= NETDEV_F_10GB_FD; } if (ecmd.supported & SUPPORTED_TP) { - netdev_dev->supported |= NETDEV_F_COPPER; + netdev->supported |= NETDEV_F_COPPER; } if (ecmd.supported & SUPPORTED_FIBRE) { - netdev_dev->supported |= NETDEV_F_FIBER; + netdev->supported |= NETDEV_F_FIBER; } if (ecmd.supported & SUPPORTED_Autoneg) { - netdev_dev->supported |= NETDEV_F_AUTONEG; + netdev->supported |= NETDEV_F_AUTONEG; } if (ecmd.supported & SUPPORTED_Pause) { - netdev_dev->supported |= NETDEV_F_PAUSE; + netdev->supported |= NETDEV_F_PAUSE; } if (ecmd.supported & SUPPORTED_Asym_Pause) { - netdev_dev->supported |= NETDEV_F_PAUSE_ASYM; + netdev->supported |= NETDEV_F_PAUSE_ASYM; } /* Advertised features. */ - netdev_dev->advertised = 0; + netdev->advertised = 0; if (ecmd.advertising & ADVERTISED_10baseT_Half) { - netdev_dev->advertised |= NETDEV_F_10MB_HD; + netdev->advertised |= NETDEV_F_10MB_HD; } if (ecmd.advertising & ADVERTISED_10baseT_Full) { - netdev_dev->advertised |= NETDEV_F_10MB_FD; + netdev->advertised |= NETDEV_F_10MB_FD; } if (ecmd.advertising & ADVERTISED_100baseT_Half) { - netdev_dev->advertised |= NETDEV_F_100MB_HD; + netdev->advertised |= NETDEV_F_100MB_HD; } if (ecmd.advertising & ADVERTISED_100baseT_Full) { - netdev_dev->advertised |= NETDEV_F_100MB_FD; + netdev->advertised |= NETDEV_F_100MB_FD; } if (ecmd.advertising & ADVERTISED_1000baseT_Half) { - netdev_dev->advertised |= NETDEV_F_1GB_HD; + netdev->advertised |= NETDEV_F_1GB_HD; } if (ecmd.advertising & ADVERTISED_1000baseT_Full) { - netdev_dev->advertised |= NETDEV_F_1GB_FD; + netdev->advertised |= NETDEV_F_1GB_FD; } if (ecmd.advertising & ADVERTISED_10000baseT_Full) { - netdev_dev->advertised |= NETDEV_F_10GB_FD; + netdev->advertised |= NETDEV_F_10GB_FD; } if (ecmd.advertising & ADVERTISED_TP) { - netdev_dev->advertised |= NETDEV_F_COPPER; + netdev->advertised |= NETDEV_F_COPPER; } if (ecmd.advertising & ADVERTISED_FIBRE) { - netdev_dev->advertised |= NETDEV_F_FIBER; + netdev->advertised |= NETDEV_F_FIBER; } if (ecmd.advertising & ADVERTISED_Autoneg) { - netdev_dev->advertised |= NETDEV_F_AUTONEG; + netdev->advertised |= NETDEV_F_AUTONEG; } if (ecmd.advertising & ADVERTISED_Pause) { - netdev_dev->advertised |= NETDEV_F_PAUSE; + netdev->advertised |= NETDEV_F_PAUSE; } if (ecmd.advertising & ADVERTISED_Asym_Pause) { - netdev_dev->advertised |= NETDEV_F_PAUSE_ASYM; + netdev->advertised |= NETDEV_F_PAUSE_ASYM; } /* Current settings. */ speed = ecmd.speed; if (speed == SPEED_10) { - netdev_dev->current = ecmd.duplex ? NETDEV_F_10MB_FD : NETDEV_F_10MB_HD; + netdev->current = ecmd.duplex ? NETDEV_F_10MB_FD : NETDEV_F_10MB_HD; } else if (speed == SPEED_100) { - netdev_dev->current = ecmd.duplex ? NETDEV_F_100MB_FD : NETDEV_F_100MB_HD; + netdev->current = ecmd.duplex ? NETDEV_F_100MB_FD : NETDEV_F_100MB_HD; } else if (speed == SPEED_1000) { - netdev_dev->current = ecmd.duplex ? NETDEV_F_1GB_FD : NETDEV_F_1GB_HD; + netdev->current = ecmd.duplex ? NETDEV_F_1GB_FD : NETDEV_F_1GB_HD; } else if (speed == SPEED_10000) { - netdev_dev->current = NETDEV_F_10GB_FD; + netdev->current = NETDEV_F_10GB_FD; } else if (speed == 40000) { - netdev_dev->current = NETDEV_F_40GB_FD; + netdev->current = NETDEV_F_40GB_FD; } else if (speed == 100000) { - netdev_dev->current = NETDEV_F_100GB_FD; + netdev->current = NETDEV_F_100GB_FD; } else if (speed == 1000000) { - netdev_dev->current = NETDEV_F_1TB_FD; + netdev->current = NETDEV_F_1TB_FD; } else { - netdev_dev->current = 0; + netdev->current = 0; } if (ecmd.port == PORT_TP) { - netdev_dev->current |= NETDEV_F_COPPER; + netdev->current |= NETDEV_F_COPPER; } else if (ecmd.port == PORT_FIBRE) { - netdev_dev->current |= NETDEV_F_FIBER; + netdev->current |= NETDEV_F_FIBER; } if (ecmd.autoneg) { - netdev_dev->current |= NETDEV_F_AUTONEG; + netdev->current |= NETDEV_F_AUTONEG; } - /* Peer advertisements. */ - netdev_dev->peer = 0; /* XXX */ - out: - netdev_dev->cache_valid |= VALID_FEATURES; - netdev_dev->get_features_error = error; + netdev->cache_valid |= VALID_FEATURES; + netdev->get_features_error = error; } -/* Stores the features supported by 'netdev' into each of '*current', - * '*advertised', '*supported', and '*peer' that are non-null. Each value is a - * bitmap of NETDEV_* bits. Returns 0 if successful, otherwise a positive - * errno value. */ +/* Stores the features supported by 'netdev' into of '*current', '*advertised', + * '*supported', and '*peer'. Each value is a bitmap of NETDEV_* bits. + * Returns 0 if successful, otherwise a positive errno value. */ static int netdev_linux_get_features(const struct netdev *netdev_, enum netdev_features *current, @@ -1645,18 +1631,17 @@ netdev_linux_get_features(const struct netdev *netdev_, enum netdev_features *supported, enum netdev_features *peer) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - netdev_linux_read_features(netdev_dev); + netdev_linux_read_features(netdev); - if (!netdev_dev->get_features_error) { - *current = netdev_dev->current; - *advertised = netdev_dev->advertised; - *supported = netdev_dev->supported; - *peer = netdev_dev->peer; + if (!netdev->get_features_error) { + *current = netdev->current; + *advertised = netdev->advertised; + *supported = netdev->supported; + *peer = 0; /* XXX */ } - return netdev_dev->get_features_error; + return netdev->get_features_error; } /* Set the features advertised by 'netdev' to 'advertise'. */ @@ -1720,12 +1705,11 @@ netdev_linux_set_advertisements(struct netdev *netdev, /* Attempts to set input rate limiting (policing) policy. Returns 0 if * successful, otherwise a positive errno value. */ static int -netdev_linux_set_policing(struct netdev *netdev, +netdev_linux_set_policing(struct netdev *netdev_, uint32_t kbits_rate, uint32_t kbits_burst) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); - const char *netdev_name = netdev_get_name(netdev); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + const char *netdev_name = netdev_get_name(netdev_); int error; @@ -1733,51 +1717,51 @@ netdev_linux_set_policing(struct netdev *netdev, : !kbits_burst ? 1000 /* Default to 1000 kbits if 0. */ : kbits_burst); /* Stick with user-specified value. */ - if (netdev_dev->cache_valid & VALID_POLICING) { - if (netdev_dev->netdev_policing_error) { - return netdev_dev->netdev_policing_error; + if (netdev->cache_valid & VALID_POLICING) { + if (netdev->netdev_policing_error) { + return netdev->netdev_policing_error; } - if (netdev_dev->kbits_rate == kbits_rate && - netdev_dev->kbits_burst == kbits_burst) { + if (netdev->kbits_rate == kbits_rate && + netdev->kbits_burst == kbits_burst) { /* Assume that settings haven't changed since we last set them. */ return 0; } - netdev_dev->cache_valid &= ~VALID_POLICING; + netdev->cache_valid &= ~VALID_POLICING; } COVERAGE_INC(netdev_set_policing); /* Remove any existing ingress qdisc. */ - error = tc_add_del_ingress_qdisc(netdev, false); + error = tc_add_del_ingress_qdisc(netdev_, false); if (error) { VLOG_WARN_RL(&rl, "%s: removing policing failed: %s", - netdev_name, strerror(error)); + netdev_name, ovs_strerror(error)); goto out; } if (kbits_rate) { - error = tc_add_del_ingress_qdisc(netdev, true); + error = tc_add_del_ingress_qdisc(netdev_, true); if (error) { VLOG_WARN_RL(&rl, "%s: adding policing qdisc failed: %s", - netdev_name, strerror(error)); + netdev_name, ovs_strerror(error)); goto out; } - error = tc_add_policer(netdev, kbits_rate, kbits_burst); + error = tc_add_policer(netdev_, kbits_rate, kbits_burst); if (error){ VLOG_WARN_RL(&rl, "%s: adding policing action failed: %s", - netdev_name, strerror(error)); + netdev_name, ovs_strerror(error)); goto out; } } - netdev_dev->kbits_rate = kbits_rate; - netdev_dev->kbits_burst = kbits_burst; + netdev->kbits_rate = kbits_rate; + netdev->kbits_burst = kbits_burst; out: if (!error || error == ENODEV) { - netdev_dev->netdev_policing_error = error; - netdev_dev->cache_valid |= VALID_POLICING; + netdev->netdev_policing_error = error; + netdev->cache_valid |= VALID_POLICING; } return error; } @@ -1786,7 +1770,7 @@ static int netdev_linux_get_qos_types(const struct netdev *netdev OVS_UNUSED, struct sset *types) { - const struct tc_ops **opsp; + const struct tc_ops *const *opsp; for (opsp = tcs; *opsp != NULL; opsp++) { const struct tc_ops *ops = *opsp; @@ -1800,7 +1784,7 @@ netdev_linux_get_qos_types(const struct netdev *netdev OVS_UNUSED, static const struct tc_ops * tc_lookup_ovs_name(const char *name) { - const struct tc_ops **opsp; + const struct tc_ops *const *opsp; for (opsp = tcs; *opsp != NULL; opsp++) { const struct tc_ops *ops = *opsp; @@ -1814,7 +1798,7 @@ tc_lookup_ovs_name(const char *name) static const struct tc_ops * tc_lookup_linux_name(const char *name) { - const struct tc_ops **opsp; + const struct tc_ops *const *opsp; for (opsp = tcs; *opsp != NULL; opsp++) { const struct tc_ops *ops = *opsp; @@ -1826,14 +1810,13 @@ tc_lookup_linux_name(const char *name) } static struct tc_queue * -tc_find_queue__(const struct netdev *netdev, unsigned int queue_id, +tc_find_queue__(const struct netdev *netdev_, unsigned int queue_id, size_t hash) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct tc_queue *queue; - HMAP_FOR_EACH_IN_BUCKET (queue, hmap_node, hash, &netdev_dev->tc->queues) { + HMAP_FOR_EACH_IN_BUCKET (queue, hmap_node, hash, &netdev->tc->queues) { if (queue->queue_id == queue_id) { return queue; } @@ -1861,30 +1844,28 @@ netdev_linux_get_qos_capabilities(const struct netdev *netdev OVS_UNUSED, } static int -netdev_linux_get_qos(const struct netdev *netdev, +netdev_linux_get_qos(const struct netdev *netdev_, const char **typep, struct smap *details) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; } - *typep = netdev_dev->tc->ops->ovs_name; - return (netdev_dev->tc->ops->qdisc_get - ? netdev_dev->tc->ops->qdisc_get(netdev, details) + *typep = netdev->tc->ops->ovs_name; + return (netdev->tc->ops->qdisc_get + ? netdev->tc->ops->qdisc_get(netdev_, details) : 0); } static int -netdev_linux_set_qos(struct netdev *netdev, +netdev_linux_set_qos(struct netdev *netdev_, const char *type, const struct smap *details) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); const struct tc_ops *new_ops; int error; @@ -1893,106 +1874,104 @@ netdev_linux_set_qos(struct netdev *netdev, return EOPNOTSUPP; } - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; } - if (new_ops == netdev_dev->tc->ops) { - return new_ops->qdisc_set ? new_ops->qdisc_set(netdev, details) : 0; + if (new_ops == netdev->tc->ops) { + return new_ops->qdisc_set ? new_ops->qdisc_set(netdev_, details) : 0; } else { /* Delete existing qdisc. */ - error = tc_del_qdisc(netdev); + error = tc_del_qdisc(netdev_); if (error) { return error; } - assert(netdev_dev->tc == NULL); + ovs_assert(netdev->tc == NULL); /* Install new qdisc. */ - error = new_ops->tc_install(netdev, details); - assert((error == 0) == (netdev_dev->tc != NULL)); + error = new_ops->tc_install(netdev_, details); + ovs_assert((error == 0) == (netdev->tc != NULL)); return error; } } static int -netdev_linux_get_queue(const struct netdev *netdev, +netdev_linux_get_queue(const struct netdev *netdev_, unsigned int queue_id, struct smap *details) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; } else { - struct tc_queue *queue = tc_find_queue(netdev, queue_id); + struct tc_queue *queue = tc_find_queue(netdev_, queue_id); return (queue - ? netdev_dev->tc->ops->class_get(netdev, queue, details) + ? netdev->tc->ops->class_get(netdev_, queue, details) : ENOENT); } } static int -netdev_linux_set_queue(struct netdev *netdev, +netdev_linux_set_queue(struct netdev *netdev_, unsigned int queue_id, const struct smap *details) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; - } else if (queue_id >= netdev_dev->tc->ops->n_queues - || !netdev_dev->tc->ops->class_set) { + } else if (queue_id >= netdev->tc->ops->n_queues + || !netdev->tc->ops->class_set) { return EINVAL; } - return netdev_dev->tc->ops->class_set(netdev, queue_id, details); + return netdev->tc->ops->class_set(netdev_, queue_id, details); } static int -netdev_linux_delete_queue(struct netdev *netdev, unsigned int queue_id) +netdev_linux_delete_queue(struct netdev *netdev_, unsigned int queue_id) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; - } else if (!netdev_dev->tc->ops->class_delete) { + } else if (!netdev->tc->ops->class_delete) { return EINVAL; } else { - struct tc_queue *queue = tc_find_queue(netdev, queue_id); + struct tc_queue *queue = tc_find_queue(netdev_, queue_id); return (queue - ? netdev_dev->tc->ops->class_delete(netdev, queue) + ? netdev->tc->ops->class_delete(netdev_, queue) : ENOENT); } } static int -netdev_linux_get_queue_stats(const struct netdev *netdev, +netdev_linux_get_queue_stats(const struct netdev *netdev_, unsigned int queue_id, struct netdev_queue_stats *stats) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; - } else if (!netdev_dev->tc->ops->class_get_stats) { + } else if (!netdev->tc->ops->class_get_stats) { return EOPNOTSUPP; } else { - const struct tc_queue *queue = tc_find_queue(netdev, queue_id); - return (queue - ? netdev_dev->tc->ops->class_get_stats(netdev, queue, stats) - : ENOENT); + const struct tc_queue *queue = tc_find_queue(netdev_, queue_id); + if (!queue) { + return ENOENT; + } + stats->created = queue->created; + return netdev->tc->ops->class_get_stats(netdev_, queue, stats); } } @@ -2007,36 +1986,35 @@ start_queue_dump(const struct netdev *netdev, struct nl_dump *dump) return false; } tcmsg->tcm_parent = 0; - nl_dump_start(dump, rtnl_sock, &request); + nl_dump_start(dump, NETLINK_ROUTE, &request); ofpbuf_uninit(&request); return true; } static int -netdev_linux_dump_queues(const struct netdev *netdev, +netdev_linux_dump_queues(const struct netdev *netdev_, netdev_dump_queues_cb *cb, void *aux) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct tc_queue *queue, *next_queue; struct smap details; int last_error; int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; - } else if (!netdev_dev->tc->ops->class_get) { + } else if (!netdev->tc->ops->class_get) { return EOPNOTSUPP; } last_error = 0; smap_init(&details); HMAP_FOR_EACH_SAFE (queue, next_queue, hmap_node, - &netdev_dev->tc->queues) { + &netdev->tc->queues) { smap_clear(&details); - error = netdev_dev->tc->ops->class_get(netdev, queue, &details); + error = netdev->tc->ops->class_get(netdev_, queue, &details); if (!error) { (*cb)(queue->queue_id, &details, aux); } else { @@ -2049,29 +2027,28 @@ netdev_linux_dump_queues(const struct netdev *netdev, } static int -netdev_linux_dump_queue_stats(const struct netdev *netdev, +netdev_linux_dump_queue_stats(const struct netdev *netdev_, netdev_dump_queue_stats_cb *cb, void *aux) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct nl_dump dump; struct ofpbuf msg; int last_error; int error; - error = tc_query_qdisc(netdev); + error = tc_query_qdisc(netdev_); if (error) { return error; - } else if (!netdev_dev->tc->ops->class_dump_stats) { + } else if (!netdev->tc->ops->class_dump_stats) { return EOPNOTSUPP; } last_error = 0; - if (!start_queue_dump(netdev, &dump)) { + if (!start_queue_dump(netdev_, &dump)) { return ENODEV; } while (nl_dump_next(&dump, &msg)) { - error = netdev_dev->tc->ops->class_dump_stats(netdev, &msg, cb, aux); + error = netdev->tc->ops->class_dump_stats(netdev_, &msg, cb, aux); if (error) { last_error = error; } @@ -2085,28 +2062,27 @@ static int netdev_linux_get_in4(const struct netdev *netdev_, struct in_addr *address, struct in_addr *netmask) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (!(netdev_dev->cache_valid & VALID_IN4)) { + if (!(netdev->cache_valid & VALID_IN4)) { int error; - error = netdev_linux_get_ipv4(netdev_, &netdev_dev->address, + error = netdev_linux_get_ipv4(netdev_, &netdev->address, SIOCGIFADDR, "SIOCGIFADDR"); if (error) { return error; } - error = netdev_linux_get_ipv4(netdev_, &netdev_dev->netmask, + error = netdev_linux_get_ipv4(netdev_, &netdev->netmask, SIOCGIFNETMASK, "SIOCGIFNETMASK"); if (error) { return error; } - netdev_dev->cache_valid |= VALID_IN4; + netdev->cache_valid |= VALID_IN4; } - *address = netdev_dev->address; - *netmask = netdev_dev->netmask; + *address = netdev->address; + *netmask = netdev->netmask; return address->s_addr == INADDR_ANY ? EADDRNOTAVAIL : 0; } @@ -2114,15 +2090,14 @@ static int netdev_linux_set_in4(struct netdev *netdev_, struct in_addr address, struct in_addr netmask) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int error; error = do_set_addr(netdev_, SIOCSIFADDR, "SIOCSIFADDR", address); if (!error) { - netdev_dev->cache_valid |= VALID_IN4; - netdev_dev->address = address; - netdev_dev->netmask = netmask; + netdev->cache_valid |= VALID_IN4; + netdev->address = address; + netdev->netmask = netmask; if (address.s_addr != INADDR_ANY) { error = do_set_addr(netdev_, SIOCSIFNETMASK, "SIOCSIFNETMASK", netmask); @@ -2152,13 +2127,12 @@ parse_if_inet6_line(const char *line, static int netdev_linux_get_in6(const struct netdev *netdev_, struct in6_addr *in6) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); - if (!(netdev_dev->cache_valid & VALID_IN6)) { + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + if (!(netdev->cache_valid & VALID_IN6)) { FILE *file; char line[128]; - netdev_dev->in6 = in6addr_any; + netdev->in6 = in6addr_any; file = fopen("/proc/net/if_inet6", "r"); if (file != NULL) { @@ -2169,15 +2143,15 @@ netdev_linux_get_in6(const struct netdev *netdev_, struct in6_addr *in6) if (parse_if_inet6_line(line, &in6_tmp, ifname) && !strcmp(name, ifname)) { - netdev_dev->in6 = in6_tmp; + netdev->in6 = in6_tmp; break; } } fclose(file); } - netdev_dev->cache_valid |= VALID_IN6; + netdev->cache_valid |= VALID_IN6; } - *in6 = netdev_dev->in6; + *in6 = netdev->in6; return 0; } @@ -2199,11 +2173,10 @@ do_set_addr(struct netdev *netdev, int ioctl_nr, const char *ioctl_name, struct in_addr addr) { struct ifreq ifr; - ovs_strzcpy(ifr.ifr_name, netdev_get_name(netdev), sizeof ifr.ifr_name); - make_in4_sockaddr(&ifr.ifr_addr, addr); - return netdev_linux_do_ioctl(netdev_get_name(netdev), &ifr, ioctl_nr, - ioctl_name); + make_in4_sockaddr(&ifr.ifr_addr, addr); + return af_inet_ifreq_ioctl(netdev_get_name(netdev), &ifr, ioctl_nr, + ioctl_name); } /* Adds 'router' as a default IP gateway. */ @@ -2219,9 +2192,9 @@ netdev_linux_add_router(struct netdev *netdev OVS_UNUSED, struct in_addr router) make_in4_sockaddr(&rt.rt_gateway, router); make_in4_sockaddr(&rt.rt_genmask, any); rt.rt_flags = RTF_UP | RTF_GATEWAY; - error = ioctl(af_inet_sock, SIOCADDRT, &rt) < 0 ? errno : 0; + error = af_inet_ioctl(SIOCADDRT, &rt); if (error) { - VLOG_WARN("ioctl(SIOCADDRT): %s", strerror(error)); + VLOG_WARN("ioctl(SIOCADDRT): %s", ovs_strerror(error)); } return error; } @@ -2238,7 +2211,7 @@ netdev_linux_get_next_hop(const struct in_addr *host, struct in_addr *next_hop, *netdev_name = NULL; stream = fopen(fn, "r"); if (stream == NULL) { - VLOG_WARN_RL(&rl, "%s: open failed: %s", fn, strerror(errno)); + VLOG_WARN_RL(&rl, "%s: open failed: %s", fn, ovs_strerror(errno)); return errno; } @@ -2288,24 +2261,36 @@ netdev_linux_get_next_hop(const struct in_addr *host, struct in_addr *next_hop, } static int -netdev_linux_get_drv_info(const struct netdev *netdev, struct smap *smap) +netdev_linux_get_status(const struct netdev *netdev_, struct smap *smap) { - int error; - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + int error = 0; + + if (!(netdev->cache_valid & VALID_DRVINFO)) { + struct ethtool_cmd *cmd = (struct ethtool_cmd *) &netdev->drvinfo; + + COVERAGE_INC(netdev_get_ethtool); + memset(&netdev->drvinfo, 0, sizeof netdev->drvinfo); + error = netdev_linux_do_ethtool(netdev->up.name, + cmd, + ETHTOOL_GDRVINFO, + "ETHTOOL_GDRVINFO"); + if (!error) { + netdev->cache_valid |= VALID_DRVINFO; + } + } - error = netdev_linux_get_drvinfo(netdev_dev); if (!error) { - smap_add(smap, "driver_name", netdev_dev->drvinfo.driver); - smap_add(smap, "driver_version", netdev_dev->drvinfo.version); - smap_add(smap, "firmware_version", netdev_dev->drvinfo.fw_version); + smap_add(smap, "driver_name", netdev->drvinfo.driver); + smap_add(smap, "driver_version", netdev->drvinfo.version); + smap_add(smap, "firmware_version", netdev->drvinfo.fw_version); } return error; } static int -netdev_internal_get_drv_info(const struct netdev *netdev OVS_UNUSED, - struct smap *smap) +netdev_internal_get_status(const struct netdev *netdev OVS_UNUSED, + struct smap *smap) { smap_add(smap, "driver_name", "openvswitch"); return 0; @@ -2333,12 +2318,13 @@ netdev_linux_arp_lookup(const struct netdev *netdev, r.arp_flags = 0; ovs_strzcpy(r.arp_dev, netdev_get_name(netdev), sizeof r.arp_dev); COVERAGE_INC(netdev_arp_lookup); - retval = ioctl(af_inet_sock, SIOCGARP, &r) < 0 ? errno : 0; + retval = af_inet_ioctl(SIOCGARP, &r); if (!retval) { memcpy(mac, r.arp_ha.sa_data, ETH_ADDR_LEN); } else if (retval != ENXIO) { VLOG_WARN_RL(&rl, "%s: could not look up ARP entry for "IP_FMT": %s", - netdev_get_name(netdev), IP_ARGS(&ip), strerror(retval)); + netdev_get_name(netdev), IP_ARGS(ip), + ovs_strerror(retval)); } return retval; } @@ -2370,20 +2356,19 @@ iff_to_nd_flags(int iff) } static int -netdev_linux_update_flags(struct netdev *netdev, enum netdev_flags off, +netdev_linux_update_flags(struct netdev *netdev_, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flagsp) { - struct netdev_dev_linux *netdev_dev; + struct netdev_linux *netdev = netdev_linux_cast(netdev_); int old_flags, new_flags; int error = 0; - netdev_dev = netdev_dev_linux_cast(netdev_get_dev(netdev)); - old_flags = netdev_dev->ifi_flags; + old_flags = netdev->ifi_flags; *old_flagsp = iff_to_nd_flags(old_flags); new_flags = (old_flags & ~nd_to_iff_flags(off)) | nd_to_iff_flags(on); if (new_flags != old_flags) { - error = set_flags(netdev, new_flags); - get_flags(&netdev_dev->netdev_dev, &netdev_dev->ifi_flags); + error = set_flags(netdev_get_name(netdev_), new_flags); + get_flags(netdev_, &netdev->ifi_flags); } return error; } @@ -2391,7 +2376,7 @@ netdev_linux_update_flags(struct netdev *netdev, enum netdev_flags off, static unsigned int netdev_linux_change_seq(const struct netdev *netdev) { - return netdev_dev_linux_cast(netdev_get_dev(netdev))->change_seq; + return netdev_linux_cast(netdev)->change_seq; } #define NETDEV_LINUX_CLASS(NAME, CREATE, GET_STATS, SET_STATS, \ @@ -2399,7 +2384,7 @@ netdev_linux_change_seq(const struct netdev *netdev) { \ NAME, \ \ - netdev_linux_init, \ + NULL, \ netdev_linux_run, \ netdev_linux_wait, \ \ @@ -2407,14 +2392,9 @@ netdev_linux_change_seq(const struct netdev *netdev) netdev_linux_destroy, \ NULL, /* get_config */ \ NULL, /* set_config */ \ + NULL, /* get_tunnel_config */ \ \ - netdev_linux_open, \ - netdev_linux_close, \ - \ - netdev_linux_listen, \ - netdev_linux_recv, \ - netdev_linux_recv_wait, \ - netdev_linux_drain, \ + netdev_linux_rx_open, \ \ netdev_linux_send, \ netdev_linux_send_wait, \ @@ -2465,7 +2445,7 @@ const struct netdev_class netdev_linux_class = netdev_linux_get_stats, NULL, /* set_stats */ netdev_linux_get_features, - netdev_linux_get_drv_info); + netdev_linux_get_status); const struct netdev_class netdev_tap_class = NETDEV_LINUX_CLASS( @@ -2474,16 +2454,23 @@ const struct netdev_class netdev_tap_class = netdev_tap_get_stats, NULL, /* set_stats */ netdev_linux_get_features, - netdev_linux_get_drv_info); + netdev_linux_get_status); const struct netdev_class netdev_internal_class = NETDEV_LINUX_CLASS( "internal", netdev_linux_create, netdev_internal_get_stats, - netdev_vport_set_stats, + netdev_internal_set_stats, NULL, /* get_features */ - netdev_internal_get_drv_info); + netdev_internal_get_status); + +static const struct netdev_rx_class netdev_rx_linux_class = { + netdev_rx_linux_destroy, + netdev_rx_linux_recv, + netdev_rx_linux_wait, + netdev_rx_linux_drain, +}; /* HTB traffic control class. */ @@ -2503,25 +2490,23 @@ struct htb_class { }; static struct htb * -htb_get__(const struct netdev *netdev) +htb_get__(const struct netdev *netdev_) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); - return CONTAINER_OF(netdev_dev->tc, struct htb, tc); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + return CONTAINER_OF(netdev->tc, struct htb, tc); } static void -htb_install__(struct netdev *netdev, uint64_t max_rate) +htb_install__(struct netdev *netdev_, uint64_t max_rate) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct htb *htb; htb = xmalloc(sizeof *htb); tc_init(&htb->tc, &tc_ops_htb); htb->max_rate = max_rate; - netdev_dev->tc = &htb->tc; + netdev->tc = &htb->tc; } /* Create an HTB qdisc. @@ -2608,7 +2593,7 @@ htb_setup_class__(struct netdev *netdev, unsigned int handle, tc_get_major(handle), tc_get_minor(handle), tc_get_major(parent), tc_get_minor(parent), class->min_rate, class->max_rate, - class->burst, class->priority, strerror(error)); + class->burst, class->priority, ovs_strerror(error)); } return error; } @@ -2792,6 +2777,7 @@ htb_update_queue__(struct netdev *netdev, unsigned int queue_id, hcp = xmalloc(sizeof *hcp); queue = &hcp->tc_queue; queue->queue_id = queue_id; + queue->created = time_msec(); hmap_insert(&htb->tc.queues, &queue->hmap_node, hash); } @@ -2982,11 +2968,10 @@ struct hfsc_class { }; static struct hfsc * -hfsc_get__(const struct netdev *netdev) +hfsc_get__(const struct netdev *netdev_) { - struct netdev_dev_linux *netdev_dev; - netdev_dev = netdev_dev_linux_cast(netdev_get_dev(netdev)); - return CONTAINER_OF(netdev_dev->tc, struct hfsc, tc); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + return CONTAINER_OF(netdev->tc, struct hfsc, tc); } static struct hfsc_class * @@ -2996,16 +2981,15 @@ hfsc_class_cast__(const struct tc_queue *queue) } static void -hfsc_install__(struct netdev *netdev, uint32_t max_rate) +hfsc_install__(struct netdev *netdev_, uint32_t max_rate) { - struct netdev_dev_linux * netdev_dev; + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct hfsc *hfsc; - netdev_dev = netdev_dev_linux_cast(netdev_get_dev(netdev)); hfsc = xmalloc(sizeof *hfsc); tc_init(&hfsc->tc, &tc_ops_hfsc); hfsc->max_rate = max_rate; - netdev_dev->tc = &hfsc->tc; + netdev->tc = &hfsc->tc; } static void @@ -3027,6 +3011,7 @@ hfsc_update_queue__(struct netdev *netdev, unsigned int queue_id, hcp = xmalloc(sizeof *hcp); queue = &hcp->tc_queue; queue->queue_id = queue_id; + queue->created = time_msec(); hmap_insert(&hfsc->tc.queues, &queue->hmap_node, hash); } @@ -3270,7 +3255,7 @@ hfsc_setup_class__(struct netdev *netdev, unsigned int handle, netdev_get_name(netdev), tc_get_major(handle), tc_get_minor(handle), tc_get_major(parent), tc_get_minor(parent), - class->min_rate, class->max_rate, strerror(error)); + class->min_rate, class->max_rate, ovs_strerror(error)); } return error; @@ -3476,17 +3461,14 @@ static const struct tc_ops tc_ops_hfsc = { * the "" (empty string) QoS type in the OVS database. */ static void -default_install__(struct netdev *netdev) +default_install__(struct netdev *netdev_) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); - static struct tc *tc; + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + static const struct tc tc = TC_INITIALIZER(&tc, &tc_ops_default); - if (!tc) { - tc = xmalloc(sizeof *tc); - tc_init(tc, &tc_ops_default); - } - netdev_dev->tc = tc; + /* Nothing but a tc class implementation is allowed to write to a tc. This + * class never does that, so we can legitimately use a const tc object. */ + netdev->tc = CONST_CAST(struct tc *, &tc); } static int @@ -3525,17 +3507,14 @@ static const struct tc_ops tc_ops_default = { * */ static int -other_tc_load(struct netdev *netdev, struct ofpbuf *nlmsg OVS_UNUSED) +other_tc_load(struct netdev *netdev_, struct ofpbuf *nlmsg OVS_UNUSED) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); - static struct tc *tc; + struct netdev_linux *netdev = netdev_linux_cast(netdev_); + static const struct tc tc = TC_INITIALIZER(&tc, &tc_ops_other); - if (!tc) { - tc = xmalloc(sizeof *tc); - tc_init(tc, &tc_ops_other); - } - netdev_dev->tc = tc; + /* Nothing but a tc class implementation is allowed to write to a tc. This + * class never does that, so we can legitimately use a const tc object. */ + netdev->tc = CONST_CAST(struct tc *, &tc); return 0; } @@ -3627,7 +3606,7 @@ tc_make_request(const struct netdev *netdev, int type, unsigned int flags, static int tc_transact(struct ofpbuf *request, struct ofpbuf **replyp) { - int error = nl_sock_transact(rtnl_sock, request, replyp); + int error = nl_transact(NETLINK_ROUTE, request, replyp); ofpbuf_uninit(request); return error; } @@ -3704,7 +3683,7 @@ tc_add_policer(struct netdev *netdev, int kbits_rate, int kbits_burst) memset(&tc_police, 0, sizeof tc_police); tc_police.action = TC_POLICE_SHOT; tc_police.mtu = mtu; - tc_fill_rate(&tc_police.rate, kbits_rate/8 * 1000, mtu); + tc_fill_rate(&tc_police.rate, (kbits_rate * 1000)/8, mtu); tc_police.burst = tc_bytes_to_ticks(tc_police.rate.rate, kbits_burst * 1024); @@ -3772,30 +3751,35 @@ read_psched(void) * [5] 2.6.32.21.22 (approx.) from Ubuntu 10.04 on VMware Fusion * [6] 2.6.34 from kernel.org on KVM */ + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; static const char fn[] = "/proc/net/psched"; unsigned int a, b, c, d; FILE *stream; + if (!ovsthread_once_start(&once)) { + return; + } + ticks_per_s = 1.0; buffer_hz = 100; stream = fopen(fn, "r"); if (!stream) { - VLOG_WARN("%s: open failed: %s", fn, strerror(errno)); - return; + VLOG_WARN("%s: open failed: %s", fn, ovs_strerror(errno)); + goto exit; } if (fscanf(stream, "%x %x %x %x", &a, &b, &c, &d) != 4) { VLOG_WARN("%s: read failed", fn); fclose(stream); - return; + goto exit; } VLOG_DBG("%s: psched parameters are: %u %u %u %u", fn, a, b, c, d); fclose(stream); if (!a || !c) { VLOG_WARN("%s: invalid scheduler parameters", fn); - return; + goto exit; } ticks_per_s = (double) a * c / b; @@ -3806,6 +3790,9 @@ read_psched(void) fn, a, b, c, d); } VLOG_DBG("%s: ticks_per_s=%f buffer_hz=%u", fn, ticks_per_s, buffer_hz); + +exit: + ovsthread_once_done(&once); } /* Returns the number of bytes that can be transmitted in 'ticks' ticks at a @@ -3813,9 +3800,7 @@ read_psched(void) static unsigned int tc_ticks_to_bytes(unsigned int rate, unsigned int ticks) { - if (!buffer_hz) { - read_psched(); - } + read_psched(); return (rate * ticks) / ticks_per_s; } @@ -3824,9 +3809,7 @@ tc_ticks_to_bytes(unsigned int rate, unsigned int ticks) static unsigned int tc_bytes_to_ticks(unsigned int rate, unsigned int size) { - if (!buffer_hz) { - read_psched(); - } + read_psched(); return rate ? ((unsigned long long int) ticks_per_s * size) / rate : 0; } @@ -3835,9 +3818,7 @@ tc_bytes_to_ticks(unsigned int rate, unsigned int size) static unsigned int tc_buffer_per_jiffy(unsigned int rate) { - if (!buffer_hz) { - read_psched(); - } + read_psched(); return rate / buffer_hz; } @@ -3985,7 +3966,7 @@ tc_query_class(const struct netdev *netdev, netdev_get_name(netdev), tc_get_major(handle), tc_get_minor(handle), tc_get_major(parent), tc_get_minor(parent), - strerror(error)); + ovs_strerror(error)); } return error; } @@ -4010,22 +3991,21 @@ tc_delete_class(const struct netdev *netdev, unsigned int handle) VLOG_WARN_RL(&rl, "delete %s class %u:%u failed (%s)", netdev_get_name(netdev), tc_get_major(handle), tc_get_minor(handle), - strerror(error)); + ovs_strerror(error)); } return error; } /* Equivalent to "tc qdisc del dev root". */ static int -tc_del_qdisc(struct netdev *netdev) +tc_del_qdisc(struct netdev *netdev_) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct ofpbuf request; struct tcmsg *tcmsg; int error; - tcmsg = tc_make_request(netdev, RTM_DELQDISC, 0, &request); + tcmsg = tc_make_request(netdev_, RTM_DELQDISC, 0, &request); if (!tcmsg) { return ENODEV; } @@ -4038,11 +4018,11 @@ tc_del_qdisc(struct netdev *netdev) * case we've accomplished our purpose. */ error = 0; } - if (!error && netdev_dev->tc) { - if (netdev_dev->tc->ops->tc_destroy) { - netdev_dev->tc->ops->tc_destroy(netdev_dev->tc); + if (!error && netdev->tc) { + if (netdev->tc->ops->tc_destroy) { + netdev->tc->ops->tc_destroy(netdev->tc); } - netdev_dev->tc = NULL; + netdev->tc = NULL; } return error; } @@ -4051,17 +4031,16 @@ tc_del_qdisc(struct netdev *netdev) * kernel to determine what they are. Returns 0 if successful, otherwise a * positive errno value. */ static int -tc_query_qdisc(const struct netdev *netdev) +tc_query_qdisc(const struct netdev *netdev_) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); struct ofpbuf request, *qdisc; const struct tc_ops *ops; struct tcmsg *tcmsg; int load_error; int error; - if (netdev_dev->tc) { + if (netdev->tc) { return 0; } @@ -4079,7 +4058,7 @@ tc_query_qdisc(const struct netdev *netdev) * * We could check for Linux 2.6.35+ and use a more straightforward method * there. */ - tcmsg = tc_make_request(netdev, RTM_GETQDISC, NLM_F_ECHO, &request); + tcmsg = tc_make_request(netdev_, RTM_GETQDISC, NLM_F_ECHO, &request); if (!tcmsg) { return ENODEV; } @@ -4112,13 +4091,13 @@ tc_query_qdisc(const struct netdev *netdev) } else { /* Who knows? Maybe the device got deleted. */ VLOG_WARN_RL(&rl, "query %s qdisc failed (%s)", - netdev_get_name(netdev), strerror(error)); + netdev_get_name(netdev_), ovs_strerror(error)); ops = &tc_ops_other; } /* Instantiate it. */ - load_error = ops->tc_load(CONST_CAST(struct netdev *, netdev), qdisc); - assert((load_error == 0) == (netdev_dev->tc != NULL)); + load_error = ops->tc_load(CONST_CAST(struct netdev *, netdev_), qdisc); + ovs_assert((load_error == 0) == (netdev->tc != NULL)); ofpbuf_delete(qdisc); return error ? error : load_error; @@ -4195,14 +4174,6 @@ tc_calc_buffer(unsigned int Bps, int mtu, uint64_t burst_bytes) /* Linux-only functions declared in netdev-linux.h */ -/* Returns a fd for an AF_INET socket or a negative errno value. */ -int -netdev_linux_get_af_inet_sock(void) -{ - int error = netdev_linux_init(); - return error ? -error : af_inet_sock; -} - /* Modifies the 'flag' bit in ethtool's flags field for 'netdev'. If * 'enable' is true, the bit is set. Otherwise, it is cleared. */ int @@ -4305,7 +4276,7 @@ get_stats_via_netlink(int ifindex, struct netdev_stats *stats) ifi = ofpbuf_put_zeros(&request, sizeof *ifi); ifi->ifi_family = PF_UNSPEC; ifi->ifi_index = ifindex; - error = nl_sock_transact(rtnl_sock, &request, &reply); + error = nl_transact(NETLINK_ROUTE, &request, &reply); ofpbuf_uninit(&request); if (error) { return error; @@ -4341,7 +4312,7 @@ get_stats_via_proc(const char *netdev_name, struct netdev_stats *stats) stream = fopen(fn, "r"); if (!stream) { - VLOG_WARN_RL(&rl, "%s: open failed: %s", fn, strerror(errno)); + VLOG_WARN_RL(&rl, "%s: open failed: %s", fn, ovs_strerror(errno)); return errno; } @@ -4389,14 +4360,13 @@ get_stats_via_proc(const char *netdev_name, struct netdev_stats *stats) } static int -get_flags(const struct netdev_dev *dev, unsigned int *flags) +get_flags(const struct netdev *dev, unsigned int *flags) { struct ifreq ifr; int error; *flags = 0; - error = netdev_linux_do_ioctl(dev->name, &ifr, SIOCGIFFLAGS, - "SIOCGIFFLAGS"); + error = af_inet_ifreq_ioctl(dev->name, &ifr, SIOCGIFFLAGS, "SIOCGIFFLAGS"); if (!error) { *flags = ifr.ifr_flags; } @@ -4404,26 +4374,28 @@ get_flags(const struct netdev_dev *dev, unsigned int *flags) } static int -set_flags(struct netdev *netdev, unsigned int flags) +set_flags(const char *name, unsigned int flags) { struct ifreq ifr; ifr.ifr_flags = flags; - return netdev_linux_do_ioctl(netdev_get_name(netdev), &ifr, SIOCSIFFLAGS, - "SIOCSIFFLAGS"); + return af_inet_ifreq_ioctl(name, &ifr, SIOCSIFFLAGS, "SIOCSIFFLAGS"); } static int do_get_ifindex(const char *netdev_name) { struct ifreq ifr; + int error; ovs_strzcpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name); COVERAGE_INC(netdev_get_ifindex); - if (ioctl(af_inet_sock, SIOCGIFINDEX, &ifr) < 0) { + + error = af_inet_ioctl(SIOCGIFINDEX, &ifr); + if (error) { VLOG_WARN_RL(&rl, "ioctl(SIOCGIFINDEX) on %s device failed: %s", - netdev_name, strerror(errno)); - return -errno; + netdev_name, ovs_strerror(error)); + return -error; } return ifr.ifr_ifindex; } @@ -4431,24 +4403,23 @@ do_get_ifindex(const char *netdev_name) static int get_ifindex(const struct netdev *netdev_, int *ifindexp) { - struct netdev_dev_linux *netdev_dev = - netdev_dev_linux_cast(netdev_get_dev(netdev_)); + struct netdev_linux *netdev = netdev_linux_cast(netdev_); - if (!(netdev_dev->cache_valid & VALID_IFINDEX)) { + if (!(netdev->cache_valid & VALID_IFINDEX)) { int ifindex = do_get_ifindex(netdev_get_name(netdev_)); if (ifindex < 0) { - netdev_dev->get_ifindex_error = -ifindex; - netdev_dev->ifindex = 0; + netdev->get_ifindex_error = -ifindex; + netdev->ifindex = 0; } else { - netdev_dev->get_ifindex_error = 0; - netdev_dev->ifindex = ifindex; + netdev->get_ifindex_error = 0; + netdev->ifindex = ifindex; } - netdev_dev->cache_valid |= VALID_IFINDEX; + netdev->cache_valid |= VALID_IFINDEX; } - *ifindexp = netdev_dev->ifindex; - return netdev_dev->get_ifindex_error; + *ifindexp = netdev->ifindex; + return netdev->get_ifindex_error; } static int @@ -4456,18 +4427,20 @@ get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]) { struct ifreq ifr; int hwaddr_family; + int error; memset(&ifr, 0, sizeof ifr); ovs_strzcpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name); COVERAGE_INC(netdev_get_hwaddr); - if (ioctl(af_inet_sock, SIOCGIFHWADDR, &ifr) < 0) { + error = af_inet_ioctl(SIOCGIFHWADDR, &ifr); + if (error) { /* ENODEV probably means that a vif disappeared asynchronously and * hasn't been removed from the database yet, so reduce the log level * to INFO for that case. */ - VLOG(errno == ENODEV ? VLL_INFO : VLL_ERR, + VLOG(error == ENODEV ? VLL_INFO : VLL_ERR, "ioctl(SIOCGIFHWADDR) on %s device failed: %s", - netdev_name, strerror(errno)); - return errno; + netdev_name, ovs_strerror(error)); + return error; } hwaddr_family = ifr.ifr_hwaddr.sa_family; if (hwaddr_family != AF_UNSPEC && hwaddr_family != ARPHRD_ETHER) { @@ -4483,18 +4456,19 @@ set_etheraddr(const char *netdev_name, const uint8_t mac[ETH_ADDR_LEN]) { struct ifreq ifr; + int error; memset(&ifr, 0, sizeof ifr); ovs_strzcpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name); ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER; memcpy(ifr.ifr_hwaddr.sa_data, mac, ETH_ADDR_LEN); COVERAGE_INC(netdev_set_hwaddr); - if (ioctl(af_inet_sock, SIOCSIFHWADDR, &ifr) < 0) { + error = af_inet_ioctl(SIOCSIFHWADDR, &ifr); + if (error) { VLOG_ERR("ioctl(SIOCSIFHWADDR) on %s device failed: %s", - netdev_name, strerror(errno)); - return errno; + netdev_name, ovs_strerror(error)); } - return 0; + return error; } static int @@ -4502,37 +4476,24 @@ netdev_linux_do_ethtool(const char *name, struct ethtool_cmd *ecmd, int cmd, const char *cmd_name) { struct ifreq ifr; + int error; memset(&ifr, 0, sizeof ifr); ovs_strzcpy(ifr.ifr_name, name, sizeof ifr.ifr_name); ifr.ifr_data = (caddr_t) ecmd; ecmd->cmd = cmd; - if (ioctl(af_inet_sock, SIOCETHTOOL, &ifr) == 0) { - return 0; - } else { - if (errno != EOPNOTSUPP) { + error = af_inet_ioctl(SIOCETHTOOL, &ifr); + if (error) { + if (error != EOPNOTSUPP) { VLOG_WARN_RL(&rl, "ethtool command %s on network device %s " - "failed: %s", cmd_name, name, strerror(errno)); + "failed: %s", cmd_name, name, ovs_strerror(error)); } else { /* The device doesn't support this operation. That's pretty * common, so there's no point in logging anything. */ } - return errno; - } -} - -static int -netdev_linux_do_ioctl(const char *name, struct ifreq *ifr, int cmd, - const char *cmd_name) -{ - ovs_strzcpy(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, - strerror(errno)); - return errno; } - return 0; + return error; } static int @@ -4543,9 +4504,10 @@ netdev_linux_get_ipv4(const struct netdev *netdev, struct in_addr *ip, int error; ifr.ifr_addr.sa_family = AF_INET; - error = netdev_linux_do_ioctl(netdev_get_name(netdev), &ifr, cmd, cmd_name); + error = af_inet_ifreq_ioctl(netdev_get_name(netdev), &ifr, cmd, cmd_name); if (!error) { - const struct sockaddr_in *sin = (struct sockaddr_in *) &ifr.ifr_addr; + const struct sockaddr_in *sin = ALIGNED_CAST(struct sockaddr_in *, + &ifr.ifr_addr); *ip = sin->sin_addr; } return error; @@ -4555,16 +4517,23 @@ netdev_linux_get_ipv4(const struct netdev *netdev, struct in_addr *ip, static int af_packet_sock(void) { - static int sock = INT_MIN; + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int sock; - if (sock == INT_MIN) { + if (ovsthread_once_start(&once)) { sock = socket(AF_PACKET, SOCK_RAW, 0); if (sock >= 0) { - set_nonblocking(sock); + int error = set_nonblocking(sock); + if (error) { + close(sock); + sock = -error; + } } else { sock = -errno; - VLOG_ERR("failed to create packet socket: %s", strerror(errno)); + VLOG_ERR("failed to create packet socket: %s", + ovs_strerror(errno)); } + ovsthread_once_done(&once); } return sock;