#include <sys/stat.h>
#include <unistd.h>
+#include "bitmap.h"
#include "dpif-provider.h"
#include "netdev.h"
#include "netdev-vport.h"
#include "rtnetlink.h"
#include "rtnetlink-link.h"
#include "shash.h"
-#include "svec.h"
+#include "sset.h"
#include "unaligned.h"
#include "util.h"
#include "vlog.h"
VLOG_DEFINE_THIS_MODULE(dpif_linux);
+enum { LRU_MAX_PORTS = 1024 };
+enum { LRU_MASK = LRU_MAX_PORTS - 1};
+BUILD_ASSERT_DECL(IS_POW2(LRU_MAX_PORTS));
+
struct dpif_linux_dp {
/* Generic Netlink header. */
uint8_t cmd;
*
* The 'stats' and 'used' members point to 64-bit data that might only be
* aligned on 32-bit boundaries, so get_unaligned_u64() should be used to
- * access their values. */
+ * access their values.
+ *
+ * If 'actions' is nonnull then ODP_FLOW_ATTR_ACTIONS will be included in
+ * the Netlink version of the command, even if actions_len is zero. */
const struct nlattr *key; /* ODP_FLOW_ATTR_KEY. */
size_t key_len;
const struct nlattr *actions; /* ODP_FLOW_ATTR_ACTIONS. */
unsigned int listen_mask;
/* Change notification. */
- struct shash changed_ports; /* Ports that have changed. */
+ struct sset changed_ports; /* Ports that have changed. */
struct rtnetlink_notifier port_notifier;
bool change_error;
+
+ /* Queue of unused ports. */
+ unsigned long *lru_bitmap;
+ uint16_t lru_ports[LRU_MAX_PORTS];
+ size_t lru_head;
+ size_t lru_tail;
};
static struct vlog_rate_limit error_rl = VLOG_RATE_LIMIT_INIT(9999, 5);
return CONTAINER_OF(dpif, struct dpif_linux, dpif);
}
+static void
+dpif_linux_push_port(struct dpif_linux *dp, uint16_t port)
+{
+ if (port < LRU_MAX_PORTS && !bitmap_is_set(dp->lru_bitmap, port)) {
+ bitmap_set1(dp->lru_bitmap, port);
+ dp->lru_ports[dp->lru_head++ & LRU_MASK] = port;
+ }
+}
+
+static uint32_t
+dpif_linux_pop_port(struct dpif_linux *dp)
+{
+ uint16_t port;
+
+ if (dp->lru_head == dp->lru_tail) {
+ return UINT32_MAX;
+ }
+
+ port = dp->lru_ports[dp->lru_tail++ & LRU_MASK];
+ bitmap_set0(dp->lru_bitmap, port);
+ return port;
+}
+
static int
-dpif_linux_enumerate(struct svec *all_dps)
+dpif_linux_enumerate(struct sset *all_dps)
{
struct nl_dump dump;
struct ofpbuf msg;
struct dpif_linux_dp dp;
if (!dpif_linux_dp_from_ofpbuf(&dp, &msg)) {
- svec_add(all_dps, dp.name);
+ sset_add(all_dps, dp.name);
}
}
return nl_dump_done(&dump);
}
dpif->listen_mask = 0;
dpif->dp_ifindex = dp->dp_ifindex;
- shash_init(&dpif->changed_ports);
+ sset_init(&dpif->changed_ports);
dpif->change_error = false;
*dpifp = &dpif->dpif;
+ dpif->lru_head = dpif->lru_tail = 0;
+ dpif->lru_bitmap = bitmap_allocate(LRU_MAX_PORTS);
+ bitmap_set1(dpif->lru_bitmap, ODPP_LOCAL);
+ for (i = 1; i < LRU_MAX_PORTS; i++) {
+ dpif_linux_push_port(dpif, i);
+ }
return 0;
error_free:
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
rtnetlink_link_notifier_unregister(&dpif->port_notifier);
- shash_destroy(&dpif->changed_ports);
+ sset_destroy(&dpif->changed_ports);
+ free(dpif->lru_bitmap);
free(dpif);
}
request.options_len = options->size;
}
- error = dpif_linux_vport_transact(&request, &reply, &buf);
- if (!error) {
- *port_nop = reply.port_no;
+ /* Loop until we find a port that isn't used. */
+ do {
+ request.port_no = dpif_linux_pop_port(dpif);
+ error = dpif_linux_vport_transact(&request, &reply, &buf);
+
+ if (!error) {
+ *port_nop = reply.port_no;
+ }
ofpbuf_delete(buf);
- }
+ } while (request.port_no != UINT32_MAX
+ && (error == EBUSY || error == EFBIG));
return error;
}
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
struct dpif_linux_vport vport;
+ int error;
dpif_linux_vport_init(&vport);
vport.cmd = ODP_VPORT_CMD_DEL;
vport.dp_ifindex = dpif->dp_ifindex;
vport.port_no = port_no;
- return dpif_linux_vport_transact(&vport, NULL, NULL);
+ error = dpif_linux_vport_transact(&vport, NULL, NULL);
+
+ if (!error) {
+ dpif_linux_push_port(dpif, port_no);
+ }
+ return error;
}
static int
if (dpif->change_error) {
dpif->change_error = false;
- shash_clear(&dpif->changed_ports);
+ sset_clear(&dpif->changed_ports);
return ENOBUFS;
- } else if (!shash_is_empty(&dpif->changed_ports)) {
- struct shash_node *node = shash_first(&dpif->changed_ports);
- *devnamep = shash_steal(&dpif->changed_ports, node);
+ } else if (!sset_is_empty(&dpif->changed_ports)) {
+ *devnamep = sset_pop(&dpif->changed_ports);
return 0;
} else {
return EAGAIN;
dpif_linux_port_poll_wait(const struct dpif *dpif_)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- if (!shash_is_empty(&dpif->changed_ports) || dpif->change_error) {
+ if (!sset_is_empty(&dpif->changed_ports) || dpif->change_error) {
poll_immediate_wake();
} else {
rtnetlink_link_notifier_wait();
}
static int
-dpif_linux_flow_get(const struct dpif *dpif_,
- const struct nlattr *key, size_t key_len,
- struct ofpbuf **actionsp, struct dpif_flow_stats *stats)
+dpif_linux_flow_get__(const struct dpif *dpif_,
+ const struct nlattr *key, size_t key_len,
+ struct dpif_linux_flow *reply, struct ofpbuf **bufp)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- struct dpif_linux_flow request, reply;
- struct ofpbuf *buf;
- int error;
+ struct dpif_linux_flow request;
dpif_linux_flow_init(&request);
request.cmd = ODP_FLOW_CMD_GET;
request.dp_ifindex = dpif->dp_ifindex;
request.key = key;
request.key_len = key_len;
- error = dpif_linux_flow_transact(&request, &reply, &buf);
+ return dpif_linux_flow_transact(&request, reply, bufp);
+}
+
+static int
+dpif_linux_flow_get(const struct dpif *dpif_,
+ const struct nlattr *key, size_t key_len,
+ struct ofpbuf **actionsp, struct dpif_flow_stats *stats)
+{
+ struct dpif_linux_flow reply;
+ struct ofpbuf *buf;
+ int error;
+
+ error = dpif_linux_flow_get__(dpif_, key, key_len, &reply, &buf);
if (!error) {
if (stats) {
dpif_linux_flow_get_stats(&reply, stats);
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
struct dpif_linux_flow request, reply;
+ struct nlattr dummy_action;
struct ofpbuf *buf;
int error;
request.dp_ifindex = dpif->dp_ifindex;
request.key = key;
request.key_len = key_len;
- request.actions = actions;
+ /* Ensure that ODP_FLOW_ATTR_ACTIONS will always be included. */
+ request.actions = actions ? actions : &dummy_action;
request.actions_len = actions_len;
if (flags & DPIF_FP_ZERO_STATS) {
request.clear = true;
struct nl_dump dump;
struct dpif_linux_flow flow;
struct dpif_flow_stats stats;
+ struct ofpbuf *buf;
};
static int
nl_dump_start(&state->dump, genl_sock, buf);
ofpbuf_delete(buf);
+ state->buf = NULL;
+
return 0;
}
struct ofpbuf buf;
int error;
- if (!nl_dump_next(&state->dump, &buf)) {
- return EOF;
- }
+ do {
+ ofpbuf_delete(state->buf);
+ state->buf = NULL;
- error = dpif_linux_flow_from_ofpbuf(&state->flow, &buf);
- if (!error) {
- if (key) {
- *key = state->flow.key;
- *key_len = state->flow.key_len;
+ if (!nl_dump_next(&state->dump, &buf)) {
+ return EOF;
}
- if (actions) {
- *actions = state->flow.actions;
- *actions_len = state->flow.actions_len;
+
+ error = dpif_linux_flow_from_ofpbuf(&state->flow, &buf);
+ if (error) {
+ return error;
}
- if (stats) {
- dpif_linux_flow_get_stats(&state->flow, &state->stats);
- *stats = &state->stats;
+
+ if (actions && !state->flow.actions) {
+ error = dpif_linux_flow_get__(dpif_, state->flow.key,
+ state->flow.key_len,
+ &state->flow, &state->buf);
+ if (error == ENOENT) {
+ VLOG_DBG("dumped flow disappeared on get");
+ } else if (error) {
+ VLOG_WARN("error fetching dumped flow: %s", strerror(error));
+ }
}
+ } while (error);
+
+ if (actions) {
+ *actions = state->flow.actions;
+ *actions_len = state->flow.actions_len;
+ }
+ if (key) {
+ *key = state->flow.key;
+ *key_len = state->flow.key_len;
+ }
+ if (stats) {
+ dpif_linux_flow_get_stats(&state->flow, &state->stats);
+ *stats = &state->stats;
}
return error;
}
{
struct dpif_linux_flow_state *state = state_;
int error = nl_dump_done(&state->dump);
+ ofpbuf_delete(state->buf);
free(state);
return error;
}
error = dpif_linux_vport_get(name, &reply, &buf);
if (!error) {
ofpbuf_delete(buf);
- } else if (error != ENODEV) {
+ } else if (error != ENODEV && error != ENOENT) {
VLOG_WARN_RL(&error_rl, "%s: vport query failed (%s)",
name, strerror(error));
}
{
/* Our datapath changed, either adding a new port or deleting an
* existing one. */
- shash_add_once(&dpif->changed_ports, change->ifname, NULL);
+ sset_add(&dpif->changed_ports, change->ifname);
}
} else {
dpif->change_error = true;
}
if (a[ODP_VPORT_ATTR_MTU]) {
vport->mtu = nl_attr_get_u32(a[ODP_VPORT_ATTR_MTU]);
+ } else {
+ vport->mtu = INT_MAX;
}
if (a[ODP_VPORT_ATTR_OPTIONS]) {
vport->options = nl_attr_get(a[ODP_VPORT_ATTR_OPTIONS]);
vport->address, ETH_ADDR_LEN);
}
- if (vport->mtu) {
+ if (vport->mtu && vport->mtu != INT_MAX) {
nl_msg_put_u32(buf, ODP_VPORT_ATTR_MTU, vport->mtu);
}
assert((reply != NULL) == (bufp != NULL));
+ error = dpif_linux_init();
+ if (error) {
+ if (reply) {
+ *bufp = NULL;
+ dpif_linux_vport_init(reply);
+ }
+ return error;
+ }
+
request_buf = ofpbuf_new(1024);
dpif_linux_vport_to_ofpbuf(request, request_buf);
error = nl_sock_transact(genl_sock, request_buf, bufp);
if (a[ODP_FLOW_ATTR_TCP_FLAGS]) {
flow->tcp_flags = nl_attr_get(a[ODP_FLOW_ATTR_TCP_FLAGS]);
}
+ if (a[ODP_FLOW_ATTR_USED]) {
+ flow->used = nl_attr_get(a[ODP_FLOW_ATTR_USED]);
+ }
return 0;
}
nl_msg_put_unspec(buf, ODP_FLOW_ATTR_KEY, flow->key, flow->key_len);
}
- if (flow->actions_len) {
+ if (flow->actions || flow->actions_len) {
nl_msg_put_unspec(buf, ODP_FLOW_ATTR_ACTIONS,
flow->actions, flow->actions_len);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff