From: Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>
To: wangyunjian <wangyunjian@huawei.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "yipeng1.wang@intel.com" <yipeng1.wang@intel.com>,
"sameh.gobriel@intel.com" <sameh.gobriel@intel.com>,
"bruce.richardson@intel.com" <bruce.richardson@intel.com>,
"jerry.lilijun@huawei.com" <jerry.lilijun@huawei.com>,
"xudingke@huawei.com" <xudingke@huawei.com>,
"stable@dpdk.org" <stable@dpdk.org>, nd <nd@arm.com>,
Honnappa Nagarahalli <Honnappa.Nagarahalli@arm.com>,
nd <nd@arm.com>
Subject: Re: [dpdk-dev] [PATCH] hash: fix return value of null not checked
Date: Tue, 21 Jul 2020 17:26:59 +0000 [thread overview]
Message-ID: <DB6PR0802MB2216A19D97A481DB7A85DF8198780@DB6PR0802MB2216.eurprd08.prod.outlook.com> (raw)
In-Reply-To: <d87e2f714999b83c69685950d43a85350dc1441c.1595335031.git.wangyunjian@huawei.com>
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of wangyunjian
> Sent: Tuesday, July 21, 2020 8:32 AM
> To: dev@dpdk.org
> Cc: yipeng1.wang@intel.com; sameh.gobriel@intel.com;
> bruce.richardson@intel.com; jerry.lilijun@huawei.com;
> xudingke@huawei.com; Yunjian Wang <wangyunjian@huawei.com>;
> stable@dpdk.org
> Subject: [dpdk-dev] [PATCH] hash: fix return value of null not checked
>
> From: Yunjian Wang <wangyunjian@huawei.com>
>
> The function rte_zmalloc_socket() could return NULL, the return value need to
> be checked.
>
> Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")
> Cc: stable@dpdk.org
>
> Reported-by: HuangBin <brian.huangbin@huawei.com>
> Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
Good catch
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
> ---
> lib/librte_hash/rte_cuckoo_hash.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/lib/librte_hash/rte_cuckoo_hash.c
> b/lib/librte_hash/rte_cuckoo_hash.c
> index 5f701d579..0a6d47471 100644
> --- a/lib/librte_hash/rte_cuckoo_hash.c
> +++ b/lib/librte_hash/rte_cuckoo_hash.c
> @@ -151,6 +151,7 @@ rte_hash_create(const struct rte_hash_parameters
> *params)
> unsigned int no_free_on_del = 0;
> uint32_t *ext_bkt_to_free = NULL;
> uint32_t *tbl_chng_cnt = NULL;
> + struct lcore_cache *local_free_slots = NULL;
> unsigned int readwrite_concur_lf_support = 0;
> uint32_t i;
>
> @@ -383,9 +384,13 @@ rte_hash_create(const struct rte_hash_parameters
> *params) #endif
>
> if (use_local_cache) {
> - h->local_free_slots = rte_zmalloc_socket(NULL,
> + local_free_slots = rte_zmalloc_socket(NULL,
> sizeof(struct lcore_cache) * RTE_MAX_LCORE,
> RTE_CACHE_LINE_SIZE, params->socket_id);
> + if (local_free_slots == NULL) {
> + RTE_LOG(ERR, HASH, "local free slots memory
> allocation failed\n");
> + goto err_unlock;
> + }
> }
>
> /* Default hash function */
> @@ -416,6 +421,7 @@ rte_hash_create(const struct rte_hash_parameters
> *params)
> *h->tbl_chng_cnt = 0;
> h->hw_trans_mem_support = hw_trans_mem_support;
> h->use_local_cache = use_local_cache;
> + h->local_free_slots = local_free_slots;
> h->readwrite_concur_support = readwrite_concur_support;
> h->ext_table_support = ext_table_support;
> h->writer_takes_lock = writer_takes_lock; @@ -461,6 +467,7 @@
> rte_hash_create(const struct rte_hash_parameters *params)
> rte_ring_free(r);
> rte_ring_free(r_ext);
> rte_free(te);
> + rte_free(local_free_slots);
> rte_free(h);
> rte_free(buckets);
> rte_free(buckets_ext);
> --
> 2.23.0
>
next prev parent reply other threads:[~2020-07-21 17:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 13:31 wangyunjian
2020-07-21 17:26 ` Honnappa Nagarahalli [this message]
2020-07-21 20:24 ` Wang, Yipeng1
2020-07-22 3:20 ` wangyunjian
2020-07-22 3:58 ` [dpdk-dev] [PATCH v2] " wangyunjian
2020-07-27 11:29 ` David Marchand
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=DB6PR0802MB2216A19D97A481DB7A85DF8198780@DB6PR0802MB2216.eurprd08.prod.outlook.com \
--to=honnappa.nagarahalli@arm.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=jerry.lilijun@huawei.com \
--cc=nd@arm.com \
--cc=sameh.gobriel@intel.com \
--cc=stable@dpdk.org \
--cc=wangyunjian@huawei.com \
--cc=xudingke@huawei.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).