From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1FDF7A0351 for ; Thu, 6 Aug 2020 11:58:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 177FB1C115; Thu, 6 Aug 2020 11:58:48 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 3A0DE1C115 for ; Thu, 6 Aug 2020 11:58:47 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id d190so8276136wmd.4 for ; Thu, 06 Aug 2020 02:58:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3alZTpnkeugkMwObRPYaSPH+0Pft0nlhvtDEUrpJ6wQ=; b=oY/7+MlEuKWJB/FpW/MXo26VWWOyJ30LpWHKZPQFiNbKhd74B05Ws/MHmwWcvll/4F 3tE8Mm7GzxMCsszNAKBt5j+PHwthajUiaezgs792+zxqRUcFoUGVUvcqt+8fNOO3Cc0Z ememktfgYwwLlfXtvsBvSZT8QTSFU4k/uzU3GtIWPdWXeToqW7ulB1kdN8vRmE+yrLpO Sb2CU7McLe55aQo4BnCVs8QGUF7ehWrB9EA6Aobs0GEJ9MpZz4eqXIJL3uaDduQZo1Rj SRmwcsUwS7OQLH7KYqm6iH+vzC2UWidiv6XKyUPaXDx628EkAeO6wGwcktEBhf0utBe7 IqEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3alZTpnkeugkMwObRPYaSPH+0Pft0nlhvtDEUrpJ6wQ=; b=riiauh/TLkwJdDR34P0J2DeLQHZ8q4ukoYUQzW9MIr13WRRXrD5CzG1N8Xwh0JvRkQ HsTQvHFzOq2f8mxPUyZ7w0peAC9ASdhHOk6pT5OmJcmpfz480bqcdr+z8iNnIa3XRfgW CzZ4xbxQ1jaqgNHaLZrFFUA/ZgjMRCZFHAkxnYXVdU9kWjmYA5PQlwTawDE5Tn5T/jRA Y2XpOessVIJ8/fGM5chTVZaZ3SrGgOl8K8EEoEEd8Xhamcpk7m5pI6Jx1dLn7IVpkUnq Vsz5i4TDFEHJoe0g9NXqaMAbI7WAKR3Hw6ijCrdZBtUNBtOcFEK6dIsWpxMKNG7Z3LcL WQ2w== X-Gm-Message-State: AOAM531VO02NQd6NIvTVFJnYhjSg5CVr6LJoq2VNgWUDJFs5VNdHgPw3 51IuttsjXGr+C8Ah8t0sUlo= X-Google-Smtp-Source: ABdhPJwS6LltnM1a48+F1nFMgyeX6wkLoQJeJVNS7sPDM7956CrFiYrjbkDnJWuoRX0B27LOGtpW7w== X-Received: by 2002:a1c:1b93:: with SMTP id b141mr7319406wmb.150.1596707926928; Thu, 06 Aug 2020 02:58:46 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a10sm5898565wrx.15.2020.08.06.02.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:46 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: dpdk stable Date: Thu, 6 Aug 2020 10:53:50 +0100 Message-Id: <20200806095411.774624-22-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix metadata storing for NEON Rx' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/20. 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. Luca Boccassi --- >From 0fb94e1cf48787f268615e519fa2640183bc4d29 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Thu, 23 Jul 2020 10:53:32 +0000 Subject: [PATCH] net/mlx5: fix metadata storing for NEON Rx [ upstream commit 4ffab7b9e199d6253e0b7fdcf4bef137930d0914 ] There was the typo introducing the bug, affected the mlx5 vectorized rx_burst on ARM architectures in case if CQE compression was enabled. Fixes: 6c55b622a956 ("net/mlx5: set dynamic flow metadata in Rx queues") Signed-off-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index b2cf857fd..607659a62 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -710,20 +710,20 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, container_of(p3, struct mlx5_cqe, pkt_info)->timestamp); } - if (!!rxq->flow_meta_mask) { + if (rxq->dynf_meta) { /* This code is subject for futher optimization. */ int32_t offs = rxq->flow_meta_offset; *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) = container_of(p0, struct mlx5_cqe, pkt_info)->flow_table_metadata; - *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) = + *RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) = container_of(p1, struct mlx5_cqe, pkt_info)->flow_table_metadata; - *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) = + *RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) = container_of(p2, struct mlx5_cqe, pkt_info)->flow_table_metadata; - *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) = + *RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) = container_of(p3, struct mlx5_cqe, pkt_info)->flow_table_metadata; if (*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *)) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.668130493 +0100 +++ 0022-net-mlx5-fix-metadata-storing-for-NEON-Rx.patch 2020-08-06 10:53:15.792597243 +0100 @@ -1,13 +1,14 @@ -From 4ffab7b9e199d6253e0b7fdcf4bef137930d0914 Mon Sep 17 00:00:00 2001 +From 0fb94e1cf48787f268615e519fa2640183bc4d29 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Thu, 23 Jul 2020 10:53:32 +0000 Subject: [PATCH] net/mlx5: fix metadata storing for NEON Rx +[ upstream commit 4ffab7b9e199d6253e0b7fdcf4bef137930d0914 ] + There was the typo introducing the bug, affected the mlx5 vectorized rx_burst on ARM architectures in case if CQE compression was enabled. Fixes: 6c55b622a956 ("net/mlx5: set dynamic flow metadata in Rx queues") -Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko --- @@ -15,12 +16,12 @@ 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h -index 6c3149523..af924b709 100644 +index b2cf857fd..607659a62 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h -@@ -736,20 +736,20 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, - pkt_info)->timestamp); - } +@@ -710,20 +710,20 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, + container_of(p3, struct mlx5_cqe, + pkt_info)->timestamp); } - if (!!rxq->flow_meta_mask) { + if (rxq->dynf_meta) {