[dpdk-stable] patch 'mem: fix 32-bit init config with meson' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

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/26/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.

Thanks.

Luca Boccassi

---
>From 63cfb8b938d405896b8026b8726bd24bfc9ded8d Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
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 <bruce.richardson at intel.com>
Tested-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 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 78bfdf309..9f77802d0 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -214,6 +214,11 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
 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
 
 
 compile_time_cpuflags = []
diff --git a/config/rte_config.h b/config/rte_config.h
index d30786bc0..765251a25 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -38,7 +38,6 @@
 #define RTE_MAX_MEM_MB_PER_LIST 32768
 #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
 #define RTE_LOG_DP_LEVEL RTE_LOG_INFO
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.392667367 +0100
+++ 0073-mem-fix-32-bit-init-config-with-meson.patch	2020-07-24 12:53:48.299006683 +0100
@@ -1,8 +1,10 @@
-From b29ac33ffccf856825c42dc11185b112f569ba57 Mon Sep 17 00:00:00 2001
+From 63cfb8b938d405896b8026b8726bd24bfc9ded8d Mon Sep 17 00:00:00 2001
 From: Bruce Richardson <bruce.richardson at intel.com>
 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
@@ -10,7 +12,6 @@
 
 Bugzilla ID: 498
 Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
-Cc: stable at dpdk.org
 
 Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
 Tested-by: Ferruh Yigit <ferruh.yigit at intel.com>
@@ -20,10 +21,10 @@
  2 files changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/config/meson.build b/config/meson.build
-index 351e268c1..241d62acc 100644
+index 78bfdf309..9f77802d0 100644
 --- a/config/meson.build
 +++ b/config/meson.build
-@@ -238,6 +238,11 @@ dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp'))
+@@ -214,6 +214,11 @@ dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
  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)
@@ -36,7 +37,7 @@
  
  compile_time_cpuflags = []
 diff --git a/config/rte_config.h b/config/rte_config.h
-index e9201fd46..086acf74a 100644
+index d30786bc0..765251a25 100644
 --- a/config/rte_config.h
 +++ b/config/rte_config.h
 @@ -38,7 +38,6 @@