From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 44EF8A0032 for ; Fri, 24 Jun 2022 18:10:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 24124400EF; Fri, 24 Jun 2022 18:10:28 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 752C3400EF for ; Fri, 24 Jun 2022 18:10:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656087026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D6X7D5cfpTISTelUr+tSoxddQ1kQNNJwsnJ3+BOzxDY=; b=NtlEhMpNDbibxqr2b0oLnnzaRp7UaTsG4Jkh4wp6+g4RVB1SjOnhEaz+K0z+4birvJBJjk m4Og0H2rRjFUEY+bIGwA9Ewu+Cbuur8mLcS02cji/DsNSwOswlnLLZMvFqe+rRjXTNExWd jBofaWQ/52b+mvklbBV3NNPIrZtjxkw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-86-8WqwPfNwMOiZpfkw9oxjRA-1; Fri, 24 Jun 2022 12:10:24 -0400 X-MC-Unique: 8WqwPfNwMOiZpfkw9oxjRA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5C769802E5C; Fri, 24 Jun 2022 16:10:24 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 89FBF40334F; Fri, 24 Jun 2022 16:10:23 +0000 (UTC) From: Kevin Traynor To: Fidaullah Noonari Cc: Dmitry Kozlyuk , dpdk stable Subject: patch 'malloc: fix allocation of almost hugepage size' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 17:10:03 +0100 Message-Id: <20220624161016.1881349-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/bee8c21938d05fd5e3721fd6ccbd31f777eae908 Thanks. Kevin --- >From bee8c21938d05fd5e3721fd6ccbd31f777eae908 Mon Sep 17 00:00:00 2001 From: Fidaullah Noonari Date: Wed, 25 May 2022 10:18:37 +0500 Subject: [PATCH] malloc: fix allocation of almost hugepage size [ upstream commit ce2f7d472e80c1b6779f230a1c7b137157f5ff3d ] If called to allocate memory of size is between multiple of hugepage size minus malloc_header_len and hugepage size, rte_malloc fails. This fix replaces malloc_elem_trailer_len with malloc_elem_overhead in try_expand_heap() to include malloc_elem_header_len when calculating n_seg. Bugzilla ID: 800 Fixes: 07dcbfe0101f ("malloc: support multiprocess memory hotplug") Signed-off-by: Fidaullah Noonari Acked-by: Dmitry Kozlyuk --- lib/eal/common/malloc_heap.c | 2 +- lib/eal/common/malloc_mp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c index 1ca01e0901..55063ccf81 100644 --- a/lib/eal/common/malloc_heap.c +++ b/lib/eal/common/malloc_heap.c @@ -403,5 +403,5 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz, alloc_sz = RTE_ALIGN_CEIL(align + elt_size + - MALLOC_ELEM_TRAILER_LEN, pg_sz); + MALLOC_ELEM_OVERHEAD, pg_sz); n_segs = alloc_sz / pg_sz; diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c index 2e597a17a2..774bd1132f 100644 --- a/lib/eal/common/malloc_mp.c +++ b/lib/eal/common/malloc_mp.c @@ -252,5 +252,5 @@ handle_alloc_request(const struct malloc_mp_req *m, alloc_sz = RTE_ALIGN_CEIL(ar->align + ar->elt_size + - MALLOC_ELEM_TRAILER_LEN, ar->page_sz); + MALLOC_ELEM_OVERHEAD, ar->page_sz); n_segs = alloc_sz / ar->page_sz; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 16:54:05.627213201 +0100 +++ 0001-malloc-fix-allocation-of-almost-hugepage-size.patch 2022-06-24 16:54:05.518164987 +0100 @@ -1 +1 @@ -From ce2f7d472e80c1b6779f230a1c7b137157f5ff3d Mon Sep 17 00:00:00 2001 +From bee8c21938d05fd5e3721fd6ccbd31f777eae908 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ce2f7d472e80c1b6779f230a1c7b137157f5ff3d ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index a3d26fcbea..27a52266ad 100644 +index 1ca01e0901..55063ccf81 100644 @@ -28 +29 @@ -@@ -404,5 +404,5 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz, +@@ -403,5 +403,5 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz, @@ -36 +37 @@ -index 207b90847e..2b8eb51067 100644 +index 2e597a17a2..774bd1132f 100644 @@ -39 +40 @@ -@@ -251,5 +251,5 @@ handle_alloc_request(const struct malloc_mp_req *m, +@@ -252,5 +252,5 @@ handle_alloc_request(const struct malloc_mp_req *m,