From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 9CD711B113 for ; Wed, 21 Nov 2018 17:49:50 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 083133002F9A; Wed, 21 Nov 2018 16:49:50 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 01C5B5C21E; Wed, 21 Nov 2018 16:49:48 +0000 (UTC) From: Kevin Traynor To: Pawel Wodkowski Cc: Anatoly Burakov , dpdk stable Date: Wed, 21 Nov 2018 16:47:27 +0000 Message-Id: <20181121164828.32249-13-ktraynor@redhat.com> In-Reply-To: <20181121164828.32249-1-ktraynor@redhat.com> References: <20181121164828.32249-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Wed, 21 Nov 2018 16:49:50 +0000 (UTC) Subject: [dpdk-stable] patch 'mem: fix --huge-unlink option' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Wed, 21 Nov 2018 16:49:51 -0000 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 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 Acked-by: Anatoly Burakov --- 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 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@dpdk.org Signed-off-by: Pawel Wodkowski Acked-by: Anatoly Burakov @@ -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)) {