[dpdk-stable] patch 'net/mlx5: fix packet inline on Tx queue wraparound' has been queued to LTS release 17.11.7

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.7

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objection by 07/27/19. So please
shout if anyone has objection.

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.

Yongseok

---
>From ff8ffef0fc43b616676fe87c5aa11cfe90e3cfc9 Mon Sep 17 00:00:00 2001
From: Shahaf Shuler <shahafs at mellanox.com>
Date: Sun, 10 Mar 2019 10:14:10 +0200
Subject: [PATCH] net/mlx5: fix packet inline on Tx queue wraparound

[ backported from upstream commit 57c0e2494c51421033771122e8972a41dddb4cb7 ]

Inlining a packet to WQE that cross the WQ wraparound, i.e. the WQE
starts on the end of the ring and ends on the beginning, is not
supported and blocked by the data path logic.

However, in case of TSO, an extra inline header is required before
inlining. This inline header is not taken into account when checking if
there is enough room left for the required inline size.
On some corner cases were
(ring_tailroom - inline header) < inline size < ring_tailroom ,
this can lead to WQE being written outsize of the ring buffer.

Fixing it by always assuming the worse case that inline of packet will
require the inline header.

Fixes: 3f13f8c23a7c ("net/mlx5: support hardware TSO")

Signed-off-by: Shahaf Shuler <shahafs at mellanox.com>
Acked-by: Yongseok Koh <yskoh at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index d95c4bff3d..d46b31c19a 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -571,7 +571,8 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
 				RTE_MIN((addr_end - addr), length) :
 				0;
 
-			if (copy_b && ((end - (uintptr_t)raw) > copy_b)) {
+			if (copy_b && ((end - (uintptr_t)raw) >
+				       (copy_b + sizeof(inl)))) {
 				/*
 				 * One Dseg remains in the current WQE.  To
 				 * keep the computation positive, it is
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-07-22 17:55:08.125343192 -0700
+++ 0030-net-mlx5-fix-packet-inline-on-Tx-queue-wraparound.patch	2019-07-22 17:55:05.943469000 -0700
@@ -1,8 +1,10 @@
-From 57c0e2494c51421033771122e8972a41dddb4cb7 Mon Sep 17 00:00:00 2001
+From ff8ffef0fc43b616676fe87c5aa11cfe90e3cfc9 Mon Sep 17 00:00:00 2001
 From: Shahaf Shuler <shahafs at mellanox.com>
 Date: Sun, 10 Mar 2019 10:14:10 +0200
 Subject: [PATCH] net/mlx5: fix packet inline on Tx queue wraparound
 
+[ backported from upstream commit 57c0e2494c51421033771122e8972a41dddb4cb7 ]
+
 Inlining a packet to WQE that cross the WQ wraparound, i.e. the WQE
 starts on the end of the ring and ends on the beginning, is not
 supported and blocked by the data path logic.
@@ -18,7 +20,6 @@
 require the inline header.
 
 Fixes: 3f13f8c23a7c ("net/mlx5: support hardware TSO")
-Cc: stable at dpdk.org
 
 Signed-off-by: Shahaf Shuler <shahafs at mellanox.com>
 Acked-by: Yongseok Koh <yskoh at mellanox.com>
@@ -27,13 +28,13 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
-index baa4079c14..38ce0e29a2 100644
+index d95c4bff3d..d46b31c19a 100644
 --- a/drivers/net/mlx5/mlx5_rxtx.c
 +++ b/drivers/net/mlx5/mlx5_rxtx.c
-@@ -693,7 +693,8 @@ pkt_inline:
- 						   RTE_CACHE_LINE_SIZE);
- 			copy_b = (addr_end > addr) ?
- 				 RTE_MIN((addr_end - addr), length) : 0;
+@@ -571,7 +571,8 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n)
+ 				RTE_MIN((addr_end - addr), length) :
+ 				0;
+ 
 -			if (copy_b && ((end - (uintptr_t)raw) > copy_b)) {
 +			if (copy_b && ((end - (uintptr_t)raw) >
 +				       (copy_b + sizeof(inl)))) {