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 4CE81A0A0E for ; Mon, 10 May 2021 18:24:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46F4F40F35; Mon, 10 May 2021 18:24:57 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2041.outbound.protection.outlook.com [40.107.93.41]) by mails.dpdk.org (Postfix) with ESMTP id 2A58240F35 for ; Mon, 10 May 2021 18:24:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AH5XdHkZ9tO1+KqrleOKEmjYIjvKLV0o2M34XLZfjGjyBGxjHwILNjuGfYzmmyEqtF+X6WINif7C6NOa8p1Peu1rfj1vLN0raon/kXSKSaa3kc9oJh0AfIFRIHlQhehBaGhdiO1veVFI/4BVbgtZTDeNiePMIkGgN2SCLVAEVBAYsfwG57VdAsfV1Tieia1aE4NSZg9jNzkF5DZnAQKjEAT9WxMLu16s6SlCbf7Gm2mpZNbzBZoYngwF+Bazodr0ynQXrlaGHNhU/j8OgQQMQaJ3qO1z69O/geRcXppit7dQ6Ltm8hJDvxyuHlfM+Bv90Ou7p40G6hUW45RU7cTXWQ== 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=6A86TbKB5i1kj6HO/d8uNg9V5GJQVCSBLl2s0xrtrTA=; b=Alf7RK4FOAG40Raph6kfmq6iFEcai13B55+GqbGMdJ9RXHeBnJ0jMhiWQHCGbWkdIfixBMfJCnIInjn6NVU+zzh8i8jDV9aWwGL5Q5q0877WR7eoJroVNgsgU7yWCyeC98z7kjsBS1bvCFfBgBkujYSh1ALJah7egrbiK9GrQYqGmPZRGTaD4VOetoRSUP7farFIEsi3Whe6C+TwZhN4xdLbQ8zxWBJR7PAvJwPAo1a/4AkutmwdpyLFAe+i6SRg2/YHGNkrc7DrAQgV9ynOr3x4ls9yP3tx7Li8S9gu4Vmz8CSd/HJTLlVusMWqvMzk9t+uc+mHVNmrC4elYYhd0A== 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=6A86TbKB5i1kj6HO/d8uNg9V5GJQVCSBLl2s0xrtrTA=; b=DPDNMq/cWyrAQXSGwK1kKtLh/X4pGOnkn5OesxXhpE2kPIJCoGJTIfiPZytRizA84/N+UXhIbQmA+lgzf0OMeg55A21Npfc/kPpnDL1BZwesyHEgWdS+m3CIXA5FPX5KvXnI88sx03l+uQIpCSvT29gT1b03yblzTn0IlJ5PqrSm5TrfLex49d/purHLCUjzZa8QvUn2QH4sU7qdAtw4Mp1C8+2AGXZEeK4LfRhIsiOKpMHPGpXZW3Z3ecBF2g9q/86U7NpH3wgeuMYZyZKWsTc01x9PQmCs4+yOKtDx2oQYjLSEMrQ5jPjRYs7/RVkeohOtS8uZvEafMdwEm1qTAg== Received: from BN9PR03CA0038.namprd03.prod.outlook.com (2603:10b6:408:fb::13) by BY5PR12MB4049.namprd12.prod.outlook.com (2603:10b6:a03:201::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May 2021 16:24:54 +0000 Received: from BN8NAM11FT030.eop-nam11.prod.protection.outlook.com (2603:10b6:408:fb:cafe::ce) by BN9PR03CA0038.outlook.office365.com (2603:10b6:408:fb::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:24:54 +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 BN8NAM11FT030.mail.protection.outlook.com (10.13.177.146) 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:54 +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:52 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Tue, 11 May 2021 00:02:48 +0800 Message-ID: <20210510160258.30982-219-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: 88419a47-65cf-483d-7bb6-08d913d024fa X-MS-TrafficTypeDiagnostic: BY5PR12MB4049: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pcRhN6X3yRY9RBFmnrusPTP/441SQQ6igbg0/kBpR1VTyDHQMI4ydeKTbFElXfrl42hPvmeWFPLBX/hDgDTBuLp2o5lwsF5vN/vWnd2rDb+9KwkEjmClCz2nl5nhBxftBcUD3QYzeW5Sq5T7gpZ6nTC1MNkk9udM+FXNBTGhTTzR1fXarwxq33HSg9xknO5aJql8d04WKzqYkKdT10A+h6oOZmS4f00NsQQ4NuFxnhmrXaFJWAxLdo34299RnWi5Ilei0seNp4LXsGHaefcFVcm6ky6JpNFpwGzRbbKm9RKF2vfpX2xB1RLWKrMHPmnfnOauT3D5jZ3XL2iGJbXhLO4mFIdFvRjSuguSfLbeirtEu26xsdHHFz1UHknCykgQDXsC6xlfb9awiPYuJkuEVe9JJUPWDlxGHS2KDHQBIqmgDbSsX2MeqHVLh9utMOLRWNsnIZVJmpVyii4h73VRNusVFEEi1EDJJdOck3L11UdIdKo7Z5FIA/iefthdxU1HtBKuZePLa84x6prUwqsOPN44mBq8refHcazs2wb1X+/Y74jySG/K+jTvybAaIQ7JQiUfXORWyrubsHJzUlFp+r455J5weyfnBBudpaq5+c9bXf/zBh7IU2G8QwJPe6TGmjnDQxfK5uLER0WQIX3M/bqhMe3jQ0fJ5rvSrl6Qsa+UTSA2NWylphAf7QnE8dcnn1NmH10PkI8IgIfBrkiKIisBH2d8xtb4lN916oPW6mhlasDFgw0f+012A4ZXJMZY+tJK0Xh4UAwA9Oq9R44Xsg== 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)(396003)(346002)(39860400002)(136003)(376002)(46966006)(36840700001)(1076003)(26005)(16526019)(186003)(4326008)(356005)(316002)(82740400003)(82310400003)(8676002)(6286002)(36906005)(54906003)(47076005)(8936002)(55016002)(7636003)(83380400001)(966005)(70206006)(336012)(70586007)(2906002)(36860700001)(86362001)(478600001)(53546011)(36756003)(7696005)(2616005)(6916009)(6666004)(5660300002)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:24:54.2237 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88419a47-65cf-483d-7bb6-08d913d024fa 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: BN8NAM11FT030.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4049 Subject: [dpdk-stable] patch 'net/hns3: fix VMDq 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/5eaa5abcd8d54b049a2136c16d17d1aa5b4d36f6 Thanks. Xueming Li --- >From 5eaa5abcd8d54b049a2136c16d17d1aa5b4d36f6 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 17 Apr 2021 17:54:57 +0800 Subject: [PATCH] net/hns3: fix VMDq mode check Cc: Luca Boccassi [ upstream commit ffd6b0b18b48d8d1b19d2567c58a0650e8d15df8 ] HNS3 PF driver only supports RSS, DCB or NONE multiple queues mode. Currently, driver doesn't verify the VMDq multi-queue mode completely. This patch fixes the verification for VMDq 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 | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 986e5ef91d..570e5fa6a6 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2137,23 +2137,16 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) int max_tc = 0; int i; - dcb_rx_conf = &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf; - dcb_tx_conf = &dev->data->dev_conf.tx_adv_conf.dcb_tx_conf; - - if (rx_mq_mode == ETH_MQ_RX_VMDQ_DCB_RSS) { - hns3_err(hw, "ETH_MQ_RX_VMDQ_DCB_RSS is not supported. " - "rx_mq_mode = %d", rx_mq_mode); - return -EINVAL; - } - - if (rx_mq_mode == ETH_MQ_RX_VMDQ_DCB || - tx_mq_mode == ETH_MQ_TX_VMDQ_DCB) { - hns3_err(hw, "ETH_MQ_RX_VMDQ_DCB and ETH_MQ_TX_VMDQ_DCB " - "is not supported. rx_mq_mode = %d, tx_mq_mode = %d", + if ((rx_mq_mode & ETH_MQ_RX_VMDQ_FLAG) || + (tx_mq_mode == ETH_MQ_TX_VMDQ_DCB || + tx_mq_mode == ETH_MQ_TX_VMDQ_ONLY)) { + hns3_err(hw, "VMDQ is not supported, rx_mq_mode = %d, tx_mq_mode = %d.", rx_mq_mode, tx_mq_mode); - return -EINVAL; + return -EOPNOTSUPP; } + dcb_rx_conf = &dev->data->dev_conf.rx_adv_conf.dcb_rx_conf; + dcb_tx_conf = &dev->data->dev_conf.tx_adv_conf.dcb_tx_conf; 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.", @@ -2212,8 +2205,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev) return -EOPNOTSUPP; } - /* Check multiple queue mode */ - return hns3_check_mq_mode(dev); + return 0; } static int @@ -2392,6 +2384,9 @@ hns3_dev_configure(struct rte_eth_dev *dev) ret = -EINVAL; goto cfg_err; } + ret = hns3_check_mq_mode(dev); + if (ret) + goto cfg_err; if ((uint32_t)mq_mode & ETH_MQ_RX_DCB_FLAG) { ret = hns3_check_dcb_cfg(dev); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:32.225525000 +0800 +++ 0220-net-hns3-fix-VMDq-mode-check.patch 2021-05-10 23:59:26.700000000 +0800 @@ -1 +1 @@ -From ffd6b0b18b48d8d1b19d2567c58a0650e8d15df8 Mon Sep 17 00:00:00 2001 +From 5eaa5abcd8d54b049a2136c16d17d1aa5b4d36f6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit ffd6b0b18b48d8d1b19d2567c58a0650e8d15df8 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -16,2 +18,2 @@ - drivers/net/hns3/hns3_ethdev.c | 28 ++++++++++++---------------- - 1 file changed, 12 insertions(+), 16 deletions(-) + drivers/net/hns3/hns3_ethdev.c | 27 +++++++++++---------------- + 1 file changed, 11 insertions(+), 16 deletions(-) @@ -20 +22 @@ -index f5dfa47ac1..3f5cbef4f9 100644 +index 986e5ef91d..570e5fa6a6 100644 @@ -23 +25 @@ -@@ -2222,23 +2222,16 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) +@@ -2137,23 +2137,16 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) @@ -54 +56 @@ -@@ -2297,8 +2290,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev) +@@ -2212,8 +2205,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev) @@ -64 +66,3 @@ -@@ -2471,6 +2463,10 @@ hns3_dev_configure(struct rte_eth_dev *dev) +@@ -2392,6 +2384,9 @@ hns3_dev_configure(struct rte_eth_dev *dev) + ret = -EINVAL; + goto cfg_err; @@ -66,2 +69,0 @@ - - hw->adapter_state = HNS3_NIC_CONFIGURING; @@ -71 +73 @@ -+ + @@ -74 +75,0 @@ - if (ret)