diff mbox series

[v5,35/40] net/txgbe: check RSS hash algorithms

Message ID	20231011092805.693171-36-haijie1@huawei.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	Ferruh Yigit
Headers	From: Jie Hai <haijie1@huawei.com> To: <dev@dpdk.org>, Jiawen Wu <jiawenwu@trustnetic.com>, Jian Wang <jianwang@trustnetic.com> CC: <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <liudongdong3@huawei.com> Subject: [PATCH v5 35/40] net/txgbe: check RSS hash algorithms Date: Wed, 11 Oct 2023 17:28:00 +0800 Message-ID: <20231011092805.693171-36-haijie1@huawei.com> In-Reply-To: <20231011092805.693171-1-haijie1@huawei.com> References: <20230908080030.3837515-1-haijie1@huawei.com> <20231011092805.693171-1-haijie1@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	support setting and querying RSS algorithms \| [v5,00/40] support setting and querying RSS algorithms [v5,01/40] ethdev: overwrite some comment related to RSS [v5,02/40] ethdev: support setting and querying RSS algorithm [v5,03/40] net/atlantic: check RSS hash algorithms [v5,04/40] net/axgbe: check RSS hash algorithms [v5,05/40] net/bnx2x: check RSS hash algorithms [v5,06/40] net/bnxt: check RSS hash algorithms [v5,07/40] net/bonding: check RSS hash algorithms [v5,08/40] net/cnxk: check RSS hash algorithms [v5,09/40] net/cpfl: check RSS hash algorithms [v5,10/40] net/cxgbe: check RSS hash algorithms [v5,11/40] net/dpaa: check RSS hash algorithms [v5,12/40] net/dpaa2: check RSS hash algorithms [v5,13/40] net/ena: check RSS hash algorithms [v5,14/40] net/enic: check RSS hash algorithms [v5,15/40] net/fm10k: check RSS hash algorithms [v5,16/40] net/hinic: check RSS hash algorithms [v5,17/40] net/i40e: check RSS hash algorithms [v5,18/40] net/iavf: check RSS hash algorithms [v5,19/40] net/ice: check RSS hash algorithms [v5,20/40] net/idpf: check RSS hash algorithms [v5,21/40] net/igc: check RSS hash algorithms [v5,22/40] net/ionic: check RSS hash algorithms [v5,23/40] net/ixgbe: check RSS hash algorithms [v5,24/40] net/mana: check RSS hash algorithms [v5,25/40] net/mlx5: check RSS hash algorithms [v5,26/40] net/mvpp2: check RSS hash algorithms [v5,27/40] net/netvsc: check RSS hash algorithms [v5,28/40] net/ngbe: : check RSS hash algorithms [v5,29/40] net/nfp: check RSS hash algorithms [v5,30/40] net/null: check RSS hash algorithms [v5,31/40] net/qede: check RSS hash algorithms [v5,32/40] net/sfc: check RSS hash algorithms [v5,33/40] net/tap: check RSS hash algorithms [v5,34/40] net/thunderx: check RSS hash algorithms [v5,35/40] net/txgbe: check RSS hash algorithms [v5,36/40] net/hns3: support setting and querying RSS hash function [v5,37/40] app/proc-info: fix never show RSS info [v5,38/40] app/proc-info: adjust the display format of RSS info [v5,39/40] app/proc-info: support querying RSS hash algorithm [v5,40/40] app/testpmd: add RSS hash algorithms display

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Jie Hai Oct. 11, 2023, 9:28 a.m. UTC

  A new field 'algorithm' has been added to rss_conf, check it
in case of ignoring unsupported values.

Signed-off-by: Jie Hai <haijie1@huawei.com>
---
 drivers/net/txgbe/txgbe_ethdev.c    | 7 ++++++-
 drivers/net/txgbe/txgbe_ethdev_vf.c | 7 ++++++-
 drivers/net/txgbe/txgbe_rxtx.c      | 3 +++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 6bc231a13063..b0e6ea6d171b 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1525,8 +1525,13 @@  txgbe_dev_configure(struct rte_eth_dev *dev)
 
 	PMD_INIT_FUNC_TRACE();
 
-	if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
+	if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
+		if (dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+		    RTE_ETH_HASH_FUNCTION_DEFAULT)
+			return -EINVAL;
+
 		dev->data->dev_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
+	}
 
 	/* multiple queue mode checking */
 	ret  = txgbe_check_mq_mode(dev);
diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index f1341fbf7e22..b0bc8441ac12 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -579,8 +579,13 @@  txgbevf_dev_configure(struct rte_eth_dev *dev)
 	PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d",
 		     dev->data->port_id);
 
-	if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
+	if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
+		if (dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+		    RTE_ETH_HASH_FUNCTION_DEFAULT)
+			return -EINVAL;
+
 		dev->data->dev_conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_RSS_HASH;
+	}
 
 	/*
 	 * VF has no ability to enable/disable HW CRC
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index f7cd2333abee..3ffc2f4a57a3 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -2894,6 +2894,9 @@  txgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
 		return -ENOTSUP;
 	}
 
+	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
+		return -EINVAL;
+
 	hash_key = rss_conf->rss_key;
 	if (hash_key) {
 		/* Fill in RSS hash key */