[PATCH v4] hash: separate creation parameters checks
Thomas Monjalon
thomas at monjalon.net
Thu Oct 17 17:10:19 CEST 2024
From: Niall Meade <niall.meade at intel.com>
Separate name, entries and key_len parameter checks in rte_hash_create().
Also make the error messages more informative/verbose
to help with debugging.
Signed-off-by: Niall Meade <niall.meade at intel.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
---
v4: formatting details
sent for triggering a new CI run
---
lib/hash/rte_cuckoo_hash.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 577b5839d3..9575e8aa0c 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -184,17 +184,24 @@ rte_hash_create(const struct rte_hash_parameters *params)
hash_list = RTE_TAILQ_CAST(rte_hash_tailq.head, rte_hash_list);
if (params == NULL) {
+ rte_errno = EINVAL;
HASH_LOG(ERR, "%s has no parameters", __func__);
return NULL;
}
/* Check for valid parameters */
if ((params->entries > RTE_HASH_ENTRIES_MAX) ||
- (params->entries < RTE_HASH_BUCKET_ENTRIES) ||
- (params->name == NULL) ||
- (params->key_len == 0)) {
+ (params->entries < RTE_HASH_BUCKET_ENTRIES)) {
rte_errno = EINVAL;
- HASH_LOG(ERR, "%s has invalid parameters", __func__);
+ HASH_LOG(ERR, "%s() entries (%u) must be in range [%d, %d] inclusive",
+ __func__, params->entries, RTE_HASH_BUCKET_ENTRIES,
+ RTE_HASH_ENTRIES_MAX);
+ return NULL;
+ }
+
+ if (params->key_len == 0) {
+ rte_errno = EINVAL;
+ HASH_LOG(ERR, "%s() key_len must be greater than 0", __func__);
return NULL;
}
@@ -204,6 +211,13 @@ rte_hash_create(const struct rte_hash_parameters *params)
return NULL;
}
+ if (params->name == NULL) {
+ rte_errno = EINVAL;
+ HASH_LOG(ERR, "%s() has invalid parameters, name can't be NULL",
+ __func__);
+ return NULL;
+ }
+
/* Validate correct usage of extra options */
if ((params->extra_flag & RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY) &&
(params->extra_flag & RTE_HASH_EXTRA_FLAGS_RW_CONCURRENCY_LF)) {
--
2.46.0
More information about the dev
mailing list