d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hash: fix key store element alignment

Browse Source 
Fix the key store array element alignment such that every array
element is aligned on KEY_ALIGNMENT boundary. This is required to
make 'pdata' in 'struct rte_hash_key' align on its natural boundary
for atomic load/store.

Fixes: 473d1bebce43 ("hash: allow to store data in hash table")
Cc: stable@dpdk.org

Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Ola Liljedahl <ola.liljedahl@arm.com>
Reviewed-by: Steve Capper <steve.capper@arm.com>
Reviewed-by: Yipeng Wang <yipeng1.wang@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Honnappa Nagarahalli 2018-10-26 00:37:31 -05:00 committed by Thomas Monjalon
parent 9d033dac7d
commit dbdbc4a2e9
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_hash/rte_cuckoo_hash.c
View File

@ -279,7 +279,9 @@ rte_hash_create(const struct rte_hash_parameters *params)
rte_ring_sp_enqueue(r_ext, (void *)((uintptr_t) i)); rte_ring_sp_enqueue(r_ext, (void *)((uintptr_t) i));
} }
const uint32_t key_entry_size = sizeof(struct rte_hash_key) + params->key_len; const uint32_t key_entry_size =
RTE_ALIGN(sizeof(struct rte_hash_key) + params->key_len,
KEY_ALIGNMENT);
const uint64_t key_tbl_size = (uint64_t) key_entry_size * num_key_slots; const uint64_t key_tbl_size = (uint64_t) key_entry_size * num_key_slots;
k = rte_zmalloc_socket(NULL, key_tbl_size, k = rte_zmalloc_socket(NULL, key_tbl_size,

2
lib/librte_hash/rte_cuckoo_hash.h
View File

@ -123,7 +123,7 @@ struct rte_hash_key {
}; };
/* Variable key size */ /* Variable key size */
char key[0]; char key[0];
} __attribute__((aligned(KEY_ALIGNMENT))); };
/* All different signature compare functions */ /* All different signature compare functions */
enum rte_hash_sig_compare_function { enum rte_hash_sig_compare_function {