From 01b2c23faecee4a60cccf8219bf37fa588009b8d Mon Sep 17 00:00:00 2001 From: Dave Barach 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 --- src/vnet/fib/mpls_fib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/vnet/fib/mpls_fib.c') diff --git a/src/vnet/fib/mpls_fib.c b/src/vnet/fib/mpls_fib.c index 15931203122..223a0ddd753 100644 --- a/src/vnet/fib/mpls_fib.c +++ b/src/vnet/fib/mpls_fib.c @@ -92,7 +92,7 @@ mpls_fib_create_with_table_id (u32 table_id, mpls_fib_t *mf; int i; - pool_get_aligned(mpls_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES); + pool_get(mpls_main.fibs, fib_table); pool_get_aligned(mpls_main.mpls_fibs, mf, CLIB_CACHE_LINE_BYTES); ASSERT((fib_table - mpls_main.fibs) == -- cgit 1.2.3-korg