[dpdk-stable] patch 'eal: do not allow legacy mode with --in-memory mode' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From c65f87875f90b0bb0c8e54f1a7f9fca3d8a3d901 Mon Sep 17 00:00:00 2001
From: Anatoly Burakov <anatoly.burakov at intel.com>
Date: Tue, 4 Sep 2018 16:15:43 +0100
Subject: [PATCH] eal: do not allow legacy mode with --in-memory mode

[ upstream commit d4ce95d6b40a91c662dcba3d6faa0f15c8c09afb ]

In-memory mode was never meant to support legacy mode, because we
cannot sort anonymous pages anyway.

Fixes: 72b49ff623c4 ("mem: support --in-memory mode")

Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 lib/librte_eal/common/eal_common_options.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index dd5f97402..873099acc 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -1391,4 +1391,10 @@ eal_check_common_options(struct internal_config *internal_cfg)
 		return -1;
 	}
+	if (internal_cfg->legacy_mem &&
+			internal_cfg->in_memory) {
+		RTE_LOG(ERR, EAL, "Option --"OPT_LEGACY_MEM" is not compatible "
+				"with --"OPT_IN_MEMORY"\n");
+		return -1;
+	}
 
 	return 0;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:08.528695450 +0000
+++ 0045-eal-do-not-allow-legacy-mode-with-in-memory-mode.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,13 +1,14 @@
-From d4ce95d6b40a91c662dcba3d6faa0f15c8c09afb Mon Sep 17 00:00:00 2001
+From c65f87875f90b0bb0c8e54f1a7f9fca3d8a3d901 Mon Sep 17 00:00:00 2001
 From: Anatoly Burakov <anatoly.burakov at intel.com>
 Date: Tue, 4 Sep 2018 16:15:43 +0100
 Subject: [PATCH] eal: do not allow legacy mode with --in-memory mode
 
+[ upstream commit d4ce95d6b40a91c662dcba3d6faa0f15c8c09afb ]
+
 In-memory mode was never meant to support legacy mode, because we
 cannot sort anonymous pages anyway.
 
 Fixes: 72b49ff623c4 ("mem: support --in-memory mode")
-Cc: stable at dpdk.org
 
 Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>