patch 'app/dumpcap: fix mbuf pool ring type' has been queued to stable release 22.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 22.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 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=2cd4ce85188101b87f0f7a22389e5744eb3ca443

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 2cd4ce85188101b87f0f7a22389e5744eb3ca443 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Wed, 8 Nov 2023 09:47:38 -0800
Subject: [PATCH] app/dumpcap: fix mbuf pool ring type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 27a26d65f8039ec38a49932c4bb73801b4fd62b8 ]

The internal buffer pool used for copies of mbufs captured
needs to be thread safe.  If capturing on multiple interfaces
or multiple queues, the same pool will be used (consumers).
And if the capture ring gets full, the queues will need
to put back the capture buffer which leads to multiple producers.

Bugzilla ID: 1271
Fixes: cbb44143be74 ("app/dumpcap: add new packet capture application")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Morten Brørup <mb at smartsharesystems.com>
---
 app/dumpcap/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c
index 4751ca26b8..fbe47c476a 100644
--- a/app/dumpcap/main.c
+++ b/app/dumpcap/main.c
@@ -592,7 +592,7 @@ static struct rte_mempool *create_mempool(void)
 	mp = rte_pktmbuf_pool_create_by_ops(pool_name, num_mbufs,
 					    MBUF_POOL_CACHE_SIZE, 0,
 					    rte_pcapng_mbuf_size(snaplen),
-					    rte_socket_id(), "ring_mp_sc");
+					    rte_socket_id(), "ring_mp_mc");
 	if (mp == NULL)
 		rte_exit(EXIT_FAILURE,
 			 "Mempool (%s) creation failed: %s\n", pool_name,
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-12-11 17:56:25.286357500 +0800
+++ 0067-app-dumpcap-fix-mbuf-pool-ring-type.patch	2023-12-11 17:56:23.067652300 +0800
@@ -1 +1 @@
-From 27a26d65f8039ec38a49932c4bb73801b4fd62b8 Mon Sep 17 00:00:00 2001
+From 2cd4ce85188101b87f0f7a22389e5744eb3ca443 Mon Sep 17 00:00:00 2001
@@ -7,0 +8,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 27a26d65f8039ec38a49932c4bb73801b4fd62b8 ]
@@ -17 +19,0 @@
-Cc: stable at dpdk.org
@@ -26 +28 @@
-index 64294bbfb3..4f581bd341 100644
+index 4751ca26b8..fbe47c476a 100644
@@ -29 +31 @@
-@@ -694,7 +694,7 @@ static struct rte_mempool *create_mempool(void)
+@@ -592,7 +592,7 @@ static struct rte_mempool *create_mempool(void)
@@ -32 +34 @@
- 					    data_size,
+ 					    rte_pcapng_mbuf_size(snaplen),