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 54199A0471 for ; Fri, 21 Jun 2019 18:53:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4A7BC1D550; Fri, 21 Jun 2019 18:53:08 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 874961D5A7 for ; Fri, 21 Jun 2019 18:53:06 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0242E3086275; Fri, 21 Jun 2019 16:53:06 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B48160BE0; Fri, 21 Jun 2019 16:53:04 +0000 (UTC) From: Kevin Traynor To: Dekel Peled Cc: Shahaf Shuler , dpdk stable Date: Fri, 21 Jun 2019 17:46:25 +0100 Message-Id: <20190621164626.31219-41-ktraynor@redhat.com> In-Reply-To: <20190621164626.31219-1-ktraynor@redhat.com> References: <20190621164626.31219-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 21 Jun 2019 16:53:06 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix order of items in NEON scatter' has been queued to LTS release 18.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/26/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. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e986e60c7526b2b01e0864aca0b7eb539d7b7101 Thanks. Kevin Traynor --- >From e986e60c7526b2b01e0864aca0b7eb539d7b7101 Mon Sep 17 00:00:00 2001 From: Dekel Peled Date: Wed, 15 May 2019 13:07:45 +0300 Subject: [PATCH] net/mlx5: fix order of items in NEON scatter [ upstream commit 0d51a5ec26ccca4582f4762854ac3b28208c4a04 ] Previous patch added handling of metadata for multi-segment packet. Function txq_scatter_v in file mlx5_rxtx_vec_neon.h was updated incorrectly, items were inserted into WQE in wrong order. This patch fixes the issue, inserting items into WQE correctly. Fixes: 7f4019d370f6 ("net/mlx5: fix Tx metadata for multi-segment packet") Signed-off-by: Dekel Peled Acked-by: Shahaf Shuler --- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 38e915c5c..b1e0e8f3d 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -172,5 +172,5 @@ txq_scatter_v(struct mlx5_txq_data *txq, struct rte_mbuf **pkts, vst1q_u32((void *)(t_wqe + 1), ((uint32x4_t){ 0, - cs_flags << 16 | rte_cpu_to_be_16(len), + rte_cpu_to_be_16(len) << 16 | cs_flags, metadata, 0 })); txq->wqe_ci = wqe_ci; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-06-21 17:22:13.870123198 +0100 +++ 0041-net-mlx5-fix-order-of-items-in-NEON-scatter.patch 2019-06-21 17:22:11.753518443 +0100 @@ -1 +1 @@ -From 0d51a5ec26ccca4582f4762854ac3b28208c4a04 Mon Sep 17 00:00:00 2001 +From e986e60c7526b2b01e0864aca0b7eb539d7b7101 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0d51a5ec26ccca4582f4762854ac3b28208c4a04 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index b2cc71088..cf5c9da8b 100644 +index 38e915c5c..b1e0e8f3d 100644