patch 'mbuf: fix dump of dynamic fields and flags' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/21. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/f1e3e6d421ba5c1faccfffbfb55a79aaa5c2ba85

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From f1e3e6d421ba5c1faccfffbfb55a79aaa5c2ba85 Mon Sep 17 00:00:00 2001
From: Alexander Bechikov <asb.tyum at gmail.com>
Date: Wed, 24 Nov 2021 13:57:04 +0100
Subject: [PATCH] mbuf: fix dump of dynamic fields and flags
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c0b48da45c151987f660b897c247132dac81021f ]

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

Fixes: d4902ed31c63 ("mbuf: check shared memory before dumping dynamic space")

Signed-off-by: Alexander Bechikov <asb.tyum at gmail.com>
Acked-by: Olivier Matz <olivier.matz at 6wind.com>
---
 lib/librte_mbuf/rte_mbuf_dyn.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c
index d55e162a68..0c463f5818 100644
--- a/lib/librte_mbuf/rte_mbuf_dyn.c
+++ b/lib/librte_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.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:06.351137328 +0800
+++ 0060-mbuf-fix-dump-of-dynamic-fields-and-flags.patch	2021-11-28 22:41:03.400206198 +0800
@@ -1 +1 @@
-From c0b48da45c151987f660b897c247132dac81021f Mon Sep 17 00:00:00 2001
+From f1e3e6d421ba5c1faccfffbfb55a79aaa5c2ba85 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c0b48da45c151987f660b897c247132dac81021f ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -15 +17 @@
- lib/mbuf/rte_mbuf_dyn.c | 2 +-
+ lib/librte_mbuf/rte_mbuf_dyn.c | 2 +-
@@ -18,4 +20,4 @@
-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
+diff --git a/lib/librte_mbuf/rte_mbuf_dyn.c b/lib/librte_mbuf/rte_mbuf_dyn.c
+index d55e162a68..0c463f5818 100644
+--- a/lib/librte_mbuf/rte_mbuf_dyn.c
++++ b/lib/librte_mbuf/rte_mbuf_dyn.c