diff mbox series

[v3] mbuf: fix dump of dynamic fields and flags

Message ID 20211124125704.26054-1-olivier.matz@6wind.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series [v3] mbuf: fix dump of dynamic fields and flags | expand

Checks

Context Check Description
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional fail Functional Testing issues
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/github-robot: build success github build: passed
ci/checkpatch success coding style OK

Commit Message

Olivier Matz Nov. 24, 2021, 12:57 p.m. UTC
From: Alexander Bechikov <asb.tyum@gmail.com>

The dump of dynamic fields and flags fails if the shm is already
allocated. Add a check to fix the issue.

Cc: stable@dpdk.org
Fixes: d4902ed31c63 ("mbuf: check shared memory before dumping dynamic space")

Signed-off-by: Alexander Bechikov <asb.tyum@gmail.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
Hi Alexander,

Sorry for late feedback, I forgot to reply to your v2.
I'm resending your fix with the 2 patches merged together, so it
can be included in 21.11.

Thanks,
Olivier


v3:
* Merge the 2 patches from v2 and add a commit log
v2:
* Drop changes with log message from v1, because rte_errno is not always set
---
 lib/mbuf/rte_mbuf_dyn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Thomas Monjalon Nov. 24, 2021, 2:08 p.m. UTC | #1
24/11/2021 13:57, Olivier Matz:
> From: Alexander Bechikov <asb.tyum@gmail.com>
> 
> The dump of dynamic fields and flags fails if the shm is already
> allocated. Add a check to fix the issue.
> 
> Cc: stable@dpdk.org
> Fixes: d4902ed31c63 ("mbuf: check shared memory before dumping dynamic space")
> 
> Signed-off-by: Alexander Bechikov <asb.tyum@gmail.com>
> Acked-by: Olivier Matz <olivier.matz@6wind.com>
> ---
> Hi Alexander,
> 
> Sorry for late feedback, I forgot to reply to your v2.
> I'm resending your fix with the 2 patches merged together, so it
> can be included in 21.11.

Applied for 21.11, thanks.
diff mbox series

Patch

diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index db8e020665..4ae79383b5 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -531,7 +531,7 @@  void rte_mbuf_dyn_dump(FILE *out)
 	size_t i;
 
 	rte_mcfg_tailq_write_lock();
-	if (init_shared_mem() < 0) {
+	if (shm == NULL && init_shared_mem() < 0) {
 		rte_mcfg_tailq_write_unlock();
 		return;
 	}