summaryrefslogtreecommitdiffstats
path: root/src/vnet/ip
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/ip
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/ip')
-rw-r--r--src/vnet/ip/ip6.h3
-rw-r--r--src/vnet/ip/ip_source_and_port_range_check.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/src/vnet/ip/ip6.h b/src/vnet/ip/ip6.h
index 359c461d1e0..4b24774c277 100644
--- a/src/vnet/ip/ip6.h
+++ b/src/vnet/ip/ip6.h
@@ -66,6 +66,9 @@ typedef struct
typedef struct
{
+ /* required for pool_get_aligned. */
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
/* Table ID (hash key) for this FIB. */
u32 table_id;
diff --git a/src/vnet/ip/ip_source_and_port_range_check.h b/src/vnet/ip/ip_source_and_port_range_check.h
index b04fe613d1c..ece2ec216e4 100644
--- a/src/vnet/ip/ip_source_and_port_range_check.h
+++ b/src/vnet/ip/ip_source_and_port_range_check.h
@@ -102,6 +102,11 @@ typedef struct
typedef struct protocol_port_range_dpo_t_
{
/**
+ * Required for pool_get_aligned
+ */
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
+ /**
* The number of blocks from the 'block' array below
* that have rnages configured. We keep this count so that in the data-path
* we can limit the loop to be only over the blocks we need