diff options
Diffstat (limited to 'src/vnet/fib')
| -rw-r--r-- | src/vnet/fib/ip4_fib.c | 2 | ||||
| -rw-r--r-- | src/vnet/fib/ip4_fib.h | 2 | ||||
| -rw-r--r-- | src/vnet/fib/ip6_fib.c | 2 | ||||
| -rw-r--r-- | src/vnet/fib/mpls_fib.c | 2 | ||||
| -rw-r--r-- | src/vnet/fib/mpls_fib.h | 5 |
5 files changed, 10 insertions, 3 deletions
diff --git a/src/vnet/fib/ip4_fib.c b/src/vnet/fib/ip4_fib.c index ef3324645c3..4ab6b1bcff6 100644 --- a/src/vnet/fib/ip4_fib.c +++ b/src/vnet/fib/ip4_fib.c @@ -108,7 +108,7 @@ ip4_create_fib_with_table_id (u32 table_id, ip4_fib_t *v4_fib; void *old_heap; - pool_get_aligned(ip4_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES); + pool_get(ip4_main.fibs, fib_table); memset(fib_table, 0, sizeof(*fib_table)); old_heap = clib_mem_set_heap (ip4_main.mtrie_mheap); diff --git a/src/vnet/fib/ip4_fib.h b/src/vnet/fib/ip4_fib.h index a0b1143ba8c..ff0d6677e53 100644 --- a/src/vnet/fib/ip4_fib.h +++ b/src/vnet/fib/ip4_fib.h @@ -58,6 +58,8 @@ typedef struct ip4_fib_t_ u32 fwd_classify_table_index; u32 rev_classify_table_index; + /* Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); } ip4_fib_t; extern fib_node_index_t ip4_fib_table_lookup(const ip4_fib_t *fib, diff --git a/src/vnet/fib/ip6_fib.c b/src/vnet/fib/ip6_fib.c index fa9eb112986..da2f1ea3368 100644 --- a/src/vnet/fib/ip6_fib.c +++ b/src/vnet/fib/ip6_fib.c @@ -60,7 +60,7 @@ create_fib_with_table_id (u32 table_id, fib_table_t *fib_table; ip6_fib_t *v6_fib; - pool_get_aligned(ip6_main.fibs, fib_table, CLIB_CACHE_LINE_BYTES); + pool_get(ip6_main.fibs, fib_table); pool_get_aligned(ip6_main.v6_fibs, v6_fib, CLIB_CACHE_LINE_BYTES); memset(fib_table, 0, sizeof(*fib_table)); 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) == diff --git a/src/vnet/fib/mpls_fib.h b/src/vnet/fib/mpls_fib.h index 9e0c7d76ff8..8d18b008b0e 100644 --- a/src/vnet/fib/mpls_fib.h +++ b/src/vnet/fib/mpls_fib.h @@ -41,6 +41,11 @@ typedef struct mpls_fib_t_ { /** + * Required for pool_get_aligned + */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); + + /** * A hash table of entries. 21 bit key * Hash table for reduced memory footprint */ |