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 C1155A0C3F for ; Sat, 12 Jun 2021 01:09:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BABC74003F; Sat, 12 Jun 2021 01:09:29 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2089.outbound.protection.outlook.com [40.107.93.89]) by mails.dpdk.org (Postfix) with ESMTP id 7A6BF4014F for ; Sat, 12 Jun 2021 01:09:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NrbvidoG9cAvYLsfBtTq18SwCuldHwgh9sT2qLJaU6/KUysCiEpFRG+2CFSF8TfIorwBbqfe+9E15AbX1Ty0NkKvnAvPJOlTUA1Z++Zdb3aIL66K1YkPhsKx3qGs5iCdTQZCnwGo947vNDQ5Yetr4giOoSQB1MBnbpoOXbns0nFJcdeW0Z+ByTG0hj/c53VreSuuJrLeuzZ1Xh8xhfLaCf8FclNiie7BJHl48kWaQ4VB+3I2K3Lg8+Ro2FZ43QHmzauTXJtqpJNzD9VmkXvWJij1I8zFr0D7STzYqbFTB/0EKVI4AlpqB/xlpyqu+0FfMKX9sngrmFe9eh6fF7cUvA== 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-SenderADCheck; bh=sgfERCEiQz33G/hbOampLnEMZiNkp90+sWAeHlUALjg=; b=hhljnQR88OSXn7pqXL4vXrtCWiL1B1ZuJLZAXcASOxNsSVAHeAXUf39zrOyUaz2ta5Q24GgikXn7LoKEf4VZ52M4WBjuoGESKLPYVSpafjIByp6vUYswXiIIq+SUFJSL27jTv03adKiSjIz3itX55rANVzlZKFXaRDqlQEOYsCYxDaT3eS65KXu3OeKHvaohpu8UWT53l6lVe85Uv6RxXDix7u5afx7jg9/1XSGpDTxBthqYHpSLGjH+1pC5tLSoZAgRMkNhkOxRZKepA3vowyio1V0Is4cmwRWhScnfxJ8dWv0JzTR3kXD2tHW3Ohfxq1ozlMVSH+akAi+cVRNw4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none 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=sgfERCEiQz33G/hbOampLnEMZiNkp90+sWAeHlUALjg=; b=XSsOx+ENNdy2aqPqbSjcsXt4q1FeC3Yy+2KzEm+NgzCVMUhyMCG9NlKbFgDRdxrVnPMTIHGWmY3D1mszdtwb1JnIcDoUaMiPKuDD/mWrg48JFM4XiUekAcFF3Vias710/MFKnc5xuqNor+jvp04/wSyNZHNiCs+xdkseblWGYYziIX502cFyHLjvBCXhwnlHNCWqFsWmGknWoJFe5Lgc9Mwq4A0amnlcgBsqtLOQGHnvb8OLe+2QYX2tSnPrXx/0ROY4YpNc+jCeOZnWQHswGdh4CQiJW7cdffMdg0iXBM7FCefxgOa/v1G10pstROqKNknEpLAuTeNpf3AciS5UnA== Received: from MW4PR04CA0368.namprd04.prod.outlook.com (2603:10b6:303:81::13) by CY4PR1201MB2487.namprd12.prod.outlook.com (2603:10b6:903:d0::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20; Fri, 11 Jun 2021 23:09:27 +0000 Received: from CO1NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:303:81:cafe::36) by MW4PR04CA0368.outlook.office365.com (2603:10b6:303:81::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Fri, 11 Jun 2021 23:09:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT011.mail.protection.outlook.com (10.13.175.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:09:26 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:09:23 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Lijun Ou , Xiaoyun Li , dpdk stable Date: Sat, 12 Jun 2021 07:02:24 +0800 Message-ID: <20210611230433.8208-50-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c78eee50-6b48-4f4a-9d7a-08d92d2df5c6 X-MS-TrafficTypeDiagnostic: CY4PR1201MB2487: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iPshAx52UHXZ7sQHwCeQmE7e5sZ66QgOBSxVjhV4dmrpvK699FheVeJiw6c46jqQboCtNeh+XubHjrYDDOPlRqYCENQkZbldQUNV444H5SbJOHM987q97PJfeE50QSWIhX1hhojbockzbHr86ntbEhWcOTAVcdU0sP8epnPleEMFOrMMrgTle5gBijTSomZLJyMuX4qVE0UqYqra6o4Me+6LwX5h6KLo+DnABpvrU9IfJgeU0ceHQUAHcnATeoaQXoKCV/CD9iW3T+RPj8Z/V/q8ptK3ilv1JO809+Bgptv8GpgYpvtuq6p9NVcTvM4k2/TyloHGOMSKoU7Xnja04U2r0vmKnKYe7+RupppDqs7SwXY9na3P7od04MSy9qsxkKUYid+fnkIe3Rp/Wz9mKAXNBPzZpZ0t6tzfsgU72RBb0TztHGccVgT2NwgPYOqYqlj3ESa/lah+FDCSVVghdAgAfbsQUfgGCmUNQ31Z85DMDjmrbhngsKpfu1KxUSJDGGkIUXecX9RslVpgrVjJOfC79W58nGebeZ78/Je2Y2XKsRsXW8MBOUIoJRgz/0+vxUDROP9haxF3ANgulDIoku+fa/ECEOs6dgyPCUgaeHcAedk7qmLNDLhK5Xf1klpbeAnXNvzESvwQSdotcM8LUTcvY/v9qe4jw5FIsEYlj4XQduylkfntfDMcHK5Um29Pe9o84tekJyykZ0TXv+tc20OosKTYet9U4nc4V3ocPjV6oOPzw5NSH/m/+/XInexXhxJNO906DdLHvggYZ967rWJMHc7daviaHFxZL/GNfl6LNdsNbW2LWI44B4kLXTxI X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(39860400002)(376002)(396003)(346002)(46966006)(36840700001)(478600001)(5660300002)(26005)(2616005)(36860700001)(36756003)(55016002)(1076003)(6286002)(82310400003)(336012)(186003)(356005)(426003)(70586007)(53546011)(86362001)(8936002)(16526019)(6916009)(2906002)(82740400003)(7696005)(47076005)(54906003)(70206006)(316002)(36906005)(7636003)(8676002)(4326008)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:09:26.8839 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c78eee50-6b48-4f4a-9d7a-08d92d2df5c6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB2487 Subject: [dpdk-stable] patch 'app/testpmd: fix forward lcores number for DCB' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/95d258ab144bbbaf5198bd48f8d75f08a4d6dcdf Thanks. Xueming Li --- >From 95d258ab144bbbaf5198bd48f8d75f08a4d6dcdf Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 28 Apr 2021 14:40:40 +0800 Subject: [PATCH] app/testpmd: fix forward lcores number for DCB Cc: Luca Boccassi [ upstream commit 9ee7d02ad467c1bd1058a61753a8ef31d2313e41 ] For the DCB forwarding test, each core is assigned to each traffic class. Number of forwarding cores for DCB test must be equal or less than number of total TC. Otherwise, the following problems may occur: 1/ Redundant polling threads will be created when forwarding cores number is greater than total TC number. 2/ Two cores would try to use a same queue on a port when Rx/Tx queue number is greater than the used TC number, which is not allowed. Fixes: 900550de04a7 ("app/testpmd: add dcb support") Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") Signed-off-by: Huisong Li Signed-off-by: Lijun Ou Acked-by: Xiaoyun Li --- app/test-pmd/config.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index cb97963157..fc64fcdb86 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3153,6 +3153,21 @@ rss_fwd_config_setup(void) } } +static uint16_t +get_fwd_port_total_tc_num(void) +{ + struct rte_eth_dcb_info dcb_info; + uint16_t total_tc_num = 0; + unsigned int i; + + for (i = 0; i < nb_fwd_ports; i++) { + (void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info); + total_tc_num += dcb_info.nb_tcs; + } + + return total_tc_num; +} + /** * For the DCB forwarding test, each core is assigned on each traffic class. * @@ -3172,12 +3187,16 @@ dcb_fwd_config_setup(void) lcoreid_t lc_id; uint16_t nb_rx_queue, nb_tx_queue; uint16_t i, j, k, sm_id = 0; + uint16_t total_tc_num; uint8_t tc = 0; cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores; cur_fwd_config.nb_fwd_ports = nb_fwd_ports; cur_fwd_config.nb_fwd_streams = (streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports); + total_tc_num = get_fwd_port_total_tc_num(); + if (cur_fwd_config.nb_fwd_lcores > total_tc_num) + cur_fwd_config.nb_fwd_lcores = total_tc_num; /* reinitialize forwarding streams */ init_fwd_streams(); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.950805500 +0800 +++ 0050-app-testpmd-fix-forward-lcores-number-for-DCB.patch 2021-06-12 06:53:56.240000000 +0800 @@ -1 +1 @@ -From 9ee7d02ad467c1bd1058a61753a8ef31d2313e41 Mon Sep 17 00:00:00 2001 +From 95d258ab144bbbaf5198bd48f8d75f08a4d6dcdf Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 9ee7d02ad467c1bd1058a61753a8ef31d2313e41 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index a4445a73bf..39c0b80a5b 100644 +index cb97963157..fc64fcdb86 100644 @@ -29 +31 @@ -@@ -3008,6 +3008,21 @@ rss_fwd_config_setup(void) +@@ -3153,6 +3153,21 @@ rss_fwd_config_setup(void) @@ -51 +53 @@ -@@ -3027,12 +3042,16 @@ dcb_fwd_config_setup(void) +@@ -3172,12 +3187,16 @@ dcb_fwd_config_setup(void)