From eb987d3a09f669787014b1553f032219522149e1 Mon Sep 17 00:00:00 2001
From: Dave Barach <dbarach@cisco.com>
Date: Thu, 3 May 2018 08:26:39 -0400
Subject: 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>
---
 src/vnet/bier/bier_disp_entry.h |  5 +++++
 src/vnet/bier/bier_disp_table.h |  5 +++++
 src/vnet/bier/bier_fmask.h      |  5 +++++
 src/vnet/bier/bier_imp.h        |  5 +++++
 src/vnet/bier/bier_table.h      | 11 ++++++-----
 5 files changed, 26 insertions(+), 5 deletions(-)

(limited to 'src/vnet/bier')

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
@@ -30,6 +30,11 @@
  * The BIER dispositon object
  */
 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
@@ -29,6 +29,11 @@
  */
 typedef struct bier_disp_table_t_
 {
+    /**
+     * Required for pool_get_aligned
+     */
+    CLIB_CACHE_LINE_ALIGN_MARK(cacheline0);
+
     /**
      * number of locks on the table
      */
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
@@ -97,6 +97,11 @@ typedef enum bier_fmask_flags_t_
  *      for the next lookup
  */
 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.
      */
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
@@ -32,6 +32,11 @@
  * The BIER imposition object
  */
 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
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
@@ -36,6 +36,12 @@ struct bier_route_update_t_;
  * bit-position. Since this is smal <4096, the table is a flat arry
  */
 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
      */
@@ -64,11 +70,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
      */
-- 
cgit 1.2.3-korg