patch 'eal/freebsd: ignore in-memory option' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/1f3a6bf92333f9c310ba6b7a9ebfc22e0c01b9a0

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 1f3a6bf92333f9c310ba6b7a9ebfc22e0c01b9a0 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Mon, 13 Sep 2021 15:34:24 +0100
Subject: [PATCH] eal/freebsd: ignore in-memory option

[ upstream commit 0faa4cfc50275751a86ed17147175c78a36f0da2 ]

The in-memory option is not supported on FreeBSD so print a warning and
ignore the flag when it is specified for BSD apps. The lack of support
is due to the different way in which memory is managed on FreeBSD using
the contigmem driver rather than via a hugetlbfs filesystem.

Fixes: 14de8734c401 ("eal: add --in-memory option")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
---
 lib/librte_eal/freebsd/eal/eal.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
index 2a995ee3f4..d97651725b 100644
--- a/lib/librte_eal/freebsd/eal/eal.c
+++ b/lib/librte_eal/freebsd/eal/eal.c
@@ -743,6 +743,10 @@ rte_eal_init(int argc, char **argv)
 
 	/* FreeBSD always uses legacy memory model */
 	internal_config.legacy_mem = true;
+	if (internal_conf.in_memory) {
+		RTE_LOG(WARNING, EAL, "Warning: ignoring unsupported flag, '%s'\n", OPT_IN_MEMORY);
+		internal_conf.in_memory = false;
+	}
 
 	if (eal_plugins_init() < 0) {
 		rte_eal_init_alert("Cannot init plugins");
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:09.749316034 +0100
+++ 0065-eal-freebsd-ignore-in-memory-option.patch	2021-11-30 16:50:05.734873118 +0100
@@ -1 +1 @@
-From 0faa4cfc50275751a86ed17147175c78a36f0da2 Mon Sep 17 00:00:00 2001
+From 1f3a6bf92333f9c310ba6b7a9ebfc22e0c01b9a0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0faa4cfc50275751a86ed17147175c78a36f0da2 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -16 +17 @@
- lib/eal/freebsd/eal.c | 4 ++++
+ lib/librte_eal/freebsd/eal/eal.c | 4 ++++
@@ -19,5 +20,5 @@
-diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c
-index 6cee5ae369..fb734012a4 100644
---- a/lib/eal/freebsd/eal.c
-+++ b/lib/eal/freebsd/eal.c
-@@ -718,6 +718,10 @@ rte_eal_init(int argc, char **argv)
+diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c
+index 2a995ee3f4..d97651725b 100644
+--- a/lib/librte_eal/freebsd/eal/eal.c
++++ b/lib/librte_eal/freebsd/eal/eal.c
+@@ -743,6 +743,10 @@ rte_eal_init(int argc, char **argv)
@@ -26,2 +27,2 @@
- 	internal_conf->legacy_mem = true;
-+	if (internal_conf->in_memory) {
+ 	internal_config.legacy_mem = true;
++	if (internal_conf.in_memory) {
@@ -29 +30 @@
-+		internal_conf->in_memory = false;
++		internal_conf.in_memory = false;