diff mbox series

[v5,21/40] net/igc: check RSS hash algorithms

Message ID	20231011092805.693171-22-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>, Junfeng Guo <junfeng.guo@intel.com>, Simei Su <simei.su@intel.com> CC: <lihuisong@huawei.com>, <fengchengwen@huawei.com>, <liudongdong3@huawei.com> Subject: [PATCH v5 21/40] net/igc: check RSS hash algorithms Date: Wed, 11 Oct 2023 17:27:46 +0800 Message-ID: <20231011092805.693171-22-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:27 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/igc/igc_ethdev.c | 4 ++++
 drivers/net/igc/igc_txrx.c   | 5 +++++
 2 files changed, 9 insertions(+)

Comments

Ferruh Yigit Oct. 11, 2023, 5:51 p.m. UTC | #1

On 10/11/2023 10:27 AM, Jie Hai wrote:
> 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/igc/igc_ethdev.c | 4 ++++
>  drivers/net/igc/igc_txrx.c   | 5 +++++
>  2 files changed, 9 insertions(+)
> 
> diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
> index 58c4f8092772..11c0f5ff231b 100644
> --- a/drivers/net/igc/igc_ethdev.c
> +++ b/drivers/net/igc/igc_ethdev.c
> @@ -2442,6 +2442,10 @@ eth_igc_rss_hash_update(struct rte_eth_dev *dev,
>  			struct rte_eth_rss_conf *rss_conf)
>  {
>  	struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
> +
> +	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
> +		return -EINVAL;
> +
>  	igc_hw_rss_hash_set(hw, rss_conf);
>  	return 0;
>  }
> diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
> index 5c60e3e99709..5e62e00d2ad9 100644
> --- a/drivers/net/igc/igc_txrx.c
> +++ b/drivers/net/igc/igc_txrx.c
> @@ -818,6 +818,7 @@ igc_rss_configure(struct rte_eth_dev *dev)
>  	rss_conf = dev->data->dev_conf.rx_adv_conf.rss_conf;
>  	if (rss_conf.rss_key == NULL)
>  		rss_conf.rss_key = default_rss_key;
> +
>

unintended change

>  	igc_hw_rss_hash_set(hw, &rss_conf);
>  }
>  
> @@ -958,6 +959,10 @@ igc_dev_mq_rx_configure(struct rte_eth_dev *dev)
>  		return -EINVAL;
>  	}
>  
> +	if (dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
> +	    RTE_ETH_HASH_FUNCTION_DEFAULT)
> +		return -EINVAL;
> +
>  	switch (dev->data->dev_conf.rxmode.mq_mode) {
>  	case RTE_ETH_MQ_RX_RSS:
>  		igc_rss_configure(dev);

diff mbox series

Patch

diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index 58c4f8092772..11c0f5ff231b 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -2442,6 +2442,10 @@  eth_igc_rss_hash_update(struct rte_eth_dev *dev,
 			struct rte_eth_rss_conf *rss_conf)
 {
 	struct igc_hw *hw = IGC_DEV_PRIVATE_HW(dev);
+
+	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
+		return -EINVAL;
+
 	igc_hw_rss_hash_set(hw, rss_conf);
 	return 0;
 }
diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c
index 5c60e3e99709..5e62e00d2ad9 100644
--- a/drivers/net/igc/igc_txrx.c
+++ b/drivers/net/igc/igc_txrx.c
@@ -818,6 +818,7 @@  igc_rss_configure(struct rte_eth_dev *dev)
 	rss_conf = dev->data->dev_conf.rx_adv_conf.rss_conf;
 	if (rss_conf.rss_key == NULL)
 		rss_conf.rss_key = default_rss_key;
+
 	igc_hw_rss_hash_set(hw, &rss_conf);
 }
 
@@ -958,6 +959,10 @@  igc_dev_mq_rx_configure(struct rte_eth_dev *dev)
 		return -EINVAL;
 	}
 
+	if (dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+	    RTE_ETH_HASH_FUNCTION_DEFAULT)
+		return -EINVAL;
+
 	switch (dev->data->dev_conf.rxmode.mq_mode) {
 	case RTE_ETH_MQ_RX_RSS:
 		igc_rss_configure(dev);