From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CBEC942604; Thu, 21 Sep 2023 08:22:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DAF84026D; Thu, 21 Sep 2023 08:22:19 +0200 (CEST) Received: from dkmailrelay1.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by mails.dpdk.org (Postfix) with ESMTP id D5C7C4014F for ; Thu, 21 Sep 2023 08:22:17 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesys.local [192.168.4.10]) by dkmailrelay1.smartsharesystems.com (Postfix) with ESMTP id C200E205F8; Thu, 21 Sep 2023 08:22:15 +0200 (CEST) Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Subject: RE: [PATCH 2/4] dumpcap: allow multiple invocations Date: Thu, 21 Sep 2023 08:22:12 +0200 X-MimeOLE: Produced By Microsoft Exchange V6.5 Message-ID: <98CBD80474FA8B44BF855DF32C47DC35D87BE2@smartserver.smartshare.dk> In-Reply-To: <20230921042349.104150-3-stephen@networkplumber.org> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: [PATCH 2/4] dumpcap: allow multiple invocations Thread-Index: AdnsQ31lyCiMs49KTN6LgL5CXgW/ZAAD0URg References: <20230921042349.104150-1-stephen@networkplumber.org> <20230921042349.104150-3-stephen@networkplumber.org> From: =?iso-8859-1?Q?Morten_Br=F8rup?= To: "Stephen Hemminger" , Cc: "Isaac Boukris" , "Reshma Pattan" X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org > From: Stephen Hemminger [mailto:stephen@networkplumber.org] > Sent: Thursday, 21 September 2023 06.24 >=20 > If dumpcap is run twice with each instance pointing a different > interface, it would fail because of overlap in ring a pool names. > Fix by putting process id in the name. >=20 > Fixes: cbb44143be74 ("app/dumpcap: add new packet capture = application") > Reported-by: Isaac Boukris > Signed-off-by: Stephen Hemminger > --- > app/dumpcap/main.c | 28 ++++++++++++++-------------- > 1 file changed, 14 insertions(+), 14 deletions(-) >=20 > diff --git a/app/dumpcap/main.c b/app/dumpcap/main.c > index 64294bbfb3e6..37754fd06f4f 100644 > --- a/app/dumpcap/main.c > +++ b/app/dumpcap/main.c > @@ -44,7 +44,6 @@ > #include > #include >=20 > -#define RING_NAME "capture-ring" > #define MONITOR_INTERVAL (500 * 1000) > #define MBUF_POOL_CACHE_SIZE 32 > #define BURST_SIZE 32 > @@ -647,6 +646,7 @@ static void dpdk_init(void) > static struct rte_ring *create_ring(void) > { > struct rte_ring *ring; > + char ring_name[RTE_RING_NAMESIZE]; > size_t size, log2; >=20 > /* Find next power of 2 >=3D size. */ > @@ -660,28 +660,28 @@ static struct rte_ring *create_ring(void) > ring_size =3D size; > } >=20 > - ring =3D rte_ring_lookup(RING_NAME); > - if (ring =3D=3D NULL) { > - ring =3D rte_ring_create(RING_NAME, ring_size, > - rte_socket_id(), 0); > - if (ring =3D=3D NULL) > - rte_exit(EXIT_FAILURE, "Could not create ring :%s\n", > - rte_strerror(rte_errno)); > - } > + /* Want one ring per invocation of program */ > + snprintf(ring_name, sizeof(ring_name), > + "dumpcap-%u", getpid()); I'm not sure getpid() is available on Windows. How about: #ifdef _WIN32 #include // With the headers, not here. "dumpcap-%lu", GetCurrentProcessId()); #else "dumpcap-%u", getpid()); #endif > + > + ring =3D rte_ring_create(ring_name, ring_size, > + rte_socket_id(), 0); > + if (ring =3D=3D NULL) > + rte_exit(EXIT_FAILURE, "Could not create ring :%s\n", > + rte_strerror(rte_errno)); > + > return ring; > } >=20 > static struct rte_mempool *create_mempool(void) > { > const struct interface *intf; > - static const char pool_name[] =3D "capture_mbufs"; > + char pool_name[RTE_MEMPOOL_NAMESIZE]; > size_t num_mbufs =3D 2 * ring_size; > struct rte_mempool *mp; > uint32_t data_size =3D 128; >=20 > - mp =3D rte_mempool_lookup(pool_name); > - if (mp) > - return mp; > + snprintf(pool_name, sizeof(pool_name), "capture_%u", getpid()); Same regarding getpid(). >=20 > /* Common pool so size mbuf for biggest snap length */ > TAILQ_FOREACH(intf, &interfaces, next) { > @@ -826,7 +826,7 @@ static void enable_pdump(struct rte_ring *r, = struct > rte_mempool *mp) > rte_exit(EXIT_FAILURE, > "Packet dump enable on %u:%s failed %s\n", > intf->port, intf->name, > - rte_strerror(-ret)); > + rte_strerror(rte_errno)); > } >=20 > if (intf->opts.promisc_mode) { > -- > 2.39.2