[PATCH 1/2] bus/dpaa: fix lock condition during error handling
Hemant Agrawal
hemant.agrawal at nxp.com
Wed Nov 13 17:14:54 CET 2024
The error handling is missing FQ unlock code.
Detected by pvr-studio
Bug 89-93: very suspicious synchronization
The analyzer issued a pack of V1020 warnings that a resource
might remain blocked.
Fixes: c47ff048b99a ("bus/dpaa: add QMAN driver core routines")
Cc: stable at dpdk.org
Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
---
drivers/bus/dpaa/base/qbman/qman.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c
index 9c90ee25a6..c48fa3e073 100644
--- a/drivers/bus/dpaa/base/qbman/qman.c
+++ b/drivers/bus/dpaa/base/qbman/qman.c
@@ -2138,8 +2138,10 @@ int qman_set_vdq(struct qman_fq *fq, u16 num, uint32_t vdqcr_flags)
if (!p->vdqcr_owned) {
FQLOCK(fq);
- if (fq_isset(fq, QMAN_FQ_STATE_VDQCR))
+ if (fq_isset(fq, QMAN_FQ_STATE_VDQCR)) {
+ FQUNLOCK(fq);
goto escape;
+ }
fq_set(fq, QMAN_FQ_STATE_VDQCR);
FQUNLOCK(fq);
p->vdqcr_owned = fq;
@@ -2172,8 +2174,10 @@ int qman_volatile_dequeue(struct qman_fq *fq, u32 flags __maybe_unused,
if (!p->vdqcr_owned) {
FQLOCK(fq);
- if (fq_isset(fq, QMAN_FQ_STATE_VDQCR))
+ if (fq_isset(fq, QMAN_FQ_STATE_VDQCR)) {
+ FQUNLOCK(fq);
goto escape;
+ }
fq_set(fq, QMAN_FQ_STATE_VDQCR);
FQUNLOCK(fq);
p->vdqcr_owned = fq;
--
2.25.1
More information about the stable
mailing list