odp-util: Avoid branch in odp_actions_add().

I have no idea why, but the test and branch in odp_actions_add() has always
bugged me.  This commit eliminates it.

diff --git a/lib/odp-util.c b/lib/odp-util.c
index ccf05c6bd4259eb99783201edd160db06892556d..442c939a7d5096ca59d0579176653e8a92e1c952 100644 (file)
--- a/lib/odp-util.c
+++ b/lib/odp-util.c
@@ -30,13 +30,10 @@ union odp_action *
 odp_actions_add(struct odp_actions *actions, uint16_t type)
 {
     union odp_action *a;
-    if (actions->n_actions < MAX_ODP_ACTIONS) {
-        a = &actions->actions[actions->n_actions++];
-    } else {
-        COVERAGE_INC(odp_overflow);
-        actions->n_actions = MAX_ODP_ACTIONS + 1;
-        a = &actions->actions[MAX_ODP_ACTIONS - 1];
-    }
+    size_t idx;
+
+    idx = actions->n_actions++ & (MAX_ODP_ACTIONS - 1);
+    a = &actions->actions[idx];
     memset(a, 0, sizeof *a);
     a->type = type;
     return a;

diff --git a/lib/odp-util.h b/lib/odp-util.h
index dc9a43db215f66778e44d4eeeedb3d7d08aa0bf8..420bde53c01cf2390f3ee3fbee9e716ae0c3afda 100644 (file)
--- a/lib/odp-util.h
+++ b/lib/odp-util.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include "openflow/openflow.h"
 #include "openvswitch/datapath-protocol.h"
+#include "util.h"
 
 struct ds;
 
@@ -29,6 +30,9 @@ struct ds;
  * memory, so there is no point in allocating more than that.  */
 enum { MAX_ODP_ACTIONS = 4096 / sizeof(union odp_action) };
 
+/* odp_actions_add() assumes that MAX_ODP_ACTIONS is a power of 2. */
+BUILD_ASSERT_DECL(IS_POW2(MAX_ODP_ACTIONS));
+
 struct odp_actions {
     size_t n_actions;
     union odp_action actions[MAX_ODP_ACTIONS];

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index d74f321d16c466a1e6284cf77bfcb75b3062093a..91ff02388c3b09d72d8c0a45a7317437c01558f9 100644 (file)
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -2772,6 +2772,7 @@ xlate_actions(const union ofp_action *in, size_t n_in,
         *nf_output_iface = ctx.nf_output_iface;
     }
     if (odp_actions_overflow(out)) {
+        COVERAGE_INC(odp_overflow);
         odp_actions_init(out);
         return ofp_mkerr(OFPET_BAD_ACTION, OFPBAC_TOO_MANY);
     }