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 A572F4625C for ; Tue, 18 Feb 2025 13:37:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0709402A0; Tue, 18 Feb 2025 13:37:10 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2082.outbound.protection.outlook.com [40.107.220.82]) by mails.dpdk.org (Postfix) with ESMTP id A6047402A0 for ; Tue, 18 Feb 2025 13:37:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lBHOuYtZk62fmRIj6HV4dIB1VTDO8PgyMT7fzyzL4Q6Nus8caoj00j8lYrz9rKODy509jUNfeKuvUTE5PQXT0+2POIqwEqIQVnMgJV/uYngbMH61NcKD2K1ifkJTLvCw1k4rDSUlOF3Idg1O0s9fd/mBROgnjvqG8irH2D4aXyA4XC+hBajTgmMcr9cnQksc24E6io/xJ+z90bzcx+DUBXMtvnMimlujkhoek29HhjwgX7mX61qlxVCHAXjuTNZiYjnYP06/Oqtb1LSE0G4kNtk3mEKLLzkz3iTS+GiR+aabONUE8Zv2/bbcbUKLgFuNsZGWWMnj1UUrQRmczfUfsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=svOVaLU7QMRe8Wk9bcjEsYTvAT3oh7XUkOjh+vQFCJI=; b=EKJAmxxTfmATZFZKnH/9OHKp2HiTDV19/TQvM72S3RjAPUBJw3WxQnWiS0EmTqE7IfxD4rl3lFReKln2SppBs7uq3T8cmJAZsGGt0P0qgkXDHV6weiJ4pQG3BzM6ccX+SlRJCeThxZw/cuB6c3GP95Pr/UDVwePi/dfz1Nkc+XfutpLjPW1Z6xR6K70DdHzf4hN7/J4EXtsMHnjUKdOsLW6IMP70xenQEaCuEKiHyxTIyPhJwPFSWWHC3d0NPVPAUJRq0MKgW6aGu+Wmxg3tZ29mIMry+nP1KD+6tGnXbIWMnItpvUy1bxQZ9rQ73rybgtUrZoJevuPcSMLzyoODVg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=corigine.com 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=svOVaLU7QMRe8Wk9bcjEsYTvAT3oh7XUkOjh+vQFCJI=; b=Spn3dopeYZN4jJWKlkbal2wQAFbJ+hZZJToeVGMDLzTSnnyQlCD6zP/5wl51DzWe4kR5YsTkSwIOo4O1z8GdO08bsH2oCxo24R/hmgp8vg5nIR9z6o4ftrk0bQVAwbkJnQJFm/Os4uUif8sI1wl/UjsY/mEc4okj8TUTgnQu/Aacpj91IclC25ikQFGjaFnuMtN8s7Yd9SmYmiME0DWvOiXzNmIdieqdCA62ub+GU6bqdSEHVlCHZ50xywIHSAEp3pSJoM4r3PCoBD1yGXM2VVYntXSobvEiNPn6LH4XI4xeIo9tdRHYNH8DaMEeFbQUScZ404d82ZI0a74RPQ2hLA== Received: from BN9PR03CA0417.namprd03.prod.outlook.com (2603:10b6:408:111::32) by MW6PR12MB9018.namprd12.prod.outlook.com (2603:10b6:303:241::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.19; Tue, 18 Feb 2025 12:37:04 +0000 Received: from BN3PEPF0000B06B.namprd21.prod.outlook.com (2603:10b6:408:111:cafe::8a) by BN9PR03CA0417.outlook.office365.com (2603:10b6:408:111::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8466.14 via Frontend Transport; Tue, 18 Feb 2025 12:37:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BN3PEPF0000B06B.mail.protection.outlook.com (10.167.243.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8489.2 via Frontend Transport; Tue, 18 Feb 2025 12:37:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:36:49 -0800 Received: from nvidia.com (10.126.230.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.1544.14; Tue, 18 Feb 2025 04:36:47 -0800 From: Xueming Li To: Long Wu CC: , Chaoyong He , dpdk stable Subject: patch 'net/bonding: fix dedicated queue setup' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:05 +0800 Message-ID: <20250218123523.36836-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BN3PEPF0000B06B:EE_|MW6PR12MB9018:EE_ X-MS-Office365-Filtering-Correlation-Id: ee0027f5-ba0d-4220-3078-08dd5018f1dc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|36860700013|1800799024|82310400026|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?x6TDu2eDyP42UX2Tx1wpOqf/wXGttff4+hRiQeP0BnrlwxJJNy3jRz2c+U4M?= =?us-ascii?Q?9YBvhDPlQbvoK2XDkka2m2DIEI6yRl2pbd6ker7A81+kbWpoKAtZzgvJHs6W?= =?us-ascii?Q?MYcG57aCT2BH/6I4u9XDMIQojpARXZAidK7V15lnM0Nawtx7G5HdsTryNLxP?= =?us-ascii?Q?w3UlDhsugo1JdRBJe12IrQpEzXg6Zrz3MR8TexMBlRzaqoN2ixhcP7RpbKw9?= =?us-ascii?Q?OwMDxfis/9fsPkK2w4xi97gWD3IM6HfVa1HvTdLTA5u93iNfsh778yjyyKKd?= =?us-ascii?Q?YdpPKdBjv2z8fhDzDzVtKKs1/oPpIYD/rmnLz9WclJemNz/q8xmgERRWLTig?= =?us-ascii?Q?xw6KTcI78BQNey9fTGNxCPAfaOdi1gxof5ZfMvjGhkTyHn8YhLSzmQaKkW7C?= =?us-ascii?Q?69ctIKewMZTQvWG2LIcdAHrjmweaEWRwCcu6AZAnKyRHPRlYgDuFXapcBZZg?= =?us-ascii?Q?rEmjwpc0T31IrbxmUFbgAjmMlwf9He4cCZ5G8qVtVSv7VAlXtDnq0/SYqR6x?= =?us-ascii?Q?L1e9Uva4/iOcPfZbP2Rle3rgI+tGeIlcH3F3T58TwBS13HkJOee3Jqnj5c/5?= =?us-ascii?Q?mSdL4+aP5hpNHd07QYHuf8l5+9sr+bvi35o6393z5fc6Wn4Bh2XDdUszitCs?= =?us-ascii?Q?JvmSpeR5R159AnP/xURckDN1Ca9f/yl9bUNJLaB8I8khea7L3K7CdsfZy6ow?= =?us-ascii?Q?nieCBYIJI1qJieSAHzKMwv/lMEIlr735wztWWNFNAjomWjAdAPaLeqMATleH?= =?us-ascii?Q?MdmK0wKOwKCvh+rJSlFnlubgxRuX8mSTt9rB2sk8JAbrE9jyBJLt3q9dvTmi?= =?us-ascii?Q?7YfksbGd31wzWvT+F9yzSprt3Z8tFGFmi5p5DRXT6smaoD2bC4/ekjzqR46E?= =?us-ascii?Q?LRW9Qeevbw2lqhMQCF/mKWB2ZdO4f5bFrbQgRzIO+ihFbB+EwMNHmSj6ilSO?= =?us-ascii?Q?5UVB3Mjrmz/Z9M4DtV4QohiFEfwyk+PthWI13R8BLyS8gEKRO8cEcFBTkxMa?= =?us-ascii?Q?N34Jm19tSxBVgzhagxtCcsIEAnDVYi1uIZO3fpjH1FwkE4Jy71qUoRSzYVhA?= =?us-ascii?Q?t8iyZRFU+biZ/Uu4w5pb+MPXDbHbDX4Ol+bTgtFjpZSyH0Lo8BWBfIfLx0SR?= =?us-ascii?Q?PZ0ac8mwPRvpfzdWneiQERKDrMJ1lz0ARHhnBUnoTmWWgBLvHtfjk+vTb6eO?= =?us-ascii?Q?ykvTQTChpMAOMjLa1ca3+udlMiof7ifgBhyhtBgP1Pl3BoTyEBshrcd3fIKr?= =?us-ascii?Q?kT5XSu601lWYUhWET5oK8huZ/Hi9viKicqjPs+8dhnuwJV5PBJgC68AoZsAd?= =?us-ascii?Q?j0Iu85NaJ+GESHEda6Iz9WgVddWP48i3Sb5NGCEE5/752Ouh4xrssnPHNMy4?= =?us-ascii?Q?XNJjfpkrfBsQQXbGl9VDlsVxSNKk9RV8YDYllq/apBi8Ph8wI9yWK0DlRwxZ?= =?us-ascii?Q?E9dLSpTpvIdWd6azhT3qL8tq1EPaTB0Xnv5GF/FzA5O1Rst2UDcbl1YT75xw?= =?us-ascii?Q?C1u5VhvO0GDwUQU=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(36860700013)(1800799024)(82310400026)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:37:02.1467 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee0027f5-ba0d-4220-3078-08dd5018f1dc 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B06B.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB9018 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=eb465c251ea6f64cd49c6ac53a8e71cfb328ebd4 Thanks. Xueming Li --- >From eb465c251ea6f64cd49c6ac53a8e71cfb328ebd4 Mon Sep 17 00:00:00 2001 From: Long Wu Date: Thu, 26 Dec 2024 09:26:18 +0800 Subject: [PATCH] net/bonding: fix dedicated queue setup Cc: Xueming Li [ upstream commit 4da0705bf896327af062212b5a1e6cb1f1366aa5 ] The bonding PMD hardcoded the value of dedicated hardware Rx/Tx queue size as (128/512). This will cause the bonding port start fail if some NIC requires more Rx/Tx descriptors than the hardcoded number. Therefore, use the minimum hardware queue size of the member port to initialize dedicated hardware Rx/Tx queue. If obtaining the minimum queue size failed, use the default queue size. Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP control") Signed-off-by: Long Wu Reviewed-by: Chaoyong He --- drivers/net/bonding/rte_eth_bond_8023ad.h | 3 +++ drivers/net/bonding/rte_eth_bond_pmd.c | 25 ++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h index 4c280c7565..54e233f858 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.h +++ b/drivers/net/bonding/rte_eth_bond_8023ad.h @@ -35,6 +35,9 @@ extern "C" { #define MARKER_TLV_TYPE_INFO 0x01 #define MARKER_TLV_TYPE_RESP 0x02 +#define SLOW_TX_QUEUE_HW_DEFAULT_SIZE 512 +#define SLOW_RX_QUEUE_HW_DEFAULT_SIZE 512 + typedef void (*rte_eth_bond_8023ad_ext_slowrx_fn)(uint16_t member_id, struct rte_mbuf *lacp_pkt); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 4144c86be4..c3a761d0d4 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1685,10 +1685,26 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev, } if (internals->mode4.dedicated_queues.enabled == 1) { - /* Configure slow Rx queue */ + struct rte_eth_dev_info member_info = {}; + uint16_t nb_rx_desc = SLOW_RX_QUEUE_HW_DEFAULT_SIZE; + uint16_t nb_tx_desc = SLOW_TX_QUEUE_HW_DEFAULT_SIZE; + + errval = rte_eth_dev_info_get(member_eth_dev->data->port_id, + &member_info); + if (errval != 0) { + RTE_BOND_LOG(ERR, + "rte_eth_dev_info_get: port=%d, err (%d)", + member_eth_dev->data->port_id, + errval); + return errval; + } + if (member_info.rx_desc_lim.nb_min != 0) + nb_rx_desc = member_info.rx_desc_lim.nb_min; + + /* Configure slow Rx queue */ errval = rte_eth_rx_queue_setup(member_eth_dev->data->port_id, - internals->mode4.dedicated_queues.rx_qid, 128, + internals->mode4.dedicated_queues.rx_qid, nb_rx_desc, rte_eth_dev_socket_id(member_eth_dev->data->port_id), NULL, port->slow_pool); if (errval != 0) { @@ -1700,8 +1716,11 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev, return errval; } + if (member_info.tx_desc_lim.nb_min != 0) + nb_tx_desc = member_info.tx_desc_lim.nb_min; + errval = rte_eth_tx_queue_setup(member_eth_dev->data->port_id, - internals->mode4.dedicated_queues.tx_qid, 512, + internals->mode4.dedicated_queues.tx_qid, nb_tx_desc, rte_eth_dev_socket_id(member_eth_dev->data->port_id), NULL); if (errval != 0) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.106319465 +0800 +++ 0010-net-bonding-fix-dedicated-queue-setup.patch 2025-02-18 19:39:00.428244082 +0800 @@ -1 +1 @@ -From 4da0705bf896327af062212b5a1e6cb1f1366aa5 Mon Sep 17 00:00:00 2001 +From eb465c251ea6f64cd49c6ac53a8e71cfb328ebd4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4da0705bf896327af062212b5a1e6cb1f1366aa5 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 395e41ff95..4c30bd40ee 100644 +index 4c280c7565..54e233f858 100644 @@ -40 +42 @@ -index f69496feec..467f7fe7ea 100644 +index 4144c86be4..c3a761d0d4 100644 @@ -43 +45 @@ -@@ -1684,10 +1684,26 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev, +@@ -1685,10 +1685,26 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev, @@ -72 +74 @@ -@@ -1699,8 +1715,11 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev, +@@ -1700,8 +1716,11 @@ member_configure_slow_queue(struct rte_eth_dev *bonding_eth_dev,