From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 169CDA053D for ; Fri, 17 Jul 2020 18:33:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BB9A1BEB4; Fri, 17 Jul 2020 18:33:03 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id CE2E91BEB4 for ; Fri, 17 Jul 2020 18:33:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1595003581; 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: in-reply-to:in-reply-to:references:references; bh=x0LbFIqwLoTx6B26Cg0l9KdmFNlsd287NnkbP/zSXEE=; b=fi0a+IbRzA6OH3pe9FfXadeJf056baNAhcnkWck7a2WhT14Lqbqw7RlXr1aVVNrbOxdbGa LdcZsuEc+ffvp6MaIb8ZcrjolGYqdOFe73BqCcx8742o9QNOvFNkHmD1CyPrGaNmo3TYG+ TovkdeqAFVSJrLmZQpKeHvUmpIfaVl0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-376-tXzjCGtpPIm3HtsUTCLUQA-1; Fri, 17 Jul 2020 12:32:53 -0400 X-MC-Unique: tXzjCGtpPIm3HtsUTCLUQA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 923768005B0; Fri, 17 Jul 2020 16:32:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE35372E48; Fri, 17 Jul 2020 16:32:51 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Ferruh Yigit , dpdk stable Date: Fri, 17 Jul 2020 17:32:06 +0100 Message-Id: <20200717163214.4839-18-ktraynor@redhat.com> In-Reply-To: <20200717163214.4839-1-ktraynor@redhat.com> References: <20200717163214.4839-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'mem: fix 32-bit init config with meson' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 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/23/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/cf6ce61a97ab5bd07061b7e8899b902c6b430f7c Thanks. Kevin. --- >From cf6ce61a97ab5bd07061b7e8899b902c6b430f7c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 2 Jul 2020 11:57:21 +0100 Subject: [PATCH] mem: fix 32-bit init config with meson [ upstream commit b29ac33ffccf856825c42dc11185b112f569ba57 ] When building with meson, the default size of virtual address space reserved for mapping pages was globally set at 512GB, which is too big for use in 32-bit processes. To match the behaviour with "make", we configure this to be 512GB for 64-bit and 2GB for 32-bit builds. Bugzilla ID: 498 Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists") Signed-off-by: Bruce Richardson Tested-by: Ferruh Yigit --- config/meson.build | 5 +++++ config/rte_config.h | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/config/meson.build b/config/meson.build index 88742ce9db..3b7fad67d7 100644 --- a/config/meson.build +++ b/config/meson.build @@ -134,4 +134,9 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64) dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true) +if dpdk_conf.get('RTE_ARCH_64') + dpdk_conf.set('RTE_MAX_MEM_MB', 524288) +else # for 32-bit we need smaller reserved memory areas + dpdk_conf.set('RTE_MAX_MEM_MB', 2048) +endif diff --git a/config/rte_config.h b/config/rte_config.h index d3732e9533..17b9a1ebc9 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -31,5 +31,4 @@ #define RTE_MAX_MEMSEG_PER_TYPE 32768 #define RTE_MAX_MEM_MB_PER_TYPE 65536 -#define RTE_MAX_MEM_MB 524288 #define RTE_MAX_MEMZONE 2560 #define RTE_MAX_TAILQ 32 -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-17 17:17:01.008386903 +0100 +++ 0018-mem-fix-32-bit-init-config-with-meson.patch 2020-07-17 17:16:59.993771146 +0100 @@ -1 +1 @@ -From b29ac33ffccf856825c42dc11185b112f569ba57 Mon Sep 17 00:00:00 2001 +From cf6ce61a97ab5bd07061b7e8899b902c6b430f7c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b29ac33ffccf856825c42dc11185b112f569ba57 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 351e268c1f..241d62acc7 100644 +index 88742ce9db..3b7fad67d7 100644 @@ -26 +27 @@ -@@ -239,4 +239,9 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) +@@ -134,4 +134,9 @@ dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64) @@ -37 +38 @@ -index e9201fd463..086acf74a2 100644 +index d3732e9533..17b9a1ebc9 100644 @@ -40 +41 @@ -@@ -39,5 +39,4 @@ +@@ -31,5 +31,4 @@