[dpdk-stable] [PATCH v2 2/2] mbuf: fix dump of dynamic fields and flags

[dpdk-stable] [PATCH v2 2/2] mbuf: fix dump of dynamic fields and flags

[Alexander Bechikov]

I suppose this issue is introduced by d4902ed31c63 ("mbuf: check shared
memory before dumping dynamic space").

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

Signed-off-by: Alexander Bechikov <asb.tyum@gmail.com>
---
v2:
* Drop changes with log message from v1, because rte_errno is not always set
---
 lib/mbuf/rte_mbuf_dyn.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/mbuf/rte_mbuf_dyn.c b/lib/mbuf/rte_mbuf_dyn.c
index a3bc9b66d2..4ae79383b5 100644
--- a/lib/mbuf/rte_mbuf_dyn.c
+++ b/lib/mbuf/rte_mbuf_dyn.c
@@ -116,8 +116,7 @@ init_shared_mem(void)
 		mz = rte_memzone_lookup(RTE_MBUF_DYN_MZNAME);
 	}
 	if (mz == NULL) {
-		RTE_LOG(ERR, MBUF, "Failed to get mbuf dyn shared memory: %s (%d)\n",
-			rte_strerror(rte_errno), rte_errno);
+		RTE_LOG(ERR, MBUF, "Failed to get mbuf dyn shared memory\n");
 		return -1;
 	}
 
-- 
2.30.2

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

[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.

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(-)

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;
 	}
-- 
2.30.2

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

[Thomas Monjalon]

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.