summaryrefslogtreecommitdiffstats
path: root/src/vnet/bier/bier_table.h
diff options
context:
space:
mode:
authorDave Barach <dbarach@cisco.com>2018-05-03 08:26:39 -0400
committerFlorin Coras <florin.coras@gmail.com>2018-05-04 15:15:22 +0000
commiteb987d3a09f669787014b1553f032219522149e1 (patch)
tree8d092c7368cfc2e02fc1869c6ded7410ad734392 /src/vnet/bier/bier_table.h
parent432bf677c6decadd05e3edfe54c02b1d01b2c64e (diff)
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>
Diffstat (limited to 'src/vnet/bier/bier_table.h')
-rw-r--r--src/vnet/bier/bier_table.h11
1 files changed, 6 insertions, 5 deletions
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;