#include "socket-util.h"
#include "shash.h"
#include "sset.h"
+#include "timer.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(netdev_linux);
struct shash_node *shash_node;
unsigned int cache_valid;
+ unsigned int change_seq;
+
+ bool miimon; /* Link status of last poll. */
+ long long int miimon_interval; /* Miimon Poll rate. Disabled if <= 0. */
+ struct timer miimon_timer;
/* The following are figured out "on demand" only. They are only valid
* when the corresponding VALID_* bit in 'cache_valid' is set. */
/* Sockets used for ioctl operations. */
static int af_inet_sock = -1; /* AF_INET, SOCK_DGRAM. */
-static int af_packet_sock = -1; /* AF_PACKET, SOCK_RAW. */
/* A Netlink routing socket that is not subscribed to any multicast groups. */
static struct nl_sock *rtnl_sock;
-struct netdev_linux_notifier {
- struct netdev_notifier notifier;
- struct list node;
-};
-
-static struct shash netdev_linux_notifiers =
- SHASH_INITIALIZER(&netdev_linux_notifiers);
-static struct rtnetlink_notifier netdev_linux_poll_notifier;
-
/* 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);
const uint8_t[ETH_ADDR_LEN]);
static int get_stats_via_netlink(int ifindex, struct netdev_stats *stats);
static int get_stats_via_proc(const char *netdev_name, struct netdev_stats *stats);
+static int af_packet_sock(void);
+static void netdev_linux_miimon_run(void);
+static void netdev_linux_miimon_wait(void);
static bool
is_netdev_linux_class(const struct netdev_class *netdev_class)
status = af_inet_sock >= 0 ? 0 : errno;
if (status) {
VLOG_ERR("failed to create inet socket: %s", strerror(status));
- } else {
- /* Create AF_PACKET socket. */
- af_packet_sock = socket(AF_PACKET, SOCK_RAW, 0);
- status = af_packet_sock >= 0 ? 0 : errno;
- if (status) {
- VLOG_ERR("failed to create packet socket: %s",
- strerror(status));
- }
- set_nonblocking(af_packet_sock);
}
/* Create rtnetlink socket. */
netdev_linux_run(void)
{
rtnetlink_link_notifier_run();
+ netdev_linux_miimon_run();
}
static void
netdev_linux_wait(void)
{
rtnetlink_link_notifier_wait();
+ netdev_linux_miimon_wait();
+}
+
+static void
+netdev_dev_linux_changed(struct netdev_dev_linux *dev)
+{
+ dev->change_seq++;
+ if (!dev->change_seq) {
+ dev->change_seq++;
+ }
+ dev->cache_valid = 0;
}
static void
if (is_netdev_linux_class(netdev_class)) {
dev = netdev_dev_linux_cast(base_dev);
- dev->cache_valid = 0;
+ netdev_dev_linux_changed(dev);
}
}
} else {
netdev_dev_get_devices(&netdev_linux_class, &device_shash);
SHASH_FOR_EACH (node, &device_shash) {
dev = node->data;
- dev->cache_valid = 0;
+ netdev_dev_linux_changed(dev);
}
shash_destroy(&device_shash);
}
cache_notifier_refcount++;
netdev_dev = xzalloc(sizeof *netdev_dev);
+ netdev_dev->change_seq = 1;
netdev_dev_init(&netdev_dev->netdev_dev, name, args, class);
*netdev_devp = &netdev_dev->netdev_dev;
protocol = (ethertype == NETDEV_ETH_TYPE_ANY ? ETH_P_ALL
: ethertype == NETDEV_ETH_TYPE_802_2 ? ETH_P_802_2
: ethertype);
- netdev->fd = socket(PF_PACKET, SOCK_RAW, htons(protocol));
+ netdev->fd = socket(PF_PACKET, SOCK_RAW,
+ (OVS_FORCE int) htons(protocol));
if (netdev->fd < 0) {
error = errno;
goto error;
struct iovec iov;
int ifindex;
int error;
+ int sock;
+
+ sock = af_packet_sock();
+ if (sock < 0) {
+ return sock;
+ }
error = get_ifindex(netdev_, &ifindex);
if (error) {
msg.msg_controllen = 0;
msg.msg_flags = 0;
- retval = sendmsg(af_packet_sock, &msg, 0);
+ 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
char *fn = NULL;
int fd = -1;
+ if (netdev_dev->miimon_interval > 0) {
+ *carrier = netdev_dev->miimon;
+ return 0;
+ }
+
if (!(netdev_dev->cache_valid & VALID_CARRIER)) {
char line[8];
int retval;
}
static int
-netdev_linux_do_miimon(const struct netdev *netdev, int cmd,
- const char *cmd_name, struct mii_ioctl_data *data)
+netdev_linux_do_miimon(const char *name, int cmd, const char *cmd_name,
+ struct mii_ioctl_data *data)
{
struct ifreq ifr;
int error;
memset(&ifr, 0, sizeof ifr);
memcpy(&ifr.ifr_data, data, sizeof *data);
- error = netdev_linux_do_ioctl(netdev_get_name(netdev),
- &ifr, cmd, cmd_name);
+ error = netdev_linux_do_ioctl(name, &ifr, cmd, cmd_name);
memcpy(data, &ifr.ifr_data, sizeof *data);
return error;
}
static int
-netdev_linux_get_miimon(const struct netdev *netdev, bool *miimon)
+netdev_linux_get_miimon(const char *name, bool *miimon)
{
- const char *name = netdev_get_name(netdev);
struct mii_ioctl_data data;
int error;
*miimon = false;
memset(&data, 0, sizeof data);
- error = netdev_linux_do_miimon(netdev, SIOCGMIIPHY, "SIOCGMIIPHY", &data);
+ error = netdev_linux_do_miimon(name, SIOCGMIIPHY, "SIOCGMIIPHY", &data);
if (!error) {
/* data.phy_id is filled out by previous SIOCGMIIPHY miimon call. */
data.reg_num = MII_BMSR;
- error = netdev_linux_do_miimon(netdev, SIOCGMIIREG, "SIOCGMIIREG",
+ error = netdev_linux_do_miimon(name, SIOCGMIIREG, "SIOCGMIIREG",
&data);
if (!error) {
return error;
}
+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_));
+
+ 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);
+ }
+
+ return 0;
+}
+
+static void
+netdev_linux_miimon_run(void)
+{
+ struct shash device_shash;
+ struct shash_node *node;
+
+ shash_init(&device_shash);
+ netdev_dev_get_devices(&netdev_linux_class, &device_shash);
+ SHASH_FOR_EACH (node, &device_shash) {
+ struct netdev_dev_linux *dev = node->data;
+ bool miimon;
+
+ if (dev->miimon_interval <= 0 || !timer_expired(&dev->miimon_timer)) {
+ continue;
+ }
+
+ netdev_linux_get_miimon(dev->netdev_dev.name, &miimon);
+ if (miimon != dev->miimon) {
+ dev->miimon = miimon;
+ netdev_dev_linux_changed(dev);
+ }
+
+ timer_set_duration(&dev->miimon_timer, dev->miimon_interval);
+ }
+
+ shash_destroy(&device_shash);
+}
+
+static void
+netdev_linux_miimon_wait(void)
+{
+ struct shash device_shash;
+ struct shash_node *node;
+
+ shash_init(&device_shash);
+ netdev_dev_get_devices(&netdev_linux_class, &device_shash);
+ SHASH_FOR_EACH (node, &device_shash) {
+ struct netdev_dev_linux *dev = node->data;
+
+ if (dev->miimon_interval > 0) {
+ timer_wait(&dev->miimon_timer);
+ }
+ }
+ shash_destroy(&device_shash);
+}
+
/* Check whether we can we use RTM_GETLINK to get network device statistics.
* In pre-2.6.19 kernels, this was only available if wireless extensions were
* enabled. */
return error;
}
-static void
-poll_notify(struct list *list)
-{
- struct netdev_linux_notifier *notifier;
- LIST_FOR_EACH (notifier, node, list) {
- struct netdev_notifier *n = ¬ifier->notifier;
- n->cb(n);
- }
-}
-
-static void
-netdev_linux_poll_cb(const struct rtnetlink_link_change *change,
- void *aux OVS_UNUSED)
-{
- if (change) {
- struct list *list = shash_find_data(&netdev_linux_notifiers,
- change->ifname);
- if (list) {
- poll_notify(list);
- }
- } else {
- struct shash_node *node;
- SHASH_FOR_EACH (node, &netdev_linux_notifiers) {
- poll_notify(node->data);
- }
- }
-}
-
-static int
-netdev_linux_poll_add(struct netdev *netdev,
- void (*cb)(struct netdev_notifier *), void *aux,
- struct netdev_notifier **notifierp)
-{
- const char *netdev_name = netdev_get_name(netdev);
- struct netdev_linux_notifier *notifier;
- struct list *list;
-
- if (shash_is_empty(&netdev_linux_notifiers)) {
- int error;
- error = rtnetlink_link_notifier_register(&netdev_linux_poll_notifier,
- netdev_linux_poll_cb, NULL);
- if (error) {
- return error;
- }
- }
-
- list = shash_find_data(&netdev_linux_notifiers, netdev_name);
- if (!list) {
- list = xmalloc(sizeof *list);
- list_init(list);
- shash_add(&netdev_linux_notifiers, netdev_name, list);
- }
-
- notifier = xmalloc(sizeof *notifier);
- netdev_notifier_init(¬ifier->notifier, netdev, cb, aux);
- list_push_back(list, ¬ifier->node);
- *notifierp = ¬ifier->notifier;
- return 0;
-}
-
-static void
-netdev_linux_poll_remove(struct netdev_notifier *notifier_)
+static unsigned int
+netdev_linux_change_seq(const struct netdev *netdev)
{
- struct netdev_linux_notifier *notifier =
- CONTAINER_OF(notifier_, struct netdev_linux_notifier, notifier);
- struct list *list;
-
- /* Remove 'notifier' from its list. */
- list = list_remove(¬ifier->node);
- if (list_is_empty(list)) {
- /* The list is now empty. Remove it from the hash and free it. */
- const char *netdev_name = netdev_get_name(notifier->notifier.netdev);
- shash_delete(&netdev_linux_notifiers,
- shash_find(&netdev_linux_notifiers, netdev_name));
- free(list);
- }
- free(notifier);
-
- /* If that was the last notifier, unregister. */
- if (shash_is_empty(&netdev_linux_notifiers)) {
- rtnetlink_link_notifier_unregister(&netdev_linux_poll_notifier);
- }
+ return netdev_dev_linux_cast(netdev_get_dev(netdev))->change_seq;
}
#define NETDEV_LINUX_CLASS(NAME, CREATE, ENUMERATE, SET_STATS) \
netdev_linux_get_mtu, \
netdev_linux_get_ifindex, \
netdev_linux_get_carrier, \
- netdev_linux_get_miimon, \
+ netdev_linux_set_miimon_interval, \
netdev_linux_get_stats, \
SET_STATS, \
\
\
netdev_linux_update_flags, \
\
- netdev_linux_poll_add, \
- netdev_linux_poll_remove \
+ netdev_linux_change_seq \
}
const struct netdev_class netdev_linux_class =
}
return error;
}
+
+/* Returns an AF_PACKET raw socket or a negative errno value. */
+static int
+af_packet_sock(void)
+{
+ static int sock = INT_MIN;
+
+ if (sock == INT_MIN) {
+ sock = socket(AF_PACKET, SOCK_RAW, 0);
+ if (sock >= 0) {
+ set_nonblocking(sock);
+ } else {
+ sock = -errno;
+ VLOG_ERR("failed to create packet socket: %s", strerror(errno));
+ }
+ }
+
+ return sock;
+}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff