#include <sys/stat.h>
#include <unistd.h>
+#include "bitmap.h"
#include "dpif-provider.h"
+#include "dynamic-string.h"
+#include "flow.h"
#include "netdev.h"
+#include "netdev-linux.h"
#include "netdev-vport.h"
+#include "netlink-notifier.h"
#include "netlink-socket.h"
#include "netlink.h"
#include "odp-util.h"
#include "openvswitch/tunnel.h"
#include "packets.h"
#include "poll-loop.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));
+
+/* This ethtool flag was introduced in Linux 2.6.24, so it might be
+ * missing if we have old headers. */
+#define ETH_FLAG_LRO (1 << 15) /* LRO is enabled */
+
struct dpif_linux_dp {
/* Generic Netlink header. */
uint8_t cmd;
- /* struct odp_header. */
+ /* struct ovs_header. */
int dp_ifindex;
/* Attributes. */
- const char *name; /* ODP_DP_ATTR_NAME. */
- struct odp_stats stats; /* ODP_DP_ATTR_STATS. */
- enum odp_frag_handling ipv4_frags; /* ODP_DP_ATTR_IPV4_FRAGS. */
- const uint32_t *sampling; /* ODP_DP_ATTR_SAMPLING. */
- uint32_t mcgroups[DPIF_N_UC_TYPES]; /* ODP_DP_ATTR_MCGROUPS. */
+ const char *name; /* OVS_DP_ATTR_NAME. */
+ struct ovs_dp_stats stats; /* OVS_DP_ATTR_STATS. */
+ enum ovs_frag_handling ipv4_frags; /* OVS_DP_ATTR_IPV4_FRAGS. */
+ const uint32_t *sampling; /* OVS_DP_ATTR_SAMPLING. */
+ uint32_t mcgroups[DPIF_N_UC_TYPES]; /* OVS_DP_ATTR_MCGROUPS. */
};
static void dpif_linux_dp_init(struct dpif_linux_dp *);
/* Generic Netlink header. */
uint8_t cmd;
- /* struct odp_header. */
+ /* struct ovs_header. */
unsigned int nlmsg_flags;
int dp_ifindex;
*
* 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. */
- const struct nlattr *key; /* ODP_FLOW_ATTR_KEY. */
+ * access their values.
+ *
+ * If 'actions' is nonnull then OVS_FLOW_ATTR_ACTIONS will be included in
+ * the Netlink version of the command, even if actions_len is zero. */
+ const struct nlattr *key; /* OVS_FLOW_ATTR_KEY. */
size_t key_len;
- const struct nlattr *actions; /* ODP_FLOW_ATTR_ACTIONS. */
+ const struct nlattr *actions; /* OVS_FLOW_ATTR_ACTIONS. */
size_t actions_len;
- const struct odp_flow_stats *stats; /* ODP_FLOW_ATTR_STATS. */
- const uint8_t *tcp_flags; /* ODP_FLOW_ATTR_TCP_FLAGS. */
- const uint64_t *used; /* ODP_FLOW_ATTR_USED. */
- bool clear; /* ODP_FLOW_ATTR_CLEAR. */
+ const struct ovs_flow_stats *stats; /* OVS_FLOW_ATTR_STATS. */
+ const uint8_t *tcp_flags; /* OVS_FLOW_ATTR_TCP_FLAGS. */
+ const uint64_t *used; /* OVS_FLOW_ATTR_USED. */
+ bool clear; /* OVS_FLOW_ATTR_CLEAR. */
};
static void dpif_linux_flow_init(struct dpif_linux_flow *);
unsigned int listen_mask;
/* Change notification. */
- struct shash changed_ports; /* Ports that have changed. */
- struct rtnetlink_notifier port_notifier;
+ struct sset changed_ports; /* Ports that have changed. */
+ struct nln_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);
-/* Generic Netlink family numbers for ODP. */
-static int odp_datapath_family;
-static int odp_vport_family;
-static int odp_flow_family;
-static int odp_packet_family;
+/* Generic Netlink family numbers for OVS. */
+static int ovs_datapath_family;
+static int ovs_vport_family;
+static int ovs_flow_family;
+static int ovs_packet_family;
/* Generic Netlink socket. */
static struct nl_sock *genl_sock;
+static struct nln *nln = NULL;
static int dpif_linux_init(void);
static int open_dpif(const struct dpif_linux_dp *, struct dpif **);
-static void dpif_linux_port_changed(const struct rtnetlink_link_change *,
- void *dpif);
+static bool dpif_linux_nln_parse(struct ofpbuf *, void *);
+static void dpif_linux_port_changed(const void *vport, void *dpif);
static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *,
struct ofpbuf *);
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);
/* Create or look up datapath. */
dpif_linux_dp_init(&dp_request);
- dp_request.cmd = create ? ODP_DP_CMD_NEW : ODP_DP_CMD_GET;
+ dp_request.cmd = create ? OVS_DP_CMD_NEW : OVS_DP_CMD_GET;
dp_request.name = name;
error = dpif_linux_dp_transact(&dp_request, &dp, &buf);
if (error) {
int i;
dpif = xmalloc(sizeof *dpif);
- error = rtnetlink_link_notifier_register(&dpif->port_notifier,
- dpif_linux_port_changed, dpif);
+ error = nln_notifier_register(nln, &dpif->port_notifier,
+ dpif_linux_port_changed, dpif);
if (error) {
goto error_free;
}
}
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, OVSP_LOCAL);
+ for (i = 1; i < LRU_MAX_PORTS; i++) {
+ dpif_linux_push_port(dpif, i);
+ }
return 0;
error_free:
dpif_linux_close(struct dpif *dpif_)
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- rtnetlink_link_notifier_unregister(&dpif->port_notifier);
- shash_destroy(&dpif->changed_ports);
+
+ if (nln) {
+ nln_notifier_unregister(nln, &dpif->port_notifier);
+ }
+
+ nl_sock_destroy(dpif->mc_sock);
+ sset_destroy(&dpif->changed_ports);
+ free(dpif->lru_bitmap);
free(dpif);
}
struct dpif_linux_dp dp;
dpif_linux_dp_init(&dp);
- dp.cmd = ODP_DP_CMD_DEL;
+ dp.cmd = OVS_DP_CMD_DEL;
dp.dp_ifindex = dpif->dp_ifindex;
return dpif_linux_dp_transact(&dp, NULL, NULL);
}
+static void
+dpif_linux_run(struct dpif *dpif OVS_UNUSED)
+{
+ if (nln) {
+ nln_notifier_run(nln);
+ }
+}
+
+static void
+dpif_linux_wait(struct dpif *dpif OVS_UNUSED)
+{
+ if (nln) {
+ nln_notifier_wait(nln);
+ }
+}
+
static int
-dpif_linux_get_stats(const struct dpif *dpif_, struct odp_stats *stats)
+dpif_linux_get_stats(const struct dpif *dpif_, struct ovs_dp_stats *stats)
{
struct dpif_linux_dp dp;
struct ofpbuf *buf;
error = dpif_linux_dp_get(dpif_, &dp, &buf);
if (!error) {
- *drop_fragsp = dp.ipv4_frags == ODP_DP_FRAG_DROP;
+ *drop_fragsp = dp.ipv4_frags == OVS_DP_FRAG_DROP;
ofpbuf_delete(buf);
}
return error;
struct dpif_linux_dp dp;
dpif_linux_dp_init(&dp);
- dp.cmd = ODP_DP_CMD_SET;
+ dp.cmd = OVS_DP_CMD_SET;
dp.dp_ifindex = dpif->dp_ifindex;
- dp.ipv4_frags = drop_frags ? ODP_DP_FRAG_DROP : ODP_DP_FRAG_ZERO;
+ dp.ipv4_frags = drop_frags ? OVS_DP_FRAG_DROP : OVS_DP_FRAG_ZERO;
return dpif_linux_dp_transact(&dp, NULL, NULL);
}
int error;
dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_CMD_NEW;
+ request.cmd = OVS_VPORT_CMD_NEW;
request.dp_ifindex = dpif->dp_ifindex;
request.type = netdev_vport_get_vport_type(netdev);
- if (request.type == ODP_VPORT_TYPE_UNSPEC) {
+ if (request.type == OVS_VPORT_TYPE_UNSPEC) {
VLOG_WARN_RL(&error_rl, "%s: cannot create port `%s' because it has "
"unsupported type `%s'",
dpif_name(dpif_), name, type);
request.options_len = options->size;
}
- error = dpif_linux_vport_transact(&request, &reply, &buf);
- if (!error) {
- *port_nop = reply.port_no;
- ofpbuf_delete(buf);
+ if (request.type == OVS_VPORT_TYPE_NETDEV) {
+ netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false);
}
+ /* 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.cmd = OVS_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
int error;
dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_CMD_GET;
+ request.cmd = OVS_VPORT_CMD_GET;
request.dp_ifindex = dpif_linux_cast(dpif)->dp_ifindex;
request.port_no = port_no;
request.name = port_name;
struct dpif_linux_flow flow;
dpif_linux_flow_init(&flow);
- flow.cmd = ODP_FLOW_CMD_DEL;
+ flow.cmd = OVS_FLOW_CMD_DEL;
flow.dp_ifindex = dpif->dp_ifindex;
return dpif_linux_flow_transact(&flow, NULL, NULL);
}
struct dpif_linux_port_state {
struct nl_dump dump;
+ unsigned long *port_bitmap; /* Ports in the datapath. */
+ bool complete; /* Dump completed without error. */
};
static int
struct ofpbuf *buf;
*statep = state = xmalloc(sizeof *state);
+ state->port_bitmap = bitmap_allocate(LRU_MAX_PORTS);
+ state->complete = false;
dpif_linux_vport_init(&request);
- request.cmd = ODP_DP_CMD_GET;
+ request.cmd = OVS_DP_CMD_GET;
request.dp_ifindex = dpif->dp_ifindex;
buf = ofpbuf_new(1024);
int error;
if (!nl_dump_next(&state->dump, &buf)) {
+ state->complete = true;
return EOF;
}
return error;
}
+ if (vport.port_no < LRU_MAX_PORTS) {
+ bitmap_set1(state->port_bitmap, vport.port_no);
+ }
+
dpif_port->name = (char *) vport.name;
dpif_port->type = (char *) netdev_vport_get_netdev_type(&vport);
dpif_port->port_no = vport.port_no;
}
static int
-dpif_linux_port_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_)
+dpif_linux_port_dump_done(const struct dpif *dpif_, void *state_)
{
+ struct dpif_linux *dpif = dpif_linux_cast(dpif_);
struct dpif_linux_port_state *state = state_;
int error = nl_dump_done(&state->dump);
+
+ if (state->complete) {
+ uint16_t i;
+
+ for (i = 0; i < LRU_MAX_PORTS; i++) {
+ if (!bitmap_is_set(state->port_bitmap, i)) {
+ dpif_linux_push_port(dpif, i);
+ }
+ }
+ }
+
+ free(state->port_bitmap);
free(state);
return error;
}
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.cmd = OVS_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;
dpif_linux_flow_init(&request);
- request.cmd = flags & DPIF_FP_CREATE ? ODP_FLOW_CMD_NEW : ODP_FLOW_CMD_SET;
+ request.cmd = flags & DPIF_FP_CREATE ? OVS_FLOW_CMD_NEW : OVS_FLOW_CMD_SET;
request.dp_ifindex = dpif->dp_ifindex;
request.key = key;
request.key_len = key_len;
- request.actions = actions;
+ /* Ensure that OVS_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;
int error;
dpif_linux_flow_init(&request);
- request.cmd = ODP_FLOW_CMD_DEL;
+ request.cmd = OVS_FLOW_CMD_DEL;
request.dp_ifindex = dpif->dp_ifindex;
request.key = key;
request.key_len = key_len;
struct nl_dump dump;
struct dpif_linux_flow flow;
struct dpif_flow_stats stats;
+ struct ofpbuf *buf;
};
static int
*statep = state = xmalloc(sizeof *state);
dpif_linux_flow_init(&request);
- request.cmd = ODP_DP_CMD_GET;
+ request.cmd = OVS_DP_CMD_GET;
request.dp_ifindex = dpif->dp_ifindex;
buf = ofpbuf_new(1024);
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;
}
static int
-dpif_linux_execute(struct dpif *dpif_,
- const struct nlattr *actions, size_t actions_len,
- const struct ofpbuf *packet)
+dpif_linux_execute__(int dp_ifindex,
+ const struct nlattr *key, size_t key_len,
+ const struct nlattr *actions, size_t actions_len,
+ const struct ofpbuf *packet)
{
- struct dpif_linux *dpif = dpif_linux_cast(dpif_);
- struct odp_header *execute;
+ struct ovs_header *execute;
struct ofpbuf *buf;
int error;
buf = ofpbuf_new(128 + actions_len + packet->size);
- nl_msg_put_genlmsghdr(buf, 0, odp_packet_family, NLM_F_REQUEST,
- ODP_PACKET_CMD_EXECUTE, 1);
+ nl_msg_put_genlmsghdr(buf, 0, ovs_packet_family, NLM_F_REQUEST,
+ OVS_PACKET_CMD_EXECUTE, 1);
execute = ofpbuf_put_uninit(buf, sizeof *execute);
- execute->dp_ifindex = dpif->dp_ifindex;
+ execute->dp_ifindex = dp_ifindex;
- nl_msg_put_unspec(buf, ODP_PACKET_ATTR_PACKET, packet->data, packet->size);
- nl_msg_put_unspec(buf, ODP_PACKET_ATTR_ACTIONS, actions, actions_len);
+ nl_msg_put_unspec(buf, OVS_PACKET_ATTR_PACKET, packet->data, packet->size);
+ nl_msg_put_unspec(buf, OVS_PACKET_ATTR_KEY, key, key_len);
+ nl_msg_put_unspec(buf, OVS_PACKET_ATTR_ACTIONS, actions, actions_len);
error = nl_sock_transact(genl_sock, buf, NULL);
ofpbuf_delete(buf);
return error;
}
+static int
+dpif_linux_execute(struct dpif *dpif_,
+ const struct nlattr *key, size_t key_len,
+ const struct nlattr *actions, size_t actions_len,
+ const struct ofpbuf *packet)
+{
+ struct dpif_linux *dpif = dpif_linux_cast(dpif_);
+
+ return dpif_linux_execute__(dpif->dp_ifindex, key, key_len,
+ actions, actions_len, packet);
+}
+
static int
dpif_linux_recv_get_mask(const struct dpif *dpif_, int *listen_mask)
{
struct dpif_linux_dp dp;
dpif_linux_dp_init(&dp);
- dp.cmd = ODP_DP_CMD_SET;
+ dp.cmd = OVS_DP_CMD_SET;
dp.dp_ifindex = dpif->dp_ifindex;
dp.sampling = &probability;
return dpif_linux_dp_transact(&dp, NULL, NULL);
parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall,
int *dp_ifindex)
{
- static const struct nl_policy odp_packet_policy[] = {
+ static const struct nl_policy ovs_packet_policy[] = {
/* Always present. */
- [ODP_PACKET_ATTR_PACKET] = { .type = NL_A_UNSPEC,
+ [OVS_PACKET_ATTR_PACKET] = { .type = NL_A_UNSPEC,
.min_len = ETH_HEADER_LEN },
- [ODP_PACKET_ATTR_KEY] = { .type = NL_A_NESTED },
+ [OVS_PACKET_ATTR_KEY] = { .type = NL_A_NESTED },
- /* ODP_PACKET_CMD_ACTION only. */
- [ODP_PACKET_ATTR_USERDATA] = { .type = NL_A_U64, .optional = true },
+ /* OVS_PACKET_CMD_ACTION only. */
+ [OVS_PACKET_ATTR_USERDATA] = { .type = NL_A_U64, .optional = true },
- /* ODP_PACKET_CMD_SAMPLE only. */
- [ODP_PACKET_ATTR_SAMPLE_POOL] = { .type = NL_A_U32, .optional = true },
- [ODP_PACKET_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true },
+ /* OVS_PACKET_CMD_SAMPLE only. */
+ [OVS_PACKET_ATTR_SAMPLE_POOL] = { .type = NL_A_U32, .optional = true },
+ [OVS_PACKET_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true },
};
- struct odp_header *odp_header;
- struct nlattr *a[ARRAY_SIZE(odp_packet_policy)];
+ struct ovs_header *ovs_header;
+ struct nlattr *a[ARRAY_SIZE(ovs_packet_policy)];
struct nlmsghdr *nlmsg;
struct genlmsghdr *genl;
struct ofpbuf b;
nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg);
genl = ofpbuf_try_pull(&b, sizeof *genl);
- odp_header = ofpbuf_try_pull(&b, sizeof *odp_header);
- if (!nlmsg || !genl || !odp_header
- || nlmsg->nlmsg_type != odp_packet_family
- || !nl_policy_parse(&b, 0, odp_packet_policy, a,
- ARRAY_SIZE(odp_packet_policy))) {
+ ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header);
+ if (!nlmsg || !genl || !ovs_header
+ || nlmsg->nlmsg_type != ovs_packet_family
+ || !nl_policy_parse(&b, 0, ovs_packet_policy, a,
+ ARRAY_SIZE(ovs_packet_policy))) {
return EINVAL;
}
- type = (genl->cmd == ODP_PACKET_CMD_MISS ? DPIF_UC_MISS
- : genl->cmd == ODP_PACKET_CMD_ACTION ? DPIF_UC_ACTION
- : genl->cmd == ODP_PACKET_CMD_SAMPLE ? DPIF_UC_SAMPLE
+ type = (genl->cmd == OVS_PACKET_CMD_MISS ? DPIF_UC_MISS
+ : genl->cmd == OVS_PACKET_CMD_ACTION ? DPIF_UC_ACTION
+ : genl->cmd == OVS_PACKET_CMD_SAMPLE ? DPIF_UC_SAMPLE
: -1);
if (type < 0) {
return EINVAL;
memset(upcall, 0, sizeof *upcall);
upcall->type = type;
upcall->packet = buf;
- upcall->packet->data = (void *) nl_attr_get(a[ODP_PACKET_ATTR_PACKET]);
- upcall->packet->size = nl_attr_get_size(a[ODP_PACKET_ATTR_PACKET]);
- upcall->key = (void *) nl_attr_get(a[ODP_PACKET_ATTR_KEY]);
- upcall->key_len = nl_attr_get_size(a[ODP_PACKET_ATTR_KEY]);
- upcall->userdata = (a[ODP_PACKET_ATTR_USERDATA]
- ? nl_attr_get_u64(a[ODP_PACKET_ATTR_USERDATA])
+ upcall->packet->data = (void *) nl_attr_get(a[OVS_PACKET_ATTR_PACKET]);
+ upcall->packet->size = nl_attr_get_size(a[OVS_PACKET_ATTR_PACKET]);
+ upcall->key = (void *) nl_attr_get(a[OVS_PACKET_ATTR_KEY]);
+ upcall->key_len = nl_attr_get_size(a[OVS_PACKET_ATTR_KEY]);
+ upcall->userdata = (a[OVS_PACKET_ATTR_USERDATA]
+ ? nl_attr_get_u64(a[OVS_PACKET_ATTR_USERDATA])
: 0);
- upcall->sample_pool = (a[ODP_PACKET_ATTR_SAMPLE_POOL]
- ? nl_attr_get_u32(a[ODP_PACKET_ATTR_SAMPLE_POOL])
+ upcall->sample_pool = (a[OVS_PACKET_ATTR_SAMPLE_POOL]
+ ? nl_attr_get_u32(a[OVS_PACKET_ATTR_SAMPLE_POOL])
: 0);
- if (a[ODP_PACKET_ATTR_ACTIONS]) {
- upcall->actions = (void *) nl_attr_get(a[ODP_PACKET_ATTR_ACTIONS]);
- upcall->actions_len = nl_attr_get_size(a[ODP_PACKET_ATTR_ACTIONS]);
+ if (a[OVS_PACKET_ATTR_ACTIONS]) {
+ upcall->actions = (void *) nl_attr_get(a[OVS_PACKET_ATTR_ACTIONS]);
+ upcall->actions_len = nl_attr_get_size(a[OVS_PACKET_ATTR_ACTIONS]);
}
- *dp_ifindex = odp_header->dp_ifindex;
+ *dp_ifindex = ovs_header->dp_ifindex;
return 0;
}
const struct dpif_class dpif_linux_class = {
"system",
- NULL, /* run */
- NULL, /* wait */
dpif_linux_enumerate,
dpif_linux_open,
dpif_linux_close,
dpif_linux_destroy,
+ dpif_linux_run,
+ dpif_linux_wait,
dpif_linux_get_stats,
dpif_linux_get_drop_frags,
dpif_linux_set_drop_frags,
static int error = -1;
if (error < 0) {
- error = nl_lookup_genl_family(ODP_DATAPATH_FAMILY,
- &odp_datapath_family);
+ unsigned int ovs_vport_mcgroup;
+
+ error = nl_lookup_genl_family(OVS_DATAPATH_FAMILY,
+ &ovs_datapath_family);
if (error) {
VLOG_ERR("Generic Netlink family '%s' does not exist. "
"The Open vSwitch kernel module is probably not loaded.",
- ODP_DATAPATH_FAMILY);
+ OVS_DATAPATH_FAMILY);
}
if (!error) {
- error = nl_lookup_genl_family(ODP_VPORT_FAMILY, &odp_vport_family);
+ error = nl_lookup_genl_family(OVS_VPORT_FAMILY, &ovs_vport_family);
}
if (!error) {
- error = nl_lookup_genl_family(ODP_FLOW_FAMILY, &odp_flow_family);
+ error = nl_lookup_genl_family(OVS_FLOW_FAMILY, &ovs_flow_family);
}
if (!error) {
- error = nl_lookup_genl_family(ODP_PACKET_FAMILY,
- &odp_packet_family);
+ error = nl_lookup_genl_family(OVS_PACKET_FAMILY,
+ &ovs_packet_family);
}
if (!error) {
error = nl_sock_create(NETLINK_GENERIC, &genl_sock);
}
+ if (!error) {
+ error = nl_lookup_genl_mcgroup(OVS_VPORT_FAMILY, OVS_VPORT_MCGROUP,
+ &ovs_vport_mcgroup);
+ }
+ if (!error) {
+ static struct dpif_linux_vport vport;
+ nln = nln_create(NETLINK_GENERIC, ovs_vport_mcgroup,
+ dpif_linux_nln_parse, &vport);
+ }
}
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));
}
- return reply.type == ODP_VPORT_TYPE_INTERNAL;
+ return reply.type == OVS_VPORT_TYPE_INTERNAL;
+}
+
+int
+dpif_linux_vport_send(int dp_ifindex, uint32_t port_no,
+ const void *data, size_t size)
+{
+ struct ofpbuf actions, key, packet;
+ struct odputil_keybuf keybuf;
+ struct flow flow;
+ uint64_t action;
+
+ ofpbuf_use_const(&packet, data, size);
+ flow_extract(&packet, htonll(0), 0, &flow);
+
+ ofpbuf_use_stack(&key, &keybuf, sizeof keybuf);
+ odp_flow_key_from_flow(&key, &flow);
+
+ ofpbuf_use_stack(&actions, &action, sizeof action);
+ nl_msg_put_u32(&actions, OVS_ACTION_ATTR_OUTPUT, port_no);
+
+ return dpif_linux_execute__(dp_ifindex, key.data, key.size,
+ actions.data, actions.size, &packet);
+}
+
+static bool
+dpif_linux_nln_parse(struct ofpbuf *buf, void *vport_)
+{
+ struct dpif_linux_vport *vport = vport_;
+ return dpif_linux_vport_from_ofpbuf(vport, buf) == 0;
}
static void
-dpif_linux_port_changed(const struct rtnetlink_link_change *change,
- void *dpif_)
+dpif_linux_port_changed(const void *vport_, void *dpif_)
{
+ const struct dpif_linux_vport *vport = vport_;
struct dpif_linux *dpif = dpif_;
- if (change) {
- if (change->master_ifindex == dpif->dp_ifindex
- && (change->nlmsg_type == RTM_NEWLINK
- || change->nlmsg_type == RTM_DELLINK))
- {
- /* Our datapath changed, either adding a new port or deleting an
- * existing one. */
- shash_add_once(&dpif->changed_ports, change->ifname, NULL);
+ if (vport) {
+ if (vport->dp_ifindex == dpif->dp_ifindex
+ && (vport->cmd == OVS_VPORT_CMD_NEW
+ || vport->cmd == OVS_VPORT_CMD_DEL
+ || vport->cmd == OVS_VPORT_CMD_SET)) {
+ VLOG_DBG("port_changed: dpif:%s vport:%s cmd:%"PRIu8,
+ dpif->dpif.full_name, vport->name, vport->cmd);
+ sset_add(&dpif->changed_ports, vport->name);
}
} else {
dpif->change_error = true;
}
}
\f
-/* Parses the contents of 'buf', which contains a "struct odp_header" followed
+/* Parses the contents of 'buf', which contains a "struct ovs_header" followed
* by Netlink attributes, into 'vport'. Returns 0 if successful, otherwise a
* positive errno value.
*
dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport,
const struct ofpbuf *buf)
{
- static const struct nl_policy odp_vport_policy[] = {
- [ODP_VPORT_ATTR_PORT_NO] = { .type = NL_A_U32 },
- [ODP_VPORT_ATTR_TYPE] = { .type = NL_A_U32 },
- [ODP_VPORT_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ },
- [ODP_VPORT_ATTR_STATS] = { .type = NL_A_UNSPEC,
- .min_len = sizeof(struct rtnl_link_stats64),
- .max_len = sizeof(struct rtnl_link_stats64),
+ static const struct nl_policy ovs_vport_policy[] = {
+ [OVS_VPORT_ATTR_PORT_NO] = { .type = NL_A_U32 },
+ [OVS_VPORT_ATTR_TYPE] = { .type = NL_A_U32 },
+ [OVS_VPORT_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ },
+ [OVS_VPORT_ATTR_STATS] = { .type = NL_A_UNSPEC,
+ .min_len = sizeof(struct ovs_vport_stats),
+ .max_len = sizeof(struct ovs_vport_stats),
.optional = true },
- [ODP_VPORT_ATTR_ADDRESS] = { .type = NL_A_UNSPEC,
+ [OVS_VPORT_ATTR_ADDRESS] = { .type = NL_A_UNSPEC,
.min_len = ETH_ADDR_LEN,
.max_len = ETH_ADDR_LEN,
.optional = true },
- [ODP_VPORT_ATTR_MTU] = { .type = NL_A_U32, .optional = true },
- [ODP_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true },
- [ODP_VPORT_ATTR_IFINDEX] = { .type = NL_A_U32, .optional = true },
- [ODP_VPORT_ATTR_IFLINK] = { .type = NL_A_U32, .optional = true },
+ [OVS_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true },
+ [OVS_VPORT_ATTR_IFINDEX] = { .type = NL_A_U32, .optional = true },
};
- struct nlattr *a[ARRAY_SIZE(odp_vport_policy)];
- struct odp_header *odp_header;
+ struct nlattr *a[ARRAY_SIZE(ovs_vport_policy)];
+ struct ovs_header *ovs_header;
struct nlmsghdr *nlmsg;
struct genlmsghdr *genl;
struct ofpbuf b;
ofpbuf_use_const(&b, buf->data, buf->size);
nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg);
genl = ofpbuf_try_pull(&b, sizeof *genl);
- odp_header = ofpbuf_try_pull(&b, sizeof *odp_header);
- if (!nlmsg || !genl || !odp_header
- || nlmsg->nlmsg_type != odp_vport_family
- || !nl_policy_parse(&b, 0, odp_vport_policy, a,
- ARRAY_SIZE(odp_vport_policy))) {
+ ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header);
+ if (!nlmsg || !genl || !ovs_header
+ || nlmsg->nlmsg_type != ovs_vport_family
+ || !nl_policy_parse(&b, 0, ovs_vport_policy, a,
+ ARRAY_SIZE(ovs_vport_policy))) {
return EINVAL;
}
vport->cmd = genl->cmd;
- vport->dp_ifindex = odp_header->dp_ifindex;
- vport->port_no = nl_attr_get_u32(a[ODP_VPORT_ATTR_PORT_NO]);
- vport->type = nl_attr_get_u32(a[ODP_VPORT_ATTR_TYPE]);
- vport->name = nl_attr_get_string(a[ODP_VPORT_ATTR_NAME]);
- if (a[ODP_VPORT_ATTR_STATS]) {
- vport->stats = nl_attr_get(a[ODP_VPORT_ATTR_STATS]);
+ vport->dp_ifindex = ovs_header->dp_ifindex;
+ vport->port_no = nl_attr_get_u32(a[OVS_VPORT_ATTR_PORT_NO]);
+ vport->type = nl_attr_get_u32(a[OVS_VPORT_ATTR_TYPE]);
+ vport->name = nl_attr_get_string(a[OVS_VPORT_ATTR_NAME]);
+ if (a[OVS_VPORT_ATTR_STATS]) {
+ vport->stats = nl_attr_get(a[OVS_VPORT_ATTR_STATS]);
}
- if (a[ODP_VPORT_ATTR_ADDRESS]) {
- vport->address = nl_attr_get(a[ODP_VPORT_ATTR_ADDRESS]);
+ if (a[OVS_VPORT_ATTR_ADDRESS]) {
+ vport->address = nl_attr_get(a[OVS_VPORT_ATTR_ADDRESS]);
}
- if (a[ODP_VPORT_ATTR_MTU]) {
- vport->mtu = nl_attr_get_u32(a[ODP_VPORT_ATTR_MTU]);
+ if (a[OVS_VPORT_ATTR_OPTIONS]) {
+ vport->options = nl_attr_get(a[OVS_VPORT_ATTR_OPTIONS]);
+ vport->options_len = nl_attr_get_size(a[OVS_VPORT_ATTR_OPTIONS]);
}
- if (a[ODP_VPORT_ATTR_OPTIONS]) {
- vport->options = nl_attr_get(a[ODP_VPORT_ATTR_OPTIONS]);
- vport->options_len = nl_attr_get_size(a[ODP_VPORT_ATTR_OPTIONS]);
- }
- if (a[ODP_VPORT_ATTR_IFINDEX]) {
- vport->ifindex = nl_attr_get_u32(a[ODP_VPORT_ATTR_IFINDEX]);
- }
- if (a[ODP_VPORT_ATTR_IFLINK]) {
- vport->iflink = nl_attr_get_u32(a[ODP_VPORT_ATTR_IFLINK]);
+ if (a[OVS_VPORT_ATTR_IFINDEX]) {
+ vport->ifindex = nl_attr_get_u32(a[OVS_VPORT_ATTR_IFINDEX]);
}
return 0;
}
-/* Appends to 'buf' (which must initially be empty) a "struct odp_header"
+/* Appends to 'buf' (which must initially be empty) a "struct ovs_header"
* followed by Netlink attributes corresponding to 'vport'. */
static void
dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport,
struct ofpbuf *buf)
{
- struct odp_header *odp_header;
+ struct ovs_header *ovs_header;
- nl_msg_put_genlmsghdr(buf, 0, odp_vport_family, NLM_F_REQUEST | NLM_F_ECHO,
+ nl_msg_put_genlmsghdr(buf, 0, ovs_vport_family, NLM_F_REQUEST | NLM_F_ECHO,
vport->cmd, 1);
- odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
- odp_header->dp_ifindex = vport->dp_ifindex;
+ ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header);
+ ovs_header->dp_ifindex = vport->dp_ifindex;
if (vport->port_no != UINT32_MAX) {
- nl_msg_put_u32(buf, ODP_VPORT_ATTR_PORT_NO, vport->port_no);
+ nl_msg_put_u32(buf, OVS_VPORT_ATTR_PORT_NO, vport->port_no);
}
- if (vport->type != ODP_VPORT_TYPE_UNSPEC) {
- nl_msg_put_u32(buf, ODP_VPORT_ATTR_TYPE, vport->type);
+ if (vport->type != OVS_VPORT_TYPE_UNSPEC) {
+ nl_msg_put_u32(buf, OVS_VPORT_ATTR_TYPE, vport->type);
}
if (vport->name) {
- nl_msg_put_string(buf, ODP_VPORT_ATTR_NAME, vport->name);
+ nl_msg_put_string(buf, OVS_VPORT_ATTR_NAME, vport->name);
}
if (vport->stats) {
- nl_msg_put_unspec(buf, ODP_VPORT_ATTR_STATS,
+ nl_msg_put_unspec(buf, OVS_VPORT_ATTR_STATS,
vport->stats, sizeof *vport->stats);
}
if (vport->address) {
- nl_msg_put_unspec(buf, ODP_VPORT_ATTR_ADDRESS,
+ nl_msg_put_unspec(buf, OVS_VPORT_ATTR_ADDRESS,
vport->address, ETH_ADDR_LEN);
}
- if (vport->mtu) {
- nl_msg_put_u32(buf, ODP_VPORT_ATTR_MTU, vport->mtu);
- }
-
if (vport->options) {
- nl_msg_put_nested(buf, ODP_VPORT_ATTR_OPTIONS,
+ nl_msg_put_nested(buf, OVS_VPORT_ATTR_OPTIONS,
vport->options, vport->options_len);
}
if (vport->ifindex) {
- nl_msg_put_u32(buf, ODP_VPORT_ATTR_IFINDEX, vport->ifindex);
- }
-
- if (vport->iflink) {
- nl_msg_put_u32(buf, ODP_VPORT_ATTR_IFLINK, vport->iflink);
+ nl_msg_put_u32(buf, OVS_VPORT_ATTR_IFINDEX, vport->ifindex);
}
}
/* Executes 'request' in the kernel datapath. If the command fails, returns a
* positive errno value. Otherwise, if 'reply' and 'bufp' are null, returns 0
* without doing anything else. If 'reply' and 'bufp' are nonnull, then the
- * result of the command is expected to be an odp_vport also, which is decoded
+ * result of the command is expected to be an ovs_vport also, which is decoded
* and stored in '*reply' and '*bufp'. The caller must free '*bufp' when the
* reply is no longer needed ('reply' will contain pointers into '*bufp'). */
int
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);
struct dpif_linux_vport request;
dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_CMD_GET;
+ request.cmd = OVS_VPORT_CMD_GET;
request.name = name;
return dpif_linux_vport_transact(&request, reply, bufp);
}
\f
-/* Parses the contents of 'buf', which contains a "struct odp_header" followed
+/* Parses the contents of 'buf', which contains a "struct ovs_header" followed
* by Netlink attributes, into 'dp'. Returns 0 if successful, otherwise a
* positive errno value.
*
static int
dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *dp, const struct ofpbuf *buf)
{
- static const struct nl_policy odp_datapath_policy[] = {
- [ODP_DP_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ },
- [ODP_DP_ATTR_STATS] = { .type = NL_A_UNSPEC,
- .min_len = sizeof(struct odp_stats),
- .max_len = sizeof(struct odp_stats),
+ static const struct nl_policy ovs_datapath_policy[] = {
+ [OVS_DP_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ },
+ [OVS_DP_ATTR_STATS] = { .type = NL_A_UNSPEC,
+ .min_len = sizeof(struct ovs_dp_stats),
+ .max_len = sizeof(struct ovs_dp_stats),
.optional = true },
- [ODP_DP_ATTR_IPV4_FRAGS] = { .type = NL_A_U32, .optional = true },
- [ODP_DP_ATTR_SAMPLING] = { .type = NL_A_U32, .optional = true },
- [ODP_DP_ATTR_MCGROUPS] = { .type = NL_A_NESTED, .optional = true },
+ [OVS_DP_ATTR_IPV4_FRAGS] = { .type = NL_A_U32, .optional = true },
+ [OVS_DP_ATTR_SAMPLING] = { .type = NL_A_U32, .optional = true },
+ [OVS_DP_ATTR_MCGROUPS] = { .type = NL_A_NESTED, .optional = true },
};
- struct nlattr *a[ARRAY_SIZE(odp_datapath_policy)];
- struct odp_header *odp_header;
+ struct nlattr *a[ARRAY_SIZE(ovs_datapath_policy)];
+ struct ovs_header *ovs_header;
struct nlmsghdr *nlmsg;
struct genlmsghdr *genl;
struct ofpbuf b;
ofpbuf_use_const(&b, buf->data, buf->size);
nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg);
genl = ofpbuf_try_pull(&b, sizeof *genl);
- odp_header = ofpbuf_try_pull(&b, sizeof *odp_header);
- if (!nlmsg || !genl || !odp_header
- || nlmsg->nlmsg_type != odp_datapath_family
- || !nl_policy_parse(&b, 0, odp_datapath_policy, a,
- ARRAY_SIZE(odp_datapath_policy))) {
+ ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header);
+ if (!nlmsg || !genl || !ovs_header
+ || nlmsg->nlmsg_type != ovs_datapath_family
+ || !nl_policy_parse(&b, 0, ovs_datapath_policy, a,
+ ARRAY_SIZE(ovs_datapath_policy))) {
return EINVAL;
}
dp->cmd = genl->cmd;
- dp->dp_ifindex = odp_header->dp_ifindex;
- dp->name = nl_attr_get_string(a[ODP_DP_ATTR_NAME]);
- if (a[ODP_DP_ATTR_STATS]) {
+ dp->dp_ifindex = ovs_header->dp_ifindex;
+ dp->name = nl_attr_get_string(a[OVS_DP_ATTR_NAME]);
+ if (a[OVS_DP_ATTR_STATS]) {
/* Can't use structure assignment because Netlink doesn't ensure
* sufficient alignment for 64-bit members. */
- memcpy(&dp->stats, nl_attr_get(a[ODP_DP_ATTR_STATS]),
+ memcpy(&dp->stats, nl_attr_get(a[OVS_DP_ATTR_STATS]),
sizeof dp->stats);
}
- if (a[ODP_DP_ATTR_IPV4_FRAGS]) {
- dp->ipv4_frags = nl_attr_get_u32(a[ODP_DP_ATTR_IPV4_FRAGS]);
+ if (a[OVS_DP_ATTR_IPV4_FRAGS]) {
+ dp->ipv4_frags = nl_attr_get_u32(a[OVS_DP_ATTR_IPV4_FRAGS]);
}
- if (a[ODP_DP_ATTR_SAMPLING]) {
- dp->sampling = nl_attr_get(a[ODP_DP_ATTR_SAMPLING]);
+ if (a[OVS_DP_ATTR_SAMPLING]) {
+ dp->sampling = nl_attr_get(a[OVS_DP_ATTR_SAMPLING]);
}
- if (a[ODP_DP_ATTR_MCGROUPS]) {
- static const struct nl_policy odp_mcgroup_policy[] = {
- [ODP_PACKET_CMD_MISS] = { .type = NL_A_U32, .optional = true },
- [ODP_PACKET_CMD_ACTION] = { .type = NL_A_U32, .optional = true },
- [ODP_PACKET_CMD_SAMPLE] = { .type = NL_A_U32, .optional = true },
+ if (a[OVS_DP_ATTR_MCGROUPS]) {
+ static const struct nl_policy ovs_mcgroup_policy[] = {
+ [OVS_PACKET_CMD_MISS] = { .type = NL_A_U32, .optional = true },
+ [OVS_PACKET_CMD_ACTION] = { .type = NL_A_U32, .optional = true },
+ [OVS_PACKET_CMD_SAMPLE] = { .type = NL_A_U32, .optional = true },
};
- struct nlattr *mcgroups[ARRAY_SIZE(odp_mcgroup_policy)];
+ struct nlattr *mcgroups[ARRAY_SIZE(ovs_mcgroup_policy)];
- if (!nl_parse_nested(a[ODP_DP_ATTR_MCGROUPS], odp_mcgroup_policy,
- mcgroups, ARRAY_SIZE(odp_mcgroup_policy))) {
+ if (!nl_parse_nested(a[OVS_DP_ATTR_MCGROUPS], ovs_mcgroup_policy,
+ mcgroups, ARRAY_SIZE(ovs_mcgroup_policy))) {
return EINVAL;
}
- if (mcgroups[ODP_PACKET_CMD_MISS]) {
+ if (mcgroups[OVS_PACKET_CMD_MISS]) {
dp->mcgroups[DPIF_UC_MISS]
- = nl_attr_get_u32(mcgroups[ODP_PACKET_CMD_MISS]);
+ = nl_attr_get_u32(mcgroups[OVS_PACKET_CMD_MISS]);
}
- if (mcgroups[ODP_PACKET_CMD_ACTION]) {
+ if (mcgroups[OVS_PACKET_CMD_ACTION]) {
dp->mcgroups[DPIF_UC_ACTION]
- = nl_attr_get_u32(mcgroups[ODP_PACKET_CMD_ACTION]);
+ = nl_attr_get_u32(mcgroups[OVS_PACKET_CMD_ACTION]);
}
- if (mcgroups[ODP_PACKET_CMD_SAMPLE]) {
+ if (mcgroups[OVS_PACKET_CMD_SAMPLE]) {
dp->mcgroups[DPIF_UC_SAMPLE]
- = nl_attr_get_u32(mcgroups[ODP_PACKET_CMD_SAMPLE]);
+ = nl_attr_get_u32(mcgroups[OVS_PACKET_CMD_SAMPLE]);
}
}
static void
dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf)
{
- struct odp_header *odp_header;
+ struct ovs_header *ovs_header;
- nl_msg_put_genlmsghdr(buf, 0, odp_datapath_family,
+ nl_msg_put_genlmsghdr(buf, 0, ovs_datapath_family,
NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, 1);
- odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
- odp_header->dp_ifindex = dp->dp_ifindex;
+ ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header);
+ ovs_header->dp_ifindex = dp->dp_ifindex;
if (dp->name) {
- nl_msg_put_string(buf, ODP_DP_ATTR_NAME, dp->name);
+ nl_msg_put_string(buf, OVS_DP_ATTR_NAME, dp->name);
}
- /* Skip ODP_DP_ATTR_STATS since we never have a reason to serialize it. */
+ /* Skip OVS_DP_ATTR_STATS since we never have a reason to serialize it. */
if (dp->ipv4_frags) {
- nl_msg_put_u32(buf, ODP_DP_ATTR_IPV4_FRAGS, dp->ipv4_frags);
+ nl_msg_put_u32(buf, OVS_DP_ATTR_IPV4_FRAGS, dp->ipv4_frags);
}
if (dp->sampling) {
- nl_msg_put_u32(buf, ODP_DP_ATTR_SAMPLING, *dp->sampling);
+ nl_msg_put_u32(buf, OVS_DP_ATTR_SAMPLING, *dp->sampling);
}
}
/* Clears 'dp' to "empty" values. */
-void
+static void
dpif_linux_dp_init(struct dpif_linux_dp *dp)
{
memset(dp, 0, sizeof *dp);
struct ofpbuf *buf;
dpif_linux_dp_init(&request);
- request.cmd = ODP_DP_CMD_GET;
+ request.cmd = OVS_DP_CMD_GET;
buf = ofpbuf_new(1024);
dpif_linux_dp_to_ofpbuf(&request, buf);
* result of the command is expected to be of the same form, which is decoded
* and stored in '*reply' and '*bufp'. The caller must free '*bufp' when the
* reply is no longer needed ('reply' will contain pointers into '*bufp'). */
-int
+static int
dpif_linux_dp_transact(const struct dpif_linux_dp *request,
struct dpif_linux_dp *reply, struct ofpbuf **bufp)
{
/* Obtains information about 'dpif_' and stores it into '*reply' and '*bufp'.
* The caller must free '*bufp' when the reply is no longer needed ('reply'
* will contain pointers into '*bufp'). */
-int
+static int
dpif_linux_dp_get(const struct dpif *dpif_, struct dpif_linux_dp *reply,
struct ofpbuf **bufp)
{
struct dpif_linux_dp request;
dpif_linux_dp_init(&request);
- request.cmd = ODP_DP_CMD_GET;
+ request.cmd = OVS_DP_CMD_GET;
request.dp_ifindex = dpif->dp_ifindex;
return dpif_linux_dp_transact(&request, reply, bufp);
}
\f
-/* Parses the contents of 'buf', which contains a "struct odp_header" followed
+/* Parses the contents of 'buf', which contains a "struct ovs_header" followed
* by Netlink attributes, into 'flow'. Returns 0 if successful, otherwise a
* positive errno value.
*
dpif_linux_flow_from_ofpbuf(struct dpif_linux_flow *flow,
const struct ofpbuf *buf)
{
- static const struct nl_policy odp_flow_policy[] = {
- [ODP_FLOW_ATTR_KEY] = { .type = NL_A_NESTED },
- [ODP_FLOW_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true },
- [ODP_FLOW_ATTR_STATS] = { .type = NL_A_UNSPEC,
- .min_len = sizeof(struct odp_flow_stats),
- .max_len = sizeof(struct odp_flow_stats),
+ static const struct nl_policy ovs_flow_policy[] = {
+ [OVS_FLOW_ATTR_KEY] = { .type = NL_A_NESTED },
+ [OVS_FLOW_ATTR_ACTIONS] = { .type = NL_A_NESTED, .optional = true },
+ [OVS_FLOW_ATTR_STATS] = { .type = NL_A_UNSPEC,
+ .min_len = sizeof(struct ovs_flow_stats),
+ .max_len = sizeof(struct ovs_flow_stats),
.optional = true },
- [ODP_FLOW_ATTR_TCP_FLAGS] = { .type = NL_A_U8, .optional = true },
- [ODP_FLOW_ATTR_USED] = { .type = NL_A_U64, .optional = true },
- /* The kernel never uses ODP_FLOW_ATTR_CLEAR. */
+ [OVS_FLOW_ATTR_TCP_FLAGS] = { .type = NL_A_U8, .optional = true },
+ [OVS_FLOW_ATTR_USED] = { .type = NL_A_U64, .optional = true },
+ /* The kernel never uses OVS_FLOW_ATTR_CLEAR. */
};
- struct nlattr *a[ARRAY_SIZE(odp_flow_policy)];
- struct odp_header *odp_header;
+ struct nlattr *a[ARRAY_SIZE(ovs_flow_policy)];
+ struct ovs_header *ovs_header;
struct nlmsghdr *nlmsg;
struct genlmsghdr *genl;
struct ofpbuf b;
ofpbuf_use_const(&b, buf->data, buf->size);
nlmsg = ofpbuf_try_pull(&b, sizeof *nlmsg);
genl = ofpbuf_try_pull(&b, sizeof *genl);
- odp_header = ofpbuf_try_pull(&b, sizeof *odp_header);
- if (!nlmsg || !genl || !odp_header
- || nlmsg->nlmsg_type != odp_flow_family
- || !nl_policy_parse(&b, 0, odp_flow_policy, a,
- ARRAY_SIZE(odp_flow_policy))) {
+ ovs_header = ofpbuf_try_pull(&b, sizeof *ovs_header);
+ if (!nlmsg || !genl || !ovs_header
+ || nlmsg->nlmsg_type != ovs_flow_family
+ || !nl_policy_parse(&b, 0, ovs_flow_policy, a,
+ ARRAY_SIZE(ovs_flow_policy))) {
return EINVAL;
}
flow->nlmsg_flags = nlmsg->nlmsg_flags;
- flow->dp_ifindex = odp_header->dp_ifindex;
- flow->key = nl_attr_get(a[ODP_FLOW_ATTR_KEY]);
- flow->key_len = nl_attr_get_size(a[ODP_FLOW_ATTR_KEY]);
- if (a[ODP_FLOW_ATTR_ACTIONS]) {
- flow->actions = nl_attr_get(a[ODP_FLOW_ATTR_ACTIONS]);
- flow->actions_len = nl_attr_get_size(a[ODP_FLOW_ATTR_ACTIONS]);
+ flow->dp_ifindex = ovs_header->dp_ifindex;
+ flow->key = nl_attr_get(a[OVS_FLOW_ATTR_KEY]);
+ flow->key_len = nl_attr_get_size(a[OVS_FLOW_ATTR_KEY]);
+ if (a[OVS_FLOW_ATTR_ACTIONS]) {
+ flow->actions = nl_attr_get(a[OVS_FLOW_ATTR_ACTIONS]);
+ flow->actions_len = nl_attr_get_size(a[OVS_FLOW_ATTR_ACTIONS]);
+ }
+ if (a[OVS_FLOW_ATTR_STATS]) {
+ flow->stats = nl_attr_get(a[OVS_FLOW_ATTR_STATS]);
}
- if (a[ODP_FLOW_ATTR_STATS]) {
- flow->stats = nl_attr_get(a[ODP_FLOW_ATTR_STATS]);
+ if (a[OVS_FLOW_ATTR_TCP_FLAGS]) {
+ flow->tcp_flags = nl_attr_get(a[OVS_FLOW_ATTR_TCP_FLAGS]);
}
- if (a[ODP_FLOW_ATTR_TCP_FLAGS]) {
- flow->tcp_flags = nl_attr_get(a[ODP_FLOW_ATTR_TCP_FLAGS]);
+ if (a[OVS_FLOW_ATTR_USED]) {
+ flow->used = nl_attr_get(a[OVS_FLOW_ATTR_USED]);
}
return 0;
}
-/* Appends to 'buf' (which must initially be empty) a "struct odp_header"
+/* Appends to 'buf' (which must initially be empty) a "struct ovs_header"
* followed by Netlink attributes corresponding to 'flow'. */
static void
dpif_linux_flow_to_ofpbuf(const struct dpif_linux_flow *flow,
struct ofpbuf *buf)
{
- struct odp_header *odp_header;
+ struct ovs_header *ovs_header;
- nl_msg_put_genlmsghdr(buf, 0, odp_flow_family,
- NLM_F_REQUEST | flow->nlmsg_flags, flow->cmd, 1);
+ nl_msg_put_genlmsghdr(buf, 0, ovs_flow_family,
+ NLM_F_REQUEST | NLM_F_ECHO | flow->nlmsg_flags,
+ flow->cmd, 1);
- odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
- odp_header->dp_ifindex = flow->dp_ifindex;
+ ovs_header = ofpbuf_put_uninit(buf, sizeof *ovs_header);
+ ovs_header->dp_ifindex = flow->dp_ifindex;
if (flow->key_len) {
- nl_msg_put_unspec(buf, ODP_FLOW_ATTR_KEY, flow->key, flow->key_len);
+ nl_msg_put_unspec(buf, OVS_FLOW_ATTR_KEY, flow->key, flow->key_len);
}
- if (flow->actions_len) {
- nl_msg_put_unspec(buf, ODP_FLOW_ATTR_ACTIONS,
+ if (flow->actions || flow->actions_len) {
+ nl_msg_put_unspec(buf, OVS_FLOW_ATTR_ACTIONS,
flow->actions, flow->actions_len);
}
assert(!flow->used);
if (flow->clear) {
- nl_msg_put_flag(buf, ODP_FLOW_ATTR_CLEAR);
+ nl_msg_put_flag(buf, OVS_FLOW_ATTR_CLEAR);
}
}
/* Clears 'flow' to "empty" values. */
-void
+static void
dpif_linux_flow_init(struct dpif_linux_flow *flow)
{
memset(flow, 0, sizeof *flow);
* result of the command is expected to be a flow also, which is decoded and
* stored in '*reply' and '*bufp'. The caller must free '*bufp' when the reply
* is no longer needed ('reply' will contain pointers into '*bufp'). */
-int
+static int
dpif_linux_flow_transact(const struct dpif_linux_flow *request,
struct dpif_linux_flow *reply, struct ofpbuf **bufp)
{
git://git.onelab.eu / sliver-openvswitch.git / blobdiff