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 54C2BA0C3F for ; Sat, 12 Jun 2021 01:20:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4A9514003F; Sat, 12 Jun 2021 01:20:48 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.43]) by mails.dpdk.org (Postfix) with ESMTP id 757F041103 for ; Sat, 12 Jun 2021 01:20:45 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oAsose45UVqqn4F501qjcfZzabYcXQbhbDe3n6PGkkqD2jIG64Z33xsHZFLnRU+eDIQLTTcOpi4F8Rnzi8APjMz7QSjkJBF1QSTBt7aB8aT/PcVqQ7Bd9coLyRdx30PPdR5d19p4/96hoyl4eh/UJHYUDoiDj0ABL0KcpUOeBZZ+PcwmyTQVlDE8x7tSkUEtidieIOWXpOcWPbrJrz6VeuamGAR5vxAdp2rdmQVc0mcmUr/WYpyXT24BSISPuWjuKKhOHcoQiE38kTbrR1Dzw567ATPVAXP6mUK5m681y5dbdhZUslntsBFgn6YVmU1lDBLdkwf69o2Z1Snn6XZu5Q== 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=pYApuAVgcfinjdOJ2zIaSKxHFU6occ8wkC3P2YOQU30=; b=Fuf3VhJg8bN5ZFD4LY7Iz0Il+7PJZ2g0cfuIWOBRK2N2KPJ4jZsJib2CygAed5EOsoi4xPY8iua2HhiSWWYVhScj0uyC0BUeIZo83NaPcE24+Nz47fZ0Pw1qhmltKtI+ydr+HKf3L1lBD5ipV+py1CK9uMIMFL1MJLIN2OL9p9cEB+NIH1e1MuhZVghjXQnVI7vfICCN0/FcKMPgifnpZyDFoddLCQQdriOGIj5ZSynLKt9GlbbCq1QMkSNxY+ylkqE3NndcNjcGR0bt7KECf92OjIujl/W5W8hMsu+we2sdPDxcTBie/JXkhqRRY/UVp7WDzSdKE4r/yz4kyHKSIA== 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=pYApuAVgcfinjdOJ2zIaSKxHFU6occ8wkC3P2YOQU30=; b=QzM27GeHOxNH9KPHpErMHdMuHAvG9N7nzvS+sOmTjp2Be6QtN+a0XCgFMAI5euLHdj3JGO3I/fc3dZuETNm1L66vuzINz/QTXEDQJ29Yt0/Oy0OSxERkHPW94FX+diUbnggBtOUcATIv+drO9BK9GUzQwWY5pnU9YewcH2Cmsp3i7bU8AWQk8goCBSGLhPpMEWJAggpHQGmn9BBNLJ0o2pHhUW7m5BcjJ/38nkvTrmy5fkqyvPyLdlmlR6HnkmK0KGE3PCv1//slkFBVRVpzhJmq5U+tZtz4ifPO9TOXHJEKWBjibzcyCa9LZ8ttWEW7x/uBldbasJFwxfgMZLTiaw== Received: from DM6PR10CA0025.namprd10.prod.outlook.com (2603:10b6:5:60::38) by BN6PR12MB1780.namprd12.prod.outlook.com (2603:10b6:404:107::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.24; Fri, 11 Jun 2021 23:20:44 +0000 Received: from DM6NAM11FT049.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::53) by DM6PR10CA0025.outlook.office365.com (2603:10b6:5:60::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:20:44 +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 DM6NAM11FT049.mail.protection.outlook.com (10.13.172.188) 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:20:43 +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.2; Fri, 11 Jun 2021 23:20:41 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Sat, 12 Jun 2021 07:04:21 +0800 Message-ID: <20210611230433.8208-167-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.5] 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: 60f3dc39-6903-479b-6c16-08d92d2f88d8 X-MS-TrafficTypeDiagnostic: BN6PR12MB1780: 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: N+QE3DkdtI21CnEGpMHIR/GAZZjVrBCcePE8/FuNa4cDQJRut4tTagaGorOrltCmsqmQuAMjcj5FU2am2LjdUreAeH2z8qLOnNUqHlgPz4y1kT3FJ71WP29nZzsPPph34tzQ0JveNDjmedH2INHhbc2S81MWpwwKYkigkbGQUAmlK4g8gzaWXTbSBFNN+o/GwRytba4xpTFxzT5VRzAW1BpUDuX3lMT8w8FNxu5byUqAIpBpjj1CS8tBRwXcLT8UviVo9x2HvC2oMx9CubRHDcqqwoUHfQnQRrjG1fUC+MgU/ioAD7eqhUQFEPYTCn6DBpend+OevEzbj4yT13kqc6v9MpQFxZGynOh66KdfERtOE0ibWSEfpIgkIJfcAAjxZIvlMKzmag2L1c+jjQwsXW8h7yllOGseDvTpyQK7NjVFgozuG+HjnOUBTRgyNFX3YnwAdhwnFMjYghmb/DX0Vyqf15+2Fp/lOzdht42R67PPDbUogXAIbtdG7tpT+taDbKr8nNegGzxqRvQ67TVZBOHgK4giuQXBvnAOFGf43oiKM36As/IZm/T6o0EkH8+laW6SEWWIW9ybMdIb3iRnKK13hH2F0UskyoDLCwZA3J8Uefo7lgNQaOOxDKAlVoLe/xa3lnS1LMLF4nnQUW5bvsKWY87uud8ciFAu/jsrXWiNGaatLhLuMhQ1oPzZaWsQS0Os3yaNhel8ljbBdIZLsYv6B+7BpsGz4cOAOAuR4Avaiqi6Zv8e2sbG4C39bNb1CMFYDkpam1yK7I8mAeisQV8WaGj6O1l5vL258Gt7YdZaIp8gTdhKT9UbR707usyC 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)(39860400002)(376002)(346002)(136003)(36840700001)(46966006)(86362001)(55016002)(36756003)(8676002)(316002)(36906005)(70206006)(53546011)(47076005)(82310400003)(26005)(70586007)(83380400001)(36860700001)(54906003)(356005)(19627235002)(966005)(478600001)(7636003)(6666004)(82740400003)(336012)(6286002)(4326008)(6916009)(8936002)(186003)(16526019)(5660300002)(2616005)(2906002)(1076003)(7696005)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:20:43.1174 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60f3dc39-6903-479b-6c16-08d92d2f88d8 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: DM6NAM11FT049.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1780 Subject: [dpdk-stable] patch 'net/hns3: fix Rx/Tx queue numbers 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 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/6442b97894923ddfc38b85e65b230382f6a42fe6 Thanks. Xueming Li --- >From 6442b97894923ddfc38b85e65b230382f6a42fe6 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 15 May 2021 08:52:33 +0800 Subject: [PATCH] net/hns3: fix Rx/Tx queue numbers check Cc: Luca Boccassi [ upstream commit 16c08f07ab673655db5fcae2043e2cb1f423c5b2 ] The Rx/Tx queue numbers should be greater than TC number, this patch adds this check for PF before updating the mapping between TC and queue. Fixes: a951c1ed3ab5 ("net/hns3: support different numbers of Rx and Tx queues") Fixes: 76d794566d43 ("net/hns3: maximize queue number") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_dcb.c | 12 ++++++++++++ drivers/net/hns3/hns3_ethdev_vf.c | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c index b395372aac..cbfcb11ed0 100644 --- a/drivers/net/hns3/hns3_dcb.c +++ b/drivers/net/hns3/hns3_dcb.c @@ -685,6 +685,18 @@ hns3_queue_to_tc_mapping(struct hns3_hw *hw, uint16_t nb_rx_q, uint16_t nb_tx_q) { int ret; + if (nb_rx_q < hw->num_tc) { + hns3_err(hw, "number of Rx queues(%u) is less than number of TC(%u).", + nb_rx_q, hw->num_tc); + return -EINVAL; + } + + if (nb_tx_q < hw->num_tc) { + hns3_err(hw, "number of Tx queues(%u) is less than number of TC(%u).", + nb_tx_q, hw->num_tc); + return -EINVAL; + } + ret = hns3_set_rss_size(hw, nb_rx_q); if (ret) return ret; diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index d18313c330..807ebe16ba 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1435,18 +1435,6 @@ hns3vf_set_tc_queue_mapping(struct hns3_adapter *hns, uint16_t nb_rx_q, { struct hns3_hw *hw = &hns->hw; - if (nb_rx_q < hw->num_tc) { - hns3_err(hw, "number of Rx queues(%u) is less than tcs(%u).", - nb_rx_q, hw->num_tc); - return -EINVAL; - } - - if (nb_tx_q < hw->num_tc) { - hns3_err(hw, "number of Tx queues(%u) is less than tcs(%u).", - nb_tx_q, hw->num_tc); - return -EINVAL; - } - return hns3_queue_to_tc_mapping(hw, nb_rx_q, nb_tx_q); } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:54:00.773243800 +0800 +++ 0167-net-hns3-fix-Rx-Tx-queue-numbers-check.patch 2021-06-12 06:53:56.660000000 +0800 @@ -1 +1 @@ -From 16c08f07ab673655db5fcae2043e2cb1f423c5b2 Mon Sep 17 00:00:00 2001 +From 6442b97894923ddfc38b85e65b230382f6a42fe6 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 16c08f07ab673655db5fcae2043e2cb1f423c5b2 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 30e59e80a6..ab307f1f54 100644 +index b395372aac..cbfcb11ed0 100644 @@ -24 +26 @@ -@@ -727,6 +727,18 @@ hns3_queue_to_tc_mapping(struct hns3_hw *hw, uint16_t nb_rx_q, uint16_t nb_tx_q) +@@ -685,6 +685,18 @@ hns3_queue_to_tc_mapping(struct hns3_hw *hw, uint16_t nb_rx_q, uint16_t nb_tx_q) @@ -44 +46 @@ -index 536ed463ef..c64961632c 100644 +index d18313c330..807ebe16ba 100644 @@ -47 +49 @@ -@@ -1498,18 +1498,6 @@ hns3vf_set_tc_queue_mapping(struct hns3_adapter *hns, uint16_t nb_rx_q, +@@ -1435,18 +1435,6 @@ hns3vf_set_tc_queue_mapping(struct hns3_adapter *hns, uint16_t nb_rx_q,