diff mbox

[dpdk-dev,1/2] net/mlx5: enforce RSS key length limitation

Message ID 20180326101219.91229-1-shahafs@mellanox.com (mailing list archive)
State Accepted, archived
Delegated to: Shahaf Shuler
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Shahaf Shuler March 26, 2018, 10:12 a.m. UTC 
  RSS hash key must be 40 Bytes long.

Cc: stable@dpdk.org

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 3 ++-
 drivers/net/mlx5/mlx5_rss.c    | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

Comments

Nélio Laranjeiro March 26, 2018, 11:17 a.m. UTC | #1 
On Mon, Mar 26, 2018 at 01:12:18PM +0300, Shahaf Shuler wrote:
> RSS hash key must be 40 Bytes long.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 3 ++-
>  drivers/net/mlx5/mlx5_rss.c    | 7 +++++++
>  2 files changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index f5511ce70..365101af9 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -329,7 +329,8 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
>  	if (use_app_rss_key &&
>  	    (dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len !=
>  	     rss_hash_default_key_len)) {
> -		/* MLX5 RSS only support 40bytes key. */
> +		DRV_LOG(ERR, "port %u RSS key len must be %zu Bytes long",
> +			dev->data->port_id, rss_hash_default_key_len);
>  		rte_errno = EINVAL;
>  		return -rte_errno;
>  	}
> diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
> index 5ac650163..ceaa570ef 100644
> --- a/drivers/net/mlx5/mlx5_rss.c
> +++ b/drivers/net/mlx5/mlx5_rss.c
> @@ -48,6 +48,13 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
>  		return -rte_errno;
>  	}
>  	if (rss_conf->rss_key && rss_conf->rss_key_len) {
> +		if (rss_conf->rss_key_len != rss_hash_default_key_len) {
> +			DRV_LOG(ERR,
> +				"port %u RSS key len must be %zu Bytes long",
> +				dev->data->port_id, rss_hash_default_key_len);
> +			rte_errno = ENOTSUP;

Should be EINVAL when values are incorrect.

> +			return -rte_errno;
> +		}
>  		priv->rss_conf.rss_key = rte_realloc(priv->rss_conf.rss_key,
>  						     rss_conf->rss_key_len, 0);
>  		if (!priv->rss_conf.rss_key) {
> -- 
> 2.12.0

Thanks,
Shahaf Shuler March 27, 2018, 5:55 a.m. UTC | #2 
Monday, March 26, 2018 2:18 PM, Nélio Laranjeiro:
> On Mon, Mar 26, 2018 at 01:12:18PM +0300, Shahaf Shuler wrote:
> > @@ -48,6 +48,13 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
> >  		return -rte_errno;
> >  	}
> >  	if (rss_conf->rss_key && rss_conf->rss_key_len) {
> > +		if (rss_conf->rss_key_len != rss_hash_default_key_len) {
> > +			DRV_LOG(ERR,
> > +				"port %u RSS key len must be %zu Bytes
> long",
> > +				dev->data->port_id,
> rss_hash_default_key_len);
> > +			rte_errno = ENOTSUP;
> 
> Should be EINVAL when values are incorrect.

OK.

Considering it is the only comment in this series, are you OK with me changing it while applying to next-net-mlx? 

> 
> > +			return -rte_errno;
> > +		}
> >  		priv->rss_conf.rss_key = rte_realloc(priv->rss_conf.rss_key,
> >  						     rss_conf->rss_key_len, 0);
> >  		if (!priv->rss_conf.rss_key) {
> > --
> > 2.12.0
> 
> Thanks,
> 
> --
> Nélio Laranjeiro
> 6WIND
Nélio Laranjeiro March 27, 2018, 7:15 a.m. UTC | #3 
On Tue, Mar 27, 2018 at 05:55:32AM +0000, Shahaf Shuler wrote:
> Monday, March 26, 2018 2:18 PM, Nélio Laranjeiro:
> > On Mon, Mar 26, 2018 at 01:12:18PM +0300, Shahaf Shuler wrote:
> > > @@ -48,6 +48,13 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
> > >  		return -rte_errno;
> > >  	}
> > >  	if (rss_conf->rss_key && rss_conf->rss_key_len) {
> > > +		if (rss_conf->rss_key_len != rss_hash_default_key_len) {
> > > +			DRV_LOG(ERR,
> > > +				"port %u RSS key len must be %zu Bytes
> > long",
> > > +				dev->data->port_id,
> > rss_hash_default_key_len);
> > > +			rte_errno = ENOTSUP;
> > 
> > Should be EINVAL when values are incorrect.
> 
> OK.
> 
> Considering it is the only comment in this series, are you OK with me
> changing it while applying to next-net-mlx? 

Sure,

Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Shahaf Shuler March 28, 2018, 6:08 a.m. UTC | #4 
Monday, March 26, 2018 1:12 PM, Shahaf Shuler:
> Subject: [dpdk-dev] [PATCH 1/2] net/mlx5: enforce RSS key length limitation
> 
> RSS hash key must be 40 Bytes long.
> 
> Cc: stable@dpdk.org
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
> ---

Series applied to next-net-mlx with ENOTSUP->EINVAL modification. Thanks.
diff mbox

Patch

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index f5511ce70..365101af9 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -329,7 +329,8 @@  mlx5_dev_configure(struct rte_eth_dev *dev)
 	if (use_app_rss_key &&
 	    (dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len !=
 	     rss_hash_default_key_len)) {
-		/* MLX5 RSS only support 40bytes key. */
+		DRV_LOG(ERR, "port %u RSS key len must be %zu Bytes long",
+			dev->data->port_id, rss_hash_default_key_len);
 		rte_errno = EINVAL;
 		return -rte_errno;
 	}
diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index 5ac650163..ceaa570ef 100644
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -48,6 +48,13 @@  mlx5_rss_hash_update(struct rte_eth_dev *dev,
 		return -rte_errno;
 	}
 	if (rss_conf->rss_key && rss_conf->rss_key_len) {
+		if (rss_conf->rss_key_len != rss_hash_default_key_len) {
+			DRV_LOG(ERR,
+				"port %u RSS key len must be %zu Bytes long",
+				dev->data->port_id, rss_hash_default_key_len);
+			rte_errno = ENOTSUP;
+			return -rte_errno;
+		}
 		priv->rss_conf.rss_key = rte_realloc(priv->rss_conf.rss_key,
 						     rss_conf->rss_key_len, 0);
 		if (!priv->rss_conf.rss_key) {