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/plugins/dpdk | |
| 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/plugins/dpdk')
| -rw-r--r-- | src/plugins/dpdk/device/dpdk.h | 5 | ||||
| -rw-r--r-- | src/plugins/dpdk/ipsec/ipsec.h | 2 |
2 files changed, 7 insertions, 0 deletions
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; |