[dpdk-stable] patch 'net/mlx5: fix inline packet size for ConnectX-4 Lx' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/29/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 cbfff4f37acaaf508c9701a8901c570186feacd8 Mon Sep 17 00:00:00 2001
From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Date: Thu, 20 Feb 2020 21:18:33 +0000
Subject: [PATCH] net/mlx5: fix inline packet size for ConnectX-4 Lx

[ upstream commit 21e59432dfe0dc9bbcaec3d9d80c372834d6264b ]

This patch does extra inline packet size check to tune
the ConnectX-4 Lx performance in the legacy Multi-Packet Write
mode.

Fixes: 7593cf1d3500 ("net/mlx5: fix legacy multi-packet write session")

Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index a69729f010..4a9c44dc61 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -4149,6 +4149,8 @@ mlx5_tx_burst_empw_inline(struct mlx5_txq_data *restrict txq,
 			if (dlen > txq->inlen_empw)
 				goto pointer_empw;
 			if (MLX5_TXOFF_CONFIG(MPW)) {
+				if (dlen > txq->inlen_send)
+					goto pointer_empw;
 				tlen = dlen;
 				if (part == room) {
 					/* Open new inline MPW session. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-27 09:31:56.972246093 +0000
+++ 0036-net-mlx5-fix-inline-packet-size-for-ConnectX-4-Lx.patch	2020-02-27 09:31:55.835946606 +0000
@@ -1,14 +1,15 @@
-From 21e59432dfe0dc9bbcaec3d9d80c372834d6264b Mon Sep 17 00:00:00 2001
+From cbfff4f37acaaf508c9701a8901c570186feacd8 Mon Sep 17 00:00:00 2001
 From: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 Date: Thu, 20 Feb 2020 21:18:33 +0000
 Subject: [PATCH] net/mlx5: fix inline packet size for ConnectX-4 Lx
 
+[ upstream commit 21e59432dfe0dc9bbcaec3d9d80c372834d6264b ]
+
 This patch does extra inline packet size check to tune
 the ConnectX-4 Lx performance in the legacy Multi-Packet Write
 mode.
 
 Fixes: 7593cf1d3500 ("net/mlx5: fix legacy multi-packet write session")
-Cc: stable at dpdk.org
 
 Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
 Acked-by: Matan Azrad <matan at mellanox.com>
@@ -17,11 +18,11 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
-index 9de6a5028a..2b4fc2ae06 100644
+index a69729f010..4a9c44dc61 100644
 --- a/drivers/net/mlx5/mlx5_rxtx.c
 +++ b/drivers/net/mlx5/mlx5_rxtx.c
-@@ -4286,6 +4286,8 @@ mlx5_tx_burst_empw_inline(struct mlx5_txq_data *restrict txq,
- 			    loc->mbuf->ol_flags & PKT_TX_DYNF_NOINLINE)
+@@ -4149,6 +4149,8 @@ mlx5_tx_burst_empw_inline(struct mlx5_txq_data *restrict txq,
+ 			if (dlen > txq->inlen_empw)
  				goto pointer_empw;
  			if (MLX5_TXOFF_CONFIG(MPW)) {
 +				if (dlen > txq->inlen_send)