DPDK patches and discussions
 help / color / mirror / Atom feed
From: Gao Feng <gfree.wind@vip.163.com>
To: dev@dpdk.org
Cc: anatoly.burakov@intel.com, stable@dpdk.org,
	Gao Feng <davidfgao@tencent.com>
Subject: [dpdk-dev] [PATCH v2] eal: fix unlock in rte_eal_memzone_init
Date: Fri,  7 Dec 2018 09:20:08 +0800	[thread overview]
Message-ID: <1544145608-828-1-git-send-email-gfree.wind@vip.163.com> (raw)
In-Reply-To: <1544057251-17351-1-git-send-email-gfree.wind@vip.163.com>

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 <davidfgao@tencent.com>
---
 v2: Unlock and return in one place, per Anatoly

 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 b7081af..664df5b 100644
--- a/lib/librte_eal/common/eal_common_memzone.c
+++ b/lib/librte_eal/common/eal_common_memzone.c
@@ -365,6 +365,7 @@ int
 rte_eal_memzone_init(void)
 {
 	struct rte_mem_config *mcfg;
+	int ret = 0;
 
 	/* get pointer to global configuration */
 	mcfg = rte_eal_get_configuration()->mem_config;
@@ -375,17 +376,16 @@ rte_eal_memzone_init(void)
 			rte_fbarray_init(&mcfg->memzones, "memzone",
 			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;
 }
 
 /* Walk all reserved memory zones */
-- 
2.7.4

  parent reply	other threads:[~2018-12-07  1:20 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-12-06  0:47 [dpdk-dev] [PATCH] " gfree.wind
2018-12-06  9:09 ` Burakov, Anatoly
2018-12-06  9:44   ` Gao Feng
2018-12-06 11:18     ` Burakov, Anatoly
2018-12-07  1:20 ` Gao Feng [this message]
2018-12-07  8:57   ` [dpdk-dev] [PATCH v2] " Burakov, Anatoly
2018-12-20 11:20     ` Thomas Monjalon
2018-12-20 11:36       ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2018-12-20 11:47         ` Gao Feng
2018-12-20 11:44       ` [dpdk-dev] " Gao Feng
2018-12-20 13:40         ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1544145608-828-1-git-send-email-gfree.wind@vip.163.com \
    --to=gfree.wind@vip.163.com \
    --cc=anatoly.burakov@intel.com \
    --cc=davidfgao@tencent.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).