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 13C66A0093 for ; Tue, 19 May 2020 15:07:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BB751D603; Tue, 19 May 2020 15:07:04 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by dpdk.org (Postfix) with ESMTP id 1FFB81D603 for ; Tue, 19 May 2020 15:07:03 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id z72so3493166wmc.2 for ; Tue, 19 May 2020 06:07:03 -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=GHb7bz1QuT520+0LSXgWOUMRKuL4oOXU2dPanOcF9mE=; b=Y7kFDv7uk3w+lzcWD+Pr04tf3cwtiCfXh/S1BZAalZVaQDyX9NpekcUXqgf41YYkQ6 46brmxvI2T49V1RWzKmdpLsOA6L33Nji13vZhE8FTWmByXxEAXz2MyD4/EkcYna1z2lN ux15xeawklxx10p2HS9vBjPYlROMmwa0OwMLUmPIu4l6uH6RThxhilpdoAun9ncbMWBQ ewVagENILdlQxlpM3Sa2AQnzTYI64mv06YIJo/cVY7onSLgQ0jfLDV8bivp8OxSD3rVo 0jOOOXygsyazGfiDuwgr5cohAD6dcCHK+H9tzK2TVLYt1MdJfvODh4JV9vgLVBND/WQn gPfw== 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=GHb7bz1QuT520+0LSXgWOUMRKuL4oOXU2dPanOcF9mE=; b=bQvtHyGZ0FkNc03u3lLzhYXteVNLH5C2/etkPPWzNsmCmCoo/Ytwzee80X+14PFQBy H8eYipLJkxh1ekXUvvWdUn7xkPW78VxqStb4KOV0pQxBbZUHVGznPSH6gkO8AYaIgNZU 4dzPhiu3Q71+QTGnSYbnaxY0Hvveg1RSbjBZdfoQFzDaTx6xZqR7POscq01F2+RbVNcL vxcFzqKPYbLgA24F97Zdoh5Uthu2HiMbSerze2RSA9ZewUkvPcm5eb4sYSgESMActF0Y LOQsG+5FUYXImDF/VjfGSIn9EXmp7MxqzuByB+hQCc2WCN078NcoAE+Ibh7hnTlFHE/v RXRw== X-Gm-Message-State: AOAM530c04rxevYbwrezMUMN3+Y9LNPieWhj8iSRid9zXj/Yuaxqm/je jAfald3u7JLtxr0huqP2DJ8kRArvzdaFr6ZD X-Google-Smtp-Source: ABdhPJwrSvBm4AhzXT0u6DMalx0uB9QFazHG7pKYLF+Ak0OwvIP1USXOdWfQQI88Qwj3bBuIVXpbvw== X-Received: by 2002:a7b:c3da:: with SMTP id t26mr5107367wmj.146.1589893622793; Tue, 19 May 2020 06:07:02 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l5sm21444988wrr.72.2020.05.19.06.07.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:07:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Matan Azrad , dpdk stable Date: Tue, 19 May 2020 14:02:36 +0100 Message-Id: <20200519130549.112823-21-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix metadata for compressed Rx CQEs' has been queued to stable release 19.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 stable release 19.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 05/21/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 2491443dce6ed77dca06fb173f5c90f791cc2839 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Tue, 24 Mar 2020 12:15:18 +0000 Subject: [PATCH] net/mlx5: fix metadata for compressed Rx CQEs [ upstream commit 70fa0b4ed083ea2444848716f5d396aba499b560 ] If packets with the same metadata are received with compressed CQE the metadata value is not copied from the title packet in vectorized rx_burst routines, it causes wrong metadata values seeing by applications. Fixes: a18ac6113331 ("net/mlx5: add metadata support to Rx datapath") Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 13 +++++++++++++ drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 13 +++++++++++++ drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 14 +++++++++++++- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h index 8e79883dfe..4df13b6d80 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h @@ -263,6 +263,19 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, elts[pos + 2]->hash.fdir.hi = flow_tag; elts[pos + 3]->hash.fdir.hi = flow_tag; } + if (rte_flow_dynf_metadata_avail()) { + const uint32_t meta = *RTE_FLOW_DYNF_METADATA(t_pkt); + + /* Check if title packet has valid metadata. */ + if (meta) { + assert(t_pkt->ol_flags & + PKT_RX_DYNF_METADATA); + *RTE_FLOW_DYNF_METADATA(elts[pos]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 1]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 2]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 3]) = meta; + } + } pos += MLX5_VPMD_DESCS_PER_LOOP; /* Move to next CQE and invalidate consumed CQEs. */ diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index 86785c7496..b3a3e028ee 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -205,6 +205,19 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, elts[pos + 2]->hash.fdir.hi = flow_tag; elts[pos + 3]->hash.fdir.hi = flow_tag; } + if (rte_flow_dynf_metadata_avail()) { + const uint32_t meta = *RTE_FLOW_DYNF_METADATA(t_pkt); + + /* Check if title packet has valid metadata. */ + if (meta) { + assert(t_pkt->ol_flags & + PKT_RX_DYNF_METADATA); + *RTE_FLOW_DYNF_METADATA(elts[pos]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 1]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 2]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 3]) = meta; + } + } pos += MLX5_VPMD_DESCS_PER_LOOP; /* Move to next CQE and invalidate consumed CQEs. */ if (!(pos & 0x7) && pos < mcqe_n) { diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index 35b7761007..8aa3f0489c 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -118,7 +118,6 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, 14, 15, 6, 7, 10, 11, 2, 3); #endif - /* * A. load mCQEs into a 128bit register. * B. store rearm data to mbuf. @@ -191,6 +190,19 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, elts[pos + 2]->hash.fdir.hi = flow_tag; elts[pos + 3]->hash.fdir.hi = flow_tag; } + if (rte_flow_dynf_metadata_avail()) { + const uint32_t meta = *RTE_FLOW_DYNF_METADATA(t_pkt); + + /* Check if title packet has valid metadata. */ + if (meta) { + assert(t_pkt->ol_flags & + PKT_RX_DYNF_METADATA); + *RTE_FLOW_DYNF_METADATA(elts[pos]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 1]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 2]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 3]) = meta; + } + } pos += MLX5_VPMD_DESCS_PER_LOOP; /* Move to next CQE and invalidate consumed CQEs. */ if (!(pos & 0x7) && pos < mcqe_n) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:45.467678005 +0100 +++ 0021-net-mlx5-fix-metadata-for-compressed-Rx-CQEs.patch 2020-05-19 14:04:44.136646922 +0100 @@ -1,15 +1,16 @@ -From 70fa0b4ed083ea2444848716f5d396aba499b560 Mon Sep 17 00:00:00 2001 +From 2491443dce6ed77dca06fb173f5c90f791cc2839 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Tue, 24 Mar 2020 12:15:18 +0000 Subject: [PATCH] net/mlx5: fix metadata for compressed Rx CQEs +[ upstream commit 70fa0b4ed083ea2444848716f5d396aba499b560 ] + If packets with the same metadata are received with compressed CQE the metadata value is not copied from the title packet in vectorized rx_burst routines, it causes wrong metadata values seeing by applications. Fixes: a18ac6113331 ("net/mlx5: add metadata support to Rx datapath") -Cc: stable@dpdk.org Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad @@ -20,7 +21,7 @@ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h -index 8e8d59ae83..d55642e57a 100644 +index 8e79883dfe..4df13b6d80 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h @@ -263,6 +263,19 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, @@ -32,7 +33,7 @@ + + /* Check if title packet has valid metadata. */ + if (meta) { -+ MLX5_ASSERT(t_pkt->ol_flags & ++ assert(t_pkt->ol_flags & + PKT_RX_DYNF_METADATA); + *RTE_FLOW_DYNF_METADATA(elts[pos]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 1]) = meta; @@ -44,7 +45,7 @@ pos += MLX5_VPMD_DESCS_PER_LOOP; /* Move to next CQE and invalidate consumed CQEs. */ diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h -index 6d952df787..701e5e0cd5 100644 +index 86785c7496..b3a3e028ee 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -205,6 +205,19 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, @@ -56,7 +57,7 @@ + + /* Check if title packet has valid metadata. */ + if (meta) { -+ MLX5_ASSERT(t_pkt->ol_flags & ++ assert(t_pkt->ol_flags & + PKT_RX_DYNF_METADATA); + *RTE_FLOW_DYNF_METADATA(elts[pos]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 1]) = meta; @@ -68,7 +69,7 @@ /* Move to next CQE and invalidate consumed CQEs. */ if (!(pos & 0x7) && pos < mcqe_n) { diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h -index 406f23f595..a4086df2e9 100644 +index 35b7761007..8aa3f0489c 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -118,7 +118,6 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, @@ -88,7 +89,7 @@ + + /* Check if title packet has valid metadata. */ + if (meta) { -+ MLX5_ASSERT(t_pkt->ol_flags & ++ assert(t_pkt->ol_flags & + PKT_RX_DYNF_METADATA); + *RTE_FLOW_DYNF_METADATA(elts[pos]) = meta; + *RTE_FLOW_DYNF_METADATA(elts[pos + 1]) = meta;