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 2BFF0A0A02 for ; Mon, 17 May 2021 18:17:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 260FB40041; Mon, 17 May 2021 18:17:36 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 424C0410E0 for ; Mon, 17 May 2021 18:17:35 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifvx-00005T-8d; Mon, 17 May 2021 16:17:33 +0000 From: Christian Ehrhardt To: Huisong Li Cc: Lijun Ou , Xiaoyun Li , dpdk stable Date: Mon, 17 May 2021 18:10:08 +0200 Message-Id: <20210517161039.3132619-179-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix forward lcores number for DCB' has been queued to stable release 19.11.9 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 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/0f4fb28abc66e7bec6275ab155518798c988c3ff Thanks. Christian Ehrhardt --- >From 0f4fb28abc66e7bec6275ab155518798c988c3ff 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 [ 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 5f875a9cac..9e5598ff54 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2328,6 +2328,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. * @@ -2347,12 +2362,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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.392077609 +0200 +++ 0179-app-testpmd-fix-forward-lcores-number-for-DCB.patch 2021-05-17 17:40:29.511812154 +0200 @@ -1 +1 @@ -From 9ee7d02ad467c1bd1058a61753a8ef31d2313e41 Mon Sep 17 00:00:00 2001 +From 0f4fb28abc66e7bec6275ab155518798c988c3ff Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9ee7d02ad467c1bd1058a61753a8ef31d2313e41 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index a4445a73bf..39c0b80a5b 100644 +index 5f875a9cac..9e5598ff54 100644 @@ -29 +30 @@ -@@ -3008,6 +3008,21 @@ rss_fwd_config_setup(void) +@@ -2328,6 +2328,21 @@ rss_fwd_config_setup(void) @@ -51 +52 @@ -@@ -3027,12 +3042,16 @@ dcb_fwd_config_setup(void) +@@ -2347,12 +2362,16 @@ dcb_fwd_config_setup(void)