[dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 7d4722302950879e32fcba9454aa956bf9fd0e2c Mon Sep 17 00:00:00 2001
From: Xueming Li <xuemingl at mellanox.com>
Date: Fri, 24 Aug 2018 07:10:33 +0800
Subject: [PATCH] net/mlx5: fix interrupt completion queue index wrapping

[ backported from upstream commit 3afdf157fcedba15167ad03b187746bd6c73811f ]

Rxq cq_ci was 16 bits while hardware is expecting to wrap
around 24 bits, this caused interrupt failure after burst of packets.

Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")

Signed-off-by: Xueming Li <xuemingl at mellanox.com>
Acked-by: Yongseok Koh <yskoh at mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 5556a0f7a..7e811c106 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -138,9 +138,9 @@ struct mlx5_rxq_data {
 	volatile uint32_t *rq_db;
 	volatile uint32_t *cq_db;
 	uint16_t port_id;
-	uint16_t rq_ci;
-	uint16_t rq_pi;
-	uint16_t cq_ci;
+	uint32_t rq_ci;
+	uint32_t rq_pi;
+	uint32_t cq_ci;
 	uint16_t rq_repl_thresh; /* Threshold for buffer replenishment. */
 	struct mlx5_mr_ctrl mr_ctrl;
 	volatile struct mlx5_wqe_data_seg(*wqes)[];
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.097649981 -0800
+++ 0004-net-mlx5-fix-interrupt-completion-queue-index-wrappi.patch	2019-01-11 02:29:10.683973000 -0800
@@ -1,52 +1,38 @@
-From 3afdf157fcedba15167ad03b187746bd6c73811f Mon Sep 17 00:00:00 2001
+From 7d4722302950879e32fcba9454aa956bf9fd0e2c Mon Sep 17 00:00:00 2001
 From: Xueming Li <xuemingl at mellanox.com>
 Date: Fri, 24 Aug 2018 07:10:33 +0800
 Subject: [PATCH] net/mlx5: fix interrupt completion queue index wrapping
 
+[ backported from upstream commit 3afdf157fcedba15167ad03b187746bd6c73811f ]
+
 Rxq cq_ci was 16 bits while hardware is expecting to wrap
 around 24 bits, this caused interrupt failure after burst of packets.
 
 Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xueming Li <xuemingl at mellanox.com>
 Acked-by: Yongseok Koh <yskoh at mellanox.com>
 ---
- drivers/net/mlx5/mlx5_rxtx.c | 2 +-
  drivers/net/mlx5/mlx5_rxtx.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
-index 2d14f8a6e..558e6b60a 100644
---- a/drivers/net/mlx5/mlx5_rxtx.c
-+++ b/drivers/net/mlx5/mlx5_rxtx.c
-@@ -2097,7 +2097,7 @@ mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
- 	const unsigned int wq_mask = (1 << rxq->elts_n) - 1;
- 	volatile struct mlx5_cqe *cqe = &(*rxq->cqes)[rxq->cq_ci & cq_mask];
- 	unsigned int i = 0;
--	uint16_t rq_ci = rxq->rq_ci;
-+	uint32_t rq_ci = rxq->rq_ci;
- 	uint16_t consumed_strd = rxq->consumed_strd;
- 	struct mlx5_mprq_buf *buf = (*rxq->mprq_bufs)[rq_ci & wq_mask];
- 
 diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
-index 48ed2b209..d225b9c27 100644
+index 5556a0f7a..7e811c106 100644
 --- a/drivers/net/mlx5/mlx5_rxtx.h
 +++ b/drivers/net/mlx5/mlx5_rxtx.h
-@@ -97,10 +97,10 @@ struct mlx5_rxq_data {
+@@ -138,9 +138,9 @@ struct mlx5_rxq_data {
  	volatile uint32_t *rq_db;
  	volatile uint32_t *cq_db;
  	uint16_t port_id;
 -	uint16_t rq_ci;
-+	uint32_t rq_ci;
- 	uint16_t consumed_strd; /* Number of consumed strides in WQE. */
 -	uint16_t rq_pi;
 -	uint16_t cq_ci;
++	uint32_t rq_ci;
 +	uint32_t rq_pi;
 +	uint32_t cq_ci;
- 	struct mlx5_mr_ctrl mr_ctrl; /* MR control descriptor. */
- 	uint16_t mprq_max_memcpy_len; /* Maximum size of packet to memcpy. */
- 	volatile void *wqes;
+ 	uint16_t rq_repl_thresh; /* Threshold for buffer replenishment. */
+ 	struct mlx5_mr_ctrl mr_ctrl;
+ 	volatile struct mlx5_wqe_data_seg(*wqes)[];
 -- 
 2.11.0