From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: Niall Meade <niall.meade@intel.com>,
Stephen Hemminger <stephen@networkplumber.org>,
Yipeng Wang <yipeng1.wang@intel.com>,
Sameh Gobriel <sameh.gobriel@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Vladimir Medvedkin <vladimir.medvedkin@intel.com>
Subject: [PATCH v4] hash: separate creation parameters checks
Date: Thu, 17 Oct 2024 17:10:19 +0200 [thread overview]
Message-ID: <20241017151131.2499153-1-thomas@monjalon.net> (raw)
In-Reply-To: <20240726145443.1058676-1-niall.meade@intel.com>
From: Niall Meade <niall.meade@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@intel.com>
Acked-by: Stephen Hemminger <stephen@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
next prev parent reply other threads:[~2024-10-17 15:11 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-26 14:54 [PATCH] hash: separate param checks in hash create func 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 ` [PATCH v3] " Niall Meade
2024-10-14 15:28 ` Stephen Hemminger
2024-10-17 7:44 ` Thomas Monjalon
2024-10-17 15:10 ` Thomas Monjalon [this message]
2024-10-18 8:37 ` [PATCH v4] hash: separate creation parameters checks 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=20241017151131.2499153-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=niall.meade@intel.com \
--cc=sameh.gobriel@intel.com \
--cc=stephen@networkplumber.org \
--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).