/*
- * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks.
+ * Copyright (c) 2009, 2010, 2011, 2012 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 <linux/gen_stats.h>
#include <linux/if_ether.h>
#include <linux/if_tun.h>
-#include <linux/ip.h>
#include <linux/types.h>
#include <linux/ethtool.h>
#include <linux/mii.h>
VALID_POLICING = 1 << 5,
VALID_VPORT_STAT_ERROR = 1 << 6,
VALID_DRVINFO = 1 << 7,
+ VALID_FEATURES = 1 << 8,
};
struct tap_state {
int netdev_mtu_error; /* Cached error code from SIOCGIFMTU or SIOCSIFMTU. */
int ether_addr_error; /* Cached error code from set/get etheraddr. */
int netdev_policing_error; /* Cached error code from set policing. */
+ int get_features_error; /* Cached error code from ETHTOOL_GSET. */
+ int get_ifindex_error; /* Cached error code from SIOCGIFINDEX. */
+
+ 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;
/* Keep drv-info */
netdev_dev_linux_changed(dev, change->ifi_flags, VALID_DRVINFO);
+ /* Update netdev from rtnl-change msg. */
if (change->mtu) {
dev->mtu = change->mtu;
dev->cache_valid |= VALID_MTU;
dev->ether_addr_error = 0;
}
+ dev->ifindex = change->ifi_index;
+ dev->cache_valid |= VALID_IFINDEX;
+ dev->get_ifindex_error = 0;
+
} else {
netdev_dev_linux_changed(dev, change->ifi_flags, 0);
}
return netdev_dev->vport_stats_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. */
-static int
-netdev_linux_get_features(const struct netdev *netdev,
- enum netdev_features *current,
- enum netdev_features *advertised,
- enum netdev_features *supported,
- enum netdev_features *peer)
+static void
+netdev_linux_read_features(struct netdev_dev_linux *netdev_dev)
{
struct ethtool_cmd ecmd;
uint32_t speed;
int error;
+ if (netdev_dev->cache_valid & VALID_FEATURES) {
+ return;
+ }
+
memset(&ecmd, 0, sizeof ecmd);
- error = netdev_linux_do_ethtool(netdev_get_name(netdev), &ecmd,
+ error = netdev_linux_do_ethtool(netdev_dev->netdev_dev.name, &ecmd,
ETHTOOL_GSET, "ETHTOOL_GSET");
if (error) {
- return error;
+ goto out;
}
/* Supported features. */
- *supported = 0;
+ netdev_dev->supported = 0;
if (ecmd.supported & SUPPORTED_10baseT_Half) {
- *supported |= NETDEV_F_10MB_HD;
+ netdev_dev->supported |= NETDEV_F_10MB_HD;
}
if (ecmd.supported & SUPPORTED_10baseT_Full) {
- *supported |= NETDEV_F_10MB_FD;
+ netdev_dev->supported |= NETDEV_F_10MB_FD;
}
if (ecmd.supported & SUPPORTED_100baseT_Half) {
- *supported |= NETDEV_F_100MB_HD;
+ netdev_dev->supported |= NETDEV_F_100MB_HD;
}
if (ecmd.supported & SUPPORTED_100baseT_Full) {
- *supported |= NETDEV_F_100MB_FD;
+ netdev_dev->supported |= NETDEV_F_100MB_FD;
}
if (ecmd.supported & SUPPORTED_1000baseT_Half) {
- *supported |= NETDEV_F_1GB_HD;
+ netdev_dev->supported |= NETDEV_F_1GB_HD;
}
if (ecmd.supported & SUPPORTED_1000baseT_Full) {
- *supported |= NETDEV_F_1GB_FD;
+ netdev_dev->supported |= NETDEV_F_1GB_FD;
}
if (ecmd.supported & SUPPORTED_10000baseT_Full) {
- *supported |= NETDEV_F_10GB_FD;
+ netdev_dev->supported |= NETDEV_F_10GB_FD;
}
if (ecmd.supported & SUPPORTED_TP) {
- *supported |= NETDEV_F_COPPER;
+ netdev_dev->supported |= NETDEV_F_COPPER;
}
if (ecmd.supported & SUPPORTED_FIBRE) {
- *supported |= NETDEV_F_FIBER;
+ netdev_dev->supported |= NETDEV_F_FIBER;
}
if (ecmd.supported & SUPPORTED_Autoneg) {
- *supported |= NETDEV_F_AUTONEG;
+ netdev_dev->supported |= NETDEV_F_AUTONEG;
}
if (ecmd.supported & SUPPORTED_Pause) {
- *supported |= NETDEV_F_PAUSE;
+ netdev_dev->supported |= NETDEV_F_PAUSE;
}
if (ecmd.supported & SUPPORTED_Asym_Pause) {
- *supported |= NETDEV_F_PAUSE_ASYM;
+ netdev_dev->supported |= NETDEV_F_PAUSE_ASYM;
}
/* Advertised features. */
- *advertised = 0;
+ netdev_dev->advertised = 0;
if (ecmd.advertising & ADVERTISED_10baseT_Half) {
- *advertised |= NETDEV_F_10MB_HD;
+ netdev_dev->advertised |= NETDEV_F_10MB_HD;
}
if (ecmd.advertising & ADVERTISED_10baseT_Full) {
- *advertised |= NETDEV_F_10MB_FD;
+ netdev_dev->advertised |= NETDEV_F_10MB_FD;
}
if (ecmd.advertising & ADVERTISED_100baseT_Half) {
- *advertised |= NETDEV_F_100MB_HD;
+ netdev_dev->advertised |= NETDEV_F_100MB_HD;
}
if (ecmd.advertising & ADVERTISED_100baseT_Full) {
- *advertised |= NETDEV_F_100MB_FD;
+ netdev_dev->advertised |= NETDEV_F_100MB_FD;
}
if (ecmd.advertising & ADVERTISED_1000baseT_Half) {
- *advertised |= NETDEV_F_1GB_HD;
+ netdev_dev->advertised |= NETDEV_F_1GB_HD;
}
if (ecmd.advertising & ADVERTISED_1000baseT_Full) {
- *advertised |= NETDEV_F_1GB_FD;
+ netdev_dev->advertised |= NETDEV_F_1GB_FD;
}
if (ecmd.advertising & ADVERTISED_10000baseT_Full) {
- *advertised |= NETDEV_F_10GB_FD;
+ netdev_dev->advertised |= NETDEV_F_10GB_FD;
}
if (ecmd.advertising & ADVERTISED_TP) {
- *advertised |= NETDEV_F_COPPER;
+ netdev_dev->advertised |= NETDEV_F_COPPER;
}
if (ecmd.advertising & ADVERTISED_FIBRE) {
- *advertised |= NETDEV_F_FIBER;
+ netdev_dev->advertised |= NETDEV_F_FIBER;
}
if (ecmd.advertising & ADVERTISED_Autoneg) {
- *advertised |= NETDEV_F_AUTONEG;
+ netdev_dev->advertised |= NETDEV_F_AUTONEG;
}
if (ecmd.advertising & ADVERTISED_Pause) {
- *advertised |= NETDEV_F_PAUSE;
+ netdev_dev->advertised |= NETDEV_F_PAUSE;
}
if (ecmd.advertising & ADVERTISED_Asym_Pause) {
- *advertised |= NETDEV_F_PAUSE_ASYM;
+ netdev_dev->advertised |= NETDEV_F_PAUSE_ASYM;
}
/* Current settings. */
speed = ecmd.speed;
if (speed == SPEED_10) {
- *current = ecmd.duplex ? NETDEV_F_10MB_FD : NETDEV_F_10MB_HD;
+ netdev_dev->current = ecmd.duplex ? NETDEV_F_10MB_FD : NETDEV_F_10MB_HD;
} else if (speed == SPEED_100) {
- *current = ecmd.duplex ? NETDEV_F_100MB_FD : NETDEV_F_100MB_HD;
+ netdev_dev->current = ecmd.duplex ? NETDEV_F_100MB_FD : NETDEV_F_100MB_HD;
} else if (speed == SPEED_1000) {
- *current = ecmd.duplex ? NETDEV_F_1GB_FD : NETDEV_F_1GB_HD;
+ netdev_dev->current = ecmd.duplex ? NETDEV_F_1GB_FD : NETDEV_F_1GB_HD;
} else if (speed == SPEED_10000) {
- *current = NETDEV_F_10GB_FD;
+ netdev_dev->current = NETDEV_F_10GB_FD;
} else if (speed == 40000) {
- *current = NETDEV_F_40GB_FD;
+ netdev_dev->current = NETDEV_F_40GB_FD;
} else if (speed == 100000) {
- *current = NETDEV_F_100GB_FD;
+ netdev_dev->current = NETDEV_F_100GB_FD;
} else if (speed == 1000000) {
- *current = NETDEV_F_1TB_FD;
+ netdev_dev->current = NETDEV_F_1TB_FD;
} else {
- *current = 0;
+ netdev_dev->current = 0;
}
if (ecmd.port == PORT_TP) {
- *current |= NETDEV_F_COPPER;
+ netdev_dev->current |= NETDEV_F_COPPER;
} else if (ecmd.port == PORT_FIBRE) {
- *current |= NETDEV_F_FIBER;
+ netdev_dev->current |= NETDEV_F_FIBER;
}
if (ecmd.autoneg) {
- *current |= NETDEV_F_AUTONEG;
+ netdev_dev->current |= NETDEV_F_AUTONEG;
}
/* Peer advertisements. */
- *peer = 0; /* XXX */
+ netdev_dev->peer = 0; /* XXX */
- return 0;
+out:
+ netdev_dev->cache_valid |= VALID_FEATURES;
+ netdev_dev->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. */
+static int
+netdev_linux_get_features(const struct netdev *netdev_,
+ enum netdev_features *current,
+ enum netdev_features *advertised,
+ enum netdev_features *supported,
+ enum netdev_features *peer)
+{
+ struct netdev_dev_linux *netdev_dev =
+ netdev_dev_linux_cast(netdev_get_dev(netdev_));
+
+ netdev_linux_read_features(netdev_dev);
+
+ if (!netdev_dev->get_features_error) {
+ *current = netdev_dev->current;
+ *advertised = netdev_dev->advertised;
+ *supported = netdev_dev->supported;
+ *peer = netdev_dev->peer;
+ }
+ return netdev_dev->get_features_error;
}
/* Set the features advertised by 'netdev' to 'advertise'. */
{
struct netdev_dev_linux *netdev_dev =
netdev_dev_linux_cast(netdev_get_dev(netdev));
- struct tc_queue *queue;
+ struct tc_queue *queue, *next_queue;
struct shash details;
int last_error;
int error;
last_error = 0;
shash_init(&details);
- HMAP_FOR_EACH (queue, hmap_node, &netdev_dev->tc->queues) {
+ HMAP_FOR_EACH_SAFE (queue, next_queue, hmap_node,
+ &netdev_dev->tc->queues) {
shash_clear(&details);
error = netdev_dev->tc->ops->class_get(netdev, queue, &details);
}
static int
-netdev_linux_get_status(const struct netdev *netdev, struct shash *sh)
+netdev_linux_get_drv_info(const struct netdev *netdev, struct shash *sh)
{
int error;
struct netdev_dev_linux *netdev_dev =
}
static int
-netdev_internal_get_status(const struct netdev *netdev OVS_UNUSED, struct shash *sh)
+netdev_internal_get_drv_info(const struct netdev *netdev OVS_UNUSED, struct shash *sh)
{
shash_add(sh, "driver_name", xstrdup("openvswitch"));
return 0;
}
#define NETDEV_LINUX_CLASS(NAME, CREATE, GET_STATS, SET_STATS, \
- GET_STATUS) \
+ GET_FEATURES, GET_STATUS) \
{ \
NAME, \
\
GET_STATS, \
SET_STATS, \
\
- netdev_linux_get_features, \
+ GET_FEATURES, \
netdev_linux_set_advertisements, \
\
netdev_linux_set_policing, \
netdev_linux_create,
netdev_linux_get_stats,
NULL, /* set_stats */
- netdev_linux_get_status);
+ netdev_linux_get_features,
+ netdev_linux_get_drv_info);
const struct netdev_class netdev_tap_class =
NETDEV_LINUX_CLASS(
netdev_linux_create_tap,
netdev_tap_get_stats,
NULL, /* set_stats */
- netdev_linux_get_status);
+ netdev_linux_get_features,
+ netdev_linux_get_drv_info);
const struct netdev_class netdev_internal_class =
NETDEV_LINUX_CLASS(
netdev_linux_create,
netdev_internal_get_stats,
netdev_vport_set_stats,
- netdev_internal_get_status);
+ NULL, /* get_features */
+ netdev_internal_get_drv_info);
\f
/* HTB traffic control class. */
max_rate_s = shash_find_data(details, "max-rate");
hc->max_rate = max_rate_s ? strtoull(max_rate_s, NULL, 10) / 8 : 0;
if (!hc->max_rate) {
- uint32_t current;
+ enum netdev_features current;
netdev_get_features(netdev, ¤t, NULL, NULL, NULL);
hc->max_rate = netdev_features_to_bps(current) / 8;
max_rate = max_rate_s ? strtoull(max_rate_s, NULL, 10) / 8 : 0;
if (!max_rate) {
- uint32_t current;
+ enum netdev_features current;
netdev_get_features(netdev, ¤t, NULL, NULL, NULL);
max_rate = netdev_features_to_bps(current) / 8;
{
struct netdev_dev_linux *netdev_dev =
netdev_dev_linux_cast(netdev_get_dev(netdev_));
- *ifindexp = 0;
+
if (!(netdev_dev->cache_valid & VALID_IFINDEX)) {
int ifindex = do_get_ifindex(netdev_get_name(netdev_));
+
if (ifindex < 0) {
- return -ifindex;
+ netdev_dev->get_ifindex_error = -ifindex;
+ netdev_dev->ifindex = 0;
+ } else {
+ netdev_dev->get_ifindex_error = 0;
+ netdev_dev->ifindex = ifindex;
}
netdev_dev->cache_valid |= VALID_IFINDEX;
- netdev_dev->ifindex = ifindex;
}
+
*ifindexp = netdev_dev->ifindex;
- return 0;
+ return netdev_dev->get_ifindex_error;
}
static int
git://git.onelab.eu / sliver-openvswitch.git / blobdiff