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 1B28AA0C3F for ; Sat, 12 Jun 2021 01:09:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 159E74003F; Sat, 12 Jun 2021 01:09:51 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2070.outbound.protection.outlook.com [40.107.93.70]) by mails.dpdk.org (Postfix) with ESMTP id 60A5440691 for ; Sat, 12 Jun 2021 01:09:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YbfhgSbsJ8XOnEf/nphHV+q4S3TsmukwnhI5uu/mXoYdiSGyXAD29KcNvdsljh5qmJBTI3F2BElg4L9dUEqv3C/yctgGEgmgbO9uKS0+BwjDNGlDZOD3vuLLEWg7fHDZ0h11uR+d5XvPxivZg4ELSqGPGOiipMW6l/AGHgp50XinKX6lUXQ6t88TA0Co3eO+RKCh0qOvNK7sHzc8rnNM3d5cDCQcWJeCdK9WGmT1gRecpTUJKhFciwHACM0n/6JdoK7qysKoJPeay9zgQ7wNibFdXEU9VqF++EO2pIb6kJK32d/2LXSVH6TViqWbN4EzJlQs5b12UwLC1Sp7SFz+ow== 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=tfd6r59tDuVe6JFaO3BFj5sI3ZkhQZ+eBmr8aDFwjqE=; b=jyzzy4SkpKSmo9b7U7M1zwDvrGCkTyYuNoVu0k1L9Cu+kVX8qYuJJx07yWCkYyryTgPondLpGLfNnyZSZguPW3Klwm/aertXBnCWz6X+Lj47E5PnNPVG4lMzKjIpzTPPKMbIJRkyEesLe3SMusqrpl5wUj7ZryBXR8RL/Wj72RL8HLhAXHFz/uAlbhZ6Bl6gjVfGCP5xwpLD660jw/XeqfTPmvHkMtlx8qx+l2lHZaEtFeu+GbnYNqGsjZEaylGAzEeEVzX2wXJl8qafQ+s+aOugTBoLvhDxgBet+akgO5rll6vgRNAMa/yCEY1mnbLt2tq12uC3VqvmUVOjaA0cDw== 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=tfd6r59tDuVe6JFaO3BFj5sI3ZkhQZ+eBmr8aDFwjqE=; b=Oq6Q4Gqzjyh+GWiGDaYHdPMWgT8sCcNBMdm5eZBEs0AqU/4JLx8E4I9PJ2+JIS0WCKFAqP51MAGMCDj9nCys5MgxVavu5EqAcSWYpZyn/16bUpTwZAwF1qDGf6a9WTBsWcJpPn7Q81x+CnBL/zGfEAPcqhX4qX2sCh5ee8hHMs6MySX3UFEZnZjQmNRVKBXOI4EjR781PRm2CZCIBk8602rT8kuhbLYnMJ+lJzTE2+IqPo+44T96SEQog5h0pYcXiqGFfHrFuE6uq0AxgM8XFuywqGgxQfl4n7dG9u6s2YRFw+adHultIxY/3cHCm3LmIKrhN6wyh9rGP9SNCcHaoQ== Received: from MW4PR03CA0249.namprd03.prod.outlook.com (2603:10b6:303:b4::14) by BY5PR12MB4855.namprd12.prod.outlook.com (2603:10b6:a03:1dd::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:09:48 +0000 Received: from CO1NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b4:cafe::18) by MW4PR03CA0249.outlook.office365.com (2603:10b6:303:b4::14) 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:48 +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 CO1NAM11FT034.mail.protection.outlook.com (10.13.174.248) 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:47 +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:45 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Lijun Ou , Xiaoyun Li , dpdk stable Date: Sat, 12 Jun 2021 07:02:26 +0800 Message-ID: <20210611230433.8208-52-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: d1e5343d-3ae8-4012-f187-08d92d2e021e X-MS-TrafficTypeDiagnostic: BY5PR12MB4855: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ktBTub0sIzLDzRoG2X/hfegg5J8OYN8Nvsxz5jHK2HIB1BvCS0NvJwPuXlqqXYFI4f/8TopCCMfTRmfIz4aQz3MaK7uP5LTMTcDBdHL9es2YMKS6Ainku5y3DSj/OQvdYGgs2/aj05P5pvNfV/MPNdcejGIga+8TfwiGZka4NgWUqqJq9AdOYpK1SO9G4eU/H7e/316npHxMPnKf2QLhXDaGtiHb2UIvM9GOikmVSRnbURfbv31fZDUHX/ULrnrW/fetp0oh7vxV5eWYyrezAY8tUuxLDn0y+YldyGnI6wEsrQVTCwzpOMSJ4Y6/61+VmPm1JR2C8HBm+Zj43mx6+f4EwHVzPzNTLlnsP+Yo607XtZbahbFh9TRLIPSJPrvTEUwIiFnIQGU3GqgpDfsx9ihivGFdaPPpwtlOiPzrL3E/Dd7SmlrSWKAKuy//cPKaMoPDIlumx20jCWytBz5xrGzior/v0qmMm0uG2q/A0yen3Kx+FOLG0VEJ/NkTf3sGeIKaMIuTDv9gjzF1gAcR7mbd3kXELJEGEgBPBhoSN40sijo8BgV/VfxSkiTvMPqN+Ii0aA6wtqPppxFh5GBpHdVydUTy8sCEtm2tDY2SlCsTmi2LIxRImGmXuMaY28yFfl+IB7h0eqXrcJv9XaixP9vJ/nYQfQTK/xAm4VnNu9YEryBVWZDien2ykM3QIgqffA1vyjcxo2DxydN1WrCqVgv1lYjK/UJEYWjcRfz5y4fM2m5zyVi9FYBHbfGguoY85RfUNN9awI/LbatdR3UiewwfW4yG6j8ixUnS2N+JBhgGH3ZDz36NB5+x/reWvyGG 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)(376002)(396003)(39860400002)(346002)(46966006)(36840700001)(336012)(53546011)(7696005)(8936002)(16526019)(26005)(1076003)(2906002)(82310400003)(55016002)(54906003)(70206006)(426003)(5660300002)(6286002)(70586007)(47076005)(36756003)(186003)(356005)(7636003)(82740400003)(4326008)(36906005)(966005)(36860700001)(2616005)(6666004)(478600001)(316002)(6916009)(8676002)(83380400001)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:09:47.5874 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d1e5343d-3ae8-4012-f187-08d92d2e021e 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: CO1NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4855 Subject: [dpdk-stable] patch 'app/testpmd: fix DCB re-configuration' 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/313bd50dab1ae2870a30e8c683950159a3a4178c Thanks. Xueming Li --- >From 313bd50dab1ae2870a30e8c683950159a3a4178c 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 Cc: Luca Boccassi [ 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 fc64fcdb86..1397b31326 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3188,7 +3188,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.000958500 +0800 +++ 0052-app-testpmd-fix-DCB-re-configuration.patch 2021-06-12 06:53:56.250000000 +0800 @@ -1 +1 @@ -From 5cbbcbad652848b8ecdf26d1d8bf1ea5c794edda Mon Sep 17 00:00:00 2001 +From 313bd50dab1ae2870a30e8c683950159a3a4178c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 5cbbcbad652848b8ecdf26d1d8bf1ea5c794edda ] @@ -26 +28,0 @@ -Cc: stable@dpdk.org @@ -36 +38 @@ -index 39c0b80a5b..bbf039de76 100644 +index fc64fcdb86..1397b31326 100644 @@ -39 +41 @@ -@@ -3043,7 +3043,33 @@ dcb_fwd_config_setup(void) +@@ -3188,7 +3188,33 @@ dcb_fwd_config_setup(void)