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 46CDCA0C3F for ; Sat, 12 Jun 2021 01:09:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39FFF4003F; Sat, 12 Jun 2021 01:09:53 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2044.outbound.protection.outlook.com [40.107.237.44]) by mails.dpdk.org (Postfix) with ESMTP id 6A1EE40DDB for ; Sat, 12 Jun 2021 01:09:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eIChqslV7WHonPK0iKEIAr5K/8Bb2UYwN1/4GvgYSyeabqjAfRbfy36KMk+SedWVVvnTBICU8Gwg69JSKT6vyP49ZTbYT8rT5RvrDhDqKgDuZcsB9Ky6b3A8GjolU+HAnrJcY1G9c5MxtGbLNIWATLUvNRlIjskm+R2T9mxOa3GY4B34bDXEixYmTEsuRNis+J8JcCd4gPcVdN/WwdODmmaK7sRc9rwY/J3aVJw3G5XjVUhwPO5fO5Yt3scO/BxvheW/dEq2RkX/m5Zn8uvjFZsniiPOhWhjjr8xVgx3OFCinT3ntwEeefTNkjwJ5hyTRRe2zEE8FBVQ7bjleXJHrw== 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=kOBnWAjmIqKkYxaU1v2NQ1E6xKkH8vcNZTkSQV/lih8=; b=BvhRM8I/WCPKGG2m+SUYkWdwG93nY2YgHaiaHbzsGS3+gNGliiaA9U2owBrdPUawTUBhXLQE4TEQUOUcO+dBhU+svTNAt3Mh+eL0edPl/LBkQFj38tme7A+9rjIdHwwy7LeOz8asTBFTV0hFMPWj+lmNcPgWn6C7jWatori39rl4BOKEmzbmoOx8EWsbfcCRLZwtwU5lMb6l9CbMW9ZxW0f9VxmIkSljEC2nX6Ao9ohA2DFM2gccmaRhbVGPtMfIxZ5inr7WVgCFDInWQN4sMWTgz+cu69A82sNiFsq3mVQpzvSKE86tNGy89NKtPNPGMJgF9Zid242ZeRiezNF81Q== 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=kOBnWAjmIqKkYxaU1v2NQ1E6xKkH8vcNZTkSQV/lih8=; b=H5yw6hNkfwbSMhOtczBZz7iCfCO63vifkNDi2gk0/wuJlslgLgX38afy9yc5lTYPxTJPORHqQerJpGDzjhIcV0iGYKgs4ici6NEdo/H0U7Vy6Ogf/M5TlrbTp+XHc1vsiHnkHjTyyKKioxl7y/CibzKP+v2NXX0JamaVAP3AqDKOv1fMuG77gron14agp8o8xK4saSDaKE7yRjjWhCd83CxgQqFWn/qeqjNN2JjNrysVO2W/h6Qyqn22u6nnox3a0qXG1Y1EXD3yHl08Lny83jePbTo2nY6aMWHKMLirCNgHRdJxqkW7MSD864GjmtQdlJE6M5XsNY8afslv1FPPag== Received: from MWHPR17CA0066.namprd17.prod.outlook.com (2603:10b6:300:93::28) by BL0PR12MB2516.namprd12.prod.outlook.com (2603:10b6:207:4e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:09:50 +0000 Received: from CO1NAM11FT058.eop-nam11.prod.protection.outlook.com (2603:10b6:300:93:cafe::8d) by MWHPR17CA0066.outlook.office365.com (2603:10b6:300:93::28) 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:50 +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 CO1NAM11FT058.mail.protection.outlook.com (10.13.174.164) 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:49 +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:47 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Lijun Ou , Xiaoyun Li , dpdk stable Date: Sat, 12 Jun 2021 07:02:27 +0800 Message-ID: <20210611230433.8208-53-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: d998c875-557a-4360-140c-08d92d2e0377 X-MS-TrafficTypeDiagnostic: BL0PR12MB2516: 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: UfDuflXJpbJ5PBiN/LjAF0itXkfXUAtmfDIwcGZY5C1KAvONw49fCeBuyJy/m5ghfnbUoCJYrxedyMoNEIHufgzREdOoBWjU9PN0ExAiSivQgyQRLOjFcPMx10ntdoF5iRTzyzBeUN7wi1K5OcUlp66oAo/Md74+bPOza06hxfMefQE28EJp5wqU0/VDqxsYg/0zaWfsTI3Iq2gHA1RioCSRI6ZFVjndybcF2tcocYrXS2yVYbfjioukdaj+LrNdn1CQC/V387h5j7xCc4aQF/9Dnjt1JNN5kOGNjNDTDHQ1zm6LKqpaSCW/An61f6v9zqBkv1ZpSnNAHqKIbsmTytx6JRcoJ6dilLmvVi5vWuURHIp9xp5sbvegdpBiwmFF6f6MxOSUQU/OU8cpdYRslarvoXUkCEdHAcvkXU0/bGwS9gdnogQzN0+2XBdh1FC1pzyh+6CMu4Be2siOhCDPvJZbmx2QCt08mlnxHaaHvjYM12gHOLWhlP00drcS5HQT76sye6sI7TGG+WU/4qyX/9xLAnFzzckbL21jHvkC2YKxorpDVqfV7tA7FQLlMtRTDjOujCxUpPwfhKu2IEoIqGVheh2l1iVGffQPRqhO+jOK01zkhK9dIh5s7RTMCqdDDVH4ADBaJ+j79JeWr60Dgtmn1v7tCs9fhxNmHQAKBi2UD8Og7/4qVkVGoVmnwlyvztDTkiu/zLo/R4V7ns5qE0Dg+HtfbigilDxTsMWVWYTcYwn0zfklMlrsdoynwHUkowc71e1h8HdDp3RTEn4RrwfySOFYqsIWT+FoHPfulINSeLaUdQRtQ1e0iHKcK+y4 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)(39860400002)(346002)(136003)(396003)(376002)(46966006)(36840700001)(7636003)(82740400003)(186003)(2906002)(16526019)(2616005)(53546011)(54906003)(316002)(86362001)(70586007)(7696005)(70206006)(1076003)(26005)(6666004)(36906005)(478600001)(8676002)(6286002)(36756003)(6916009)(82310400003)(426003)(4326008)(356005)(36860700001)(8936002)(336012)(83380400001)(47076005)(55016002)(15650500001)(5660300002)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:09:49.8407 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d998c875-557a-4360-140c-08d92d2e0377 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: CO1NAM11FT058.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB2516 Subject: [dpdk-stable] patch 'app/testpmd: verify DCB config during forward config' 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/1f6d0c6f6c460c8ed720cd5f198a191c09b864dd Thanks. Xueming Li --- >From 1f6d0c6f6c460c8ed720cd5f198a191c09b864dd Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 28 Apr 2021 14:40:44 +0800 Subject: [PATCH] app/testpmd: verify DCB config during forward config Cc: Luca Boccassi [ upstream commit 43f1f8261136852357057b78aa49d354beaf3931 ] Currently, the check for doing DCB test is assigned to start_packet_forwarding(), which will be called when run "start" cmd. But fwd_config_setup() is used in many scenarios, such as, "port config all rxq". This patch moves the check from start_packet_forwarding() to fwd_config_setup(). 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/config.c | 23 +++++++++++++++++++++-- app/test-pmd/testpmd.c | 19 ------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 1397b31326..25c2340d74 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3344,6 +3344,10 @@ icmp_echo_config_setup(void) void fwd_config_setup(void) { + struct rte_port *port; + portid_t pt_id; + unsigned int i; + cur_fwd_config.fwd_eng = cur_fwd_eng; if (strcmp(cur_fwd_eng->fwd_mode_name, "icmpecho") == 0) { icmp_echo_config_setup(); @@ -3351,9 +3355,24 @@ fwd_config_setup(void) } if ((nb_rxq > 1) && (nb_txq > 1)){ - if (dcb_config) + if (dcb_config) { + for (i = 0; i < nb_fwd_ports; i++) { + pt_id = fwd_ports_ids[i]; + port = &ports[pt_id]; + if (!port->dcb_flag) { + printf("In DCB mode, all forwarding ports must " + "be configured in this mode.\n"); + return; + } + } + if (nb_fwd_lcores == 1) { + printf("In DCB mode,the nb forwarding cores " + "should be larger than 1.\n"); + return; + } + dcb_fwd_config_setup(); - else + } else rss_fwd_config_setup(); } else diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index a419929f52..d830fe3a2f 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2120,9 +2120,7 @@ start_packet_forwarding(int with_tx_first) { port_fwd_begin_t port_fwd_begin; port_fwd_end_t port_fwd_end; - struct rte_port *port; unsigned int i; - portid_t pt_id; if (strcmp(cur_fwd_eng->fwd_mode_name, "rxonly") == 0 && !nb_rxq) rte_exit(EXIT_FAILURE, "rxq are 0, cannot use rxonly fwd mode\n"); @@ -2145,23 +2143,6 @@ start_packet_forwarding(int with_tx_first) printf("Packet forwarding already started\n"); return; } - - if (dcb_config) { - for (i = 0; i < nb_fwd_ports; i++) { - pt_id = fwd_ports_ids[i]; - port = &ports[pt_id]; - if (!port->dcb_flag) { - printf("In DCB mode, all forwarding ports must " - "be configured in this mode.\n"); - return; - } - } - if (nb_fwd_lcores == 1) { - printf("In DCB mode,the nb forwarding cores " - "should be larger than 1.\n"); - return; - } - } test_done = 0; fwd_config_setup(); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.024893300 +0800 +++ 0053-app-testpmd-verify-DCB-config-during-forward-config.patch 2021-06-12 06:53:56.260000000 +0800 @@ -1 +1 @@ -From 43f1f8261136852357057b78aa49d354beaf3931 Mon Sep 17 00:00:00 2001 +From 1f6d0c6f6c460c8ed720cd5f198a191c09b864dd Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 43f1f8261136852357057b78aa49d354beaf3931 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index bbf039de76..fc057e5687 100644 +index 1397b31326..25c2340d74 100644 @@ -29 +31 @@ -@@ -3199,6 +3199,10 @@ icmp_echo_config_setup(void) +@@ -3344,6 +3344,10 @@ icmp_echo_config_setup(void) @@ -40 +42 @@ -@@ -3206,9 +3210,24 @@ fwd_config_setup(void) +@@ -3351,9 +3355,24 @@ fwd_config_setup(void) @@ -68 +70 @@ -index a076b1dcde..abcbdaa6e1 100644 +index a419929f52..d830fe3a2f 100644 @@ -71 +73 @@ -@@ -2138,9 +2138,7 @@ start_packet_forwarding(int with_tx_first) +@@ -2120,9 +2120,7 @@ start_packet_forwarding(int with_tx_first) @@ -81 +83 @@ -@@ -2163,23 +2161,6 @@ start_packet_forwarding(int with_tx_first) +@@ -2145,23 +2143,6 @@ start_packet_forwarding(int with_tx_first)