Get rid of OFP_MAXLEN.

[openvswitch] / lib / dpif.c

diff --git a/lib/dpif.c b/lib/dpif.c
index e591985637d8be2e0b05833184a70648326728a4..4a60334a60c2680cadc095403f457450ac19145a 100644 (file)
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include "dpif.h"
 
 #include <ctype.h>
@@ -53,6 +54,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;
 
@@ -107,7 +111,7 @@ 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
@@ -128,27 +132,31 @@ dpif_recv_openflow(struct dpif *dp, struct buffer **bufferp,
     struct nlattr *attrs[ARRAY_SIZE(openflow_policy)];
     struct buffer *buffer;
     struct ofp_header *oh;
-    size_t ofp_len;
+    uint16_t ofp_len;
     int retval;
 
-    *bufferp = NULL;
+    buffer = *bufferp = NULL;
     do {
+        buffer_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 +165,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,8 +175,9 @@ 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;
@@ -229,7 +239,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 +275,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;
-}
 \f
 static const struct nl_policy openflow_multicast_policy[] = {
     [DP_GENL_A_DP_IDX] = { .type = NL_A_U32 },