#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"
uint8_t cmd;
/* struct odp_header. */
- uint32_t dp_idx;
+ int dp_ifindex;
/* Attributes. */
const char *name; /* ODP_DP_ATTR_NAME. */
/* struct odp_header. */
unsigned int nlmsg_flags;
- uint32_t dp_idx;
+ int dp_ifindex;
/* Attributes.
*
* 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. */
/* Datapath interface for the openvswitch Linux kernel module. */
struct dpif_linux {
struct dpif dpif;
+ int dp_ifindex;
/* Multicast group messages. */
struct nl_sock *mc_sock;
uint32_t mcgroups[DPIF_N_UC_TYPES];
unsigned int listen_mask;
- /* Used by dpif_linux_get_all_names(). */
- char *local_ifname;
- int dp_idx;
-
/* Change notification. */
- int local_ifindex; /* Ifindex of local port. */
- struct shash changed_ports; /* Ports that have changed. */
+ struct sset changed_ports; /* Ports that have changed. */
struct rtnetlink_notifier port_notifier;
bool change_error;
};
static struct nl_sock *genl_sock;
static int dpif_linux_init(void);
-static int open_dpif(const struct dpif_linux_dp *,
- const struct dpif_linux_vport *local_vport,
- struct dpif **);
+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 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_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name,
bool create, struct dpif **dpifp)
{
- struct dpif_linux_vport vport_request, vport;
struct dpif_linux_dp dp_request, dp;
struct ofpbuf *buf;
- int dp_idx;
int error;
error = dpif_linux_init();
return error;
}
- dp_idx = (!strncmp(name, "dp", 2)
- && isdigit((unsigned char)name[2]) ? atoi(name + 2) : -1);
-
/* 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.dp_idx = dp_idx;
- dp_request.name = dp_idx < 0 ? name : NULL;
+ dp_request.name = name;
error = dpif_linux_dp_transact(&dp_request, &dp, &buf);
if (error) {
return error;
}
- ofpbuf_delete(buf); /* Pointers inside 'dp' are now invalid! */
-
- /* Look up local port. */
- dpif_linux_vport_init(&vport_request);
- vport_request.cmd = ODP_VPORT_CMD_GET;
- vport_request.dp_idx = dp.dp_idx;
- vport_request.port_no = ODPP_LOCAL;
- vport_request.name = dp_idx < 0 ? name : NULL;
- error = dpif_linux_vport_transact(&vport_request, &vport, &buf);
- if (error) {
- return error;
- } else if (vport.port_no != ODPP_LOCAL) {
- /* This is an Open vSwitch device but not the local port. We
- * intentionally support only using the name of the local port as the
- * name of a datapath; otherwise, it would be too difficult to
- * enumerate all the names of a datapath. */
- error = EOPNOTSUPP;
- } else {
- error = open_dpif(&dp, &vport, dpifp);
- }
+ error = open_dpif(&dp, dpifp);
ofpbuf_delete(buf);
+
return error;
}
static int
-open_dpif(const struct dpif_linux_dp *dp,
- const struct dpif_linux_vport *local_vport, struct dpif **dpifp)
+open_dpif(const struct dpif_linux_dp *dp, struct dpif **dpifp)
{
- int dp_idx = local_vport->dp_idx;
struct dpif_linux *dpif;
- char *name;
int error;
int i;
goto error_free;
}
- name = xasprintf("dp%d", dp_idx);
- dpif_init(&dpif->dpif, &dpif_linux_class, name, dp_idx, dp_idx);
- free(name);
+ dpif_init(&dpif->dpif, &dpif_linux_class, dp->name,
+ dp->dp_ifindex, dp->dp_ifindex);
dpif->mc_sock = NULL;
for (i = 0; i < DPIF_N_UC_TYPES; i++) {
dpif->mcgroups[i] = dp->mcgroups[i];
}
dpif->listen_mask = 0;
- dpif->local_ifname = xstrdup(local_vport->name);
- dpif->local_ifindex = local_vport->ifindex;
- dpif->dp_idx = dp_idx;
- shash_init(&dpif->changed_ports);
+ dpif->dp_ifindex = dp->dp_ifindex;
+ sset_init(&dpif->changed_ports);
dpif->change_error = false;
*dpifp = &dpif->dpif;
{
struct dpif_linux *dpif = dpif_linux_cast(dpif_);
rtnetlink_link_notifier_unregister(&dpif->port_notifier);
- shash_destroy(&dpif->changed_ports);
- free(dpif->local_ifname);
+ sset_destroy(&dpif->changed_ports);
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->dp_idx));
- svec_add(all_names, dpif->local_ifname);
- return 0;
-}
-
static int
dpif_linux_destroy(struct dpif *dpif_)
{
dpif_linux_dp_init(&dp);
dp.cmd = ODP_DP_CMD_DEL;
- dp.dp_idx = dpif->dp_idx;
+ dp.dp_ifindex = dpif->dp_ifindex;
return dpif_linux_dp_transact(&dp, NULL, NULL);
}
dpif_linux_dp_init(&dp);
dp.cmd = ODP_DP_CMD_SET;
- dp.dp_idx = dpif->dp_idx;
+ dp.dp_ifindex = dpif->dp_ifindex;
dp.ipv4_frags = drop_frags ? ODP_DP_FRAG_DROP : ODP_DP_FRAG_ZERO;
return dpif_linux_dp_transact(&dp, NULL, NULL);
}
dpif_linux_vport_init(&request);
request.cmd = ODP_VPORT_CMD_NEW;
- request.dp_idx = dpif->dp_idx;
+ request.dp_ifindex = dpif->dp_ifindex;
request.type = netdev_vport_get_vport_type(netdev);
if (request.type == ODP_VPORT_TYPE_UNSPEC) {
VLOG_WARN_RL(&error_rl, "%s: cannot create port `%s' because it has "
dpif_linux_vport_init(&vport);
vport.cmd = ODP_VPORT_CMD_DEL;
- vport.dp_idx = dpif->dp_idx;
+ vport.dp_ifindex = dpif->dp_ifindex;
vport.port_no = port_no;
return dpif_linux_vport_transact(&vport, NULL, NULL);
}
dpif_linux_vport_init(&request);
request.cmd = ODP_VPORT_CMD_GET;
- request.dp_idx = dpif_linux_cast(dpif)->dp_idx;
+ request.dp_ifindex = dpif_linux_cast(dpif)->dp_ifindex;
request.port_no = port_no;
request.name = port_name;
dpif_linux_flow_init(&flow);
flow.cmd = ODP_FLOW_CMD_DEL;
- flow.dp_idx = dpif->dp_idx;
+ flow.dp_ifindex = dpif->dp_ifindex;
return dpif_linux_flow_transact(&flow, NULL, NULL);
}
dpif_linux_vport_init(&request);
request.cmd = ODP_DP_CMD_GET;
- request.dp_idx = dpif->dp_idx;
+ request.dp_ifindex = dpif->dp_ifindex;
buf = ofpbuf_new(1024);
dpif_linux_vport_to_ofpbuf(&request, buf);
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_idx = dpif->dp_idx;
+ 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.dp_idx = dpif->dp_idx;
+ 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;
dpif_linux_flow_init(&request);
request.cmd = ODP_FLOW_CMD_DEL;
- request.dp_idx = dpif->dp_idx;
+ request.dp_ifindex = dpif->dp_ifindex;
request.key = key;
request.key_len = key_len;
error = dpif_linux_flow_transact(&request,
struct nl_dump dump;
struct dpif_linux_flow flow;
struct dpif_flow_stats stats;
+ struct ofpbuf *buf;
};
static int
dpif_linux_flow_init(&request);
request.cmd = ODP_DP_CMD_GET;
- request.dp_idx = dpif->dp_idx;
+ request.dp_ifindex = dpif->dp_ifindex;
buf = ofpbuf_new(1024);
dpif_linux_flow_to_ofpbuf(&request, buf);
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;
}
ODP_PACKET_CMD_EXECUTE, 1);
execute = ofpbuf_put_uninit(buf, sizeof *execute);
- execute->dp_idx = dpif->dp_idx;
+ execute->dp_ifindex = dpif->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);
dpif_linux_dp_init(&dp);
dp.cmd = ODP_DP_CMD_SET;
- dp.dp_idx = dpif->dp_idx;
+ dp.dp_ifindex = dpif->dp_ifindex;
dp.sampling = &probability;
return dpif_linux_dp_transact(&dp, NULL, NULL);
}
static int
parse_odp_packet(struct ofpbuf *buf, struct dpif_upcall *upcall,
- uint32_t *dp_idx)
+ int *dp_ifindex)
{
static const struct nl_policy odp_packet_policy[] = {
/* Always present. */
upcall->actions_len = nl_attr_get_size(a[ODP_PACKET_ATTR_ACTIONS]);
}
- *dp_idx = odp_header->dp_idx;
+ *dp_ifindex = odp_header->dp_ifindex;
return 0;
}
}
for (i = 0; i < 50; i++) {
- uint32_t dp_idx;
+ int dp_ifindex;
error = nl_sock_recv(dpif->mc_sock, &buf, false);
if (error) {
return error;
}
- error = parse_odp_packet(buf, upcall, &dp_idx);
+ error = parse_odp_packet(buf, upcall, &dp_ifindex);
if (!error
- && dp_idx == dpif->dp_idx
+ && dp_ifindex == dpif->dp_ifindex
&& dpif->listen_mask & (1u << upcall->type)) {
return 0;
}
dpif_linux_enumerate,
dpif_linux_open,
dpif_linux_close,
- dpif_linux_get_all_names,
dpif_linux_destroy,
dpif_linux_get_stats,
dpif_linux_get_drop_frags,
return reply.type == ODP_VPORT_TYPE_INTERNAL;
}
+int
+dpif_linux_vport_send(int dp_ifindex, uint32_t port_no,
+ const void *data, size_t size)
+{
+ struct odp_header *execute;
+ struct ofpbuf *buf;
+ size_t actions_ofs;
+ int error;
+
+ buf = ofpbuf_new(128 + size);
+
+ nl_msg_put_genlmsghdr(buf, 0, odp_packet_family, NLM_F_REQUEST,
+ ODP_PACKET_CMD_EXECUTE, 1);
+
+ execute = ofpbuf_put_uninit(buf, sizeof *execute);
+ execute->dp_ifindex = dp_ifindex;
+
+ nl_msg_put_unspec(buf, ODP_PACKET_ATTR_PACKET, data, size);
+
+ actions_ofs = nl_msg_start_nested(buf, ODP_PACKET_ATTR_ACTIONS);
+ nl_msg_put_u32(buf, ODP_ACTION_ATTR_OUTPUT, port_no);
+ nl_msg_end_nested(buf, actions_ofs);
+
+ error = nl_sock_transact(genl_sock, buf, NULL);
+ ofpbuf_delete(buf);
+ return error;
+}
+
static void
dpif_linux_port_changed(const struct rtnetlink_link_change *change,
void *dpif_)
struct dpif_linux *dpif = dpif_;
if (change) {
- if (change->master_ifindex == dpif->local_ifindex
+ 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);
+ sset_add(&dpif->changed_ports, change->ifname);
}
} else {
dpif->change_error = true;
}
vport->cmd = genl->cmd;
- vport->dp_idx = odp_header->dp_idx;
+ 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_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->cmd, 1);
odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
- odp_header->dp_idx = vport->dp_idx;
+ odp_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);
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);
}
dpif_linux_vport_init(struct dpif_linux_vport *vport)
{
memset(vport, 0, sizeof *vport);
- vport->dp_idx = UINT32_MAX;
vport->port_no = UINT32_MAX;
}
}
dp->cmd = genl->cmd;
- dp->dp_idx = odp_header->dp_idx;
+ dp->dp_ifindex = odp_header->dp_ifindex;
dp->name = nl_attr_get_string(a[ODP_DP_ATTR_NAME]);
if (a[ODP_DP_ATTR_STATS]) {
/* Can't use structure assignment because Netlink doesn't ensure
NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, 1);
odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
- odp_header->dp_idx = dp->dp_idx;
+ odp_header->dp_ifindex = dp->dp_ifindex;
if (dp->name) {
nl_msg_put_string(buf, ODP_DP_ATTR_NAME, dp->name);
dpif_linux_dp_init(struct dpif_linux_dp *dp)
{
memset(dp, 0, sizeof *dp);
- dp->dp_idx = -1;
}
static void
dpif_linux_dp_init(&request);
request.cmd = ODP_DP_CMD_GET;
- request.dp_idx = dpif->dp_idx;
+ request.dp_ifindex = dpif->dp_ifindex;
return dpif_linux_dp_transact(&request, reply, bufp);
}
}
flow->nlmsg_flags = nlmsg->nlmsg_flags;
- flow->dp_idx = odp_header->dp_idx;
+ 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]) {
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;
}
struct odp_header *odp_header;
nl_msg_put_genlmsghdr(buf, 0, odp_flow_family,
- NLM_F_REQUEST | flow->nlmsg_flags, flow->cmd, 1);
+ NLM_F_REQUEST | NLM_F_ECHO | flow->nlmsg_flags,
+ flow->cmd, 1);
odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
- odp_header->dp_idx = flow->dp_idx;
+ odp_header->dp_ifindex = flow->dp_ifindex;
if (flow->key_len) {
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