From: Niall Meade <niall.meade@intel.com>
To: Thomas Monjalon <thomas@monjalon.net>,
Yipeng Wang <yipeng1.wang@intel.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Cc: dev@dpdk.org, Niall Meade <niall.meade@intel.com>
Subject: [PATCH v3] hash: separate param checks in hash create func
Date: Mon, 14 Oct 2024 10:19:16 +0000 [thread overview]
Message-ID: <20241014101916.2043948-1-niall.meade@intel.com> (raw)
In-Reply-To: <20241010164602.1794534-1-niall.meade@intel.com>
Separated name, entries and key_len parameter checks in
rte_hash_create(). Also made the error messages more
informative/verbose to help with debugging. Also added myself to the
mailing list.
Signed-off-by: Niall Meade <niall.meade@intel.com>
---
v3:
* code indentation fix and rte_errno set correctly
v2:
* change hash log messages to be one line
I had name set to NULL in the parameters I was passing to
rte_hash_create() and the error message I got didn't specify which
parameter was invalid.
---
.mailmap | 1 +
lib/hash/rte_cuckoo_hash.c | 22 ++++++++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/.mailmap b/.mailmap
index a66da3c8cb..93df2effb2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1055,6 +1055,7 @@ Nelson Escobar <neescoba@cisco.com>
Nemanja Marjanovic <nemanja.marjanovic@intel.com>
Netanel Belgazal <netanel@amazon.com>
Netanel Gonen <netanelg@mellanox.com>
+Niall Meade <niall.meade@intel.com>
Niall Power <niall.power@intel.com>
Nicholas Pratte <npratte@iol.unh.edu>
Nick Connolly <nick.connolly@arm.com> <nick.connolly@mayadata.io>
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() 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 has invalid parameters", __func__);
+ 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.34.1
next prev parent reply other threads:[~2024-10-14 10:19 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-26 14:54 [PATCH] " Niall Meade
2024-09-04 17:28 ` Medvedkin, Vladimir
2024-10-07 21:08 ` Stephen Hemminger
2024-10-10 16:46 ` [PATCH v2] " Niall Meade
2024-10-10 17:34 ` Stephen Hemminger
2024-10-10 17:38 ` Stephen Hemminger
2024-10-14 10:19 ` Niall Meade [this message]
2024-10-14 15:28 ` [PATCH v3] " Stephen Hemminger
2024-10-17 7:44 ` Thomas Monjalon
2024-10-17 15:10 ` [PATCH v4] hash: separate creation parameters checks Thomas Monjalon
2024-10-18 8:37 ` Thomas Monjalon
2024-10-18 9:26 ` Meade, Niall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241014101916.2043948-1-niall.meade@intel.com \
--to=niall.meade@intel.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=sameh.gobriel@intel.com \
--cc=thomas@monjalon.net \
--cc=vladimir.medvedkin@intel.com \
--cc=yipeng1.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).