From: Thierry Herbelot <thierry.herbelot@6wind.com>
To: dev@dpdk.org
Cc: Thierry Herbelot <thierry.herbelot@6wind.com>,
Thomas Monjalon <thomas@monjalon.net>,
Nithin Dabilpuram <ndabilpuram@marvell.com>,
Satha Koteswara Rao Kottidi <skoteshwar@marvell.com>,
Jerin Jacob Kollanukkaran <jerinj@marvell.com>
Subject: [PATCH v3] common/cnxk/roc_npa: unlock mbox in error cases
Date: Tue, 20 Jun 2023 11:43:37 +0200 [thread overview]
Message-ID: <20230620094337.3127595-1-thierry.herbelot@6wind.com> (raw)
In-Reply-To: <20230620093950.3127383-1-thierry.herbelot@6wind.com>
In npa_aura_pool_fini and in npa_aura_fini, Unlock mbox when an error is
detected.
Fixes: ea4d70cc4f0b46d5 ('common/cnxk: add NPA aura create/destroy ROC APIs')
Signed-off-by: Thierry Herbelot <thierry.herbelot@6wind.com>
--
V2: also patch npa_aura_pool_fini
V3: add missing space
---
drivers/common/cnxk/roc_npa.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c
index 377439c2baaf..3b9a70028ba2 100644
--- a/drivers/common/cnxk/roc_npa.c
+++ b/drivers/common/cnxk/roc_npa.c
@@ -197,8 +197,10 @@ npa_aura_pool_fini(struct mbox *m_box, uint32_t aura_id, uint64_t aura_handle)
off = mbox->rx_start + pool_rsp->hdr.next_msgoff;
aura_rsp = (struct npa_aq_enq_rsp *)((uintptr_t)mdev->mbase + off);
- if (aura_rsp->hdr.rc != 0 || pool_rsp->hdr.rc != 0)
- return NPA_ERR_AURA_POOL_FINI;
+ if (aura_rsp->hdr.rc != 0 || pool_rsp->hdr.rc != 0) {
+ rc = NPA_ERR_AURA_POOL_FINI;
+ goto exit;
+ }
/* Sync NDC-NPA for LF */
ndc_req = mbox_alloc_msg_ndc_sync_op(mbox);
@@ -245,8 +247,10 @@ npa_aura_fini(struct mbox *m_box, uint32_t aura_id)
if (rc < 0)
goto exit;
- if (aura_rsp->hdr.rc != 0)
- return NPA_ERR_AURA_POOL_FINI;
+ if (aura_rsp->hdr.rc != 0) {
+ rc = NPA_ERR_AURA_POOL_FINI;
+ goto exit;
+ }
/* Sync NDC-NPA for LF */
ndc_req = mbox_alloc_msg_ndc_sync_op(mbox);
--
2.39.2
next prev parent reply other threads:[~2023-06-20 9:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 8:51 [PATCH] common/cnxk/roc_npa: fix npa_aura_fini Thierry Herbelot
2023-06-20 9:27 ` [EXT] " Ashwin Sekhar T K
2023-06-20 9:29 ` Thierry Herbelot
2023-06-20 9:32 ` David Marchand
2023-06-20 9:49 ` Thierry Herbelot
2023-06-20 9:39 ` [PATCH v2] common/cnxk/roc_npa: unlock mbox in error cases Thierry Herbelot
2023-06-20 9:43 ` Thierry Herbelot [this message]
2023-06-21 4:46 ` [EXT] [PATCH v3] " Ashwin Sekhar T K
2023-06-21 5:00 ` Jerin Jacob
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=20230620094337.3127595-1-thierry.herbelot@6wind.com \
--to=thierry.herbelot@6wind.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=ndabilpuram@marvell.com \
--cc=skoteshwar@marvell.com \
--cc=thomas@monjalon.net \
/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).