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

[Ferruh Yigit]

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 at 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);