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 A229A433D8 for ; Mon, 11 Dec 2023 11:18:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 99F7140ED2; Mon, 11 Dec 2023 11:18:55 +0100 (CET) Received: from outbound.mail.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id C3A4240E0F for ; Mon, 11 Dec 2023 11:18:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EeVKIt1Ag+p7eqHJmc9FA8IugproHz0QStjWGhyuDx6XGriz8J/dEPQjI/dXpqn2E1LVTw32we7X0wAB81UveC4dPar9bdyrDUnbvMLF6RUwIFOWCA9FydMJuH9G71C1/U5k/nmIFpuAL36tVtuLLLDxBk7S/N9ORze/fGrGaH0AFiI7dWUltgNObLT8gEOzzX6hsiSxGerqSiVp68jnSnx0ehQhCHr9AlR8ZH8qhZlVbw3GNwLsDDIR3MVENeHTDtKISYpO/ULnMNrQvq+oVKGRFsmwCi4YH+D3cMBbwNJAPPYaATnHvTioEw0n26EJCtccGGml6mMoVyQ5gvzboA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QCtoNoRIkDdjacexI3xgB03nX0AQ+QQwO5PJT+ExJvY=; b=jiruqIEFXKPCObzuuvnwa4woXSQJc2aKHBOnEvV128+hnwfqxI3UvC2Om/we4UFMKSpTY68Hod5hQTtc2rRIjFZLvP0mNggBgGZeqZ2Hn2U17YFL+TfCQXogpqy96qk5nDEdu+CzcxERFEOoT5rOQvLrH5Kr2+fUSgsn00vvnvfVrYDXuU0po2XxF7blaCXHeMjbKRPaq69n1h7nLX+uC7rMWVGa1609mqNLOaSt6n+d2+Ex8OO9hRKdEJreMICgvHtXbRVxic7sK1vUf4cw8rmsndqZjwfELyKlNhnpUQNHJCaYH6Vc74h6tGgGRCqIPGZLht/H4r/n4m2wdzcQXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=networkplumber.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QCtoNoRIkDdjacexI3xgB03nX0AQ+QQwO5PJT+ExJvY=; b=q1gMZcyfB17ktHN0d4D+gtarPTGn3g9xmGCqWzMqwTK7C5aKZ58L/iN+5bQ4BDevUF9zpDdl/LrHSxVZHJlK5i/Rq3J3vdDb9Ndmlmogedek+P1Ug2oA3VGVVryRSUoavEm3t6hGONnVayxHPFGcppkUL91Za1R0Lr/z0RbAghINkBTEqCrvBbKWq5q15ZCwc8jlF67yeCvob2P16MJBsC6RBTEd4KB8ZessBY8p0VZ0R8g4uvQ1yrSnY56XMasN/JoJaB/HD2mRExWji40oPelJDVjrERze2IWJ377EHJrPB33fqPGGgjqiLnbGV2DUeQQB4GRyl5c/Ip+TZkZacg== Received: from SN1PR12CA0096.namprd12.prod.outlook.com (2603:10b6:802:21::31) by CH3PR12MB7521.namprd12.prod.outlook.com (2603:10b6:610:143::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:18:50 +0000 Received: from SN1PEPF000252A3.namprd05.prod.outlook.com (2603:10b6:802:21:cafe::2b) by SN1PR12CA0096.outlook.office365.com (2603:10b6:802:21::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:18:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF000252A3.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:18:50 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:18:36 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:18:34 -0800 From: Xueming Li 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 22.11.4 Date: Mon, 11 Dec 2023 18:11:32 +0800 Message-ID: <20231211101226.2122-68-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A3:EE_|CH3PR12MB7521:EE_ X-MS-Office365-Filtering-Correlation-Id: b510bad4-67b7-4264-5caf-08dbfa3291aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PjXCCObpgmy5vl8hmrCXU5NhUKJqpwcP7mT5lG4hiO6004wowz0Kqhfs6WBKlgS+GQFJZp/vsVdy4DHSyzq8P0vqcPbYi/4o0fWCHdOGXN4HXDnPA8Os8+yPT18/fv8DdSDOet2M/RXL8tmQyru/hFElMjaYSyVrKZuFngXom4zQJfIm3zjQp526inT5a9KIyCSh4WSFuhW8M9ed90Og3mSobsUwJF+HsbZ2+Nhu2eDiqnffEGAnAG6dsh0CBjMkUgOM5tAEzECa57D7kqhg9fh8BAB7PdB0+1DCpClBk5A7rxpvUhKxtqKl1+zq8aKQQ0WJfSi00dNUSGOjdksqGbwbkE0Ji4aNL6LVdGLkvGv62HJcqAxtPmCXHrlbPP9215eK9EH07D04hklb3QuBLoA5EbwX7buemQUEDa7jSlgTGQLs0ilsqYA72KfGb4cQlv3kdHXiFHkk7mxqHtAbTVGY3XR9dxXjsN1nYcIv+/LaNg+3Lmhh6LqpH5rb4coUatjhxU+hpBuA5V3F/k3fpUgxAqaOst7f5tk7Imf0R32fIxotGImaibIMt+T7DdSUep5PmMKgSEAJ49TnNC3hyGQwvPvt56qTvKdWt63ZcjdUhFEZhl6ikn+J2JF59D8XkSiZOITJmiXR4f/WLRRrZc2Z6p5ANVwRf1NdJxFlbhamhlkRXEQX0xtC+l9gUMNSOgcX+FxvvDqxgoPMSfiXV3RfR3hMgaX8Q9uffeebHYzS7N/7bSTljd0rl4bvTCneXdeSkwfCCSDWzYDc1mihnMvmYUh3wQH/SHUmZFSiKMU= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(39860400002)(346002)(376002)(136003)(396003)(230922051799003)(186009)(64100799003)(1800799012)(82310400011)(451199024)(46966006)(40470700004)(36840700001)(40460700003)(26005)(6286002)(1076003)(16526019)(2616005)(66574015)(426003)(336012)(7696005)(53546011)(36860700001)(83380400001)(47076005)(5660300002)(41300700001)(4001150100001)(2906002)(4326008)(478600001)(966005)(8676002)(8936002)(70206006)(70586007)(316002)(6916009)(54906003)(82740400003)(86362001)(7636003)(356005)(36756003)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:18:50.0820 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b510bad4-67b7-4264-5caf-08dbfa3291aa X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A3.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7521 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 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 --- >From 2cd4ce85188101b87f0f7a22389e5744eb3ca443 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 Cc: Xueming Li [ 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 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 + +[ upstream commit 27a26d65f8039ec38a49932c4bb73801b4fd62b8 ] @@ -17 +19,0 @@ -Cc: stable@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),