diff options
| author |   Dave Barach <dbarach@cisco.com> | 2018-05-03 08:26:39 -0400 |
|---|---|---|
| committer |   Florin Coras <florin.coras@gmail.com> | 2018-05-04 15:15:22 +0000 |
| commit | eb987d3a09f669787014b1553f032219522149e1 (patch) | |
| tree | 8d092c7368cfc2e02fc1869c6ded7410ad734392 /src/vnet/mfib | |
| parent | 432bf677c6decadd05e3edfe54c02b1d01b2c64e (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/mfib')
| -rw-r--r-- | src/vnet/mfib/mfib_itf.h | 5 | ||||
| -rw-r--r-- | src/vnet/mfib/mfib_table.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/vnet/mfib/mfib_itf.h b/src/vnet/mfib/mfib_itf.h index fe39c895d8b..295be1b20e5 100644 --- a/src/vnet/mfib/mfib_itf.h +++ b/src/vnet/mfib/mfib_itf.h @@ -25,6 +25,11 @@ typedef struct mfib_itf_t_ { /** + * Required for pool_get_aligned + */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); + + /** * @brief Forwarding Flags on the entry - checked in the data-path */ mfib_itf_flags_t mfi_flags; diff --git a/src/vnet/mfib/mfib_table.h b/src/vnet/mfib/mfib_table.h index 63af25b0151..b8ade8b5cd9 100644 --- a/src/vnet/mfib/mfib_table.h +++ b/src/vnet/mfib/mfib_table.h @@ -35,6 +35,11 @@ typedef struct mfib_table_t_ { /** + * Required for pool_get_aligned + */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); + + /** * A union of the protocol specific FIBs that provide the * underlying LPM mechanism. * This element is first in the struct so that it is in the |