[v5,30/40] net/null: check RSS hash algorithms

Message ID 20231011092805.693171-31-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/null/rte_eth_null.c | 8 ++++++++
 1 file changed, 8 insertions(+)
  

Comments

Ferruh Yigit Oct. 11, 2023, 6:06 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/null/rte_eth_null.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
> index 31081af79752..8427d7484178 100644
> --- a/drivers/net/null/rte_eth_null.c
> +++ b/drivers/net/null/rte_eth_null.c
> @@ -186,6 +186,11 @@ eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
>  static int
>  eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
>  {
> +	if ((dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) &&
> +	     dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
> +	     RTE_ETH_HASH_FUNCTION_DEFAULT)
> +		return -EINVAL;
> +
>  	return 0;
>  }
>  
> @@ -444,6 +449,9 @@ eth_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf)
>  
>  	rte_spinlock_lock(&internal->rss_lock);
>  
> +	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
> +		return -EINVAL;
> +
>  	if ((rss_conf->rss_hf & internal->flow_type_rss_offloads) != 0)
>  		dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =
>  				rss_conf->rss_hf & internal->flow_type_rss_offloads;

I think 'eth_dev_configure()' can be dropped, as it is not checking any
RSS configuration at all, no need to add this specific one.
  

Patch

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 31081af79752..8427d7484178 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -186,6 +186,11 @@  eth_null_copy_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 static int
 eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
 {
+	if ((dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) &&
+	     dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+	     RTE_ETH_HASH_FUNCTION_DEFAULT)
+		return -EINVAL;
+
 	return 0;
 }
 
@@ -444,6 +449,9 @@  eth_rss_hash_update(struct rte_eth_dev *dev, struct rte_eth_rss_conf *rss_conf)
 
 	rte_spinlock_lock(&internal->rss_lock);
 
+	if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
+		return -EINVAL;
+
 	if ((rss_conf->rss_hf & internal->flow_type_rss_offloads) != 0)
 		dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf =
 				rss_conf->rss_hf & internal->flow_type_rss_offloads;