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 D03EAA034F for ; Wed, 10 Nov 2021 07:47:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C4A0040142; Wed, 10 Nov 2021 07:47:44 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2077.outbound.protection.outlook.com [40.107.243.77]) by mails.dpdk.org (Postfix) with ESMTP id 88E0340142 for ; Wed, 10 Nov 2021 07:47:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ap+TjZgowM73FXCkqYAJ5zNu6C2PoqZSuYLh/vV+CSgA/YNRjS5Xo04H6d9uO2iS7nhuV3xPZsZb9Khr99Yz0risbRA6u+Xn3sa4WjiISAN1+baP8yAAnr04ZL95pgCxxjnLBuVl2WM/K6X1XNGsM85z63oRg4rKRASe+iEY37Dbzu8c/0t8BW9cf3us9GKkNCrtIWd6yG62dGZJZXddu6XUQ6orxyXvq8qr0SeAzNKTwlavpRobkVKcRuWWOktKE52IGS+PL8QhOKQ6UXLM2zV+tHALHGVFIWF8vtcCZB0MApHQtN45YqH1UYcgsAnm21nP8XHa+7Wlf0nAP7fvEg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kjznD8BhFRkua5RfFrGvq9MRfx+iMldfpxiO2q+9IFs=; b=O2xtBXWNXy4ijQAkOBHzVeZ0W2opDf7xSmvMBW5lBORKzBjfzpIS0QRiYaITqphkEAkaN7t0wkKVIe2Qxqg1smhKRAHLdbpq36NGdFwiSEabhaaF1nO/N82zJUT5UN1EiRG6Qq1dVxi4oEvPsXIW8FDOpTbDN2NgZdLZW6Z4Qui2wU63TKXoOPs7pausTerJcp3Vztwgwa/txTgKa+tdgbP/TIXxpOnM30QD3rFuShXFIcOLVGGgq6ii8V4UO9GsQFrFsYeoYB+MG4g9FneWTmn46FrsjnQ6sMCXFc8RqZwoPo3Rj9AEZhyHz1lqJDcd7R3Sk7Jph28GMjurhITKOQ== 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=quarantine sp=quarantine 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=kjznD8BhFRkua5RfFrGvq9MRfx+iMldfpxiO2q+9IFs=; b=ujmSuXoLuoOIq3fg5ZvhyFVbWpaAYFb4btHTunge6AKu/LGA53a5bAE6XaIcfQArlbXLoFp1E3X0Zbc13J691tA+AK/OqhXnq3FQ/bv1FamBalnS+4QzEx+WnOL1xozaNlMeY5UmK8gMzdtV0G6y4f9rmHjD9BIflKyE7tgrbVlrDySx7LctLPkIuJ64rfCvx6g1ijjtJ1p/O2gQPmbqp2WEGa9Y1xPFxsXY+riirZ6x9scJFqb2v4SdLH72X2EDyiTGH9/AJBrWSQjxQX05nN63TDQxJ0o/dYViinWjxBThl7qytBLR6aghYzQyJrCF5swS15DDdWjYb1fj0BrO0g== Received: from BN9PR03CA0410.namprd03.prod.outlook.com (2603:10b6:408:111::25) by DM6PR12MB3578.namprd12.prod.outlook.com (2603:10b6:5:3c::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.23; Wed, 10 Nov 2021 06:47:40 +0000 Received: from BN8NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:408:111:cafe::d5) by BN9PR03CA0410.outlook.office365.com (2603:10b6:408:111::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:47:40 +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 BN8NAM11FT017.mail.protection.outlook.com (10.13.177.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:47:40 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:47:38 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , Xiaoyun Li , dpdk stable Date: Wed, 10 Nov 2021 14:30:21 +0800 Message-ID: <20211110063216.2744012-138-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5e18e338-272c-4f47-e273-08d9a415fda5 X-MS-TrafficTypeDiagnostic: DM6PR12MB3578: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bBBS6YDzyDdsTsGVpmw2nERH5fyhRH0L6Dsyyi5QqnmgxGjaEmuCd0eqpaYS/2yekLF0eWqXYExjhXGSj0U91rN8JTAnOqRn3emNkN71DYFvmpY0+gDKU4hOm7tkPzGnS1l0U/0p7QyS0iLcjbLZnX3exGjfaPEe7wH3+wnQR0pLmyKG1/4P3BHTXgYYR63+5c7xEUenKGSWdA3DvqKgHolGaeU6NFF9qw/21bQGGPNE0Ug7gl2MjPciO3ii5Ntz3kFOLjwavviH20so6/0e8/RzpUFuD8vHT3hVLZdjSbIdfNwDmkpBMrpz92SzW9pe2jMwFZIMptF2DBofwKTaPM7h0zT1Q8l9H7ddqgQr2gucIfeEC4+L+KdkdrKGvwyzbjqphkWQTOTu8VMxibwaWG9qTh3ei9eUhGaUqkVwjg2ap6/oGpUIrv+fAsVwVzio9F4uPprjdmgK6sCekbgDH0g2Wssr5j0x6ZJpLO7dohY/s9viEycB0KRAC9v0upgOTgq7D5NjgzBq3jXrLJCNksW+YoBy89u7P859sahS3HGGTqXyi1B+mn0ngqTkHpWtx9mZrUnO0duh6Yzt5KbfN6+EajEKIoI71tzLOHxCP7fgOgodnybLJF0aEDUwp+TGpukiSG/uOa5SvsRJBaZe1VWuHl3ED71G3l7N/eT7W9jCvAVwUMfIS8S6Tfd0zT4j2XnCSCMj0qkAiMYmawyc1Nxodx0JwHw/m2QvOMTwt75IoDowP2deU0iHWNrN9SpHTbjNc9EyFiLUbQb7ec9QCVbuu1mteGlBH3kwsHNErpPuAJJoYIbzdT+NU/SSgNqpfM1L32ExDBnGhYiDRGYYyQ== 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)(46966006)(36840700001)(6666004)(8936002)(356005)(53546011)(316002)(36860700001)(36906005)(336012)(55016002)(1076003)(54906003)(83380400001)(8676002)(5660300002)(6286002)(966005)(2906002)(426003)(47076005)(16526019)(36756003)(7636003)(70206006)(186003)(2616005)(70586007)(4326008)(7696005)(82310400003)(86362001)(4001150100001)(508600001)(26005)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:47:40.4762 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e18e338-272c-4f47-e273-08d9a415fda5 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: BN8NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3578 Subject: [dpdk-stable] patch 'app/testpmd: retain all original dev conf when config DCB' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/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/07c572ba8224a09e5a696cb7a0e4535c4d4a7579 Thanks. Xueming Li --- >From 07c572ba8224a09e5a696cb7a0e4535c4d4a7579 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 11 Oct 2021 17:12:46 +0800 Subject: [PATCH] app/testpmd: retain all original dev conf when config DCB Cc: Xueming Li [ upstream commit c1ba6c325c4c7c8e0f32d9e96bc25ab172a222ee ] When configuring DCB, testpmd retains the rx_mode/tx_mode configuration in rte_port->dev_conf. But some configurations, such as the link_speed, were not saved if they were set before configuring DCB. Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) Acked-by: Xiaoyun Li --- app/test-pmd/testpmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 75714ff648..466df37a2a 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3574,10 +3574,8 @@ init_port_dcb_config(portid_t pid, rte_port = &ports[pid]; - memset(&port_conf, 0, sizeof(struct rte_eth_conf)); - - port_conf.rxmode = rte_port->dev_conf.rxmode; - port_conf.txmode = rte_port->dev_conf.txmode; + /* retain the original device configuration. */ + memcpy(&port_conf, &rte_port->dev_conf, sizeof(struct rte_eth_conf)); /*set configuration of DCB in vt mode and DCB in non-vt mode*/ retval = get_eth_dcb_conf(pid, &port_conf, dcb_mode, num_tcs, pfc_en); -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:08.026653589 +0800 +++ 0137-app-testpmd-retain-all-original-dev-conf-when-config.patch 2021-11-10 14:17:01.900745845 +0800 @@ -1 +1 @@ -From c1ba6c325c4c7c8e0f32d9e96bc25ab172a222ee Mon Sep 17 00:00:00 2001 +From 07c572ba8224a09e5a696cb7a0e4535c4d4a7579 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c1ba6c325c4c7c8e0f32d9e96bc25ab172a222ee ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index eec4f1b81d..12a0db8796 100644 +index 75714ff648..466df37a2a 100644 @@ -24,2 +26,2 @@ -@@ -3729,10 +3729,8 @@ init_port_dcb_config(portid_t pid, - } +@@ -3574,10 +3574,8 @@ init_port_dcb_config(portid_t pid, +