[dpdk-stable] patch 'hash: fix out-of-memory handling in hash creation' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 8825b47499d932fea98f7b0c9602ad034610e8d1 Mon Sep 17 00:00:00 2001
From: Yunjian Wang <wangyunjian at huawei.com>
Date: Wed, 22 Jul 2020 11:58:58 +0800
Subject: [PATCH] hash: fix out-of-memory handling in hash creation

[ upstream commit a5f803c804c4f75ce7c736a143170c49bb7e72c9 ]

The function rte_zmalloc_socket() could return NULL, the return
value need to be checked.

Fixes: 5915699153d7 ("hash: fix scaling by reducing contention")

Reported-by: Bin Huang <brian.huangbin at huawei.com>
Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Acked-by: Yipeng Wang <yipeng1.wang at intel.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 87a4c01f2..51ebae9cd 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -144,6 +144,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;
 
 	rte_hash_function default_hash_func = (rte_hash_function)rte_jhash;
@@ -369,9 +370,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 */
@@ -402,6 +407,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;
@@ -447,6 +453,7 @@ err:
 	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.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:15.870047970 +0100
+++ 0001-hash-fix-out-of-memory-handling-in-hash-creation.patch	2020-08-06 10:53:15.696595342 +0100
@@ -1,13 +1,14 @@
-From a5f803c804c4f75ce7c736a143170c49bb7e72c9 Mon Sep 17 00:00:00 2001
+From 8825b47499d932fea98f7b0c9602ad034610e8d1 Mon Sep 17 00:00:00 2001
 From: Yunjian Wang <wangyunjian at huawei.com>
 Date: Wed, 22 Jul 2020 11:58:58 +0800
 Subject: [PATCH] hash: fix out-of-memory handling in hash creation
 
+[ upstream commit a5f803c804c4f75ce7c736a143170c49bb7e72c9 ]
+
 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 at dpdk.org
 
 Reported-by: Bin Huang <brian.huangbin at huawei.com>
 Signed-off-by: Yunjian Wang <wangyunjian at huawei.com>
@@ -18,18 +19,18 @@
  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
+index 87a4c01f2..51ebae9cd 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)
+@@ -144,6 +144,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)
+ 	rte_hash_function default_hash_func = (rte_hash_function)rte_jhash;
+@@ -369,9 +370,13 @@ rte_hash_create(const struct rte_hash_parameters *params)
  #endif
  
  	if (use_local_cache) {
@@ -44,7 +45,7 @@
  	}
  
  	/* Default hash function */
-@@ -416,6 +421,7 @@ rte_hash_create(const struct rte_hash_parameters *params)
+@@ -402,6 +407,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;
@@ -52,7 +53,7 @@
  	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 @@ err:
+@@ -447,6 +453,7 @@ err:
  	rte_ring_free(r);
  	rte_ring_free(r_ext);
  	rte_free(te);