X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=44675185e3bbebf320d1c9abc0a6897d0eae8eb1;hb=060ea9d5152b5c8cc6646ead1175484e07c583fe;hp=64dfda528848737363582b8f168404b014f6f71f;hpb=3e34f3d06d2f912a15d7303c9186a79cd64c4447;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 64dfda528..44675185e 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 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. @@ -17,7 +17,6 @@ #include #include "netdev.h" -#include #include #include #include @@ -37,6 +36,7 @@ #include "packets.h" #include "poll-loop.h" #include "shash.h" +#include "smap.h" #include "sset.h" #include "svec.h" #include "vlog.h" @@ -48,6 +48,13 @@ COVERAGE_DEFINE(netdev_sent); COVERAGE_DEFINE(netdev_add_router); COVERAGE_DEFINE(netdev_get_stats); +struct netdev_saved_flags { + struct netdev_dev *dev; + struct list node; /* In struct netdev_dev's saved_flags_list. */ + enum netdev_flags saved_flags; + enum netdev_flags saved_values; +}; + static struct shash netdev_classes = SHASH_INITIALIZER(&netdev_classes); /* All created network devices. */ @@ -60,8 +67,7 @@ static struct list netdev_list = LIST_INITIALIZER(&netdev_list); * additional log messages. */ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); -static void close_all_netdevs(void *aux OVS_UNUSED); -static int restore_flags(struct netdev *netdev); +static void restore_all_flags(void *aux OVS_UNUSED); void update_device_args(struct netdev_dev *, const struct shash *args); static void @@ -72,14 +78,21 @@ netdev_initialize(void) if (!inited) { inited = true; - fatal_signal_add_hook(close_all_netdevs, NULL, NULL, true); + fatal_signal_add_hook(restore_all_flags, NULL, NULL, true); + netdev_vport_patch_register(); -#ifdef HAVE_NETLINK +#ifdef LINUX_DATAPATH netdev_register_provider(&netdev_linux_class); netdev_register_provider(&netdev_internal_class); netdev_register_provider(&netdev_tap_class); - netdev_vport_register(); + netdev_vport_tunnel_register(); +#endif +#ifdef __FreeBSD__ + netdev_register_provider(&netdev_tap_class); + netdev_register_provider(&netdev_bsd_class); #endif + netdev_register_provider(&netdev_tunnel_class); + netdev_register_provider(&netdev_pltap_class); } } @@ -223,7 +236,7 @@ netdev_open(const char *name, const char *type, struct netdev **netdevp) if (error) { return error; } - assert(netdev_dev->netdev_class == class); + ovs_assert(netdev_dev->netdev_class == class); } @@ -243,15 +256,15 @@ netdev_open(const char *name, const char *type, struct netdev **netdevp) /* Reconfigures the device 'netdev' with 'args'. 'args' may be empty * or NULL if none are needed. */ int -netdev_set_config(struct netdev *netdev, const struct shash *args) +netdev_set_config(struct netdev *netdev, const struct smap *args) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); if (netdev_dev->netdev_class->set_config) { - struct shash no_args = SHASH_INITIALIZER(&no_args); + struct smap no_args = SMAP_INITIALIZER(&no_args); return netdev_dev->netdev_class->set_config(netdev_dev, args ? args : &no_args); - } else if (args && !shash_is_empty(args)) { + } else if (args && !smap_is_empty(args)) { VLOG_WARN("%s: arguments provided to device that is not configurable", netdev_get_name(netdev)); } @@ -260,23 +273,23 @@ netdev_set_config(struct netdev *netdev, const struct shash *args) } /* Returns the current configuration for 'netdev' in 'args'. The caller must - * have already initialized 'args' with shash_init(). Returns 0 on success, in + * have already initialized 'args' with smap_init(). Returns 0 on success, in * which case 'args' will be filled with 'netdev''s configuration. On failure * returns a positive errno value, in which case 'args' will be empty. * * The caller owns 'args' and its contents and must eventually free them with - * shash_destroy_free_data(). */ + * smap_destroy(). */ int -netdev_get_config(const struct netdev *netdev, struct shash *args) +netdev_get_config(const struct netdev *netdev, struct smap *args) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); int error; - shash_clear_free_data(args); + smap_clear(args); if (netdev_dev->netdev_class->get_config) { error = netdev_dev->netdev_class->get_config(netdev_dev, args); if (error) { - shash_clear_free_data(args); + smap_clear(args); } } else { error = 0; @@ -285,51 +298,37 @@ netdev_get_config(const struct netdev *netdev, struct shash *args) return error; } -/* Closes and destroys 'netdev'. */ -void -netdev_close(struct netdev *netdev) +const struct netdev_tunnel_config * +netdev_get_tunnel_config(const struct netdev *netdev) { - if (netdev) { - struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - - assert(netdev_dev->ref_cnt); - netdev_dev->ref_cnt--; - netdev_uninit(netdev, true); + struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - /* If the reference count for the netdev device is zero, destroy it. */ - if (!netdev_dev->ref_cnt) { - netdev_dev_uninit(netdev_dev, true); - } + if (netdev_dev->netdev_class->get_tunnel_config) { + return netdev_dev->netdev_class->get_tunnel_config(netdev_dev); + } else { + return NULL; } } -/* Returns true if a network device named 'name' exists and may be opened, - * otherwise false. */ -bool -netdev_exists(const char *name) +static void +netdev_dev_unref(struct netdev_dev *dev) { - struct netdev *netdev; - int error; - - error = netdev_open(name, "system", &netdev); - if (!error) { - netdev_close(netdev); - return true; - } else { - if (error != ENODEV) { - VLOG_WARN("failed to open network device %s: %s", - name, strerror(error)); - } - return false; + ovs_assert(dev->ref_cnt); + if (!--dev->ref_cnt) { + netdev_dev_uninit(dev, true); } } -/* Returns true if a network device named 'name' is currently opened, - * otherwise false. */ -bool -netdev_is_open(const char *name) +/* Closes and destroys 'netdev'. */ +void +netdev_close(struct netdev *netdev) { - return !!shash_find_data(&netdev_dev_shash, name); + if (netdev) { + struct netdev_dev *dev = netdev_get_dev(netdev); + + netdev_uninit(netdev, true); + netdev_dev_unref(dev); + } } /* Parses 'netdev_name_', which is of the form [type@]name into its component @@ -351,49 +350,44 @@ netdev_parse_name(const char *netdev_name_, char **name, char **type) } } -/* Attempts to set up 'netdev' for receiving packets with netdev_recv(). - * Returns 0 if successful, otherwise a positive errno value. EOPNOTSUPP - * indicates that the network device does not implement packet reception - * through this interface. */ int -netdev_listen(struct netdev *netdev) +netdev_rx_open(struct netdev *netdev, struct netdev_rx **rxp) { - int (*listen)(struct netdev *); + struct netdev_dev *dev = netdev_get_dev(netdev); + int error; - listen = netdev_get_dev(netdev)->netdev_class->listen; - return listen ? (listen)(netdev) : EOPNOTSUPP; + error = (dev->netdev_class->rx_open + ? dev->netdev_class->rx_open(netdev, rxp) + : EOPNOTSUPP); + if (!error) { + ovs_assert((*rxp)->netdev_dev == dev); + dev->ref_cnt++; + } else { + *rxp = NULL; + } + return error; +} + +void +netdev_rx_close(struct netdev_rx *rx) +{ + if (rx) { + struct netdev_dev *dev = rx->netdev_dev; + + rx->rx_class->destroy(rx); + netdev_dev_unref(dev); + } } -/* Attempts to receive a packet from 'netdev' into 'buffer', which the caller - * must have initialized with sufficient room for the packet. The space - * required to receive any packet is ETH_HEADER_LEN bytes, plus VLAN_HEADER_LEN - * bytes, plus the device's MTU (which may be retrieved via netdev_get_mtu()). - * (Some devices do not allow for a VLAN header, in which case VLAN_HEADER_LEN - * need not be included.) - * - * This function can only be expected to return a packet if ->listen() has - * been called successfully. - * - * If a packet is successfully retrieved, returns 0. In this case 'buffer' is - * guaranteed to contain at least ETH_TOTAL_MIN bytes. Otherwise, returns a - * positive errno value. Returns EAGAIN immediately if no packet is ready to - * be returned. - * - * Some network devices may not implement support for this function. In such - * cases this function will always return EOPNOTSUPP. */ int -netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) +netdev_rx_recv(struct netdev_rx *rx, struct ofpbuf *buffer) { - int (*recv)(struct netdev *, void *, size_t); int retval; - assert(buffer->size == 0); - assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); + ovs_assert(buffer->size == 0); + ovs_assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); - recv = netdev_get_dev(netdev)->netdev_class->recv; - retval = (recv - ? (recv)(netdev, buffer->data, ofpbuf_tailroom(buffer)) - : -EOPNOTSUPP); + retval = rx->rx_class->recv(rx, buffer->data, ofpbuf_tailroom(buffer)); if (retval >= 0) { COVERAGE_INC(netdev_received); buffer->size += retval; @@ -406,27 +400,16 @@ netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) } } -/* 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'. */ void -netdev_recv_wait(struct netdev *netdev) +netdev_rx_wait(struct netdev_rx *rx) { - void (*recv_wait)(struct netdev *); - - recv_wait = netdev_get_dev(netdev)->netdev_class->recv_wait; - if (recv_wait) { - recv_wait(netdev); - } + rx->rx_class->wait(rx); } -/* Discards all packets waiting to be received from 'netdev'. */ int -netdev_drain(struct netdev *netdev) +netdev_rx_drain(struct netdev_rx *rx) { - int (*drain)(struct netdev *); - - drain = netdev_get_dev(netdev)->netdev_class->drain; - return drain ? drain(netdev) : 0; + return rx->rx_class->drain ? rx->rx_class->drain(rx) : 0; } /* Sends 'buffer' on 'netdev'. Returns 0 if successful, otherwise a positive @@ -516,7 +499,7 @@ netdev_get_mtu(const struct netdev *netdev, int *mtup) if (error) { *mtup = 0; if (error != EOPNOTSUPP) { - VLOG_WARN_RL(&rl, "failed to retrieve MTU for network device %s: " + VLOG_DBG_RL(&rl, "failed to retrieve MTU for network device %s: " "%s", netdev_get_name(netdev), strerror(error)); } } @@ -537,7 +520,7 @@ netdev_set_mtu(const struct netdev *netdev, int mtu) error = class->set_mtu ? class->set_mtu(netdev, mtu) : EOPNOTSUPP; if (error && error != EOPNOTSUPP) { - VLOG_WARN_RL(&rl, "failed to set MTU for network device %s: %s", + VLOG_DBG_RL(&rl, "failed to set MTU for network device %s: %s", netdev_get_name(netdev), strerror(error)); } @@ -576,13 +559,17 @@ netdev_get_ifindex(const struct netdev *netdev) * cases this function will always return EOPNOTSUPP. */ int netdev_get_features(const struct netdev *netdev, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer) + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer) { int (*get_features)(const struct netdev *netdev, - uint32_t *current, uint32_t *advertised, - uint32_t *supported, uint32_t *peer); - uint32_t dummy[4]; + enum netdev_features *current, + enum netdev_features *advertised, + enum netdev_features *supported, + enum netdev_features *peer); + enum netdev_features dummy[4]; int error; if (!current) { @@ -600,7 +587,8 @@ netdev_get_features(const struct netdev *netdev, get_features = netdev_get_dev(netdev)->netdev_class->get_features; error = get_features - ? get_features(netdev, current, advertised, supported, peer) + ? get_features(netdev, current, advertised, supported, + peer) : EOPNOTSUPP; if (error) { *current = *advertised = *supported = *peer = 0; @@ -608,39 +596,48 @@ netdev_get_features(const struct netdev *netdev, return error; } -/* Returns the maximum speed of a network connection that has the "enum - * ofp_port_features" bits in 'features', in bits per second. If no bits that - * indicate a speed are set in 'features', assumes 100Mbps. */ +/* Returns the maximum speed of a network connection that has the NETDEV_F_* + * bits in 'features', in bits per second. If no bits that indicate a speed + * are set in 'features', returns 'default_bps'. */ uint64_t -netdev_features_to_bps(uint32_t features) +netdev_features_to_bps(enum netdev_features features, + uint64_t default_bps) { enum { - F_10000MB = OFPPF_10GB_FD, - F_1000MB = OFPPF_1GB_HD | OFPPF_1GB_FD, - F_100MB = OFPPF_100MB_HD | OFPPF_100MB_FD, - F_10MB = OFPPF_10MB_HD | OFPPF_10MB_FD + F_1000000MB = NETDEV_F_1TB_FD, + F_100000MB = NETDEV_F_100GB_FD, + F_40000MB = NETDEV_F_40GB_FD, + F_10000MB = NETDEV_F_10GB_FD, + F_1000MB = NETDEV_F_1GB_HD | NETDEV_F_1GB_FD, + F_100MB = NETDEV_F_100MB_HD | NETDEV_F_100MB_FD, + F_10MB = NETDEV_F_10MB_HD | NETDEV_F_10MB_FD }; - return ( features & F_10000MB ? UINT64_C(10000000000) - : features & F_1000MB ? UINT64_C(1000000000) - : features & F_100MB ? UINT64_C(100000000) - : features & F_10MB ? UINT64_C(10000000) - : UINT64_C(100000000)); + return ( features & F_1000000MB ? UINT64_C(1000000000000) + : features & F_100000MB ? UINT64_C(100000000000) + : features & F_40000MB ? UINT64_C(40000000000) + : features & F_10000MB ? UINT64_C(10000000000) + : features & F_1000MB ? UINT64_C(1000000000) + : features & F_100MB ? UINT64_C(100000000) + : features & F_10MB ? UINT64_C(10000000) + : default_bps); } -/* Returns true if any of the "enum ofp_port_features" bits that indicate a - * full-duplex link are set in 'features', otherwise false. */ +/* Returns true if any of the NETDEV_F_* bits that indicate a full-duplex link + * are set in 'features', otherwise false. */ bool -netdev_features_is_full_duplex(uint32_t features) +netdev_features_is_full_duplex(enum netdev_features features) { - return (features & (OFPPF_10MB_FD | OFPPF_100MB_FD | OFPPF_1GB_FD - | OFPPF_10GB_FD)) != 0; + return (features & (NETDEV_F_10MB_FD | NETDEV_F_100MB_FD | NETDEV_F_1GB_FD + | NETDEV_F_10GB_FD | NETDEV_F_40GB_FD + | NETDEV_F_100GB_FD | NETDEV_F_1TB_FD)) != 0; } /* Set the features advertised by 'netdev' to 'advertise'. Returns 0 if * successful, otherwise a positive errno value. */ int -netdev_set_advertisements(struct netdev *netdev, uint32_t advertise) +netdev_set_advertisements(struct netdev *netdev, + enum netdev_features advertise) { return (netdev_get_dev(netdev)->netdev_class->set_advertisements ? netdev_get_dev(netdev)->netdev_class->set_advertisements( @@ -746,18 +743,18 @@ netdev_get_next_hop(const struct netdev *netdev, return error; } -/* Populates 'sh' with status information. +/* Populates 'smap' with status information. * - * Populates 'sh' with 'netdev' specific status information. This information - * may be used to populate the status column of the Interface table as defined - * in ovs-vswitchd.conf.db(5). */ + * Populates 'smap' with 'netdev' specific status information. This + * information may be used to populate the status column of the Interface table + * as defined in ovs-vswitchd.conf.db(5). */ int -netdev_get_status(const struct netdev *netdev, struct shash *sh) +netdev_get_status(const struct netdev *netdev, struct smap *smap) { struct netdev_dev *dev = netdev_get_dev(netdev); return (dev->netdev_class->get_status - ? dev->netdev_class->get_status(netdev, sh) + ? dev->netdev_class->get_status(netdev, smap) : EOPNOTSUPP); } @@ -789,37 +786,44 @@ netdev_get_in6(const struct netdev *netdev, struct in6_addr *in6) } /* On 'netdev', turns off the flags in 'off' and then turns on the flags in - * 'on'. If 'permanent' is true, the changes will persist; otherwise, they - * will be reverted when 'netdev' is closed or the program exits. Returns 0 if - * successful, otherwise a positive errno value. */ + * 'on'. Returns 0 if successful, otherwise a positive errno value. */ static int do_update_flags(struct netdev *netdev, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flagsp, - bool permanent) + struct netdev_saved_flags **sfp) { + struct netdev_dev *dev = netdev_get_dev(netdev); + struct netdev_saved_flags *sf = NULL; enum netdev_flags old_flags; int error; - error = netdev_get_dev(netdev)->netdev_class->update_flags(netdev, - off & ~on, on, &old_flags); + error = dev->netdev_class->update_flags(dev, off & ~on, on, &old_flags); if (error) { VLOG_WARN_RL(&rl, "failed to %s flags for network device %s: %s", off || on ? "set" : "get", netdev_get_name(netdev), strerror(error)); old_flags = 0; - } else if ((off || on) && !permanent) { + } else if ((off || on) && sfp) { enum netdev_flags new_flags = (old_flags & ~off) | on; enum netdev_flags changed_flags = old_flags ^ new_flags; if (changed_flags) { - if (!netdev->changed_flags) { - netdev->save_flags = old_flags; - } - netdev->changed_flags |= changed_flags; + *sfp = sf = xmalloc(sizeof *sf); + sf->dev = dev; + list_push_front(&dev->saved_flags_list, &sf->node); + sf->saved_flags = changed_flags; + sf->saved_values = changed_flags & new_flags; + + dev->ref_cnt++; } } + if (old_flagsp) { *old_flagsp = old_flags; } + if (sfp) { + *sfp = sf; + } + return error; } @@ -829,41 +833,64 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off, int netdev_get_flags(const struct netdev *netdev_, enum netdev_flags *flagsp) { - struct netdev *netdev = (struct netdev *) netdev_; - return do_update_flags(netdev, 0, 0, flagsp, false); + struct netdev *netdev = CONST_CAST(struct netdev *, netdev_); + return do_update_flags(netdev, 0, 0, flagsp, NULL); } /* Sets the flags for 'netdev' to 'flags'. - * If 'permanent' is true, the changes will persist; otherwise, they - * will be reverted when 'netdev' is closed or the program exits. * Returns 0 if successful, otherwise a positive errno value. */ int netdev_set_flags(struct netdev *netdev, enum netdev_flags flags, - bool permanent) + struct netdev_saved_flags **sfp) { - return do_update_flags(netdev, -1, flags, NULL, permanent); + return do_update_flags(netdev, -1, flags, NULL, sfp); } -/* Turns on the specified 'flags' on 'netdev'. - * If 'permanent' is true, the changes will persist; otherwise, they - * will be reverted when 'netdev' is closed or the program exits. - * Returns 0 if successful, otherwise a positive errno value. */ +/* Turns on the specified 'flags' on 'netdev': + * + * - On success, returns 0. If 'sfp' is nonnull, sets '*sfp' to a newly + * allocated 'struct netdev_saved_flags *' that may be passed to + * netdev_restore_flags() to restore the original values of 'flags' on + * 'netdev' (this will happen automatically at program termination if + * netdev_restore_flags() is never called) , or to NULL if no flags were + * actually changed. + * + * - On failure, returns a positive errno value. If 'sfp' is nonnull, sets + * '*sfp' to NULL. */ int netdev_turn_flags_on(struct netdev *netdev, enum netdev_flags flags, - bool permanent) + struct netdev_saved_flags **sfp) { - return do_update_flags(netdev, 0, flags, NULL, permanent); + return do_update_flags(netdev, 0, flags, NULL, sfp); } -/* Turns off the specified 'flags' on 'netdev'. - * If 'permanent' is true, the changes will persist; otherwise, they - * will be reverted when 'netdev' is closed or the program exits. - * Returns 0 if successful, otherwise a positive errno value. */ +/* Turns off the specified 'flags' on 'netdev'. See netdev_turn_flags_on() for + * details of the interface. */ int netdev_turn_flags_off(struct netdev *netdev, enum netdev_flags flags, - bool permanent) + struct netdev_saved_flags **sfp) +{ + return do_update_flags(netdev, flags, 0, NULL, sfp); +} + +/* Restores the flags that were saved in 'sf', and destroys 'sf'. + * Does nothing if 'sf' is NULL. */ +void +netdev_restore_flags(struct netdev_saved_flags *sf) { - return do_update_flags(netdev, flags, 0, NULL, permanent); + if (sf) { + struct netdev_dev *dev = sf->dev; + enum netdev_flags old_flags; + + dev->netdev_class->update_flags(dev, + sf->saved_flags & sf->saved_values, + sf->saved_flags & ~sf->saved_values, + &old_flags); + list_remove(&sf->node); + free(sf); + + netdev_dev_unref(dev); + } } /* Looks up the ARP table entry for 'ip' on 'netdev'. If one exists and can be @@ -1052,10 +1079,9 @@ netdev_get_n_queues(const struct netdev *netdev, * * A '*typep' of "" indicates that QoS is currently disabled on 'netdev'. * - * The caller must initialize 'details' as an empty shash (e.g. with - * shash_init()) before calling this function. The caller must free 'details', - * including 'data' members, when it is no longer needed (e.g. with - * shash_destroy_free_data()). + * The caller must initialize 'details' as an empty smap (e.g. with + * smap_init()) before calling this function. The caller must free 'details' + * when it is no longer needed (e.g. with smap_destroy()). * * The caller must not modify or free '*typep'. * @@ -1065,7 +1091,7 @@ netdev_get_n_queues(const struct netdev *netdev, * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). */ int netdev_get_qos(const struct netdev *netdev, - const char **typep, struct shash *details) + const char **typep, struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; int retval; @@ -1074,7 +1100,7 @@ netdev_get_qos(const struct netdev *netdev, retval = class->get_qos(netdev, typep, details); if (retval) { *typep = NULL; - shash_clear_free_data(details); + smap_clear(details); } return retval; } else { @@ -1104,7 +1130,7 @@ netdev_get_qos(const struct netdev *netdev, * details. */ int netdev_set_qos(struct netdev *netdev, - const char *type, const struct shash *details) + const char *type, const struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; @@ -1114,7 +1140,7 @@ netdev_set_qos(struct netdev *netdev, if (class->set_qos) { if (!details) { - static struct shash empty = SHASH_INITIALIZER(&empty); + static const struct smap empty = SMAP_INITIALIZER(&empty); details = ∅ } return class->set_qos(netdev, type, details); @@ -1134,12 +1160,12 @@ netdev_set_qos(struct netdev *netdev, * given 'type' in the "other_config" column in the "Queue" table in * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). * - * The caller must initialize 'details' (e.g. with shash_init()) before calling - * this function. The caller must free 'details', including 'data' members, - * when it is no longer needed (e.g. with shash_destroy_free_data()). */ + * The caller must initialize 'details' (e.g. with smap_init()) before calling + * this function. The caller must free 'details' when it is no longer needed + * (e.g. with smap_destroy()). */ int netdev_get_queue(const struct netdev *netdev, - unsigned int queue_id, struct shash *details) + unsigned int queue_id, struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; int retval; @@ -1148,7 +1174,7 @@ netdev_get_queue(const struct netdev *netdev, ? class->get_queue(netdev, queue_id, details) : EOPNOTSUPP); if (retval) { - shash_clear_free_data(details); + smap_clear(details); } return retval; } @@ -1167,7 +1193,7 @@ netdev_get_queue(const struct netdev *netdev, * it. */ int netdev_set_queue(struct netdev *netdev, - unsigned int queue_id, const struct shash *details) + unsigned int queue_id, const struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; return (class->set_queue @@ -1222,7 +1248,11 @@ netdev_get_queue_stats(const struct netdev *netdev, unsigned int queue_id, * Calling this function may be more efficient than calling netdev_get_queue() * for every queue. * - * 'cb' must not modify or free the 'details' argument passed in. + * 'cb' must not modify or free the 'details' argument passed in. It may + * delete or modify the queue passed in as its 'queue_id' argument. It may + * modify but must not delete any other queue within 'netdev'. 'cb' should not + * add new queues because this may cause some queues to be visited twice or not + * at all. * * Returns 0 if successful, otherwise a positive errno value. On error, some * configured queues may not have been included in the iteration. */ @@ -1282,12 +1312,13 @@ void netdev_dev_init(struct netdev_dev *netdev_dev, const char *name, const struct netdev_class *netdev_class) { - assert(!shash_find(&netdev_dev_shash, name)); + ovs_assert(!shash_find(&netdev_dev_shash, name)); memset(netdev_dev, 0, sizeof *netdev_dev); netdev_dev->netdev_class = netdev_class; netdev_dev->name = xstrdup(name); netdev_dev->node = shash_add(&netdev_dev_shash, name, netdev_dev); + list_init(&netdev_dev->saved_flags_list); } /* Undoes the results of initialization. @@ -1302,7 +1333,8 @@ netdev_dev_uninit(struct netdev_dev *netdev_dev, bool destroy) { char *name = netdev_dev->name; - assert(!netdev_dev->ref_cnt); + ovs_assert(!netdev_dev->ref_cnt); + ovs_assert(list_is_empty(&netdev_dev->saved_flags_list)); shash_delete(&netdev_dev_shash, netdev_dev->node); @@ -1385,20 +1417,12 @@ netdev_init(struct netdev *netdev, struct netdev_dev *netdev_dev) void netdev_uninit(struct netdev *netdev, bool close) { - /* Restore flags that we changed, if any. */ - int error = restore_flags(netdev); list_remove(&netdev->node); - if (error) { - VLOG_WARN("failed to restore network device flags on %s: %s", - netdev_get_name(netdev), strerror(error)); - } - if (close) { netdev_get_dev(netdev)->netdev_class->close(netdev); } } - /* Returns the class type of 'netdev'. * * The caller must not free the returned value. */ @@ -1408,37 +1432,71 @@ netdev_get_type(const struct netdev *netdev) return netdev_get_dev(netdev)->netdev_class->type; } +const char * +netdev_get_type_from_name(const char *name) +{ + const struct netdev_dev *dev = netdev_dev_from_name(name); + return dev ? netdev_dev_get_type(dev) : NULL; +} + struct netdev_dev * netdev_get_dev(const struct netdev *netdev) { return netdev->netdev_dev; } -/* Restore the network device flags on 'netdev' to those that were active - * before we changed them. Returns 0 if successful, otherwise a positive - * errno value. - * - * To avoid reentry, the caller must ensure that fatal signals are blocked. */ -static int -restore_flags(struct netdev *netdev) +void +netdev_rx_init(struct netdev_rx *rx, struct netdev_dev *dev, + const struct netdev_rx_class *class) { - if (netdev->changed_flags) { - enum netdev_flags restore = netdev->save_flags & netdev->changed_flags; - enum netdev_flags old_flags; - return netdev_get_dev(netdev)->netdev_class->update_flags(netdev, - netdev->changed_flags & ~restore, - restore, &old_flags); - } - return 0; + ovs_assert(dev->ref_cnt > 0); + rx->rx_class = class; + rx->netdev_dev = dev; +} + +void +netdev_rx_uninit(struct netdev_rx *rx OVS_UNUSED) +{ + /* Nothing to do. */ +} + +struct netdev_dev * +netdev_rx_get_dev(const struct netdev_rx *rx) +{ + ovs_assert(rx->netdev_dev->ref_cnt > 0); + return rx->netdev_dev; +} + +const char * +netdev_rx_get_name(const struct netdev_rx *rx) +{ + return netdev_dev_get_name(netdev_rx_get_dev(rx)); } -/* Close all netdevs on shutdown so they can do any needed cleanup such as - * destroying devices, restoring flags, etc. */ static void -close_all_netdevs(void *aux OVS_UNUSED) +restore_all_flags(void *aux OVS_UNUSED) { - struct netdev *netdev, *next; - LIST_FOR_EACH_SAFE(netdev, next, node, &netdev_list) { - netdev_close(netdev); + struct shash_node *node; + + SHASH_FOR_EACH (node, &netdev_dev_shash) { + struct netdev_dev *dev = node->data; + const struct netdev_saved_flags *sf; + enum netdev_flags saved_values; + enum netdev_flags saved_flags; + + saved_values = saved_flags = 0; + LIST_FOR_EACH (sf, node, &dev->saved_flags_list) { + saved_flags |= sf->saved_flags; + saved_values &= ~sf->saved_flags; + saved_values |= sf->saved_flags & sf->saved_values; + } + if (saved_flags) { + enum netdev_flags old_flags; + + dev->netdev_class->update_flags(dev, + saved_flags & saved_values, + saved_flags & ~saved_values, + &old_flags); + } } }