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

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/02/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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/d717370c7bbf06b251bf13882708d1c4df21df13

Thanks.

Kevin.

---
>From d717370c7bbf06b251bf13882708d1c4df21df13 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 e76277167b..bd264b068e 100644
--- a/lib/librte_hash/rte_cuckoo_hash.c
+++ b/lib/librte_hash/rte_cuckoo_hash.c
@@ -142,4 +142,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
 	unsigned int no_free_on_del = 0;
 	uint32_t *tbl_chng_cnt = NULL;
+	struct lcore_cache *local_free_slots = NULL;
 	unsigned int readwrite_concur_lf_support = 0;
 
@@ -366,7 +367,11 @@ rte_hash_create(const struct rte_hash_parameters *params)
 
 	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;
+		}
 	}
 
@@ -398,4 +403,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
 	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;
@@ -439,4 +445,5 @@ err:
 	rte_ring_free(r_ext);
 	rte_free(te);
+	rte_free(local_free_slots);
 	rte_free(h);
 	rte_free(buckets);
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.401555412 +0100
+++ 0019-hash-fix-out-of-memory-handling-in-hash-creation.patch	2020-08-28 11:03:25.946955632 +0100
@@ -1 +1 @@
-From a5f803c804c4f75ce7c736a143170c49bb7e72c9 Mon Sep 17 00:00:00 2001
+From d717370c7bbf06b251bf13882708d1c4df21df13 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a5f803c804c4f75ce7c736a143170c49bb7e72c9 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 5f701d5792..0a6d474713 100644
+index e76277167b..bd264b068e 100644
@@ -24,2 +25,2 @@
-@@ -152,4 +152,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
- 	uint32_t *ext_bkt_to_free = NULL;
+@@ -142,4 +142,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
+ 	unsigned int no_free_on_del = 0;
@@ -29,2 +30,2 @@
- 	uint32_t i;
-@@ -384,7 +385,11 @@ rte_hash_create(const struct rte_hash_parameters *params)
+ 
+@@ -366,7 +367,11 @@ rte_hash_create(const struct rte_hash_parameters *params)
@@ -43 +44 @@
-@@ -417,4 +422,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
+@@ -398,4 +403,5 @@ rte_hash_create(const struct rte_hash_parameters *params)
@@ -49 +50 @@
-@@ -462,4 +468,5 @@ err:
+@@ -439,4 +445,5 @@ err: