/*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <unistd.h>
#include "dpif-provider.h"
-#include "netdev-linux.h"
#include "ofpbuf.h"
#include "poll-loop.h"
+#include "rtnetlink.h"
#include "svec.h"
#include "util.h"
struct dpif dpif;
int fd;
+ /* Used by dpif_linux_get_all_names(). */
+ char *local_ifname;
+ int minor;
+
/* Change notification. */
int local_ifindex; /* Ifindex of local port. */
struct svec changed_ports; /* Ports that have changed. */
- struct linux_netdev_notifier port_notifier;
+ struct rtnetlink_notifier port_notifier;
+ bool change_error;
};
static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5);
static int do_ioctl(const struct dpif *, int cmd, const void *arg);
static int lookup_minor(const char *name, int *minor);
static int finish_open(struct dpif *, const char *local_ifname);
+static int get_openvswitch_major(void);
static int create_minor(const char *name, int minor, struct dpif **dpifp);
static int open_minor(int minor, struct dpif **dpifp);
static int make_openvswitch_device(int minor, char **fnp);
-static void dpif_linux_port_changed(const struct linux_netdev_change *,
+static void dpif_linux_port_changed(const struct rtnetlink_change *,
void *dpif);
static struct dpif_linux *
return CONTAINER_OF(dpif, struct dpif_linux, dpif);
}
-static void
-dpif_linux_run(void)
+static int
+dpif_linux_enumerate(struct svec *all_dps)
{
- linux_netdev_notifier_run();
-}
+ int major;
+ int error;
+ int i;
-static void
-dpif_linux_wait(void)
-{
- linux_netdev_notifier_wait();
+ /* Check that the Open vSwitch module is loaded. */
+ major = get_openvswitch_major();
+ if (major < 0) {
+ return -major;
+ }
+
+ error = 0;
+ for (i = 0; i < ODP_MAX; i++) {
+ struct dpif *dpif;
+ char devname[16];
+ int retval;
+
+ sprintf(devname, "dp%d", i);
+ retval = dpif_open(devname, &dpif);
+ if (!retval) {
+ svec_add(all_dps, devname);
+ dpif_close(dpif);
+ } else if (retval != ENODEV && !error) {
+ error = retval;
+ }
+ }
+ return error;
}
static int
{
int minor;
- minor = !strncmp(name, "dp", 2) && isdigit(name[2]) ? atoi(name + 2) : -1;
+ minor = !strncmp(name, "dp", 2)
+ && isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1;
if (create) {
if (minor >= 0) {
return create_minor(suffix, minor, dpifp);
dpif_linux_close(struct dpif *dpif_)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- linux_netdev_notifier_unregister(&dpif->port_notifier);
+ rtnetlink_notifier_unregister(&dpif->port_notifier);
svec_destroy(&dpif->changed_ports);
+ free(dpif->local_ifname);
close(dpif->fd);
free(dpif);
}
+static int
+dpif_linux_get_all_names(const struct dpif *dpif_, struct svec *all_names)
+{
+ struct dpif_linux *dpif = dpif_linux_cast(dpif_);
+
+ svec_add_nocopy(all_names, xasprintf("dp%d", dpif->minor));
+ svec_add(all_names, dpif->local_ifname);
+ return 0;
+}
+
static int
dpif_linux_delete(struct dpif *dpif_)
{
static int
dpif_linux_get_stats(const struct dpif *dpif_, struct odp_stats *stats)
{
+ memset(stats, 0, sizeof *stats);
return do_ioctl(dpif_, ODP_DP_STATS, stats);
}
dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- int error;
- error = linux_netdev_notifier_get_error(&dpif->port_notifier);
- if (!error) {
- if (!dpif->changed_ports.n) {
- return EAGAIN;
- }
+ if (dpif->change_error) {
+ dpif->change_error = false;
+ svec_clear(&dpif->changed_ports);
+ return ENOBUFS;
+ } else if (dpif->changed_ports.n) {
*devnamep = dpif->changed_ports.names[--dpif->changed_ports.n];
+ return 0;
} else {
- svec_clear(&dpif->changed_ports);
+ return EAGAIN;
}
- return error;
}
static void
dpif_linux_port_poll_wait(const struct dpif *dpif_)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- if (dpif->changed_ports.n
- || linux_netdev_notifier_peek_error(&dpif->port_notifier)) {
+ if (dpif->changed_ports.n || dpif->change_error) {
poll_immediate_wake();
} else {
- linux_netdev_notifier_wait();
+ rtnetlink_notifier_wait();
}
}
return do_ioctl(dpif_, ODP_SET_LISTEN_MASK, &listen_mask);
}
+static int
+dpif_linux_get_sflow_probability(const struct dpif *dpif_,
+ uint32_t *probability)
+{
+ return do_ioctl(dpif_, ODP_GET_SFLOW_PROBABILITY, probability);
+}
+
+static int
+dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability)
+{
+ return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability);
+}
+
static int
dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp)
{
return 0;
} else {
VLOG_WARN_RL(&error_rl, "%s: discarding message truncated "
- "from %zu bytes to %d",
+ "from %"PRIu32" bytes to %d",
dpif_name(dpif_), msg->length, retval);
error = ERANGE;
}
const struct dpif_class dpif_linux_class = {
"", /* This is the default class. */
"linux",
- dpif_linux_run,
- dpif_linux_wait,
+ NULL,
+ NULL,
+ dpif_linux_enumerate,
dpif_linux_open,
dpif_linux_close,
+ dpif_linux_get_all_names,
dpif_linux_delete,
dpif_linux_get_stats,
dpif_linux_get_drop_frags,
dpif_linux_execute,
dpif_linux_recv_get_mask,
dpif_linux_recv_set_mask,
+ dpif_linux_get_sflow_probability,
+ dpif_linux_set_sflow_probability,
dpif_linux_recv,
dpif_linux_recv_wait,
};
\f
static int get_openvswitch_major(void);
-static int get_major(const char *target, int default_major);
+static int get_major(const char *target);
static int
do_ioctl(const struct dpif *dpif_, int cmd, const void *arg)
static int
make_openvswitch_device(int minor, char **fnp)
{
- dev_t dev = makedev(get_openvswitch_major(), minor);
const char dirname[] = "/dev/net";
+ int major;
+ dev_t dev;
struct stat s;
char fn[128];
+ major = get_openvswitch_major();
+ if (major < 0) {
+ return -major;
+ }
+ dev = makedev(major, minor);
+
*fnp = NULL;
sprintf(fn, "%s/dp%d", dirname, minor);
if (!stat(fn, &s)) {
fn);
} else if (s.st_rdev != dev) {
VLOG_WARN_RL(&error_rl,
- "%s is device %u:%u instead of %u:%u, fixing",
+ "%s is device %u:%u but should be %u:%u, fixing",
fn, major(s.st_rdev), minor(s.st_rdev),
major(dev), minor(dev));
} else {
return 0;
}
-
+/* Return the major device number of the Open vSwitch device. If it
+ * cannot be determined, a negative errno is returned. */
static int
get_openvswitch_major(void)
{
- static unsigned int openvswitch_major;
- if (!openvswitch_major) {
- enum { DEFAULT_MAJOR = 248 };
- openvswitch_major = get_major("openvswitch", DEFAULT_MAJOR);
+ static int openvswitch_major = -1;
+ if (openvswitch_major < 0) {
+ openvswitch_major = get_major("openvswitch");
}
return openvswitch_major;
}
static int
-get_major(const char *target, int default_major)
+get_major(const char *target)
{
const char fn[] = "/proc/devices";
char line[128];
file = fopen(fn, "r");
if (!file) {
VLOG_ERR("opening %s failed (%s)", fn, strerror(errno));
- goto error;
+ return -errno;
}
for (ln = 1; fgets(line, sizeof line, file); ln++) {
}
}
- VLOG_ERR("%s: %s major not found (is the module loaded?), using "
- "default major %d", fn, target, default_major);
-error:
- VLOG_INFO("using default major %d for %s", default_major, target);
- return default_major;
+ VLOG_ERR("%s: %s major not found (is the module loaded?)", fn, target);
+ return -ENODEV;
}
static int
finish_open(struct dpif *dpif_, const char *local_ifname)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
+ dpif->local_ifname = strdup(local_ifname);
dpif->local_ifindex = if_nametoindex(local_ifname);
if (!dpif->local_ifindex) {
int error = errno;
fd = open(fn, O_RDONLY | O_NONBLOCK);
if (fd >= 0) {
struct dpif_linux *dpif = xmalloc(sizeof *dpif);
- error = linux_netdev_notifier_register(&dpif->port_notifier,
- dpif_linux_port_changed, dpif);
+ error = rtnetlink_notifier_register(&dpif->port_notifier,
+ dpif_linux_port_changed, dpif);
if (!error) {
char *name;
free(name);
dpif->fd = fd;
+ dpif->local_ifname = NULL;
+ dpif->minor = minor;
dpif->local_ifindex = 0;
svec_init(&dpif->changed_ports);
+ dpif->change_error = false;
*dpifp = &dpif->dpif;
} else {
free(dpif);
}
static void
-dpif_linux_port_changed(const struct linux_netdev_change *change, void *dpif_)
+dpif_linux_port_changed(const struct rtnetlink_change *change, void *dpif_)
{
struct dpif_linux *dpif = dpif_;
- if (change->master_ifindex == dpif->local_ifindex
- && (change->nlmsg_type == RTM_NEWLINK
- || change->nlmsg_type == RTM_DELLINK))
- {
- /* Our datapath changed, either adding a new port or deleting an
- * existing one. */
- if (!svec_contains(&dpif->changed_ports, change->ifname)) {
- svec_add(&dpif->changed_ports, change->ifname);
- svec_sort(&dpif->changed_ports);
+ if (change) {
+ if (change->master_ifindex == dpif->local_ifindex
+ && (change->nlmsg_type == RTM_NEWLINK
+ || change->nlmsg_type == RTM_DELLINK))
+ {
+ /* Our datapath changed, either adding a new port or deleting an
+ * existing one. */
+ if (!svec_contains(&dpif->changed_ports, change->ifname)) {
+ svec_add(&dpif->changed_ports, change->ifname);
+ svec_sort(&dpif->changed_ports);
+ }
}
+ } else {
+ dpif->change_error = true;
}
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff