dpif: Consistently help datapath to execute oversized actions.

Only dpif_execute() was checking for oversized actions but dpif_operate()
should do so also.  This fixes the problem.

Found by inspection.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/lib/dpif.c b/lib/dpif.c
index 199f1972637e6873ea498c225d15a8c36698ee0b..2e98de2d7688e2160c3a8256914efb4a2cf11b8d 100644 (file)
--- a/lib/dpif.c
+++ b/lib/dpif.c
@@ -1145,6 +1145,13 @@ dpif_execute_with_help(struct dpif *dpif, struct dpif_execute *execute)
     return aux.error;
 }
 
+/* Returns true if the datapath needs help executing 'execute'. */
+static bool
+dpif_execute_needs_help(const struct dpif_execute *execute)
+{
+    return execute->needs_help || nl_attr_oversized(execute->actions_len);
+}
+
 /* Causes 'dpif' to perform the 'execute->actions_len' bytes of actions in
  * 'execute->actions' on the Ethernet frame in 'execute->packet' and on packet
  * metadata in 'execute->md'.  The implementation is allowed to modify both the
@@ -1168,7 +1175,7 @@ dpif_execute(struct dpif *dpif, struct dpif_execute *execute)
 
     COVERAGE_INC(dpif_execute);
     if (execute->actions_len > 0) {
-        error = (execute->needs_help || nl_attr_oversized(execute->actions_len)
+        error = (dpif_execute_needs_help(execute)
                  ? dpif_execute_with_help(dpif, execute)
                  : dpif->dpif_class->execute(dpif, execute));
     } else {
@@ -1199,7 +1206,8 @@ dpif_operate(struct dpif *dpif, struct dpif_op **ops, size_t n_ops)
             for (chunk = 0; chunk < n_ops; chunk++) {
                 struct dpif_op *op = ops[chunk];
 
-                if (op->type == DPIF_OP_EXECUTE && op->u.execute.needs_help) {
+                if (op->type == DPIF_OP_EXECUTE
+                    && dpif_execute_needs_help(&op->u.execute)) {
                     break;
                 }
             }