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 ED9901B49D for ; Fri, 4 Jan 2019 14:27:11 +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 57DD2A0BFD; Fri, 4 Jan 2019 13:27:11 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4EDC5C1A1; Fri, 4 Jan 2019 13:27:09 +0000 (UTC) From: Kevin Traynor To: Gao Feng Cc: Anatoly Burakov , dpdk stable Date: Fri, 4 Jan 2019 13:24:11 +0000 Message-Id: <20190104132455.15170-29-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-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.39]); Fri, 04 Jan 2019 13:27:11 +0000 (UTC) Subject: [dpdk-stable] patch 'memzone: fix unlock on initialization failure' has been queued to LTS release 18.11.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: Fri, 04 Jan 2019 13:27:12 -0000 Hi, FYI, your patch has been queued to LTS release 18.11.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 01/11/19. 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. Thanks. Kevin Traynor --- >>From 2f476141e41717169144075ddfc5b954e3233be5 Mon Sep 17 00:00:00 2001 From: Gao Feng Date: Fri, 7 Dec 2018 09:20:08 +0800 Subject: [PATCH] memzone: fix unlock on initialization failure [ upstream commit cc8035322384b2454b596ee7e557cae3250f20f1 ] The RTE_PROC_PRIMARY error handler lost the unlock statement in the current codes. Now unlock and return in one place to fix it. Fixes: 49df3db84883 ("memzone: replace memzone array with fbarray") Signed-off-by: Gao Feng Acked-by: Anatoly Burakov --- lib/librte_eal/common/eal_common_memzone.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/eal_common_memzone.c b/lib/librte_eal/common/eal_common_memzone.c index b7081afbf..664df5b9f 100644 --- a/lib/librte_eal/common/eal_common_memzone.c +++ b/lib/librte_eal/common/eal_common_memzone.c @@ -366,4 +366,5 @@ rte_eal_memzone_init(void) { struct rte_mem_config *mcfg; + int ret = 0; /* get pointer to global configuration */ @@ -376,15 +377,14 @@ rte_eal_memzone_init(void) RTE_MAX_MEMZONE, sizeof(struct rte_memzone))) { RTE_LOG(ERR, EAL, "Cannot allocate memzone list\n"); - return -1; + ret = -1; } else if (rte_eal_process_type() == RTE_PROC_SECONDARY && rte_fbarray_attach(&mcfg->memzones)) { RTE_LOG(ERR, EAL, "Cannot attach to memzone list\n"); - rte_rwlock_write_unlock(&mcfg->mlock); - return -1; + ret = -1; } rte_rwlock_write_unlock(&mcfg->mlock); - return 0; + return ret; } -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-01-04 13:23:08.141928703 +0000 +++ 0029-memzone-fix-unlock-on-initialization-failure.patch 2019-01-04 13:23:07.000000000 +0000 @@ -1,13 +1,14 @@ -From cc8035322384b2454b596ee7e557cae3250f20f1 Mon Sep 17 00:00:00 2001 +From 2f476141e41717169144075ddfc5b954e3233be5 Mon Sep 17 00:00:00 2001 From: Gao Feng Date: Fri, 7 Dec 2018 09:20:08 +0800 Subject: [PATCH] memzone: fix unlock on initialization failure +[ upstream commit cc8035322384b2454b596ee7e557cae3250f20f1 ] + The RTE_PROC_PRIMARY error handler lost the unlock statement in the current codes. Now unlock and return in one place to fix it. Fixes: 49df3db84883 ("memzone: replace memzone array with fbarray") -Cc: stable@dpdk.org Signed-off-by: Gao Feng Acked-by: Anatoly Burakov