From eb987d3a09f669787014b1553f032219522149e1 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/plugins/acl/acl.h | 6 ++++++ src/plugins/dpdk/device/dpdk.h | 5 +++++ src/plugins/dpdk/ipsec/ipsec.h | 2 ++ src/plugins/gtpu/gtpu.h | 3 +++ src/plugins/ioam/analyse/ioam_analyse.h | 2 ++ src/plugins/ioam/export-common/ioam_export.h | 2 ++ src/plugins/ioam/ip6/ioam_cache.h | 7 +++++-- src/plugins/ioam/udp-ping/udp_ping.h | 3 +++ src/plugins/memif/private.h | 2 ++ src/plugins/pppoe/pppoe.h | 3 +++ 10 files changed, 33 insertions(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/acl/acl.h b/src/plugins/acl/acl.h index 8e7c80076f6..51c5b0c18db 100644 --- a/src/plugins/acl/acl.h +++ b/src/plugins/acl/acl.h @@ -101,6 +101,8 @@ typedef struct */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); u8 tag[64]; u32 count; acl_rule_t *rules; @@ -108,6 +110,8 @@ typedef struct typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); u8 tag[64]; u32 count; macip_acl_rule_t *rules; @@ -127,6 +131,8 @@ typedef struct */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK(cacheline0); fa_5tuple_t mask; u32 refcount; } ace_mask_type_entry_t; diff --git a/src/plugins/dpdk/device/dpdk.h b/src/plugins/dpdk/device/dpdk.h index bd442bd97af..f02e718dc9c 100644 --- a/src/plugins/dpdk/device/dpdk.h +++ b/src/plugins/dpdk/device/dpdk.h @@ -125,6 +125,9 @@ typedef uint16_t dpdk_portid_t; typedef struct { + /* Required for vec_validate_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + struct rte_ring *swq; u64 hqos_field0_slabmask; @@ -141,6 +144,8 @@ typedef struct typedef struct { + /* Required for vec_validate_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); struct rte_ring **swq; struct rte_mbuf **pkts_enq; struct rte_mbuf **pkts_deq; diff --git a/src/plugins/dpdk/ipsec/ipsec.h b/src/plugins/dpdk/ipsec/ipsec.h index d4c620a133b..4287a2a9372 100644 --- a/src/plugins/dpdk/ipsec/ipsec.h +++ b/src/plugins/dpdk/ipsec/ipsec.h @@ -127,6 +127,8 @@ typedef struct typedef struct { + /* Required for vec_validate_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); struct rte_mempool *crypto_op; struct rte_mempool *session_h; struct rte_mempool **session_drv; diff --git a/src/plugins/gtpu/gtpu.h b/src/plugins/gtpu/gtpu.h index b1e677d4f29..6331aa31890 100644 --- a/src/plugins/gtpu/gtpu.h +++ b/src/plugins/gtpu/gtpu.h @@ -123,6 +123,9 @@ typedef CLIB_PACKED typedef struct { + /* Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + /* Rewrite string */ u8 *rewrite; diff --git a/src/plugins/ioam/analyse/ioam_analyse.h b/src/plugins/ioam/analyse/ioam_analyse.h index ef2865daf8c..881b0451721 100644 --- a/src/plugins/ioam/analyse/ioam_analyse.h +++ b/src/plugins/ioam/analyse/ioam_analyse.h @@ -96,6 +96,8 @@ typedef struct */ typedef struct ioam_analyser_data_t_ { + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + u8 is_free; u8 pad[3]; diff --git a/src/plugins/ioam/export-common/ioam_export.h b/src/plugins/ioam/export-common/ioam_export.h index 9de0d13bd5e..74347683e10 100644 --- a/src/plugins/ioam/export-common/ioam_export.h +++ b/src/plugins/ioam/export-common/ioam_export.h @@ -33,6 +33,8 @@ typedef struct ioam_export_buffer { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); /* Allocated buffer */ u32 buffer_index; u64 touched_at; diff --git a/src/plugins/ioam/ip6/ioam_cache.h b/src/plugins/ioam/ip6/ioam_cache.h index 338ed9828ee..3a3cf6a620e 100644 --- a/src/plugins/ioam/ip6/ioam_cache.h +++ b/src/plugins/ioam/ip6/ioam_cache.h @@ -98,6 +98,8 @@ */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); ip6_address_t src_address; ip6_address_t dst_address; u16 src_port; @@ -122,6 +124,8 @@ typedef struct */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); u32 pool_id; u32 pool_index; ip6_address_t src_address; @@ -528,8 +532,7 @@ ioam_cache_ts_table_init (vlib_main_t * vm) CLIB_CACHE_LINE_BYTES); vec_validate_aligned (cm->ts_stats, no_of_threads - 1, CLIB_CACHE_LINE_BYTES); - vec_validate_aligned (cm->timer_wheels, no_of_threads - 1, - CLIB_CACHE_LINE_BYTES); + vec_validate (cm->timer_wheels, no_of_threads - 1); cm->lookup_table_nbuckets = IOAM_CACHE_TABLE_DEFAULT_HASH_NUM_BUCKETS; cm->lookup_table_nbuckets = 1 << max_log2 (cm->lookup_table_nbuckets); cm->lookup_table_size = IOAM_CACHE_TABLE_DEFAULT_HASH_MEMORY_SIZE; diff --git a/src/plugins/ioam/udp-ping/udp_ping.h b/src/plugins/ioam/udp-ping/udp_ping.h index 26c4201900e..2c0d214ee35 100644 --- a/src/plugins/ioam/udp-ping/udp_ping.h +++ b/src/plugins/ioam/udp-ping/udp_ping.h @@ -84,6 +84,9 @@ typedef struct */ typedef struct { + /** Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + /** Local source IPv4/6 address to be used. */ ip46_address_t src; diff --git a/src/plugins/memif/private.h b/src/plugins/memif/private.h index ad6295e4bb8..5c8a919061a 100644 --- a/src/plugins/memif/private.h +++ b/src/plugins/memif/private.h @@ -80,6 +80,8 @@ typedef struct typedef struct { + /* Required for vec_validate_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); void *shm; memif_region_size_t region_size; int fd; diff --git a/src/plugins/pppoe/pppoe.h b/src/plugins/pppoe/pppoe.h index 77bc88fea60..f010750f420 100644 --- a/src/plugins/pppoe/pppoe.h +++ b/src/plugins/pppoe/pppoe.h @@ -48,6 +48,9 @@ typedef struct typedef struct { + /* Required for pool_get_aligned */ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); + /* pppoe session_id in HOST byte order */ u16 session_id; -- cgit 1.2.3-korg