Harmonize vec/pool_get_aligned object sizes and alignment requests

Object sizes must evenly divide alignment requests, or vice
versa. Otherwise, only the first object will be aligned as
requested.

Three choices: add CLIB_CACHE_LINE_ALIGN_MARK(align_me) at
the end of structures, manually pad to an even divisor or multiple of
the alignment request, or use plain vectors/pools.

static assert for enforcement.

Change-Id: I41aa6ff1a58267301d32aaf4b9cd24678ac1c147
Signed-off-by: Dave Barach <dbarach@cisco.com>

5 files changed, 26 insertions, 5 deletions

diff --git a/src/vnet/bier/bier_disp_entry.h b/src/vnet/bier/bier_disp_entry.h
index 34ca5d4a09a..1647a7e166a 100644
--- a/src/vnet/bier/bier_disp_entry.h
+++ b/src/vnet/bier/bier_disp_entry.h
@@ -31,6 +31,11 @@
  */
 typedef struct bier_disp_entry_t_ {
     /**
+     * Required for pool_get_aligned
+     */
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
+    /**
      * The DPO contirubted from the per-payload protocol parents
      * on cachline 1.
      */
diff --git a/src/vnet/bier/bier_disp_table.h b/src/vnet/bier/bier_disp_table.h
index 6f9380a507f..c5b211001e2 100644
--- a/src/vnet/bier/bier_disp_table.h
+++ b/src/vnet/bier/bier_disp_table.h
@@ -30,6 +30,11 @@
 typedef struct bier_disp_table_t_
 {
     /**
+     * Required for pool_get_aligned
+     */
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
+    /**
      * number of locks on the table
      */
     u16 bdt_locks;
diff --git a/src/vnet/bier/bier_fmask.h b/src/vnet/bier/bier_fmask.h
index 81b3923f54c..56930f6cd44 100644
--- a/src/vnet/bier/bier_fmask.h
+++ b/src/vnet/bier/bier_fmask.h
@@ -98,6 +98,11 @@ typedef enum bier_fmask_flags_t_
  */
 typedef struct bier_fmask_t_ {
     /**
+     * Required for pool_get_aligned
+     */
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
+    /**
      * The BIER fmask is a child of a FIB entry in the FIB graph.
      */
     fib_node_t bfm_node;
diff --git a/src/vnet/bier/bier_imp.h b/src/vnet/bier/bier_imp.h
index 5b21b06b12d..cdc4dbb4fc1 100644
--- a/src/vnet/bier/bier_imp.h
+++ b/src/vnet/bier/bier_imp.h
@@ -33,6 +33,11 @@
  */
 typedef struct bier_imp_t_ {
     /**
+     * Required for pool_get_aligned
+     */
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
+    /**
      * The DPO contirubted from the resolving BIER table.
      * One per-IP protocol. This allows us to share a BIER imposition
      * object for a IPv4 and IPv6 mfib path.
diff --git a/src/vnet/bier/bier_table.h b/src/vnet/bier/bier_table.h
index a22e2e335b2..5af275f104a 100644
--- a/src/vnet/bier/bier_table.h
+++ b/src/vnet/bier/bier_table.h
@@ -37,6 +37,12 @@ struct bier_route_update_t_;
  */
 typedef struct bier_table_t_ {
     /**
+     * required for pool_get_aligned.
+     *  memebers used in the switch path come first!
+     */
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
+    /**
      * Save the MPLS local label associated with the table
      */
     mpls_label_t bt_ll;
@@ -65,11 +71,6 @@ typedef struct bier_table_t_ {
     index_t *bt_entries;
 
     /**
-     * Everything before this declaration is unused in the switch path
-     */
-    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
-
-    /**
      * The identity/key or the table. we need the hdr_len in the data-path
      */
     bier_table_id_t bt_id;