diff mbox series

[RESEND] malloc: fix allocation for a specific case with ASan

Message ID 20241017100207.1207-1-artur.paszkiewicz@intel.com (mailing list archive)
State New
Delegated to: Thomas Monjalon
Headers
Series [RESEND] malloc: fix allocation for a specific case with ASan |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/intel-Functional success Functional PASS
ci/iol-compile-amd64-testing success Testing PASS RETEST #1
ci/iol-mellanox-Performance success Performance Testing PASS RETEST #2
ci/iol-intel-Functional success Functional Testing PASS RETEST #2
ci/iol-marvell-Functional success Functional Testing PASS RETEST #2
ci/iol-broadcom-Performance success Performance Testing PASS RETEST #2
ci/iol-unit-amd64-testing pending Testing pending RETEST #2
ci/iol-compile-arm64-testing success Testing PASS RETEST #2
ci/iol-unit-arm64-testing fail Testing issues RETEST #2
ci/iol-sample-apps-testing success Testing PASS RETEST #2

Commit Message

Artur Paszkiewicz Oct. 17, 2024, 10:02 a.m. UTC 
Allocation would fail with ASan enabled if the size and alignment was
equal to half of the page size, e.g.:

size_t pg_sz = 2 * (1 << 20);
rte_malloc(NULL, pg_sz / 2, pg_sz / 2);

In such case, try_expand_heap_primary() only allocated one page but it
is not enough to fit this allocation with such alignment and
MALLOC_ELEM_TRAILER_LEN > 0, as correctly checked by
malloc_elem_can_hold().

Signed-off-by: Artur Paszkiewicz <artur.paszkiewicz@intel.com>
---
 lib/eal/common/malloc_heap.c | 4 ++--
 lib/eal/common/malloc_mp.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

Artur Paszkiewicz Oct. 18, 2024, 9:03 a.m. UTC | #1 
Recheck-request: iol-unit-amd64-testing
Artur Paszkiewicz Oct. 23, 2024, 8:08 a.m. UTC | #2 
Recheck-request: rebase=main,iol-unit-amd64-testing,iol-unit-arm64-testing
Artur Paszkiewicz Oct. 24, 2024, 7:29 a.m. UTC | #3 
Recheck-request: 
iol-compile-amd64-testing,iol-compile-arm64-testing,iol-unit-amd64-testing,iol-unit-arm64-testing
diff mbox series

Patch

diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index 058aaf4209..5b93e7fcb8 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -401,8 +401,8 @@  try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz,
 	int n_segs;
 	bool callback_triggered = false;
 
-	alloc_sz = RTE_ALIGN_CEIL(RTE_ALIGN_CEIL(elt_size, align) +
-			MALLOC_ELEM_OVERHEAD, pg_sz);
+	alloc_sz = RTE_ALIGN_CEIL(RTE_MAX(MALLOC_ELEM_HEADER_LEN, align) +
+			elt_size + MALLOC_ELEM_TRAILER_LEN, pg_sz);
 	n_segs = alloc_sz / pg_sz;
 
 	/* we can't know in advance how many pages we'll need, so we malloc */
diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
index 9765277f5d..1373da44c9 100644
--- a/lib/eal/common/malloc_mp.c
+++ b/lib/eal/common/malloc_mp.c
@@ -251,8 +251,8 @@  handle_alloc_request(const struct malloc_mp_req *m,
 		return -1;
 	}
 
-	alloc_sz = RTE_ALIGN_CEIL(RTE_ALIGN_CEIL(ar->elt_size, ar->align) +
-			MALLOC_ELEM_OVERHEAD, ar->page_sz);
+	alloc_sz = RTE_ALIGN_CEIL(RTE_MAX(MALLOC_ELEM_HEADER_LEN, ar->align) +
+			ar->elt_size + MALLOC_ELEM_TRAILER_LEN, ar->page_sz);
 	n_segs = alloc_sz / ar->page_sz;
 
 	/* we can't know in advance how many pages we'll need, so we malloc */