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 02D2CA0A02 for ; Mon, 17 May 2021 18:15:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DFF2641102; Mon, 17 May 2021 18:15:49 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id D7D2540041 for ; Mon, 17 May 2021 18:15:48 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuG-0008Ft-MG; Mon, 17 May 2021 16:15:48 +0000 From: Christian Ehrhardt To: Huisong Li Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:09:23 +0200 Message-Id: <20210517161039.3132619-134-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hns3: fix VMDq mode check' has been queued to stable release 19.11.9 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 19.11.9 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/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a877b1aa32b8f6a8b9cb720d1b63adb745ff38fa Thanks. Christian Ehrhardt --- >From a877b1aa32b8f6a8b9cb720d1b63adb745ff38fa 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 [ 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 | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 1a775eba65..6463a76c94 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2115,23 +2115,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.", @@ -2190,8 +2183,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 @@ -2364,6 +2356,10 @@ hns3_dev_configure(struct rte_eth_dev *dev) 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); if (ret) -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.658320897 +0200 +++ 0134-net-hns3-fix-VMDq-mode-check.patch 2021-05-17 17:40:29.395811239 +0200 @@ -1 +1 @@ -From ffd6b0b18b48d8d1b19d2567c58a0650e8d15df8 Mon Sep 17 00:00:00 2001 +From a877b1aa32b8f6a8b9cb720d1b63adb745ff38fa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ffd6b0b18b48d8d1b19d2567c58a0650e8d15df8 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index f5dfa47ac1..3f5cbef4f9 100644 +index 1a775eba65..6463a76c94 100644 @@ -23 +24 @@ -@@ -2222,23 +2222,16 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) +@@ -2115,23 +2115,16 @@ hns3_check_mq_mode(struct rte_eth_dev *dev) @@ -54 +55 @@ -@@ -2297,8 +2290,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev) +@@ -2190,8 +2183,7 @@ hns3_check_dcb_cfg(struct rte_eth_dev *dev) @@ -64 +65,2 @@ -@@ -2471,6 +2463,10 @@ hns3_dev_configure(struct rte_eth_dev *dev) +@@ -2364,6 +2356,10 @@ hns3_dev_configure(struct rte_eth_dev *dev) + goto cfg_err; @@ -67 +68,0 @@ - hw->adapter_state = HNS3_NIC_CONFIGURING;