VLOG_DEFINE_THIS_MODULE(dpif_linux);
struct dpif_linux_dp {
- /* ioctl command argument. */
- int cmd;
+ /* Generic Netlink header. */
+ uint8_t cmd;
- /* struct odp_datapath header. */
+ /* struct odp_header. */
uint32_t dp_idx;
/* Attributes. */
};
static void dpif_linux_dp_init(struct dpif_linux_dp *);
+static int dpif_linux_dp_from_ofpbuf(struct dpif_linux_dp *,
+ const struct ofpbuf *);
+static void dpif_linux_dp_dump_start(struct nl_dump *);
static int dpif_linux_dp_transact(const struct dpif_linux_dp *request,
struct dpif_linux_dp *reply,
struct ofpbuf **bufp);
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_packet_family;
/* Generic Netlink socket. */
static void dpif_linux_port_changed(const struct rtnetlink_link_change *,
void *dpif);
+static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *,
+ struct ofpbuf *);
+static int dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *,
+ const struct ofpbuf *);
+
static struct dpif_linux *
dpif_linux_cast(const struct dpif *dpif)
{
static int
dpif_linux_enumerate(struct svec *all_dps)
{
- uint32_t dp_idx;
+ struct nl_dump dump;
+ struct ofpbuf msg;
int major;
- int err;
+ int error;
- err = dpif_linux_init();
- if (err) {
- return err;
+ error = dpif_linux_init();
+ if (error) {
+ return error;
}
/* Check that the Open vSwitch module is loaded. */
return -major;
}
- dp_idx = 0;
- for (;;) {
- struct dpif_linux_dp request, reply;
- struct ofpbuf *buf;
- char devname[16];
- int error;
-
- dpif_linux_dp_init(&request);
- request.dp_idx = dp_idx;
- request.cmd = ODP_DP_DUMP;
+ dpif_linux_dp_dump_start(&dump);
+ while (nl_dump_next(&dump, &msg)) {
+ struct dpif_linux_dp dp;
- error = dpif_linux_dp_transact(&request, &reply, &buf);
- if (error) {
- return error == ENODEV ? 0 : error;
+ if (!dpif_linux_dp_from_ofpbuf(&dp, &msg)) {
+ svec_add(all_dps, dp.name);
}
- ofpbuf_delete(buf);
-
- sprintf(devname, "dp%d", reply.dp_idx);
- svec_add(all_dps, devname);
-
- dp_idx = reply.dp_idx + 1;
}
+ return nl_dump_done(&dump);
}
static int
/* Create or look up datapath. */
dpif_linux_dp_init(&dp_request);
- dp_request.cmd = create ? ODP_DP_NEW : ODP_DP_GET;
+ dp_request.cmd = create ? ODP_DP_CMD_NEW : ODP_DP_CMD_GET;
dp_request.dp_idx = minor;
dp_request.name = minor < 0 ? name : NULL;
error = dpif_linux_dp_transact(&dp_request, &dp, &buf);
/* Look up local port. */
dpif_linux_vport_init(&vport_request);
- vport_request.cmd = ODP_VPORT_GET;
+ vport_request.cmd = ODP_VPORT_CMD_GET;
vport_request.dp_idx = dp.dp_idx;
vport_request.port_no = ODPP_LOCAL;
vport_request.name = minor < 0 ? name : NULL;
struct dpif_linux_dp dp;
dpif_linux_dp_init(&dp);
- dp.cmd = ODP_DP_DEL;
+ dp.cmd = ODP_DP_CMD_DEL;
dp.dp_idx = dpif->minor;
return dpif_linux_dp_transact(&dp, NULL, NULL);
}
struct dpif_linux_dp dp;
dpif_linux_dp_init(&dp);
- dp.cmd = ODP_DP_SET;
+ dp.cmd = ODP_DP_CMD_SET;
dp.dp_idx = dpif->minor;
dp.ipv4_frags = drop_frags ? ODP_DP_FRAG_DROP : ODP_DP_FRAG_ZERO;
return dpif_linux_dp_transact(&dp, NULL, NULL);
int error;
dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_NEW;
+ request.cmd = ODP_VPORT_CMD_NEW;
request.dp_idx = dpif->minor;
request.type = netdev_vport_get_vport_type(netdev);
if (request.type == ODP_VPORT_TYPE_UNSPEC) {
struct dpif_linux_vport vport;
dpif_linux_vport_init(&vport);
- vport.cmd = ODP_VPORT_DEL;
+ vport.cmd = ODP_VPORT_CMD_DEL;
vport.dp_idx = dpif->minor;
vport.port_no = port_no;
return dpif_linux_vport_transact(&vport, NULL, NULL);
int error;
dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_GET;
+ request.cmd = ODP_VPORT_CMD_GET;
request.dp_idx = dpif_linux_cast(dpif)->minor;
request.port_no = port_no;
request.name = port_name;
}
struct dpif_linux_port_state {
- struct ofpbuf *buf;
- uint32_t next;
+ struct nl_dump dump;
};
static int
-dpif_linux_port_dump_start(const struct dpif *dpif OVS_UNUSED, void **statep)
+dpif_linux_port_dump_start(const struct dpif *dpif_, void **statep)
{
- *statep = xzalloc(sizeof(struct dpif_linux_port_state));
+ struct dpif_linux *dpif = dpif_linux_cast(dpif_);
+ struct dpif_linux_port_state *state;
+ struct dpif_linux_vport request;
+ struct ofpbuf *buf;
+
+ *statep = state = xmalloc(sizeof *state);
+
+ dpif_linux_vport_init(&request);
+ request.cmd = ODP_DP_CMD_GET;
+ request.dp_idx = dpif->minor;
+
+ buf = ofpbuf_new(1024);
+ dpif_linux_vport_to_ofpbuf(&request, buf);
+ nl_dump_start(&state->dump, genl_sock, buf);
+ ofpbuf_delete(buf);
+
return 0;
}
static int
-dpif_linux_port_dump_next(const struct dpif *dpif, void *state_,
+dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_,
struct dpif_port *dpif_port)
{
struct dpif_linux_port_state *state = state_;
- struct dpif_linux_vport request, reply;
- struct ofpbuf *buf;
+ struct dpif_linux_vport vport;
+ struct ofpbuf buf;
int error;
- ofpbuf_delete(state->buf);
- state->buf = NULL;
+ if (!nl_dump_next(&state->dump, &buf)) {
+ return EOF;
+ }
- dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_DUMP;
- request.dp_idx = dpif_linux_cast(dpif)->minor;
- request.port_no = state->next;
- error = dpif_linux_vport_transact(&request, &reply, &buf);
+ error = dpif_linux_vport_from_ofpbuf(&vport, &buf);
if (error) {
- return error == ENODEV ? EOF : error;
- } else {
- dpif_port->name = (char *) reply.name;
- dpif_port->type = (char *) netdev_vport_get_netdev_type(&reply);
- dpif_port->port_no = reply.port_no;
- state->buf = buf;
- state->next = reply.port_no + 1;
- return 0;
+ return error;
}
+
+ dpif_port->name = (char *) vport.name;
+ dpif_port->type = (char *) netdev_vport_get_netdev_type(&vport);
+ dpif_port->port_no = vport.port_no;
+ return 0;
}
static int
dpif_linux_port_dump_done(const struct dpif *dpif OVS_UNUSED, void *state_)
{
struct dpif_linux_port_state *state = state_;
- ofpbuf_delete(state->buf);
+ int error = nl_dump_done(&state->dump);
free(state);
- return 0;
+ return error;
}
static int
struct dpif_linux_dp dp;
dpif_linux_dp_init(&dp);
- dp.cmd = ODP_DP_SET;
+ dp.cmd = ODP_DP_CMD_SET;
dp.dp_idx = dpif->minor;
dp.sampling = &probability;
return dpif_linux_dp_transact(&dp, NULL, NULL);
struct nlmsghdr *nlmsg;
struct genlmsghdr *genl;
struct ofpbuf b;
+ int type;
ofpbuf_use_const(&b, buf->data, buf->size);
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))) {
return EINVAL;
}
- memset(upcall, 0, sizeof *upcall);
-
- upcall->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
- : -1);
+ 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
+ : -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]);
static int error = -1;
if (error < 0) {
- error = nl_lookup_genl_family(ODP_PACKET_FAMILY, &odp_packet_family);
+ error = nl_lookup_genl_family(ODP_DATAPATH_FAMILY,
+ &odp_datapath_family);
+ if (!error) {
+ error = nl_lookup_genl_family(ODP_VPORT_FAMILY, &odp_vport_family);
+ }
+ if (!error) {
+ error = nl_lookup_genl_family(ODP_PACKET_FAMILY,
+ &odp_packet_family);
+ }
if (!error) {
error = nl_sock_create(NETLINK_GENERIC, &genl_sock);
}
return 0;
}
\f
-/* Parses the contents of 'buf', which contains a "struct odp_vport" followed
+/* Parses the contents of 'buf', which contains a "struct odp_header" followed
* by Netlink attributes, into 'vport'. Returns 0 if successful, otherwise a
* positive errno value.
*
[ODP_VPORT_ATTR_IFLINK] = { .type = NL_A_U32, .optional = true },
};
- struct odp_vport *odp_vport;
struct nlattr *a[ARRAY_SIZE(odp_vport_policy)];
+ struct odp_header *odp_header;
+ struct nlmsghdr *nlmsg;
+ struct genlmsghdr *genl;
+ struct ofpbuf b;
dpif_linux_vport_init(vport);
- if (!nl_policy_parse(buf, sizeof *odp_vport, odp_vport_policy,
- a, ARRAY_SIZE(odp_vport_policy))) {
+ 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))) {
return EINVAL;
}
- odp_vport = buf->data;
- vport->dp_idx = odp_vport->dp_idx;
+ vport->cmd = genl->cmd;
+ vport->dp_idx = odp_header->dp_idx;
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]);
return 0;
}
-/* Appends to 'buf' (which must initially be empty) a "struct odp_vport"
+/* Appends to 'buf' (which must initially be empty) a "struct odp_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_vport *odp_vport;
+ struct odp_header *odp_header;
- ofpbuf_reserve(buf, sizeof odp_vport);
+ nl_msg_put_genlmsghdr(buf, 0, odp_vport_family, NLM_F_REQUEST | NLM_F_ECHO,
+ vport->cmd, 1);
+
+ odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
+ odp_header->dp_idx = vport->dp_idx;
if (vport->port_no != UINT32_MAX) {
nl_msg_put_u32(buf, ODP_VPORT_ATTR_PORT_NO, vport->port_no);
if (vport->iflink) {
nl_msg_put_u32(buf, ODP_VPORT_ATTR_IFLINK, vport->iflink);
}
-
- odp_vport = ofpbuf_push_uninit(buf, sizeof *odp_vport);
- odp_vport->dp_idx = vport->dp_idx;
- odp_vport->len = buf->size;
- odp_vport->total_len = (char *) ofpbuf_end(buf) - (char *) buf->data;
}
/* Clears 'vport' to "empty" values. */
struct dpif_linux_vport *reply,
struct ofpbuf **bufp)
{
- struct ofpbuf *buf = NULL;
+ struct ofpbuf *request_buf;
int error;
- int fd;
assert((reply != NULL) == (bufp != NULL));
- error = get_dp0_fd(&fd);
- if (error) {
- goto error;
- }
-
- buf = ofpbuf_new(1024);
- dpif_linux_vport_to_ofpbuf(request, buf);
-
- error = ioctl(fd, request->cmd, buf->data) ? errno : 0;
- if (error) {
- goto error;
- }
+ request_buf = ofpbuf_new(1024);
+ dpif_linux_vport_to_ofpbuf(request, request_buf);
+ error = nl_sock_transact(genl_sock, request_buf, bufp);
+ ofpbuf_delete(request_buf);
- if (bufp) {
- buf->size = ((struct odp_vport *) buf->data)->len;
- error = dpif_linux_vport_from_ofpbuf(reply, buf);
+ if (reply) {
+ if (!error) {
+ error = dpif_linux_vport_from_ofpbuf(reply, *bufp);
+ }
if (error) {
- goto error;
+ dpif_linux_vport_init(reply);
+ ofpbuf_delete(*bufp);
+ *bufp = NULL;
}
- *bufp = buf;
- } else {
- ofpbuf_delete(buf);
- }
- return 0;
-
-error:
- ofpbuf_delete(buf);
- if (bufp) {
- memset(reply, 0, sizeof *reply);
- *bufp = NULL;
}
return error;
}
struct dpif_linux_vport request;
dpif_linux_vport_init(&request);
- request.cmd = ODP_VPORT_GET;
+ request.cmd = ODP_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_datapath"
- * followed by Netlink attributes, into 'dp'. Returns 0 if successful,
- * otherwise a positive errno value.
+/* Parses the contents of 'buf', which contains a "struct odp_header" followed
+ * by Netlink attributes, into 'dp'. Returns 0 if successful, otherwise a
+ * positive errno value.
*
* 'dp' will contain pointers into 'buf', so the caller should not free 'buf'
* while 'dp' is still in use. */
[ODP_DP_ATTR_MCGROUPS] = { .type = NL_A_NESTED, .optional = true },
};
- struct odp_datapath *odp_dp;
struct nlattr *a[ARRAY_SIZE(odp_datapath_policy)];
+ struct odp_header *odp_header;
+ struct nlmsghdr *nlmsg;
+ struct genlmsghdr *genl;
+ struct ofpbuf b;
dpif_linux_dp_init(dp);
- if (!nl_policy_parse(buf, sizeof *odp_dp, odp_datapath_policy,
- a, ARRAY_SIZE(odp_datapath_policy))) {
+ 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))) {
return EINVAL;
}
- odp_dp = buf->data;
- dp->dp_idx = odp_dp->dp_idx;
+ dp->cmd = genl->cmd;
+ dp->dp_idx = odp_header->dp_idx;
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
return 0;
}
-/* Appends to 'buf' (which must initially be empty) a "struct odp_datapath"
- * followed by Netlink attributes corresponding to 'dp'. */
+/* Appends to 'buf' the Generic Netlink message described by 'dp'. */
static void
dpif_linux_dp_to_ofpbuf(const struct dpif_linux_dp *dp, struct ofpbuf *buf)
{
- struct odp_datapath *odp_dp;
+ struct odp_header *odp_header;
+
+ nl_msg_put_genlmsghdr(buf, 0, odp_datapath_family,
+ NLM_F_REQUEST | NLM_F_ECHO, dp->cmd, 1);
- ofpbuf_reserve(buf, sizeof odp_dp);
+ odp_header = ofpbuf_put_uninit(buf, sizeof *odp_header);
+ odp_header->dp_idx = dp->dp_idx;
if (dp->name) {
nl_msg_put_string(buf, ODP_DP_ATTR_NAME, dp->name);
if (dp->sampling) {
nl_msg_put_u32(buf, ODP_DP_ATTR_SAMPLING, *dp->sampling);
}
-
- odp_dp = ofpbuf_push_uninit(buf, sizeof *odp_dp);
- odp_dp->dp_idx = dp->dp_idx;
- odp_dp->len = buf->size;
- odp_dp->total_len = (char *) ofpbuf_end(buf) - (char *) buf->data;
}
/* Clears 'dp' to "empty" values. */
dp->dp_idx = -1;
}
+static void
+dpif_linux_dp_dump_start(struct nl_dump *dump)
+{
+ struct dpif_linux_dp request;
+ struct ofpbuf *buf;
+
+ dpif_linux_dp_init(&request);
+ request.cmd = ODP_DP_CMD_GET;
+
+ buf = ofpbuf_new(1024);
+ dpif_linux_dp_to_ofpbuf(&request, buf);
+ nl_dump_start(dump, genl_sock, buf);
+ ofpbuf_delete(buf);
+}
+
/* 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_datapath 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'). */
+ * 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
dpif_linux_dp_transact(const struct dpif_linux_dp *request,
struct dpif_linux_dp *reply, struct ofpbuf **bufp)
{
- struct ofpbuf *buf = NULL;
+ struct ofpbuf *request_buf;
int error;
- int fd;
assert((reply != NULL) == (bufp != NULL));
- error = get_dp0_fd(&fd);
- if (error) {
- goto error;
- }
-
- buf = ofpbuf_new(1024);
- dpif_linux_dp_to_ofpbuf(request, buf);
-
- error = ioctl(fd, request->cmd, buf->data) ? errno : 0;
- if (error) {
- goto error;
- }
+ request_buf = ofpbuf_new(1024);
+ dpif_linux_dp_to_ofpbuf(request, request_buf);
+ error = nl_sock_transact(genl_sock, request_buf, bufp);
+ ofpbuf_delete(request_buf);
- if (bufp) {
- buf->size = ((struct odp_datapath *) buf->data)->len;
- error = dpif_linux_dp_from_ofpbuf(reply, buf);
+ if (reply) {
+ if (!error) {
+ error = dpif_linux_dp_from_ofpbuf(reply, *bufp);
+ }
if (error) {
- goto error;
+ dpif_linux_dp_init(reply);
+ ofpbuf_delete(*bufp);
+ *bufp = NULL;
}
- *bufp = buf;
- } else {
- ofpbuf_delete(buf);
- }
- return 0;
-
-error:
- ofpbuf_delete(buf);
- if (bufp) {
- memset(reply, 0, sizeof *reply);
- *bufp = NULL;
}
return error;
}
struct dpif_linux_dp request;
dpif_linux_dp_init(&request);
- request.cmd = ODP_DP_GET;
+ request.cmd = ODP_DP_CMD_GET;
request.dp_idx = dpif->minor;
return dpif_linux_dp_transact(&request, reply, bufp);
git://git.onelab.eu / sliver-openvswitch.git / blobdiff