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

app/test: fix crash for fbk hashes with a lot of entries

Browse Source 
The four-byte-key (fbk) autotest was allocating the keys to be used for
the test on the stack. When the number of entries in the table was
increased significantly, for example, to test larger hashes by increase the
value of ENTRIES, this array of keys was greater than that
allowed on the stack, and so caused problems, i.e. crashes and core dumps.

The solution is to have the keys dynamically allocated on the heap using
malloc. Now if ENTRIES is increased and we run out of memory we get an
error message instead of a crash.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Bruce Richardson 2014-10-17 14:18:12 +01:00 committed by Thomas Monjalon
parent f2c4afab58
commit 46bf72f97b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/test/test_hash_perf.c
View File

@ -397,6 +397,7 @@ struct tbl_perf_test_params tbl_perf_params[] =
if (cond) { \ if (cond) { \
printf("ERROR line %d: " str "\n", __LINE__, ##__VA_ARGS__); \ printf("ERROR line %d: " str "\n", __LINE__, ##__VA_ARGS__); \
if (handle) rte_fbk_hash_free(handle); \ if (handle) rte_fbk_hash_free(handle); \
if (keys) rte_free(keys); \
return -1; \ return -1; \
} \ } \
} while(0) } while(0)
@ -697,8 +698,8 @@ fbk_hash_perf_test(void)
.entries_per_bucket = 4, .entries_per_bucket = 4,
.socket_id = rte_socket_id(), .socket_id = rte_socket_id(),
}; };
struct rte_fbk_hash_table *handle; struct rte_fbk_hash_table *handle = NULL;
uint32_t keys[ENTRIES] = {0}; uint32_t *keys = NULL;
unsigned indexes[TEST_SIZE]; unsigned indexes[TEST_SIZE];
uint64_t lookup_time = 0; uint64_t lookup_time = 0;
unsigned added = 0; unsigned added = 0;
@ -708,6 +709,10 @@ fbk_hash_perf_test(void)
handle = rte_fbk_hash_create(&params); handle = rte_fbk_hash_create(&params);
RETURN_IF_ERROR_FBK(handle == NULL, "fbk hash creation failed"); RETURN_IF_ERROR_FBK(handle == NULL, "fbk hash creation failed");
keys = rte_zmalloc(NULL, ENTRIES * sizeof(*keys), 0);
RETURN_IF_ERROR_FBK(keys == NULL,
"fbk hash: memory allocation for key store failed");
/* Generate random keys and values. */ /* Generate random keys and values. */
for (i = 0; i < ENTRIES; i++) { for (i = 0; i < ENTRIES; i++) {
uint32_t key = (uint32_t)rte_rand(); uint32_t key = (uint32_t)rte_rand();