/*
- * Copyright (c) 2008, 2009, 2010, 2011 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.
#include <config.h>
#include "netdev.h"
-#include <assert.h>
#include <errno.h>
#include <inttypes.h>
#include <netinet/in.h>
#include "packets.h"
#include "poll-loop.h"
#include "shash.h"
+#include "smap.h"
#include "sset.h"
#include "svec.h"
#include "vlog.h"
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. */
* 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
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);
}
}
}
}
-void
-update_device_args(struct netdev_dev *dev, const struct shash *args)
-{
- smap_destroy(&dev->args);
- smap_clone(&dev->args, args);
-}
-
-/* Opens the network device named 'name' (e.g. "eth0") and returns zero if
- * successful, otherwise a positive errno value. On success, sets '*netdevp'
- * to the new network device, otherwise to null.
- *
- * If this is the first time the device has been opened, then create is called
- * before opening. The device is created using the given type and arguments.
+/* Opens the network device named 'name' (e.g. "eth0") of the specified 'type'
+ * (e.g. "system") and returns zero if successful, otherwise a positive errno
+ * value. On success, sets '*netdevp' to the new network device, otherwise to
+ * null.
*
- * 'ethertype' may be a 16-bit Ethernet protocol value in host byte order to
- * capture frames of that type received on the device. It may also be one of
- * the 'enum netdev_pseudo_ethertype' values to receive frames in one of those
- * categories. */
+ * Some network devices may need to be configured (with netdev_set_config())
+ * before they can be used. */
int
-netdev_open(struct netdev_options *options, struct netdev **netdevp)
+netdev_open(const char *name, const char *type, struct netdev **netdevp)
{
- struct shash empty_args = SHASH_INITIALIZER(&empty_args);
struct netdev_dev *netdev_dev;
int error;
*netdevp = NULL;
netdev_initialize();
- if (!options->args) {
- options->args = &empty_args;
- }
-
- netdev_dev = shash_find_data(&netdev_dev_shash, options->name);
+ netdev_dev = shash_find_data(&netdev_dev_shash, name);
if (!netdev_dev) {
const struct netdev_class *class;
- class = netdev_lookup_provider(options->type);
+ class = netdev_lookup_provider(type);
if (!class) {
VLOG_WARN("could not create netdev %s of unknown type %s",
- options->name, options->type);
+ name, type);
return EAFNOSUPPORT;
}
- error = class->create(class, options->name, options->args,
- &netdev_dev);
+ error = class->create(class, name, &netdev_dev);
if (error) {
return error;
}
- assert(netdev_dev->netdev_class == class);
-
- } else if (!shash_is_empty(options->args) &&
- !smap_equal(&netdev_dev->args, options->args)) {
+ ovs_assert(netdev_dev->netdev_class == class);
- VLOG_WARN("%s: attempted to open already open netdev with "
- "different arguments", options->name);
- return EINVAL;
}
- error = netdev_dev->netdev_class->open(netdev_dev, options->ethertype,
- netdevp);
+ error = netdev_dev->netdev_class->open(netdev_dev, netdevp);
if (!error) {
netdev_dev->ref_cnt++;
return error;
}
+/* Reconfigures the device 'netdev' with 'args'. 'args' may be empty
+ * or NULL if none are needed. */
int
-netdev_open_default(const char *name, struct netdev **netdevp)
+netdev_set_config(struct netdev *netdev, const struct smap *args)
{
- struct netdev_options options;
+ struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
- memset(&options, 0, sizeof options);
- options.name = name;
- options.ethertype = NETDEV_ETH_TYPE_NONE;
+ if (netdev_dev->netdev_class->set_config) {
+ struct smap no_args = SMAP_INITIALIZER(&no_args);
+ return netdev_dev->netdev_class->set_config(netdev_dev,
+ args ? args : &no_args);
+ } else if (args && !smap_is_empty(args)) {
+ VLOG_WARN("%s: arguments provided to device that is not configurable",
+ netdev_get_name(netdev));
+ }
- return netdev_open(&options, netdevp);
+ return 0;
}
-/* Reconfigures the device 'netdev' with 'args'. 'args' may be empty
- * or NULL if none are needed. */
+/* Returns the current configuration for 'netdev' in 'args'. The caller must
+ * 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
+ * smap_destroy(). */
int
-netdev_set_config(struct netdev *netdev, const struct shash *args)
+netdev_get_config(const struct netdev *netdev, struct smap *args)
{
- struct shash empty_args = SHASH_INITIALIZER(&empty_args);
struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
+ int error;
- if (!args) {
- args = &empty_args;
- }
-
- if (netdev_dev->netdev_class->set_config) {
- if (!smap_equal(&netdev_dev->args, args)) {
- update_device_args(netdev_dev, args);
- return netdev_dev->netdev_class->set_config(netdev_dev, args);
+ smap_clear(args);
+ if (netdev_dev->netdev_class->get_config) {
+ error = netdev_dev->netdev_class->get_config(netdev_dev, args);
+ if (error) {
+ smap_clear(args);
}
- } else if (!shash_is_empty(args)) {
- VLOG_WARN("%s: arguments provided to device whose configuration "
- "cannot be changed", netdev_get_name(netdev));
+ } else {
+ error = 0;
}
- return 0;
+ return error;
}
-/* Returns the current configuration for 'netdev'. This is either the
- * configuration passed to netdev_open() or netdev_set_config(), or it is a
- * configuration retrieved from the device itself if no configuration was
- * passed to those functions.
- *
- * 'netdev' retains ownership of the returned configuration. */
-const struct shash *
-netdev_get_config(const struct netdev *netdev)
+const struct netdev_tunnel_config *
+netdev_get_tunnel_config(const struct netdev *netdev)
+{
+ struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
+
+ if (netdev_dev->netdev_class->get_tunnel_config) {
+ return netdev_dev->netdev_class->get_tunnel_config(netdev_dev);
+ } else {
+ return NULL;
+ }
+}
+
+static void
+netdev_dev_unref(struct netdev_dev *dev)
{
- return &netdev_get_dev(netdev)->args;
+ ovs_assert(dev->ref_cnt);
+ if (!--dev->ref_cnt) {
+ netdev_dev_uninit(dev, true);
+ }
}
/* Closes and destroys 'netdev'. */
netdev_close(struct netdev *netdev)
{
if (netdev) {
- struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
+ struct netdev_dev *dev = netdev_get_dev(netdev);
- assert(netdev_dev->ref_cnt);
- netdev_dev->ref_cnt--;
netdev_uninit(netdev, true);
-
- /* If the reference count for the netdev device is zero, destroy it. */
- if (!netdev_dev->ref_cnt) {
- netdev_dev_uninit(netdev_dev, true);
- }
+ netdev_dev_unref(dev);
}
}
-/* Returns true if a network device named 'name' exists and may be opened,
- * otherwise false. */
-bool
-netdev_exists(const char *name)
+/* Parses 'netdev_name_', which is of the form [type@]name into its component
+ * pieces. 'name' and 'type' must be freed by the caller. */
+void
+netdev_parse_name(const char *netdev_name_, char **name, char **type)
{
- struct netdev *netdev;
- int error;
+ char *netdev_name = xstrdup(netdev_name_);
+ char *separator;
- error = netdev_open_default(name, &netdev);
- if (!error) {
- netdev_close(netdev);
- return true;
+ separator = strchr(netdev_name, '@');
+ if (separator) {
+ *separator = '\0';
+ *type = netdev_name;
+ *name = xstrdup(separator + 1);
} else {
- if (error != ENODEV) {
- VLOG_WARN("failed to open network device %s: %s",
- name, strerror(error));
- }
- return false;
+ *name = netdev_name;
+ *type = xstrdup("system");
}
}
-/* Returns true if a network device named 'name' is currently opened,
- * otherwise false. */
-bool
-netdev_is_open(const char *name)
+int
+netdev_rx_open(struct netdev *netdev, struct netdev_rx **rxp)
{
- return !!shash_find_data(&netdev_dev_shash, name);
+ struct netdev_dev *dev = netdev_get_dev(netdev);
+ int error;
+
+ 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;
}
-/* Clears 'sset' and enumerates the names of all known network devices. */
-int
-netdev_enumerate(struct sset *sset)
+void
+netdev_rx_close(struct netdev_rx *rx)
{
- struct shash_node *node;
- int error = 0;
-
- netdev_initialize();
- sset_clear(sset);
+ if (rx) {
+ struct netdev_dev *dev = rx->netdev_dev;
- SHASH_FOR_EACH(node, &netdev_classes) {
- const struct netdev_class *netdev_class = node->data;
- if (netdev_class->enumerate) {
- int retval = netdev_class->enumerate(sset);
- if (retval) {
- VLOG_WARN("failed to enumerate %s network devices: %s",
- netdev_class->type, strerror(retval));
- if (!error) {
- error = retval;
- }
- }
- }
+ rx->rx_class->destroy(rx);
+ netdev_dev_unref(dev);
}
-
- return error;
}
-/* 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.)
- *
- * 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;
}
}
-/* 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
* (and received) packets, in bytes, not including the hardware header; thus,
* this is typically 1500 bytes for Ethernet devices.
*
- * If successful, returns 0 and stores the MTU size in '*mtup'. Stores INT_MAX
- * in '*mtup' if 'netdev' does not have an MTU (as e.g. some tunnels do not).On
- * failure, returns a positive errno value and stores ETH_PAYLOAD_MAX (1500) in
- * '*mtup'. */
+ * If successful, returns 0 and stores the MTU size in '*mtup'. Returns
+ * EOPNOTSUPP if 'netdev' does not have an MTU (as e.g. some tunnels do not).
+ * On other failure, returns a positive errno value. On failure, sets '*mtup'
+ * to 0. */
int
netdev_get_mtu(const struct netdev *netdev, int *mtup)
{
- int error = netdev_get_dev(netdev)->netdev_class->get_mtu(netdev, mtup);
+ const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+ int error;
+
+ error = class->get_mtu ? class->get_mtu(netdev, mtup) : EOPNOTSUPP;
if (error) {
- VLOG_WARN_RL(&rl, "failed to retrieve MTU for network device %s: %s",
+ *mtup = 0;
+ if (error != EOPNOTSUPP) {
+ VLOG_DBG_RL(&rl, "failed to retrieve MTU for network device %s: "
+ "%s", netdev_get_name(netdev), strerror(error));
+ }
+ }
+ return error;
+}
+
+/* Sets the MTU of 'netdev'. The MTU is the maximum size of transmitted
+ * (and received) packets, in bytes.
+ *
+ * If successful, returns 0. Returns EOPNOTSUPP if 'netdev' does not have an
+ * MTU (as e.g. some tunnels do not). On other failure, returns a positive
+ * errno value. */
+int
+netdev_set_mtu(const struct netdev *netdev, int mtu)
+{
+ const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class;
+ int error;
+
+ error = class->set_mtu ? class->set_mtu(netdev, mtu) : EOPNOTSUPP;
+ if (error && error != EOPNOTSUPP) {
+ VLOG_DBG_RL(&rl, "failed to set MTU for network device %s: %s",
netdev_get_name(netdev), strerror(error));
- *mtup = ETH_PAYLOAD_MAX;
}
+
return error;
}
* 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) {
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;
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(
*
* - EOPNOTSUPP: No IPv4 network stack attached to 'netdev'.
*
- * 'address' or 'netmask' or both may be null, in which case the address or
+ * 'address' or 'netmask' or both may be null, in which case the address or
* netmask is not reported. */
int
netdev_get_in4(const struct netdev *netdev,
: EOPNOTSUPP);
}
+/* Obtains ad IPv4 address from device name and save the address in
+ * in4. Returns 0 if successful, otherwise a positive errno value.
+ */
+int
+netdev_get_in4_by_name(const char *device_name, struct in_addr *in4)
+{
+ struct netdev *netdev;
+ int error;
+
+ error = netdev_open(device_name, "system", &netdev);
+ if (error) {
+ in4->s_addr = htonl(0);
+ return error;
+ }
+
+ error = netdev_get_in4(netdev, in4, NULL);
+ netdev_close(netdev);
+ return error;
+}
+
/* Adds 'router' as a default IP gateway for the TCP/IP stack that corresponds
* to 'netdev'. */
int
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);
}
}
/* 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;
}
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, permanent);
+ 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)
+{
+ 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
return carrier;
}
+/* Returns the number of times 'netdev''s carrier has changed. */
+long long int
+netdev_get_carrier_resets(const struct netdev *netdev)
+{
+ return (netdev_get_dev(netdev)->netdev_class->get_carrier_resets
+ ? netdev_get_dev(netdev)->netdev_class->get_carrier_resets(netdev)
+ : 0);
+}
+
/* Attempts to force netdev_get_carrier() to poll 'netdev''s MII registers for
* link status instead of checking 'netdev''s carrier. 'netdev''s MII
* registers will be polled once ever 'interval' milliseconds. If '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'.
*
* 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;
retval = class->get_qos(netdev, typep, details);
if (retval) {
*typep = NULL;
- shash_clear_free_data(details);
+ smap_clear(details);
}
return retval;
} else {
* 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;
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);
* 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;
? class->get_queue(netdev, queue_id, details)
: EOPNOTSUPP);
if (retval) {
- shash_clear_free_data(details);
+ smap_clear(details);
}
return retval;
}
* 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
* 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. */
{
return netdev_get_dev(netdev)->netdev_class->change_seq(netdev);
}
-
-/* If 'netdev' is a VLAN network device (e.g. one created with vconfig(8)),
- * sets '*vlan_vid' to the VLAN VID associated with that device and returns 0.
- * Otherwise returns a errno value (specifically ENOENT if 'netdev_name' is the
- * name of a network device that is not a VLAN device) and sets '*vlan_vid' to
- * -1. */
-int
-netdev_get_vlan_vid(const struct netdev *netdev, int *vlan_vid)
-{
- int error = (netdev_get_dev(netdev)->netdev_class->get_vlan_vid
- ? netdev_get_dev(netdev)->netdev_class->get_vlan_vid(netdev,
- vlan_vid)
- : ENOENT);
- if (error) {
- *vlan_vid = 0;
- }
- return error;
-}
-
-/* Returns a network device that has 'in4' as its IP address, if one exists,
- * otherwise a null pointer. */
-struct netdev *
-netdev_find_dev_by_in4(const struct in_addr *in4)
-{
- struct netdev *netdev;
- struct sset dev_list = SSET_INITIALIZER(&dev_list);
- const char *name;
-
- netdev_enumerate(&dev_list);
- SSET_FOR_EACH (name, &dev_list) {
- struct in_addr dev_in4;
-
- if (!netdev_open_default(name, &netdev)
- && !netdev_get_in4(netdev, &dev_in4, NULL)
- && dev_in4.s_addr == in4->s_addr) {
- goto exit;
- }
- netdev_close(netdev);
- }
- netdev = NULL;
-
-exit:
- sset_destroy(&dev_list);
- return netdev;
-}
\f
/* Initializes 'netdev_dev' as a netdev device named 'name' of the specified
* 'netdev_class'. This function is ordinarily called from a netdev provider's
* 'create' function.
*
- * 'args' should be the arguments that were passed to the netdev provider's
- * 'create'. If an empty set of arguments was passed, and 'name' is the name
- * of a network device that existed before the 'create' call, then 'args' may
- * instead be the configuration for that existing device.
- *
* This function adds 'netdev_dev' to a netdev-owned shash, so it is
* very important that 'netdev_dev' only be freed after calling
* the refcount drops to zero. */
void
netdev_dev_init(struct netdev_dev *netdev_dev, const char *name,
- const struct shash *args,
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);
- smap_clone(&netdev_dev->args, args);
+ list_init(&netdev_dev->saved_flags_list);
}
/* Undoes the results of initialization.
{
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);
- smap_destroy(&netdev_dev->args);
if (destroy) {
netdev_dev->netdev_class->destroy(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. */
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;
}
\f
-/* 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);
+ }
}
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff