From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 83BBBA0096 for ; Wed, 10 Apr 2019 18:46:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 75D601B11F; Wed, 10 Apr 2019 18:46:10 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 25FA41B11F for ; Wed, 10 Apr 2019 18:46:09 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C5C9C007344; Wed, 10 Apr 2019 16:46:08 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-94.ams2.redhat.com [10.36.117.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F5D15D961; Wed, 10 Apr 2019 16:46:07 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Wed, 10 Apr 2019 17:44:11 +0100 Message-Id: <20190410164411.10546-63-ktraynor@redhat.com> In-Reply-To: <20190410164411.10546-1-ktraynor@redhat.com> References: <20190410164411.10546-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 10 Apr 2019 16:46:08 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix sync when handling Tx completions' has been queued to LTS release 18.11.2 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/16/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. 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. Kevin Traynor --- >From 92dcc157c4d29a23ee31c646f7597eaea83200e8 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Thu, 28 Feb 2019 17:20:30 +0200 Subject: [PATCH] net/mlx5: fix sync when handling Tx completions [ upstream commit fd350d3c9a13b5ebcb41741870c3f09b6920033f ] Function mlx5_tx_complete() reads completion entry information from Tx queue. For some processors not having strongly-ordered memory model, there has to be a memory barrier between reading the entry index and the entry fields, in order to guarantee data is valid. Fixes: 54d3fe948dba ("net/mlx5: poll completion queue once per a call") Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_rxtx.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index e58baaa35..820675b82 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -569,4 +569,5 @@ mlx5_tx_complete(struct mlx5_txq_data *txq) #endif /* NDEBUG */ ++cq_ci; + rte_cio_rmb(); txq->wqe_pi = rte_be_to_cpu_16(cqe->wqe_counter); ctrl = (volatile struct mlx5_wqe_ctrl *) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-10 14:06:12.688048845 +0100 +++ 0063-net-mlx5-fix-sync-when-handling-Tx-completions.patch 2019-04-10 14:06:08.033290374 +0100 @@ -1,8 +1,10 @@ -From fd350d3c9a13b5ebcb41741870c3f09b6920033f Mon Sep 17 00:00:00 2001 +From 92dcc157c4d29a23ee31c646f7597eaea83200e8 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Thu, 28 Feb 2019 17:20:30 +0200 Subject: [PATCH] net/mlx5: fix sync when handling Tx completions +[ upstream commit fd350d3c9a13b5ebcb41741870c3f09b6920033f ] + Function mlx5_tx_complete() reads completion entry information from Tx queue. For some processors not having strongly-ordered memory model, @@ -10,7 +12,6 @@ and the entry fields, in order to guarantee data is valid. Fixes: 54d3fe948dba ("net/mlx5: poll completion queue once per a call") -Cc: stable@dpdk.org Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler @@ -19,7 +20,7 @@ 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h -index c0e1adf14..53115dde3 100644 +index e58baaa35..820675b82 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -569,4 +569,5 @@ mlx5_tx_complete(struct mlx5_txq_data *txq)