From mboxrd@z Thu Jan 1 00:00:00 1970 From: Olivier Matz Subject: [PATCH v2] mempool: fix alignment of memzone length when populating Date: Mon, 7 May 2018 10:18:01 +0200 Message-ID: <20180507081801.15050-1-olivier.matz@6wind.com> References: <20180502201349.15568-1-olivier.matz@6wind.com> Cc: Anatoly Burakov , Andrew Rybchenko To: dev@dpdk.org Return-path: Received: from proxy.6wind.com (host.76.145.23.62.rev.coltfrance.com [62.23.145.76]) by dpdk.org (Postfix) with ESMTP id 24E6A2C6A for ; Mon, 7 May 2018 10:26:46 +0200 (CEST) In-Reply-To: <20180502201349.15568-1-olivier.matz@6wind.com> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When populating a mempool with the default function, if there is not enough virtually contiguous memory for the whole mempool, it will be populated with several chunks. A chunk of the maximum available length is requested with: mz = rte_memzone_reserve_aligned(..., len=0, ..., align=x) If align is smaller than the page size, the address and the length of the memzone may not be a multiple of the page size. This makes rte_mempool_populate_virt() to fail because it requires them to be page-aligned. This patch fixes that. The problem can be reproduced easily by allocating more than available memory: ./build/app/testpmd -l 0,1 -- --total-num-mbufs=65536 ... Cause: Creation of mbuf pool for socket 0 failed: Invalid argument After the patch, the error code is correct: ./build/app/testpmd -l 0,1 -- --total-num-mbufs=65536 ... Cause: Creation of mbuf pool for socket 0 failed: Cannot allocate memory Signed-off-by: Olivier Matz Fixes: ba0009560c30 ("mempool: support new allocation methods") Acked-by: Anatoly Burakov --- v2: * ensure that both address and length are page-aligned, as suggested by Andrew lib/librte_mempool/rte_mempool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.c b/lib/librte_mempool/rte_mempool.c index cf5d124ec..9f1a4253b 100644 --- a/lib/librte_mempool/rte_mempool.c +++ b/lib/librte_mempool/rte_mempool.c @@ -684,7 +684,8 @@ rte_mempool_populate_default(struct rte_mempool *mp) * have */ mz = rte_memzone_reserve_aligned(mz_name, 0, - mp->socket_id, flags, align); + mp->socket_id, flags, + RTE_MAX(pg_sz, align)); } if (mz == NULL) { ret = -rte_errno; @@ -709,7 +710,7 @@ rte_mempool_populate_default(struct rte_mempool *mp) (void *)(uintptr_t)mz); else ret = rte_mempool_populate_virt(mp, mz->addr, - mz->len, pg_sz, + RTE_ALIGN_FLOOR(mz->len, pg_sz), pg_sz, rte_mempool_memchunk_mz_free, (void *)(uintptr_t)mz); if (ret < 0) { -- 2.11.0