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 13950A0540 for ; Thu, 7 Jul 2022 09:58:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0F8DC406B4; Thu, 7 Jul 2022 09:58:54 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 2E26F4282F for ; Thu, 7 Jul 2022 09:58:52 +0200 (CEST) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E8AA93FD90 for ; Thu, 7 Jul 2022 07:58:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180731; bh=heUhhJ8BeIGvCfv2m1FvQ0yePo8yCRqnHQZiQFNQhnI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BDssTykoHfNhzgmZyThxXqFaiSlVgmex0telAmPlR3eQ4vssnNvD4EdGjAF8dEIfY Z07QjIDnBvVoi/k+yfLMMVGxtyjVlM9CcCwW9KIIAYH4KIsmgTshvV9PKq4LIpq5Kb W0JL3m904t1hyT+/7a5X9Oy4aCNTsNRts262kDARJsP5ltCwO24TxhrbcFOROI0w0f kYmzNar+3gSELjgW7fdJXaymVJAg9rhEDVlB+3uvWlbLJ2jKtH4MJ2xjDgIt7a0c2/ vauPVQR2B2RzxKJsQ6zZIqWk2rZNf73D/G2Df7TSzxGOtxqSYv7eAqUzHMuP+FuivR 0ROkigVIZC0iQ== Received: by mail-ed1-f72.google.com with SMTP id b7-20020a056402350700b00435bd1c4523so13367804edd.5 for ; Thu, 07 Jul 2022 00:58:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=heUhhJ8BeIGvCfv2m1FvQ0yePo8yCRqnHQZiQFNQhnI=; b=wLczcVF0JCjgMTVFOJYma+mTtTlBjJk6BXZ1sd1Gl3UhYTx3JpH2Jrg9i2RAweVWt/ 3gBjujk/Fpd5i/NLTVBXZO0ngtObhOF474jggkQBJoxBnio7ADWpc203WZqqhQN2cj0Y ++0WM08RFyxWerINkUcilBjLetDovwznSnmLL+AFV1lBVAaOiV7IeJ9k2mWYvWZRiLbj KyUJKylVU1oBv3lHwc82OAwQ8UwOfMPZRGTZ+X7qRNJVgJHGY3N3bPYrUUK59P6sFG0/ Ys6xDWN/Ve1dfLa+P4aT4Yg7LEKn1Hq7CGe2X/Pu3J/R+JpLX8oySKJDn70NSqVzi9fX IpWw== X-Gm-Message-State: AJIora9mmCw49P4j3aZYFDmoKqYQFA235TmzNbOtDusE1wQ5uu9JU3qo HZMQ7FPtL0nxmnL+0iBvqwyPkPASrcD/peUkcx403sfkzEw5YzGr5ymKq7garEQRvvuQFA5/aaY k6OITglKSkmhtFQjs7waDHNLo X-Received: by 2002:a17:906:8475:b0:72b:12c7:effe with SMTP id hx21-20020a170906847500b0072b12c7effemr1057464ejc.337.1657180731565; Thu, 07 Jul 2022 00:58:51 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vOULwvtBTC37TVhRvZ9WOSJIFLkzKcA3VSeqqmxrcj4viE+PRwnkXaUIxg1QgYKBK8epCuRg== X-Received: by 2002:a17:906:8475:b0:72b:12c7:effe with SMTP id hx21-20020a170906847500b0072b12c7effemr1057450ejc.337.1657180731358; Thu, 07 Jul 2022 00:58:51 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id t12-20020a50d70c000000b0043590660f16sm28173064edi.35.2022.07.07.00.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:50 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Fidaullah Noonari Cc: Dmitry Kozlyuk , dpdk stable Subject: patch 'malloc: fix allocation of almost hugepage size' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:55:04 +0200 Message-Id: <20220707075522.194223-69-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.13 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/09/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/69b392322552189e89b66ee133a19575b4a5f2b9 Thanks. Christian Ehrhardt --- >From 69b392322552189e89b66ee133a19575b4a5f2b9 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/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 bd5065698d..03a263a004 100644 --- a/lib/librte_eal/common/malloc_heap.c +++ b/lib/librte_eal/common/malloc_heap.c @@ -397,7 +397,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz, bool callback_triggered = false; 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; /* we can't know in advance how many pages we'll need, so we malloc */ diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c index dd814ef53a..f9d558ba64 100644 --- a/lib/librte_eal/common/malloc_mp.c +++ b/lib/librte_eal/common/malloc_mp.c @@ -186,7 +186,7 @@ handle_alloc_request(const struct malloc_mp_req *m, void *map_addr; 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; heap = ar->heap; -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:14.010878901 +0200 +++ 0069-malloc-fix-allocation-of-almost-hugepage-size.patch 2022-07-07 09:54:10.985824740 +0200 @@ -1 +1 @@ -From ce2f7d472e80c1b6779f230a1c7b137157f5ff3d Mon Sep 17 00:00:00 2001 +From 69b392322552189e89b66ee133a19575b4a5f2b9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ce2f7d472e80c1b6779f230a1c7b137157f5ff3d ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,2 +21,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 +- @@ -24,5 +25,5 @@ -diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c -index a3d26fcbea..27a52266ad 100644 ---- a/lib/eal/common/malloc_heap.c -+++ b/lib/eal/common/malloc_heap.c -@@ -403,7 +403,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 bd5065698d..03a263a004 100644 +--- a/lib/librte_eal/common/malloc_heap.c ++++ b/lib/librte_eal/common/malloc_heap.c +@@ -397,7 +397,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t pg_sz, @@ -37,6 +38,6 @@ -diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c -index 207b90847e..2b8eb51067 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, - } +diff --git a/lib/librte_eal/common/malloc_mp.c b/lib/librte_eal/common/malloc_mp.c +index dd814ef53a..f9d558ba64 100644 +--- a/lib/librte_eal/common/malloc_mp.c ++++ b/lib/librte_eal/common/malloc_mp.c +@@ -186,7 +186,7 @@ handle_alloc_request(const struct malloc_mp_req *m, + void *map_addr; @@ -49 +50 @@ - /* we can't know in advance how many pages we'll need, so we malloc */ + heap = ar->heap;