From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 57A8A5323 for ; Tue, 20 Nov 2018 20:14:54 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BDA6FC034DDB; Tue, 20 Nov 2018 19:14:53 +0000 (UTC) Received: from ktraynor.remote.csb (unknown [10.36.118.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id AA1DD60141; Tue, 20 Nov 2018 19:14:52 +0000 (UTC) From: Kevin Traynor To: Xueming Li Cc: Yongseok Koh , dpdk stable Date: Tue, 20 Nov 2018 19:12:14 +0000 Message-Id: <20181120191252.30277-24-ktraynor@redhat.com> In-Reply-To: <20181120191252.30277-1-ktraynor@redhat.com> References: <20181120191252.30277-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 20 Nov 2018 19:14:53 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' has been queued to stable release 18.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 19:14:54 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 11/23/18. 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. Kevin Traynor --- >>From 6413f6c03f19d0ccac991997543a115217dee89c Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Fri, 24 Aug 2018 07:10:33 +0800 Subject: [PATCH] net/mlx5: fix interrupt completion queue index wrapping [ 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 Acked-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx.c | 2 +- drivers/net/mlx5/mlx5_rxtx.h | 6 +++--- 2 files changed, 4 insertions(+), 4 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 @@ -2098,5 +2098,5 @@ mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n) 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 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -98,8 +98,8 @@ struct mlx5_rxq_data { 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_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. */ -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-20 17:53:08.050999251 +0000 +++ 0024-net-mlx5-fix-interrupt-completion-queue-index-wrappi.patch 2018-11-20 17:53:07.000000000 +0000 @@ -1,13 +1,14 @@ -From 3afdf157fcedba15167ad03b187746bd6c73811f Mon Sep 17 00:00:00 2001 +From 6413f6c03f19d0ccac991997543a115217dee89c Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Fri, 24 Aug 2018 07:10:33 +0800 Subject: [PATCH] net/mlx5: fix interrupt completion queue index wrapping +[ 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@dpdk.org Signed-off-by: Xueming Li Acked-by: Yongseok Koh