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 F018FA0A02 for ; Mon, 17 May 2021 18:17:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E99B440041; Mon, 17 May 2021 18:17:47 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 13B1F41105 for ; Mon, 17 May 2021 18:17:46 +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 1lifw8-00006T-2s; Mon, 17 May 2021 16:17:44 +0000 From: Christian Ehrhardt To: Huisong Li Cc: Lijun Ou , Xiaoyun Li , dpdk stable Date: Mon, 17 May 2021 18:10:10 +0200 Message-Id: <20210517161039.3132619-181-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 DCB re-configuration' 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/e01b6b075c620bdd7eefc3b8ef7c580ae60c552b Thanks. Christian Ehrhardt --- >From e01b6b075c620bdd7eefc3b8ef7c580ae60c552b Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 28 Apr 2021 14:40:42 +0800 Subject: [PATCH] app/testpmd: fix DCB re-configuration [ upstream commit 5cbbcbad652848b8ecdf26d1d8bf1ea5c794edda ] After DCB mode is configured, if we decrease the number of RX and TX queues, fwd_config_setup() will be called to setup the DCB forwarding configuration. And forwarding streams are updated based on new queue numbers in fwd_config_setup(), but the mapping between the TC and queues obtained by rte_eth_dev_get_dcb_info() is still old queue numbers (old queue numbers are greater than new queue numbers). In this case, the segment fault happens. So rte_eth_dev_configure() should be called again to update the mapping between the TC and queues before rte_eth_dev_get_dcb_info(). Like: set nbcore 4 port stop all port config 0 dcb vt off 4 pfc on port start all port stop all port config all rxq 8 port config all txq 8 Fixes: 900550de04a7 ("app/testpmd: add dcb support") Signed-off-by: Huisong Li Signed-off-by: Lijun Ou Acked-by: Xiaoyun Li --- app/test-pmd/config.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 9e5598ff54..bee9fa6dcf 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2363,7 +2363,33 @@ dcb_fwd_config_setup(void) uint16_t nb_rx_queue, nb_tx_queue; uint16_t i, j, k, sm_id = 0; uint16_t total_tc_num; + struct rte_port *port; uint8_t tc = 0; + portid_t pid; + int ret; + + /* + * The fwd_config_setup() is called when the port is RTE_PORT_STARTED + * or RTE_PORT_STOPPED. + * + * Re-configure ports to get updated mapping between tc and queue in + * case the queue number of the port is changed. Skip for started ports + * since modifying queue number and calling dev_configure need to stop + * ports first. + */ + for (pid = 0; pid < nb_fwd_ports; pid++) { + if (port_is_started(pid) == 1) + continue; + + port = &ports[pid]; + ret = rte_eth_dev_configure(pid, nb_rxq, nb_txq, + &port->dev_conf); + if (ret < 0) { + printf("Failed to re-configure port %d, ret = %d.\n", + pid, ret); + return; + } + } cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores; cur_fwd_config.nb_fwd_ports = nb_fwd_ports; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:36.470111032 +0200 +++ 0181-app-testpmd-fix-DCB-re-configuration.patch 2021-05-17 17:40:29.519812216 +0200 @@ -1 +1 @@ -From 5cbbcbad652848b8ecdf26d1d8bf1ea5c794edda Mon Sep 17 00:00:00 2001 +From e01b6b075c620bdd7eefc3b8ef7c580ae60c552b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5cbbcbad652848b8ecdf26d1d8bf1ea5c794edda ] + @@ -26 +27,0 @@ -Cc: stable@dpdk.org @@ -36 +37 @@ -index 39c0b80a5b..bbf039de76 100644 +index 9e5598ff54..bee9fa6dcf 100644 @@ -39 +40 @@ -@@ -3043,7 +3043,33 @@ dcb_fwd_config_setup(void) +@@ -2363,7 +2363,33 @@ dcb_fwd_config_setup(void)