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 28FE5A0A0E for ; Mon, 10 May 2021 18:24:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1FE6C4003E; Mon, 10 May 2021 18:24:56 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2059.outbound.protection.outlook.com [40.107.93.59]) by mails.dpdk.org (Postfix) with ESMTP id 07134406A3 for ; Mon, 10 May 2021 18:24:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QGNf1WOt22+aRFYJO2CFNZRM3XxXbKz7X6W7p9qQ8gpmr9Tc1e10O5c4oSWRVPIViqNMQ5Y9B5ffEp4lhmOccdE+e0is8dzg/vEG3TBnYgt/HX/RBwH1UARITrXtT5d9FcH80XCKHnwUFC2LZswBoRrbyDJzZ+J+v3X10/jHvY8Y4ItfaQAlKK/X/je2TLio4/PBhIFgoxzwpMvJfipkwcJ1YpcdRlKjfiqCXHB+q1XAS2lvzkimO3uImjlrrHuI5nEeqnxxlp0ngelAmvvrVncMKqmFqcuRQcJR9IFI79UbuiBxRXxkYD6zfFfLOAMksERkIYibQ5YIPttrDOnjGA== 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=GUPfTZ8MF+YhqpLs8ffMXBLmE7Wz84GMnBzDTiAX/r0=; b=cyFXldoNUj5tTTZ5gulYR9rqCb4pSaaYm0SFZuQdGLUL0qxSI77vgQ5U4rxAnDtIOTRjIhmWGDa/9nqEgm7cNj/7AhiuigaD7yQ4FyMOjxuA1y4J6i0yBdZCkoopSYxyPdvGy+Xh6eYMgph9Q1vwX1Uto05E0byCP+11OkBVr6UYBrgr+InwVAr67XuuMhiUko17zG4tpl8A9DHen7nBIudHkcxvpM5cgBQMMFtbBGPv2HZfg8kh/YIELhhiW/4aZqQ+RkfbGO0FmTbPJWxz52dg+eQ25OGqN0iEe2HrjBw5rqAHXnzgJ+faxRq1JoWmknmvyruUUMzqL9tBMmg2tg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.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=GUPfTZ8MF+YhqpLs8ffMXBLmE7Wz84GMnBzDTiAX/r0=; b=mYhFf4OdZyemf3WFDJVEIxcdodWWD/tOsL44M9h+/4hwc1k80McELjc5Pj+g6Gyf9b+QTYeO4IEyu4XL+F26LCyimxt2Rc6tQasDvvvOVmUuTLwmoo0dSiGpXkYPKaROXBOqylslaD5+/t7zyCe91tJ/sCdQ94rUtufWASYPiRYGSjrdWAGp/FbYGMp5LPdqiBVF98K0lolStg0LtPnHTjobTCr0WfjHtAaRlkKX48yUHhTPWgp2ZbR+CmBGum6KBRcoLSxI3fkuxtFyC7DNGYSEl4Dp1e0aBoX9rt8ERnrSgh71gd5xqhs/e8mPgSmt09Q9qiNCQoC8IUOqfSncHw== Received: from BN9PR03CA0870.namprd03.prod.outlook.com (2603:10b6:408:13d::35) by BN6PR12MB1666.namprd12.prod.outlook.com (2603:10b6:405:3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:24:52 +0000 Received: from BN8NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13d:cafe::f6) by BN9PR03CA0870.outlook.office365.com (2603:10b6:408:13d::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:24:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; huawei.com; dkim=none (message not signed) header.d=none;huawei.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 BN8NAM11FT055.mail.protection.outlook.com (10.13.177.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:24:52 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:24:49 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Tue, 11 May 2021 00:02:47 +0800 Message-ID: <20210510160258.30982-218-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 146e655c-9b33-4901-b4f4-08d913d023ce X-MS-TrafficTypeDiagnostic: BN6PR12MB1666: 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: MBve5YLYKNYWhTYUDO3jmVelb7wqfbm9wBLz80/JQlo0UHSJ3W9pEAuMx0uxI5o+fZiGJlQd15mAXrmyXrbTK/X+QuRX+AkDC2BSTwcnOcpBsZcX1FtOmmAL/3utBy0wURAEH8v77J7VRAhVmu65j6eeTI3MV7sYrFX0IDEC8fYaNZJaGHxPJgT0rS3PQFPRnpdNyU1B353N4A55EuEdHMOQAj1E8Sx/tu9clTNdisGD7cz7r4PSxWnrfkgtBYlUiyBFsEMruMuEqAX7ksHt9BcBbsNgvy/HTT9Ki6juH+2pifbClu8PuapLvfz0o00opPUh2/i2yW1fhDnspyor1wCnWEgWCMeLmgRdjEoYLqpwX4JAUdANqHbKN7T6teTgC4hbDh6IVeiVMktp8a/CZTwni0gQbYnPOzQe3OMiY8v5uT/E1dj621AbsWUMkpTpL6LekpzQpwgTARJ1COOkehVF08wunvhNj2XGcGwWUrOWGpEYkU164Xt8pko74ZA4NzLwPq904z6AhnuJBLYcuP4PvWFPP27B18A45TyNFL7qv73jfLYiTvZPLqo0OY43llrZR+h/zv5nUufXPjPfJRjv0wQVcXxwjwun0MWil0W/mP1zTufcaiwSNBLPsAkB7t2Yy/BpbdjANc+zOdOVw6YgYt8KyGXNl/E32HTapGXvJMUXgIiDTIdevbj+5PIF8Oq7CYhrN7RTr1c68g8JTtnWCBywkcQkvf/g9LJ+qhDE0+9mo5omMkzkb1hrE50RUhcvqpIzQrnNqV7p7dlWgw== 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)(346002)(136003)(376002)(396003)(39860400002)(46966006)(36840700001)(7696005)(2616005)(26005)(36756003)(55016002)(36906005)(6286002)(8676002)(316002)(36860700001)(8936002)(336012)(47076005)(82310400003)(6916009)(2906002)(16526019)(426003)(54906003)(5660300002)(86362001)(478600001)(356005)(966005)(82740400003)(186003)(7636003)(70586007)(70206006)(53546011)(4326008)(1076003)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:24:52.2641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 146e655c-9b33-4901-b4f4-08d913d023ce 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: BN8NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1666 Subject: [dpdk-stable] patch 'net/hns3: fix DCB mode check' 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 05/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/cdffbfb77ff108503b741479e6d74ae55ad1df84 Thanks. Xueming Li --- >From cdffbfb77ff108503b741479e6d74ae55ad1df84 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 17 Apr 2021 17:54:56 +0800 Subject: [PATCH] net/hns3: fix DCB mode check Cc: Luca Boccassi [ upstream commit edba2e32cbfd3747391031188c6a060ec8e70465 ] Currently, "ONLY DCB" and "DCB+RSS" mode are both supported by HNS3 PF driver. But the driver verifies only the "DCB+RSS" multiple queues mode. Fixes: 62e3ccc2b94c ("net/hns3: support flow control") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index d63159f278..986e5ef91d 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2154,7 +2154,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) return -EINVAL; } - if (rx_mq_mode == ETH_MQ_RX_DCB_RSS) { + if (rx_mq_mode & ETH_MQ_RX_DCB_FLAG) { if (dcb_rx_conf->nb_tcs > pf->tc_max) { hns3_err(hw, "nb_tcs(%u) > max_tc(%u) driver supported.", dcb_rx_conf->nb_tcs, pf->tc_max); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:32.200676500 +0800 +++ 0219-net-hns3-fix-DCB-mode-check.patch 2021-05-10 23:59:26.690000000 +0800 @@ -1 +1 @@ -From edba2e32cbfd3747391031188c6a060ec8e70465 Mon Sep 17 00:00:00 2001 +From cdffbfb77ff108503b741479e6d74ae55ad1df84 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit edba2e32cbfd3747391031188c6a060ec8e70465 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index eb9a340e69..f5dfa47ac1 100644 +index d63159f278..986e5ef91d 100644 @@ -23 +25 @@ -@@ -2239,7 +2239,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) +@@ -2154,7 +2154,7 @@ hns3_check_mq_mode(struct rte_eth_dev *dev)