[PATCH 1/2] net/mlx5: fix ethtool link setting call order

[PATCH 1/2] net/mlx5: fix ethtool link setting call order

[Shahaf Shuler]

According to ethtool_link_setting API recommendation ETHTOOL_GLINKSETTINGS
should be called before ETHTOOL_GSET as the later one deprecated.

Fixes: f47ba80080ab ("net/mlx5: remove kernel version check")
Cc: nelio.laranjeiro@6wind.com

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 746b94f734..588d4ba627 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -697,9 +697,9 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	time_t start_time = time(NULL);
 
 	do {
-		ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
+		ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
 		if (ret)
-			ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
+			ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
 		if (ret == 0)
 			break;
 		/* Handle wait to complete situation. */
-- 
2.12.0

[PATCH 2/2] net/mlx5: add Rx and Tx tuning parameters

[Shahaf Shuler]

A new ethdev API was exposed by
commit 3be82f5cc5e3 ("ethdev: support PMD-tuned Tx/Rx parameters")

Enabling the PMD to provide default parameters in case no strict request
from application in order to improve the out of the box experience.

While the current API lacks the means for the PMD to provide the best
possible value, providing the best default the PMD can guess.
The values are based on Mellanox performance report and depends on the
underlying NIC capabilities.

Cc: erezsc@mellanox.com
Cc: amira@mellanox.com
Cc: olgas@mellanox.com

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 51 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 588d4ba627..78354922b0 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -417,6 +417,56 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
 }
 
 /**
+ * Sets default tuning parameters.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ * @param[out] info
+ *   Info structure output buffer.
+ */
+static void
+mlx5_set_default_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
+{
+	struct priv *priv = dev->data->dev_private;
+
+	if (priv->link_speed_capa & ETH_LINK_SPEED_100G) {
+		if (dev->data->nb_rx_queues <= 2 &&
+		    dev->data->nb_tx_queues <= 2) {
+			/* Minimum CPU utilization. */
+			info->default_rxportconf.ring_size = 256;
+			info->default_txportconf.ring_size = 256;
+			/* Don't care as queue num is set. */
+			info->default_rxportconf.nb_queues = 0;
+			info->default_txportconf.nb_queues = 0;
+		} else {
+			/* Max Throughput. */
+			info->default_rxportconf.ring_size = 2048;
+			info->default_txportconf.ring_size = 2048;
+			info->default_rxportconf.nb_queues = 16;
+			info->default_txportconf.nb_queues = 16;
+		}
+	} else {
+		if (dev->data->nb_rx_queues <= 2 &&
+		    dev->data->nb_tx_queues <= 2) {
+			/* Minimum CPU utilization. */
+			info->default_rxportconf.ring_size = 256;
+			info->default_txportconf.ring_size = 256;
+			/* Don't care as queue num is set. */
+			info->default_rxportconf.nb_queues = 0;
+			info->default_txportconf.nb_queues = 0;
+		} else {
+			/* Max Throughput. */
+			info->default_rxportconf.ring_size = 4096;
+			info->default_txportconf.ring_size = 4096;
+			info->default_rxportconf.nb_queues = 8;
+			info->default_txportconf.nb_queues = 8;
+		}
+	}
+	info->default_rxportconf.burst_size = 64;
+	info->default_txportconf.burst_size = 64;
+}
+
+/**
  * DPDK callback to get information about the device.
  *
  * @param dev
@@ -458,6 +508,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	info->hash_key_size = rss_hash_default_key_len;
 	info->speed_capa = priv->link_speed_capa;
 	info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK;
+	mlx5_set_default_params(dev, info);
 }
 
 /**
-- 
2.12.0

Re: [PATCH 2/2] net/mlx5: add Rx and Tx tuning parameters

[Nélio Laranjeiro]

On Sun, Apr 29, 2018 at 09:03:08PM +0300, Shahaf Shuler wrote:
> A new ethdev API was exposed by
> commit 3be82f5cc5e3 ("ethdev: support PMD-tuned Tx/Rx parameters")
> 
> Enabling the PMD to provide default parameters in case no strict request
> from application in order to improve the out of the box experience.
> 
> While the current API lacks the means for the PMD to provide the best
> possible value, providing the best default the PMD can guess.
> The values are based on Mellanox performance report and depends on the
> underlying NIC capabilities.
> 
> Cc: erezsc@mellanox.com
> Cc: amira@mellanox.com
> Cc: olgas@mellanox.com
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 51 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 51 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index 588d4ba627..78354922b0 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -417,6 +417,56 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
>  }
>  
>  /**
> + * Sets default tuning parameters.
> + *
> + * @param dev
> + *   Pointer to Ethernet device.
> + * @param[out] info
> + *   Info structure output buffer.
> + */
> +static void
> +mlx5_set_default_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
> +{
> +	struct priv *priv = dev->data->dev_private;
> +
> +	if (priv->link_speed_capa & ETH_LINK_SPEED_100G) {
> +		if (dev->data->nb_rx_queues <= 2 &&
> +		    dev->data->nb_tx_queues <= 2) {
> +			/* Minimum CPU utilization. */
> +			info->default_rxportconf.ring_size = 256;
> +			info->default_txportconf.ring_size = 256;
> +			/* Don't care as queue num is set. */
> +			info->default_rxportconf.nb_queues = 0;
> +			info->default_txportconf.nb_queues = 0;
> +		} else {
> +			/* Max Throughput. */
> +			info->default_rxportconf.ring_size = 2048;
> +			info->default_txportconf.ring_size = 2048;
> +			info->default_rxportconf.nb_queues = 16;
> +			info->default_txportconf.nb_queues = 16;
> +		}
> +	} else {
> +		if (dev->data->nb_rx_queues <= 2 &&
> +		    dev->data->nb_tx_queues <= 2) {
> +			/* Minimum CPU utilization. */
> +			info->default_rxportconf.ring_size = 256;
> +			info->default_txportconf.ring_size = 256;
> +			/* Don't care as queue num is set. */
> +			info->default_rxportconf.nb_queues = 0;
> +			info->default_txportconf.nb_queues = 0;
> +		} else {
> +			/* Max Throughput. */
> +			info->default_rxportconf.ring_size = 4096;
> +			info->default_txportconf.ring_size = 4096;
> +			info->default_rxportconf.nb_queues = 8;
> +			info->default_txportconf.nb_queues = 8;
> +		}
> +	}
> +	info->default_rxportconf.burst_size = 64;
> +	info->default_txportconf.burst_size = 64;

This can be fully re-written to simplify and ease the maintenance,
default values i.e. "Minimum CPU utilization" are duplicated, this can
be used as default values and just tweak in case the amount of queues
are different from 2 according to the link speed. 

> +}
> +
> +/**
>   * DPDK callback to get information about the device.
>   *
>   * @param dev
> @@ -458,6 +508,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
>  	info->hash_key_size = rss_hash_default_key_len;
>  	info->speed_capa = priv->link_speed_capa;
>  	info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK;
> +	mlx5_set_default_params(dev, info);
>  }
>  
>  /**
> -- 
> 2.12.0

Thanks,

-- 
Nélio Laranjeiro
6WIND

Re: [PATCH 1/2] net/mlx5: fix ethtool link setting call order

[Nélio Laranjeiro]

On Sun, Apr 29, 2018 at 09:03:07PM +0300, Shahaf Shuler wrote:
> According to ethtool_link_setting API recommendation ETHTOOL_GLINKSETTINGS
> should be called before ETHTOOL_GSET as the later one deprecated.
> 
> Fixes: f47ba80080ab ("net/mlx5: remove kernel version check")
> Cc: nelio.laranjeiro@6wind.com
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>

Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index 746b94f734..588d4ba627 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -697,9 +697,9 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
>  	time_t start_time = time(NULL);
>  
>  	do {
> -		ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
> +		ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
>  		if (ret)
> -			ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
> +			ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
>  		if (ret == 0)
>  			break;
>  		/* Handle wait to complete situation. */
> -- 
> 2.12.0
> 

