patch 'malloc: fix storage size for some allocations' has been queued to stable release 19.11.14

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.14

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

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/6768e641e2faf6ebb859d38b067309bce33c23cf

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 6768e641e2faf6ebb859d38b067309bce33c23cf Mon Sep 17 00:00:00 2001
From: Fidaullah Noonari <fidaullah.noonari at emumba.com>
Date: Thu, 28 Jul 2022 14:41:03 +0500
Subject: [PATCH] malloc: fix storage size for some allocations

[ upstream commit f92b9ebed03dbd140a5a7b921cb898e661a59068 ]

The amount of memory to allocate from the system for heap expansion
was calculated in a way that may yield one page more than needed.
This could hit the allocation limit from the system or EAL.
The allocation would fail despite enough memory being available.

In response to mail:
https://inbox.dpdk.org/dev/CAEYuUWCnRZNwxiOHEeTHw0Gy9aFJRLZtvAG9g=smuUvUEMcFXg@mail.gmail.com/

A reproducer has been provided by Dmitry, see:
https://inbox.dpdk.org/dev/20220922015212.03bfde66@sovereign/

Fixes: 07dcbfe0101f ("malloc: support multiprocess memory hotplug")

Signed-off-by: Fidaullah Noonari <fidaullah.noonari at emumba.com>
Acked-by: Dmitry Kozlyuk <dmitry.kozliuk at gmail.com>
---
 lib/librte_eal/common/malloc_heap.c | 2 +-
 lib/librte_eal/common/malloc_mp.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
index 03a263a004..0343d7ff1a 100644
--- a/lib/librte_eal/common/malloc_heap.c
+++ b/lib/librte_eal/common/malloc_heap.c
@@ -396,7 +396,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
 	int n_segs;
 	bool callback_triggered = false;
 
-	alloc_sz = RTE_ALIGN_CEIL(align + elt_size +
+	alloc_sz = RTE_ALIGN_CEIL(RTE_ALIGN_CEIL(elt_size, align) +
 			MALLOC_ELEM_OVERHEAD, pg_sz);
 	n_segs = alloc_sz / pg_sz;
 
diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c
index f9d558ba64..8b2f06720b 100644
--- a/lib/librte_eal/common/malloc_mp.c
+++ b/lib/librte_eal/common/malloc_mp.c
@@ -185,7 +185,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
 	int n_segs;
 	void *map_addr;
 
-	alloc_sz = RTE_ALIGN_CEIL(ar->align + ar->elt_size +
+	alloc_sz = RTE_ALIGN_CEIL(RTE_ALIGN_CEIL(ar->elt_size, ar->align) +
 			MALLOC_ELEM_OVERHEAD, ar->page_sz);
 	n_segs = alloc_sz / ar->page_sz;
 
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-11 12:35:05.073291553 +0100
+++ 0008-malloc-fix-storage-size-for-some-allocations.patch	2022-11-11 12:35:04.717191754 +0100
@@ -1 +1 @@
-From f92b9ebed03dbd140a5a7b921cb898e661a59068 Mon Sep 17 00:00:00 2001
+From 6768e641e2faf6ebb859d38b067309bce33c23cf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f92b9ebed03dbd140a5a7b921cb898e661a59068 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -23,2 +24,2 @@
- lib/eal/common/malloc_heap.c | 2 +-
- lib/eal/common/malloc_mp.c   | 2 +-
+ lib/librte_eal/common/malloc_heap.c | 2 +-
+ lib/librte_eal/common/malloc_mp.c   | 2 +-
@@ -27,5 +28,5 @@
-diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
-index 27a52266ad..d7c410b786 100644
---- a/lib/eal/common/malloc_heap.c
-+++ b/lib/eal/common/malloc_heap.c
-@@ -402,7 +402,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
+diff --git a/lib/librte_eal/common/malloc_heap.c b/lib/librte_eal/common/malloc_heap.c
+index 03a263a004..0343d7ff1a 100644
+--- a/lib/librte_eal/common/malloc_heap.c
++++ b/lib/librte_eal/common/malloc_heap.c
+@@ -396,7 +396,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
@@ -40,7 +41,7 @@
-diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
-index 0c2624c62d..7270c2ec90 100644
---- a/lib/eal/common/malloc_mp.c
-+++ b/lib/eal/common/malloc_mp.c
-@@ -250,7 +250,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
- 		return -1;
- 	}
+diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c
+index f9d558ba64..8b2f06720b 100644
+--- a/lib/librte_eal/common/malloc_mp.c
++++ b/lib/librte_eal/common/malloc_mp.c
+@@ -185,7 +185,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
+ 	int n_segs;
+ 	void *map_addr;