net/mlx5: fix assert in dynamic metadata handling
Checks
Commit Message
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: 6c55b62 ("net/mlx5: set dynamic flow metadata in Rx queues")
Cc: stable@dpdk.org
Signed-off-by: Alexander Kozyrev <akozyrev@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
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(-)
Comments
Hi,
> -----Original Message-----
> From: Alexander Kozyrev <akozyrev@mellanox.com>
> Sent: Monday, April 27, 2020 9:20 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Raslan Darawsheh <rasland@mellanox.com>; Slava
> Ovsiienko <viacheslavo@mellanox.com>
> 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: 6c55b62 ("net/mlx5: set dynamic flow metadata in Rx queues")
> Cc: stable@dpdk.org
>
> Signed-off-by: Alexander Kozyrev <akozyrev@mellanox.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
> ---
> 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(-)
>
Patch applied to next-net-mlx,
Kindest regards,
Raslan Darawsheh
@@ -264,14 +264,15 @@
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 @@
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;
@@ -205,14 +205,15 @@
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,
@@ -199,7 +199,8 @@
/* 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,