-- 
Nélio Laranjeiro
6WIND

[PATCH v2 1/2] net/mlx5: fix ethtool link setting call order

[Shahaf Shuler]

According to ethtool_link_setting API recommendation ETHTOOL_GLINKSETTINGS
should be called before ETHTOOL_GSET as the later one deprecated.

Fixes: f47ba80080ab ("net/mlx5: remove kernel version check")

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
On v2:
 - no change.

--
 drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 746b94f734..588d4ba627 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -697,9 +697,9 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	time_t start_time = time(NULL);
 
 	do {
-		ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
+		ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
 		if (ret)
-			ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
+			ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
 		if (ret == 0)
 			break;
 		/* Handle wait to complete situation. */
-- 
2.12.0

[PATCH v2 2/2] net/mlx5: add Rx and Tx tuning parameters

[Shahaf Shuler]

A new ethdev API was exposed by
commit 3be82f5cc5e3 ("ethdev: support PMD-tuned Tx/Rx parameters")

Enabling the PMD to provide default parameters in case no strict request
from application in order to improve the out of the box experience.

While the current API lacks the means for the PMD to provide the best
possible value, providing the best default the PMD can guess.
The values are based on Mellanox performance report and depends on the
underlying NIC capabilities.

Cc: erezsc@mellanox.com
Cc: amira@mellanox.com
Cc: olgas@mellanox.com

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
---

On v2:
 - refactor the code to ease the maintenance.

---
 drivers/net/mlx5/mlx5_ethdev.c | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 588d4ba627..3fad199a60 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -417,6 +417,45 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
 }
 
 /**
+ * Sets default tuning parameters.
+ *
+ * @param dev
+ *   Pointer to Ethernet device.
+ * @param[out] info
+ *   Info structure output buffer.
+ */
+static void
+mlx5_set_default_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
+{
+	struct priv *priv = dev->data->dev_private;
+
+	/* Minimum CPU utilization. */
+	info->default_rxportconf.ring_size = 256;
+	info->default_txportconf.ring_size = 256;
+	info->default_rxportconf.burst_size = 64;
+	info->default_txportconf.burst_size = 64;
+	if (priv->link_speed_capa & ETH_LINK_SPEED_100G) {
+		info->default_rxportconf.nb_queues = 16;
+		info->default_txportconf.nb_queues = 16;
+		if (dev->data->nb_rx_queues > 2 ||
+		    dev->data->nb_tx_queues > 2) {
+			/* Max Throughput. */
+			info->default_rxportconf.ring_size = 2048;
+			info->default_txportconf.ring_size = 2048;
+		}
+	} else {
+		info->default_rxportconf.nb_queues = 8;
+		info->default_txportconf.nb_queues = 8;
+		if (dev->data->nb_rx_queues > 2 ||
+		    dev->data->nb_tx_queues > 2) {
+			/* Max Throughput. */
+			info->default_rxportconf.ring_size = 4096;
+			info->default_txportconf.ring_size = 4096;
+		}
+	}
+}
+
+/**
  * DPDK callback to get information about the device.
  *
  * @param dev
@@ -458,6 +497,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
 	info->hash_key_size = rss_hash_default_key_len;
 	info->speed_capa = priv->link_speed_capa;
 	info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK;
+	mlx5_set_default_params(dev, info);
 }
 
 /**
-- 
2.12.0

Re: [PATCH v2 2/2] net/mlx5: add Rx and Tx tuning parameters

[Nélio Laranjeiro]

On Tue, May 01, 2018 at 12:58:49PM +0300, Shahaf Shuler wrote:
> A new ethdev API was exposed by
> commit 3be82f5cc5e3 ("ethdev: support PMD-tuned Tx/Rx parameters")
> 
> Enabling the PMD to provide default parameters in case no strict request
> from application in order to improve the out of the box experience.
> 
> While the current API lacks the means for the PMD to provide the best
> possible value, providing the best default the PMD can guess.
> The values are based on Mellanox performance report and depends on the
> underlying NIC capabilities.
> 
> Cc: erezsc@mellanox.com
> Cc: amira@mellanox.com
> Cc: olgas@mellanox.com
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>

Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

> ---
> 
> On v2:
>  - refactor the code to ease the maintenance.
> 
> ---
>  drivers/net/mlx5/mlx5_ethdev.c | 40 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 40 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
> index 588d4ba627..3fad199a60 100644
> --- a/drivers/net/mlx5/mlx5_ethdev.c
> +++ b/drivers/net/mlx5/mlx5_ethdev.c
> @@ -417,6 +417,45 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
>  }
>  
>  /**
> + * Sets default tuning parameters.
> + *
> + * @param dev
> + *   Pointer to Ethernet device.
> + * @param[out] info
> + *   Info structure output buffer.
> + */
> +static void
> +mlx5_set_default_params(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
> +{
> +	struct priv *priv = dev->data->dev_private;
> +
> +	/* Minimum CPU utilization. */
> +	info->default_rxportconf.ring_size = 256;
> +	info->default_txportconf.ring_size = 256;
> +	info->default_rxportconf.burst_size = 64;
> +	info->default_txportconf.burst_size = 64;
> +	if (priv->link_speed_capa & ETH_LINK_SPEED_100G) {
> +		info->default_rxportconf.nb_queues = 16;
> +		info->default_txportconf.nb_queues = 16;
> +		if (dev->data->nb_rx_queues > 2 ||
> +		    dev->data->nb_tx_queues > 2) {
> +			/* Max Throughput. */
> +			info->default_rxportconf.ring_size = 2048;
> +			info->default_txportconf.ring_size = 2048;
> +		}
> +	} else {
> +		info->default_rxportconf.nb_queues = 8;
> +		info->default_txportconf.nb_queues = 8;
> +		if (dev->data->nb_rx_queues > 2 ||
> +		    dev->data->nb_tx_queues > 2) {
> +			/* Max Throughput. */
> +			info->default_rxportconf.ring_size = 4096;
> +			info->default_txportconf.ring_size = 4096;
> +		}
> +	}
> +}
> +
> +/**
>   * DPDK callback to get information about the device.
>   *
>   * @param dev
> @@ -458,6 +497,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info)
>  	info->hash_key_size = rss_hash_default_key_len;
>  	info->speed_capa = priv->link_speed_capa;
>  	info->flow_type_rss_offloads = ~MLX5_RSS_HF_MASK;
> +	mlx5_set_default_params(dev, info);
>  }
>  
>  /**
> -- 
> 2.12.0
> 

Thanks,

-- 
Nélio Laranjeiro
6WIND

Re: [PATCH v2 1/2] net/mlx5: fix ethtool link setting call order

[Shahaf Shuler]

Tuesday, May 1, 2018 12:59 PM, Shahaf Shuler:
> Subject: [dpdk-dev] [PATCH v2 1/2] net/mlx5: fix ethtool link setting call
> order
> 
> According to ethtool_link_setting API recommendation
> ETHTOOL_GLINKSETTINGS should be called before ETHTOOL_GSET as the
> later one deprecated.
> 
> Fixes: f47ba80080ab ("net/mlx5: remove kernel version check")
> 
> Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
> Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>

Series applied to next-net-mlx, thanks.