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 D38D943345 for ; Thu, 16 Nov 2023 14:25:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD8E740E7C; Thu, 16 Nov 2023 14:25:02 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 5689440A89 for ; Thu, 16 Nov 2023 14:25:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=agfoTHUx0CMJy9uIt2LZPGnFxEDU5McPs1/5mj+uYeE=; b=cwK1rC39kpY5jACmcFleQqRhu3yxTNgnrVbsIzzlTUgJuCZiWxJbUIWz+U/587ZHAQmXnk Ia4N2jvqmf8UembBCSvNCdIfpOExYGa96IapDqfFU901fLRPRTjfEue2gZ403bZqEA/XPr /XOA20JYYAdSciGq1nPBrS78rkqcggY= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-693-jTjtVTbfOMy9WgUp0mSMQQ-1; Thu, 16 Nov 2023 08:24:57 -0500 X-MC-Unique: jTjtVTbfOMy9WgUp0mSMQQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6FCE23C0FC84; Thu, 16 Nov 2023 13:24:57 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C9542166B27; Thu, 16 Nov 2023 13:24:56 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'app/dumpcap: fix mbuf pool ring type' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:23:26 +0000 Message-ID: <20231116132348.557257-44-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 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/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ac4382d19486f974cff19f3f44d81b310307c6c6 Thanks. Kevin --- >From ac4382d19486f974cff19f3f44d81b310307c6c6 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger 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 [ 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 Reviewed-by: Morten Brørup --- 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 a828b7c8a4..4a76cc3d05 100644 --- a/app/dumpcap/main.c +++ b/app/dumpcap/main.c @@ -577,5 +577,5 @@ static struct rte_mempool *create_mempool(void) 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, -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:53.608871312 +0000 +++ 0044-app-dumpcap-fix-mbuf-pool-ring-type.patch 2023-11-16 13:21:52.507946541 +0000 @@ -1 +1 @@ -From 27a26d65f8039ec38a49932c4bb73801b4fd62b8 Mon Sep 17 00:00:00 2001 +From ac4382d19486f974cff19f3f44d81b310307c6c6 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 27a26d65f8039ec38a49932c4bb73801b4fd62b8 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 64294bbfb3..4f581bd341 100644 +index a828b7c8a4..4a76cc3d05 100644 @@ -29 +30 @@ -@@ -695,5 +695,5 @@ static struct rte_mempool *create_mempool(void) +@@ -577,5 +577,5 @@ static struct rte_mempool *create_mempool(void) @@ -31 +32 @@ - data_size, + rte_pcapng_mbuf_size(snaplen),