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 E8B39A0C3F for ; Sat, 12 Jun 2021 01:09:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E2BD54003F; Sat, 12 Jun 2021 01:09:48 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2050.outbound.protection.outlook.com [40.107.237.50]) by mails.dpdk.org (Postfix) with ESMTP id 64B9A4003F for ; Sat, 12 Jun 2021 01:09:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nkvy4q8rWgHHVEgkmyO6L/L4AMC61sv2L1nlWr4R3Bhy7JPoSn5jXdiudSg0N5FKJNgxj0mFDXr5Wh2Lu7r3m32FBp7gG357BAxFCWgSul0Q6+up9e++3EqR0OfaSWfEy15w3NBqu0TKVPIbgWEmkh+oW5UcKnQSs8MpPHc/+B4uxCiKQ4nA6WHOOz7wq04TJgauGBuNToRtP/tBIGFBILMxn8CGAxQ9rco0JjS4eUD7/9lNCZpdjkAxz4Ujluv1vlm/hEfpp/o4uKPh2VIsyvbAcS4I6wICSF1Zenn1KI6kgbgDLrFzhGjJd0qHDPRaW/c0LG84EjZZ3iHK5FUncQ== 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=zJBnlBKh6MMZ1rDoTep5+7AyujTVv6pzySXglHqiXms=; b=aVAGV7hn/mVl2ryQEF6EGzl4++4r5K17ZSZjxHS6Kpa0d1xeeffEWAnjnrYHy8jvoladE9iLcxWzuLWdRxdbDT3bOa2tHwZ9riDhzdperUdIqGxjpiGBYE0LQ69nvn8LPljiVKG/zfjOIVIHC9TwdJMe74h60lJj8iaNdnT1xHXC5F7RCL+rsLi3IxU/iOx4W/p+ZGzQ5O9KuwV1myDLufgFvsDuoM4djgypqNayfMhLkl17px8JIY2Fm42sUaEAyayjAnbZ6JNXwxe1PzYnBGjzKr0fn+0uAPAzQcwePQqMCeO6Uur2jxSJb1CheYIpdG1WDDHZqn6KI1rCZl7LoA== 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=zJBnlBKh6MMZ1rDoTep5+7AyujTVv6pzySXglHqiXms=; b=nTVyupBmQlGcudui52QaL2JgRo29LsdShXDAOC50JnTMphLTQWStN3XI0z0cLl2FAh1dSbzn5hKv1r0wqYi+OwNrbXF91zwGsWvAGDdKP5IIG9TRTLGOgprqg3dWsZckxs52TGv48F16vulmZeGZd/tygXB6TqSvooeZFtTMVCFQDIxxJL2UdB6bvlqIjd4yjZk6zBvRoMBv2t5vILK5FLyrq7OfzJez5wdta/BqMZjfMPFH2QMQtnEt6xrj/V3Tl+LyZAcx+yIljLQkZN2QDPfJafsq+3+U6p46DaQsR8mXOpQuOJ6dLYMfabkuzwoREAIAlOBYXQCRYXia3O+Wdw== Received: from MWHPR2001CA0022.namprd20.prod.outlook.com (2603:10b6:301:15::32) by BN9PR12MB5034.namprd12.prod.outlook.com (2603:10b6:408:104::17) 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:45 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:301:15:cafe::ad) by MWHPR2001CA0022.outlook.office365.com (2603:10b6:301:15::32) 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:45 +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 CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) 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:45 +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:43 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Lijun Ou , Xiaoyun Li , dpdk stable Date: Sat, 12 Jun 2021 07:02:25 +0800 Message-ID: <20210611230433.8208-51-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-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit 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: 6c972865-d9d6-4b2b-0614-08d92d2e00d1 X-MS-TrafficTypeDiagnostic: BN9PR12MB5034: 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: nmXkQLYgOtn21XR+R9It0B/N7ZggwO1L/JmiPjIOeBi4uRJa0fwAUz44ee2kV8x2vXFOoxc/bYGObQGGWmh8qupSBpYZxijSKRVcp7pX8dM3NfZjB0bxJGzAcTxJ8udatGHSUmxY+51L7n5iTzDn3iu1CEjzk3ETW4xZQQOKPNqKWFmSdWzrX4GfHfso1v6RrFyTl0Ydt4Ww+eOUxg5x1+EW9Xqn9Lyro9wbuz8oRhrfwARFdV9ne/PC/u6fiv8VgZyX7kIbgoRqXt0wiC9g9ENBPn2xj5fNd8T/8NB6Xp9x9s/bSx6skDHJX2whM3/cXJVZIwyYTv/tZ72MCG/IWAwbiVj2LBrKelI8vZ1j8yIPEp/39LF4G2WMPEfmwnI3J1wgjsqFz6Q1EwVXbNRv0szfixoGWkxQylfIf6AkKaYKSZ1+07RcGIWN5RnFQpPlpvooWngXbTa+GTHq43229g7Sl3sBtDD3O9jjrkjFmuIzi/q6zHZbFiiA0OQFermfHbVj36siezH2+HBoYHyyYSNiLlKk6K6FV8xrQOSRorwCvVssJPIB9Pu2zpERa55J/vMb39a0Fv1am50YJHjrZ/pUGtMvJp5CCRCjgfhdHpfkcacwI6F2B8SmJiW9imcQ3rVLjupHYRIV3aHV9VJdiqteCChNWF5TCzqJDk/9H50DJrtgq0pyVfXeZwBNs+fYxUv62DpGuyzCML2J5/jzMcSYSnL3YW+G2/+NAW0SFw1hcMxzBOrg+TSX6C8jJoV82Mrq81VvdkxZvJZCV6XkyA65R9imaICO2jmN6FqPe3Cj/Hm6qowoBuRac0Ug1Ix3 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)(376002)(136003)(346002)(396003)(39860400002)(46966006)(36840700001)(6286002)(356005)(16526019)(186003)(426003)(70586007)(26005)(2616005)(966005)(36756003)(36860700001)(336012)(47076005)(70206006)(5660300002)(55016002)(82310400003)(478600001)(2906002)(8676002)(316002)(1076003)(82740400003)(8936002)(53546011)(86362001)(54906003)(7636003)(7696005)(6666004)(6916009)(36906005)(4326008)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:09:45.3390 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c972865-d9d6-4b2b-0614-08d92d2e00d1 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: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5034 Subject: [dpdk-stable] patch 'app/testpmd: fix DCB forwarding 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/a3da20734911a0a28ab97fafd1e7c4b464e69cc0 Thanks. Xueming Li --- >From a3da20734911a0a28ab97fafd1e7c4b464e69cc0 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 28 Apr 2021 14:40:41 +0800 Subject: [PATCH] app/testpmd: fix DCB forwarding configuration MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Luca Boccassi [ upstream commit a690a070a4f7bc25000a6ba6c71023c29c9d26d4 ] After DCB mode is configured, the operations of port stop and port start change the value of the global variable "dcb_test", As a result, the forwarding configuration from DCB to RSS mode, namely, “dcb_fwd_config_setup()” to "rss_fwd_config_setup()". Currently, the 'dcb_flag' field in struct 'rte_port' indicates whether the port is configured with DCB. And it is sufficient to have 'dcb_config' as a global variable to control the DCB test status. So this patch deletes the "dcb_test". In addition, setting 'dcb_config' at the end of init_port_dcb_config() in case that ports fail to enter DCB mode. Fixes: 900550de04a7 ("app/testpmd: add dcb support") Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") Fixes: 7741e4cf16c0 ("app/testpmd: VMDq and DCB updates") Signed-off-by: Huisong Li Signed-off-by: Lijun Ou Acked-by: Xiaoyun Li --- app/test-pmd/testpmd.c | 18 ++++-------------- app/test-pmd/testpmd.h | 1 - 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 555852ae5e..a419929f52 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -245,9 +245,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */ /* current configuration is in DCB or not,0 means it is not in DCB mode */ uint8_t dcb_config = 0; -/* Whether the dcb is in testing status */ -uint8_t dcb_test = 0; - /* * Configurable number of RX/TX queues. */ @@ -2149,8 +2146,7 @@ start_packet_forwarding(int with_tx_first) return; } - - if(dcb_test) { + if (dcb_config) { for (i = 0; i < nb_fwd_ports; i++) { pt_id = fwd_ports_ids[i]; port = &ports[pt_id]; @@ -2458,8 +2454,6 @@ start_port(portid_t pid) if (port_id_is_invalid(pid, ENABLED_WARN)) return 0; - if(dcb_config) - dcb_test = 1; RTE_ETH_FOREACH_DEV(pi) { if (pid != pi && pid != (portid_t)RTE_PORT_ALL) continue; @@ -2697,11 +2691,6 @@ stop_port(portid_t pid) portid_t peer_pl[RTE_MAX_ETHPORTS]; int peer_pi; - if (dcb_test) { - dcb_test = 0; - dcb_config = 0; - } - if (port_id_is_invalid(pid, ENABLED_WARN)) return; @@ -3604,8 +3593,6 @@ init_port_dcb_config(portid_t pid, rte_port = &ports[pid]; memset(&port_conf, 0, sizeof(struct rte_eth_conf)); - /* Enter DCB configuration status */ - dcb_config = 1; port_conf.rxmode = rte_port->dev_conf.rxmode; port_conf.txmode = rte_port->dev_conf.txmode; @@ -3673,6 +3660,9 @@ init_port_dcb_config(portid_t pid, rte_port->dcb_flag = 1; + /* Enter DCB configuration status */ + dcb_config = 1; + return 0; } diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 1c276f4644..aad2eb30f4 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -423,7 +423,6 @@ extern uint64_t noisy_lkup_num_reads; extern uint64_t noisy_lkup_num_reads_writes; extern uint8_t dcb_config; -extern uint8_t dcb_test; extern uint32_t mbuf_data_size_n; extern uint16_t mbuf_data_size[MAX_SEGS_BUFFER_SPLIT]; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:57.973151500 +0800 +++ 0051-app-testpmd-fix-DCB-forwarding-configuration.patch 2021-06-12 06:53:56.250000000 +0800 @@ -1 +1 @@ -From a690a070a4f7bc25000a6ba6c71023c29c9d26d4 Mon Sep 17 00:00:00 2001 +From a3da20734911a0a28ab97fafd1e7c4b464e69cc0 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Luca Boccassi + +[ upstream commit a690a070a4f7bc25000a6ba6c71023c29c9d26d4 ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org @@ -36 +38 @@ -index d4be23f8f8..a076b1dcde 100644 +index 555852ae5e..a419929f52 100644 @@ -39 +41 @@ -@@ -246,9 +246,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */ +@@ -245,9 +245,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */ @@ -49 +51 @@ -@@ -2167,8 +2164,7 @@ start_packet_forwarding(int with_tx_first) +@@ -2149,8 +2146,7 @@ start_packet_forwarding(int with_tx_first) @@ -59 +61 @@ -@@ -2476,8 +2472,6 @@ start_port(portid_t pid) +@@ -2458,8 +2454,6 @@ start_port(portid_t pid) @@ -68 +70 @@ -@@ -2717,11 +2711,6 @@ stop_port(portid_t pid) +@@ -2697,11 +2691,6 @@ stop_port(portid_t pid) @@ -80 +82 @@ -@@ -3625,8 +3614,6 @@ init_port_dcb_config(portid_t pid, +@@ -3604,8 +3593,6 @@ init_port_dcb_config(portid_t pid, @@ -89 +91 @@ -@@ -3694,6 +3681,9 @@ init_port_dcb_config(portid_t pid, +@@ -3673,6 +3660,9 @@ init_port_dcb_config(portid_t pid, @@ -100 +102 @@ -index 6ca872db82..283b5e3680 100644 +index 1c276f4644..aad2eb30f4 100644 @@ -103 +105 @@ -@@ -425,7 +425,6 @@ extern uint64_t noisy_lkup_num_reads; +@@ -423,7 +423,6 @@ extern uint64_t noisy_lkup_num_reads;