[dpdk-stable] patch 'mem: fix --huge-unlink option' 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/27/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 b37f33cc06491cc7462f1721f31170910f694d9d Mon Sep 17 00:00:00 2001
From: Pawel Wodkowski <pawelx.wodkowski at intel.com>
Date: Fri, 21 Sep 2018 13:56:38 +0200
Subject: [PATCH] mem: fix --huge-unlink option

[ upstream commit 8e1fdcaa3d76bd531d03897c9dfef0f6dc76c7c8 ]

The final_va field is set during remap_segment() but this information is
not propagated to temporal copy of huge page memory configuration so the
unlink_hugepage_files() function wrongly assume that there is nothing to
unlink. Fix this issue by checking orig_va instead of final_va.

Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski at intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/linuxapp/eal/eal_memory.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 7747ee6df..6131bfde2 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -587,5 +587,5 @@ unlink_hugepage_files(struct hugepage_file *hugepg_tbl,
 		struct hugepage_file *hp = &hugepg_tbl[page];
 
-		if (hp->final_va != NULL && unlink(hp->filepath)) {
+		if (hp->orig_va != NULL && unlink(hp->filepath)) {
 			RTE_LOG(WARNING, EAL, "%s(): Removing %s failed: %s\n",
 				__func__, hp->filepath, strerror(errno));
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:31.285044238 +0000
+++ 0013-mem-fix-huge-unlink-option.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,15 +1,16 @@
-From 8e1fdcaa3d76bd531d03897c9dfef0f6dc76c7c8 Mon Sep 17 00:00:00 2001
+From b37f33cc06491cc7462f1721f31170910f694d9d Mon Sep 17 00:00:00 2001
 From: Pawel Wodkowski <pawelx.wodkowski at intel.com>
 Date: Fri, 21 Sep 2018 13:56:38 +0200
 Subject: [PATCH] mem: fix --huge-unlink option
 
+[ upstream commit 8e1fdcaa3d76bd531d03897c9dfef0f6dc76c7c8 ]
+
 The final_va field is set during remap_segment() but this information is
 not propagated to temporal copy of huge page memory configuration so the
 unlink_hugepage_files() function wrongly assume that there is nothing to
 unlink. Fix this issue by checking orig_va instead of final_va.
 
 Fixes: 66cc45e293ed ("mem: replace memseg with memseg lists")
-Cc: stable at dpdk.org
 
 Signed-off-by: Pawel Wodkowski <pawelx.wodkowski at intel.com>
 Acked-by: Anatoly Burakov <anatoly.burakov at intel.com>
@@ -18,10 +19,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
-index 4913fb05e..31f44e524 100644
+index 7747ee6df..6131bfde2 100644
 --- a/lib/librte_eal/linuxapp/eal/eal_memory.c
 +++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
-@@ -588,5 +588,5 @@ unlink_hugepage_files(struct hugepage_file *hugepg_tbl,
+@@ -587,5 +587,5 @@ unlink_hugepage_files(struct hugepage_file *hugepg_tbl,
  		struct hugepage_file *hp = &hugepg_tbl[page];
  
 -		if (hp->final_va != NULL && unlink(hp->filepath)) {