From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 17604568A for ; Tue, 20 Nov 2018 20:15:50 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7BD98307D84F; Tue, 20 Nov 2018 19:15:49 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 67955600C3; Tue, 20 Nov 2018 19:15:48 +0000 (UTC) From: Kevin Traynor To: Beilei Xing Cc: Wei Zhao , dpdk stable Date: Tue, 20 Nov 2018 19:12:38 +0000 Message-Id: <20181120191252.30277-48-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 20 Nov 2018 19:15:49 +0000 (UTC) Subject: [dpdk-stable] patch 'net/e1000: fix queue number in RSS configuration' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 19:15:50 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 5df32732bb5df288c0a1723d6fdd7d80c80ed4bf Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Thu, 13 Sep 2018 15:06:23 +0800 Subject: [PATCH] net/e1000: fix queue number in RSS configuration [ upstream commit 2b39bf0f75ab07851f61a298e0280da3d009a9b3 ] RSS configuration works for all e1000 NICs except 82576. This patch fixes this issue by correcting queue number in RSS configuration. Fixes: 424ae915baf0 ("net/e1000: move RSS to flow API") Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") Signed-off-by: Beilei Xing Acked-by: Wei Zhao --- drivers/net/e1000/e1000_ethdev.h | 6 ++++-- drivers/net/e1000/igb_flow.c | 10 +++++++--- drivers/net/e1000/igb_rxtx.c | 12 +++++++++--- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h index 902001f36..94edff08e 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h @@ -237,5 +237,6 @@ struct igb_rte_flow_rss_conf { struct rte_flow_action_rss conf; /**< RSS parameters. */ uint8_t key[IGB_HKEY_MAX_INDEX * sizeof(uint32_t)]; /* Hash key. */ - uint16_t queue[IGB_MAX_RX_QUEUE_NUM]; /**< Queues indices to use. */ + /* Queues indices to use. */ + uint16_t queue[IGB_MAX_RX_QUEUE_NUM_82576]; }; @@ -507,5 +508,6 @@ int eth_igb_add_del_flex_filter(struct rte_eth_dev *dev, struct rte_eth_flex_filter *filter, bool add); -int igb_rss_conf_init(struct igb_rte_flow_rss_conf *out, +int igb_rss_conf_init(struct rte_eth_dev *dev, + struct igb_rte_flow_rss_conf *out, const struct rte_flow_action_rss *in); int igb_action_rss_same(const struct rte_flow_action_rss *comp, diff --git a/drivers/net/e1000/igb_flow.c b/drivers/net/e1000/igb_flow.c index 073852913..33683498a 100644 --- a/drivers/net/e1000/igb_flow.c +++ b/drivers/net/e1000/igb_flow.c @@ -1308,4 +1308,5 @@ igb_parse_rss_filter(struct rte_eth_dev *dev, struct rte_flow_error *error) { + struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); const struct rte_flow_action *act; const struct rte_flow_action_rss *rss; @@ -1358,9 +1359,12 @@ igb_parse_rss_filter(struct rte_eth_dev *dev, (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act, "RSS hash key must be exactly 40 bytes"); - if (rss->queue_num > RTE_DIM(rss_conf->queue)) + if (((hw->mac.type == e1000_82576) && + (rss->queue_num > IGB_MAX_RX_QUEUE_NUM_82576)) || + ((hw->mac.type != e1000_82576) && + (rss->queue_num > IGB_MAX_RX_QUEUE_NUM))) return rte_flow_error_set (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act, "too many queues for RSS context"); - if (igb_rss_conf_init(rss_conf, rss)) + if (igb_rss_conf_init(dev, rss_conf, rss)) return rte_flow_error_set (error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, act, @@ -1575,5 +1579,5 @@ igb_flow_create(struct rte_eth_dev *dev, goto out; } - igb_rss_conf_init(&rss_filter_ptr->filter_info, + igb_rss_conf_init(dev, &rss_filter_ptr->filter_info, &rss_conf.conf); TAILQ_INSERT_TAIL(&igb_filter_rss_list, diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 8aefd976a..e97b244ff 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -2853,9 +2853,15 @@ igb_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, int -igb_rss_conf_init(struct igb_rte_flow_rss_conf *out, +igb_rss_conf_init(struct rte_eth_dev *dev, + struct igb_rte_flow_rss_conf *out, const struct rte_flow_action_rss *in) { + struct e1000_hw *hw = E1000_DEV_PRIVATE_TO_HW(dev->data->dev_private); + if (in->key_len > RTE_DIM(out->key) || - in->queue_num > RTE_DIM(out->queue)) + ((hw->mac.type == e1000_82576) && + (in->queue_num > IGB_MAX_RX_QUEUE_NUM_82576)) || + ((hw->mac.type != e1000_82576) && + (in->queue_num > IGB_MAX_RX_QUEUE_NUM))) return -EINVAL; out->conf = (struct rte_flow_action_rss){ @@ -2946,5 +2952,5 @@ igb_config_rss_filter(struct rte_eth_dev *dev, igb_hw_rss_hash_set(hw, &rss_conf); - if (igb_rss_conf_init(&filter_info->rss_info, &conf->conf)) + if (igb_rss_conf_init(dev, &filter_info->rss_info, &conf->conf)) return -EINVAL; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.596401072 +0000 +++ 0048-net-e1000-fix-queue-number-in-RSS-configuration.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,15 +1,16 @@ -From 2b39bf0f75ab07851f61a298e0280da3d009a9b3 Mon Sep 17 00:00:00 2001 +From 5df32732bb5df288c0a1723d6fdd7d80c80ed4bf Mon Sep 17 00:00:00 2001 From: Beilei Xing Date: Thu, 13 Sep 2018 15:06:23 +0800 Subject: [PATCH] net/e1000: fix queue number in RSS configuration +[ upstream commit 2b39bf0f75ab07851f61a298e0280da3d009a9b3 ] + RSS configuration works for all e1000 NICs except 82576. This patch fixes this issue by correcting queue number in RSS configuration. Fixes: 424ae915baf0 ("net/e1000: move RSS to flow API") Fixes: ac8d22de2394 ("ethdev: flatten RSS configuration in flow API") -Cc: stable@dpdk.org Signed-off-by: Beilei Xing Acked-by: Wei Zhao @@ -72,10 +73,10 @@ &rss_conf.conf); TAILQ_INSERT_TAIL(&igb_filter_rss_list, diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c -index f2d3d4911..25ff5f68f 100644 +index 8aefd976a..e97b244ff 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c -@@ -2852,9 +2852,15 @@ igb_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, +@@ -2853,9 +2853,15 @@ igb_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, int -igb_rss_conf_init(struct igb_rte_flow_rss_conf *out, @@ -93,7 +94,7 @@ + (in->queue_num > IGB_MAX_RX_QUEUE_NUM))) return -EINVAL; out->conf = (struct rte_flow_action_rss){ -@@ -2945,5 +2951,5 @@ igb_config_rss_filter(struct rte_eth_dev *dev, +@@ -2946,5 +2952,5 @@ igb_config_rss_filter(struct rte_eth_dev *dev, igb_hw_rss_hash_set(hw, &rss_conf); - if (igb_rss_conf_init(&filter_info->rss_info, &conf->conf))