[dpdk-stable] patch 'net/mlx5: improve logging of MPRQ selection' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 4c84ef15a76a8a0e4352baa71938c780cc4a514b Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev at mellanox.com>
Date: Fri, 17 Apr 2020 17:20:39 +0000
Subject: [PATCH] net/mlx5: improve logging of MPRQ selection

[ upstream commit a24431dffb206948de15687e6b49198b5d50fb12 ]

MPRQ is silently turned off in case there is not enough
Rx queues configured. Improve the logging to show a
warning in this case to notify a user about the Rx burst
function selected.

Fixes: 7d6bf6b866b8 ("net/mlx5: add Multi-Packet Rx support")

Signed-off-by: Alexander Kozyrev <akozyrev at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxq.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index a4071f891e..c687752cb7 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1896,19 +1896,22 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
 		tmpl->rxq.sges_n = sges_n;
 		max_lro_size = max_rx_pkt_len;
 	}
-	if (mprq_en && !mlx5_rxq_mprq_enabled(&tmpl->rxq))
+	if (config->mprq.enabled && !mlx5_rxq_mprq_enabled(&tmpl->rxq))
 		DRV_LOG(WARNING,
-			"port %u MPRQ is requested but cannot be enabled"
-			" (requested: packet size = %u, desc = %u,"
-			" stride_sz = %u, stride_num = %u,"
-			" supported: min_stride_sz = %u, max_stride_sz = %u).",
-			dev->data->port_id, non_scatter_min_mbuf_size, desc,
+			"port %u MPRQ is requested but cannot be enabled\n"
+			" (requested: pkt_sz = %u, desc_num = %u,"
+			" rxq_num = %u, stride_sz = %u, stride_num = %u\n"
+			"  supported: min_rxqs_num = %u,"
+			" min_stride_sz = %u, max_stride_sz = %u).",
+			dev->data->port_id, non_scatter_min_mbuf_size,
+			desc, priv->rxqs_n,
 			config->mprq.stride_size_n ?
 				(1U << config->mprq.stride_size_n) :
 				(1U << mprq_stride_size),
 			config->mprq.stride_num_n ?
 				(1U << config->mprq.stride_num_n) :
 				(1U << mprq_stride_nums),
+			config->mprq.min_rxqs_num,
 			(1U << config->mprq.min_stride_size_n),
 			(1U << config->mprq.max_stride_size_n));
 	DRV_LOG(DEBUG, "port %u maximum number of segments per packet: %u",
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:48.883667543 +0100
+++ 0108-net-mlx5-improve-logging-of-MPRQ-selection.patch	2020-05-19 14:04:44.356650911 +0100
@@ -1,15 +1,16 @@
-From a24431dffb206948de15687e6b49198b5d50fb12 Mon Sep 17 00:00:00 2001
+From 4c84ef15a76a8a0e4352baa71938c780cc4a514b Mon Sep 17 00:00:00 2001
 From: Alexander Kozyrev <akozyrev at mellanox.com>
 Date: Fri, 17 Apr 2020 17:20:39 +0000
 Subject: [PATCH] net/mlx5: improve logging of MPRQ selection
 
+[ upstream commit a24431dffb206948de15687e6b49198b5d50fb12 ]
+
 MPRQ is silently turned off in case there is not enough
 Rx queues configured. Improve the logging to show a
 warning in this case to notify a user about the Rx burst
 function selected.
 
 Fixes: 7d6bf6b866b8 ("net/mlx5: add Multi-Packet Rx support")
-Cc: stable at dpdk.org
 
 Signed-off-by: Alexander Kozyrev <akozyrev at mellanox.com>
 Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -18,10 +19,10 @@
  1 file changed, 9 insertions(+), 6 deletions(-)
 
 diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
-index 9bc7af6d92..7a50ec6f16 100644
+index a4071f891e..c687752cb7 100644
 --- a/drivers/net/mlx5/mlx5_rxq.c
 +++ b/drivers/net/mlx5/mlx5_rxq.c
-@@ -1921,19 +1921,22 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
+@@ -1896,19 +1896,22 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
  		tmpl->rxq.sges_n = sges_n;
  		max_lro_size = max_rx_pkt_len;
  	}