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 2219F29D2 for ; Tue, 20 Nov 2018 20:15:44 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8801C3082B50; Tue, 20 Nov 2018 19:15:43 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCD98600C3; Tue, 20 Nov 2018 19:15:37 +0000 (UTC) From: Kevin Traynor To: Anatoly Burakov Cc: Maxime Coquelin , dpdk stable Date: Tue, 20 Nov 2018 19:12:34 +0000 Message-Id: <20181120191252.30277-44-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 20 Nov 2018 19:15:43 +0000 (UTC) Subject: [dpdk-stable] patch 'fbarray: fix detach in --no-shconf mode' 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: Tue, 20 Nov 2018 19:15:44 -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/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 be131f6ef3cde02669ade07c56b396ca66e22330 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 4 Sep 2018 16:15:42 +0100 Subject: [PATCH] fbarray: fix detach in --no-shconf mode [ upstream commit 310aa7c04143105200fd81ae3e5f680e22c9bb6a ] In noshconf mode, no shared files are created, but we're still trying to unlink them, resulting in detach/destroy failure even though it should have succeeded. Fix it by exiting early in noshconf mode. Fixes: 3ee2cde248a7 ("fbarray: support --no-shconf mode") Signed-off-by: Anatoly Burakov Reviewed-by: Maxime Coquelin --- lib/librte_eal/common/eal_common_fbarray.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/librte_eal/common/eal_common_fbarray.c b/lib/librte_eal/common/eal_common_fbarray.c index 43caf3ced..ba6c4ae39 100644 --- a/lib/librte_eal/common/eal_common_fbarray.c +++ b/lib/librte_eal/common/eal_common_fbarray.c @@ -879,4 +879,8 @@ rte_fbarray_destroy(struct rte_fbarray *arr) return ret; + /* with no shconf, there were never any files to begin with */ + if (internal_config.no_shconf) + return 0; + /* try deleting the file */ eal_get_fbarray_path(path, sizeof(path), arr->name); -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.506229017 +0000 +++ 0044-fbarray-fix-detach-in-no-shconf-mode.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,14 +1,15 @@ -From 310aa7c04143105200fd81ae3e5f680e22c9bb6a Mon Sep 17 00:00:00 2001 +From be131f6ef3cde02669ade07c56b396ca66e22330 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Tue, 4 Sep 2018 16:15:42 +0100 Subject: [PATCH] fbarray: fix detach in --no-shconf mode +[ upstream commit 310aa7c04143105200fd81ae3e5f680e22c9bb6a ] + In noshconf mode, no shared files are created, but we're still trying to unlink them, resulting in detach/destroy failure even though it should have succeeded. Fix it by exiting early in noshconf mode. Fixes: 3ee2cde248a7 ("fbarray: support --no-shconf mode") -Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov Reviewed-by: Maxime Coquelin