From 0c55591588e017f1ef2c1ac845a1fa23ea1e19fb Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Mon, 27 Apr 2020 18:20:11 +0000 Subject: [PATCH] net/mlx5: fix assert in dynamic metadata handling The assert in dynamic flow metadata handling is wrong after the fix for the performance degradation. The assert meant to check the metadata mask but was updated with the metadata offset instead. Fix this assert and restore proper metadata mask checking. Fixes: 6c55b622a956 ("net/mlx5: set dynamic flow metadata in Rx queues") Cc: stable@dpdk.org Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx_vec_altivec.h | 7 ++++--- drivers/net/mlx5/mlx5_rxtx_vec_neon.h | 5 +++-- drivers/net/mlx5/mlx5_rxtx_vec_sse.h | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h index 69b934707c..26715ef450 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_altivec.h @@ -264,14 +264,15 @@ 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 (!!rxq->flow_meta_mask) { + if (rxq->dynf_meta) { int32_t offs = rxq->flow_meta_offset; const uint32_t meta = *RTE_MBUF_DYNFIELD(t_pkt, offs, uint32_t *); /* Check if title packet has valid metadata. */ if (meta) { - MLX5_ASSERT(t_pkt->ol_flags & offs); + MLX5_ASSERT(t_pkt->ol_flags & + rxq->flow_meta_mask); *RTE_MBUF_DYNFIELD(elts[pos], offs, uint32_t *) = meta; *RTE_MBUF_DYNFIELD(elts[pos + 1], offs, @@ -1028,7 +1029,7 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n, pkts[pos + 3]->timestamp = rte_be_to_cpu_64(cq[pos + p3].timestamp); } - if (!!rxq->flow_meta_mask) { + if (rxq->dynf_meta) { uint64_t flag = rxq->flow_meta_mask; int32_t offs = rxq->flow_meta_offset; uint32_t metadata; diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h index d39e72680b..ecafbf8004 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h @@ -205,14 +205,15 @@ 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 (!!rxq->flow_meta_mask) { + if (rxq->dynf_meta) { int32_t offs = rxq->flow_meta_offset; const uint32_t meta = *RTE_MBUF_DYNFIELD(t_pkt, offs, uint32_t *); /* Check if title packet has valid metadata. */ if (meta) { - MLX5_ASSERT(t_pkt->ol_flags & offs); + MLX5_ASSERT(t_pkt->ol_flags & + rxq->flow_meta_mask); *RTE_MBUF_DYNFIELD(elts[pos], offs, uint32_t *) = meta; *RTE_MBUF_DYNFIELD(elts[pos + 1], offs, diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h index f110f73b4a..6847ae7827 100644 --- a/drivers/net/mlx5/mlx5_rxtx_vec_sse.h +++ b/drivers/net/mlx5/mlx5_rxtx_vec_sse.h @@ -199,7 +199,8 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq, /* Check if title packet has valid metadata. */ if (meta) { - MLX5_ASSERT(t_pkt->ol_flags & offs); + MLX5_ASSERT(t_pkt->ol_flags & + rxq->flow_meta_mask); *RTE_MBUF_DYNFIELD(elts[pos], offs, uint32_t *) = meta; *RTE_MBUF_DYNFIELD(elts[pos + 1], offs, -- 2.20.1