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 |
Context | Check | Description |
---|---|---|
ci/checkpatch | success | coding style OK |
ci/github-robot: build | success | github build: passed |
ci/Intel-compilation | success | Compilation OK |
ci/intel-Testing | success | Testing PASS |
ci/iol-mellanox-Performance | success | Performance Testing PASS |
ci/iol-broadcom-Performance | success | Performance Testing PASS |
ci/iol-broadcom-Functional | success | Functional Testing PASS |
ci/iol-x86_64-unit-testing | success | Testing PASS |
ci/iol-x86_64-compile-testing | success | Testing PASS |
ci/iol-intel-Functional | fail | Functional Testing issues |
ci/iol-intel-Performance | success | Performance Testing PASS |
ci/iol-aarch64-unit-testing | success | Testing PASS |
ci/iol-aarch64-compile-testing | success | Testing PASS |
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 --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; }