X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.c;h=6407490def8ebf7f33f7f5876f5cb7030da0908b;hb=refs%2Fheads%2Ffor-nox%2F0.4;hp=34268993c1d4d3a1bae7305618d07c32ceaafe3d;hpb=db74f018735cef6f5e975e6278f78997d1de23b3;p=sliver-openvswitch.git diff --git a/lib/dpif.c b/lib/dpif.c index 34268993c..6407490de 100644 --- a/lib/dpif.c +++ b/lib/dpif.c @@ -31,6 +31,7 @@ * derivatives without specific, written prior permission. */ +#include #include "dpif.h" #include @@ -40,12 +41,11 @@ #include #include -#include "buffer.h" #include "netlink.h" #include "netlink-protocol.h" -#include "ofp-print.h" -#include "openflow-netlink.h" -#include "openflow.h" +#include "ofpbuf.h" +#include "openflow/openflow-netlink.h" +#include "openflow/openflow.h" #include "packets.h" #include "util.h" #include "xtoxll.h" @@ -53,6 +53,9 @@ #include "vlog.h" #define THIS_MODULE VLM_dpif +/* Not really much point in logging many dpif errors. */ +static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 60); + /* The Generic Netlink family number used for OpenFlow. */ static int openflow_family; @@ -100,19 +103,21 @@ dpif_open(int dp_idx, bool subscribe, struct dpif *dp) void dpif_close(struct dpif *dp) { - nl_sock_destroy(dp->sock); + if (dp) { + nl_sock_destroy(dp->sock); + } } static const struct nl_policy openflow_policy[] = { [DP_GENL_A_DP_IDX] = { .type = NL_A_U32 }, [DP_GENL_A_OPENFLOW] = { .type = NL_A_UNSPEC, .min_len = sizeof(struct ofp_header), - .max_len = OFP_MAXLEN }, + .max_len = 65535 }, }; /* Tries to receive an openflow message from the kernel on 'sock'. If * successful, stores the received message into '*msgp' and returns 0. The - * caller is responsible for destroying the message with buffer_delete(). On + * caller is responsible for destroying the message with ofpbuf_delete(). On * failure, returns a positive errno value and stores a null pointer into * '*msgp'. * @@ -122,33 +127,37 @@ static const struct nl_policy openflow_policy[] = { * If 'wait' is true, dpif_recv_openflow waits for a message to be ready; * otherwise, returns EAGAIN if the 'sock' receive buffer is empty. */ int -dpif_recv_openflow(struct dpif *dp, struct buffer **bufferp, +dpif_recv_openflow(struct dpif *dp, struct ofpbuf **bufferp, bool wait) { struct nlattr *attrs[ARRAY_SIZE(openflow_policy)]; - struct buffer *buffer; + struct ofpbuf *buffer; struct ofp_header *oh; - size_t ofp_len; + uint16_t ofp_len; int retval; - *bufferp = NULL; + buffer = *bufferp = NULL; do { + ofpbuf_delete(buffer); retval = nl_sock_recv(dp->sock, &buffer, wait); - } while (retval == ENOBUFS || (!retval && nl_msg_nlmsgerr(buffer, NULL))); + } while (retval == ENOBUFS + || (!retval + && (nl_msg_nlmsgerr(buffer, NULL) + || nl_msg_nlmsghdr(buffer)->nlmsg_type == NLMSG_DONE))); if (retval) { if (retval != EAGAIN) { - VLOG_WARN("dpif_recv_openflow: %s", strerror(retval)); + VLOG_WARN_RL(&rl, "dpif_recv_openflow: %s", strerror(retval)); } return retval; } if (nl_msg_genlmsghdr(buffer) == NULL) { - VLOG_DBG("received packet too short for Generic Netlink"); + VLOG_DBG_RL(&rl, "received packet too short for Generic Netlink"); goto error; } if (nl_msg_nlmsghdr(buffer)->nlmsg_type != openflow_family) { - VLOG_DBG("received type (%"PRIu16") != openflow family (%d)", - nl_msg_nlmsghdr(buffer)->nlmsg_type, openflow_family); + VLOG_DBG_RL(&rl, "received type (%"PRIu16") != openflow family (%d)", + nl_msg_nlmsghdr(buffer)->nlmsg_type, openflow_family); goto error; } @@ -157,8 +166,9 @@ dpif_recv_openflow(struct dpif *dp, struct buffer **bufferp, goto error; } if (nl_attr_get_u32(attrs[DP_GENL_A_DP_IDX]) != dp->dp_idx) { - VLOG_WARN("received dp_idx (%"PRIu32") differs from expected (%d)", - nl_attr_get_u32(attrs[DP_GENL_A_DP_IDX]), dp->dp_idx); + VLOG_WARN_RL(&rl, "received dp_idx (%"PRIu32") differs from expected " + "(%d)", nl_attr_get_u32(attrs[DP_GENL_A_DP_IDX]), + dp->dp_idx); goto error; } @@ -166,15 +176,16 @@ dpif_recv_openflow(struct dpif *dp, struct buffer **bufferp, buffer->size = nl_attr_get_size(attrs[DP_GENL_A_OPENFLOW]); ofp_len = ntohs(oh->length); if (ofp_len != buffer->size) { - VLOG_WARN("ofp_header.length %"PRIu16" != attribute length %zu\n", - ofp_len, buffer->size); + VLOG_WARN_RL(&rl, + "ofp_header.length %"PRIu16" != attribute length %zu\n", + ofp_len, buffer->size); buffer->size = MIN(ofp_len, buffer->size); } *bufferp = buffer; return 0; error: - buffer_delete(buffer); + ofpbuf_delete(buffer); return EPROTO; } @@ -190,11 +201,11 @@ error: * for details). */ int -dpif_send_openflow(struct dpif *dp, struct buffer *buffer, bool wait) +dpif_send_openflow(struct dpif *dp, struct ofpbuf *buffer, bool wait) { struct ofp_header *oh; unsigned int dump_flag; - struct buffer hdr; + struct ofpbuf hdr; struct nlattr *nla; uint32_t fixed_buffer[64 / 4]; struct iovec iov[3]; @@ -202,16 +213,16 @@ dpif_send_openflow(struct dpif *dp, struct buffer *buffer, bool wait) int n_iov; int retval; - /* The reply to OFPT_FLOW_STATS_REQUEST may be multiple segments long, so - * we need to specify NLM_F_DUMP in the request. */ - oh = buffer_at_assert(buffer, 0, sizeof *oh); - dump_flag = oh->type == OFPT_FLOW_STATS_REQUEST ? NLM_F_DUMP : 0; + /* The reply to OFPT_STATS_REQUEST may be multiple segments long, so we + * need to specify NLM_F_DUMP in the request. */ + oh = ofpbuf_at_assert(buffer, 0, sizeof *oh); + dump_flag = oh->type == OFPT_STATS_REQUEST ? NLM_F_DUMP : 0; - buffer_use(&hdr, fixed_buffer, sizeof fixed_buffer); + ofpbuf_use(&hdr, fixed_buffer, sizeof fixed_buffer); nl_msg_put_genlmsghdr(&hdr, dp->sock, 32, openflow_family, NLM_F_REQUEST | dump_flag, DP_GENL_C_OPENFLOW, 1); nl_msg_put_u32(&hdr, DP_GENL_A_DP_IDX, dp->dp_idx); - nla = buffer_put_uninit(&hdr, sizeof *nla); + nla = ofpbuf_put_uninit(&hdr, sizeof *nla); nla->nla_len = sizeof *nla + buffer->size; nla->nla_type = DP_GENL_A_OPENFLOW; pad_bytes = NLA_ALIGN(nla->nla_len) - nla->nla_len; @@ -229,7 +240,7 @@ dpif_send_openflow(struct dpif *dp, struct buffer *buffer, bool wait) } retval = nl_sock_sendv(dp->sock, iov, n_iov, false); if (retval && retval != EAGAIN) { - VLOG_WARN("dpif_send_openflow: %s", strerror(retval)); + VLOG_WARN_RL(&rl, "dpif_send_openflow: %s", strerror(retval)); } return retval; } @@ -265,25 +276,6 @@ dpif_del_port(struct dpif *dp, const char *netdev) { return send_mgmt_command(dp, DP_GENL_C_DEL_PORT, netdev); } - -/* Tells dp to send num_packets up through netlink for benchmarking*/ -int -dpif_benchmark_nl(struct dpif *dp, uint32_t num_packets, uint32_t packet_size) -{ - struct buffer request; - int retval; - - buffer_init(&request, 0); - nl_msg_put_genlmsghdr(&request, dp->sock, 0, openflow_family, - NLM_F_REQUEST, DP_GENL_C_BENCHMARK_NL, 1); - nl_msg_put_u32(&request, DP_GENL_A_DP_IDX, dp->dp_idx); - nl_msg_put_u32(&request, DP_GENL_A_NPACKETS, num_packets); - nl_msg_put_u32(&request, DP_GENL_A_PSIZE, packet_size); - retval = nl_sock_send(dp->sock, &request, true); - buffer_uninit(&request); - - return retval; -} static const struct nl_policy openflow_multicast_policy[] = { [DP_GENL_A_DP_IDX] = { .type = NL_A_U32 }, @@ -297,7 +289,7 @@ static int lookup_openflow_multicast_group(int dp_idx, int *multicast_group) { struct nl_sock *sock; - struct buffer request, *reply; + struct ofpbuf request, *reply; struct nlattr *attrs[ARRAY_SIZE(openflow_multicast_policy)]; int retval; @@ -305,12 +297,12 @@ lookup_openflow_multicast_group(int dp_idx, int *multicast_group) if (retval) { return retval; } - buffer_init(&request, 0); + ofpbuf_init(&request, 0); nl_msg_put_genlmsghdr(&request, sock, 0, openflow_family, NLM_F_REQUEST, DP_GENL_C_QUERY_DP, 1); nl_msg_put_u32(&request, DP_GENL_A_DP_IDX, dp_idx); retval = nl_sock_transact(sock, &request, &reply); - buffer_uninit(&request); + ofpbuf_uninit(&request); if (retval) { nl_sock_destroy(sock); return retval; @@ -318,12 +310,12 @@ lookup_openflow_multicast_group(int dp_idx, int *multicast_group) if (!nl_policy_parse(reply, openflow_multicast_policy, attrs, ARRAY_SIZE(openflow_multicast_policy))) { nl_sock_destroy(sock); - buffer_delete(reply); + ofpbuf_delete(reply); return EPROTO; } *multicast_group = nl_attr_get_u32(attrs[DP_GENL_A_MC_GROUP]); nl_sock_destroy(sock); - buffer_delete(reply); + ofpbuf_delete(reply); return 0; } @@ -334,10 +326,10 @@ lookup_openflow_multicast_group(int dp_idx, int *multicast_group) static int send_mgmt_command(struct dpif *dp, int command, const char *netdev) { - struct buffer request, *reply; + struct ofpbuf request, *reply; int retval; - buffer_init(&request, 0); + ofpbuf_init(&request, 0); nl_msg_put_genlmsghdr(&request, dp->sock, 32, openflow_family, NLM_F_REQUEST | NLM_F_ACK, command, 1); nl_msg_put_u32(&request, DP_GENL_A_DP_IDX, dp->dp_idx); @@ -345,8 +337,8 @@ send_mgmt_command(struct dpif *dp, int command, const char *netdev) nl_msg_put_string(&request, DP_GENL_A_PORTNAME, netdev); } retval = nl_sock_transact(dp->sock, &request, &reply); - buffer_uninit(&request); - buffer_delete(reply); + ofpbuf_uninit(&request); + ofpbuf_delete(reply); return retval; }