diff mbox series

[v5,08/40] net/cnxk: check RSS hash algorithms

Message ID 20231011092805.693171-9-haijie1@huawei.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series support setting and querying RSS algorithms |

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/cnxk/cnxk_ethdev.c     | 5 +++++
 drivers/net/cnxk/cnxk_ethdev_ops.c | 3 +++
 2 files changed, 8 insertions(+)

Comments

Ferruh Yigit Oct. 11, 2023, 5:04 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/cnxk/cnxk_ethdev.c     | 5 +++++
>  drivers/net/cnxk/cnxk_ethdev_ops.c | 3 +++
>  2 files changed, 8 insertions(+)
> 
> diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
> index 01b707b6c4ac..dc150de745df 100644
> --- a/drivers/net/cnxk/cnxk_ethdev.c
> +++ b/drivers/net/cnxk/cnxk_ethdev.c
> @@ -976,6 +976,10 @@ nix_rss_default_setup(struct cnxk_eth_dev *dev)
>  	if (rss_hash_level)
>  		rss_hash_level -= 1;
>  
> +	if (eth_dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
> +	    RTE_ETH_HASH_FUNCTION_DEFAULT)
> +		return -EINVAL;
> +
>  	flowkey_cfg = cnxk_rss_ethdev_to_nix(dev, rss_hf, rss_hash_level);
>  	return roc_nix_rss_default_setup(&dev->nix, flowkey_cfg);
>  }
> @@ -1373,6 +1377,7 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
>  	}
>  
>  	/* Configure RSS */
> +
>

Looks like unintended change.

>  	rc = nix_rss_default_setup(dev);
>  	if (rc) {
>  		plt_err("Failed to configure rss rc=%d", rc);
> diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c
> index 3ade8eed3626..b6cba99cbb7f 100644
> --- a/drivers/net/cnxk/cnxk_ethdev_ops.c
> +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c
> @@ -1054,6 +1054,9 @@ cnxk_nix_rss_hash_update(struct rte_eth_dev *eth_dev,
>  	int rc = -EINVAL;
>  	uint8_t alg_idx;
>  
> +	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
> +		goto fail;
> +
>  	if (rss_conf->rss_key && rss_conf->rss_key_len != ROC_NIX_RSS_KEY_LEN) {
>  		plt_err("Hash key size mismatch %d vs %d",
>  			rss_conf->rss_key_len, ROC_NIX_RSS_KEY_LEN);
Jie Hai Oct. 12, 2023, 2:25 a.m. UTC | #2 
On 2023/10/12 1:04, Ferruh Yigit wrote:
> 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/cnxk/cnxk_ethdev.c     | 5 +++++
>>   drivers/net/cnxk/cnxk_ethdev_ops.c | 3 +++
>>   2 files changed, 8 insertions(+)
>>
>> diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
>> index 01b707b6c4ac..dc150de745df 100644
>> --- a/drivers/net/cnxk/cnxk_ethdev.c
>> +++ b/drivers/net/cnxk/cnxk_ethdev.c
>> @@ -976,6 +976,10 @@ nix_rss_default_setup(struct cnxk_eth_dev *dev)
>>   	if (rss_hash_level)
>>   		rss_hash_level -= 1;
>>   
>> +	if (eth_dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
>> +	    RTE_ETH_HASH_FUNCTION_DEFAULT)
>> +		return -EINVAL;
>> +
>>   	flowkey_cfg = cnxk_rss_ethdev_to_nix(dev, rss_hf, rss_hash_level);
>>   	return roc_nix_rss_default_setup(&dev->nix, flowkey_cfg);
>>   }
>> @@ -1373,6 +1377,7 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
>>   	}
>>   
>>   	/* Configure RSS */
>> +
>>
> 
> Looks like unintended change.
Will check it before setup in cnxk_nix_configure().
> 
>>   	rc = nix_rss_default_setup(dev);
>>   	if (rc) {
>>   		plt_err("Failed to configure rss rc=%d", rc);
>> diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c
>> index 3ade8eed3626..b6cba99cbb7f 100644
>> --- a/drivers/net/cnxk/cnxk_ethdev_ops.c
>> +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c
>> @@ -1054,6 +1054,9 @@ cnxk_nix_rss_hash_update(struct rte_eth_dev *eth_dev,
>>   	int rc = -EINVAL;
>>   	uint8_t alg_idx;
>>   
>> +	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
>> +		goto fail;
>> +
>>   	if (rss_conf->rss_key && rss_conf->rss_key_len != ROC_NIX_RSS_KEY_LEN) {
>>   		plt_err("Hash key size mismatch %d vs %d",
>>   			rss_conf->rss_key_len, ROC_NIX_RSS_KEY_LEN);
> 
> .
diff mbox series

Patch

diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 01b707b6c4ac..dc150de745df 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -976,6 +976,10 @@  nix_rss_default_setup(struct cnxk_eth_dev *dev)
 	if (rss_hash_level)
 		rss_hash_level -= 1;
 
+	if (eth_dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+	    RTE_ETH_HASH_FUNCTION_DEFAULT)
+		return -EINVAL;
+
 	flowkey_cfg = cnxk_rss_ethdev_to_nix(dev, rss_hf, rss_hash_level);
 	return roc_nix_rss_default_setup(&dev->nix, flowkey_cfg);
 }
@@ -1373,6 +1377,7 @@  cnxk_nix_configure(struct rte_eth_dev *eth_dev)
 	}
 
 	/* Configure RSS */
+
 	rc = nix_rss_default_setup(dev);
 	if (rc) {
 		plt_err("Failed to configure rss rc=%d", rc);
diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c
index 3ade8eed3626..b6cba99cbb7f 100644
--- a/drivers/net/cnxk/cnxk_ethdev_ops.c
+++ b/drivers/net/cnxk/cnxk_ethdev_ops.c
@@ -1054,6 +1054,9 @@  cnxk_nix_rss_hash_update(struct rte_eth_dev *eth_dev,
 	int rc = -EINVAL;
 	uint8_t alg_idx;
 
+	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
+		goto fail;
+
 	if (rss_conf->rss_key && rss_conf->rss_key_len != ROC_NIX_RSS_KEY_LEN) {
 		plt_err("Hash key size mismatch %d vs %d",
 			rss_conf->rss_key_len, ROC_NIX_RSS_KEY_LEN);