net/mlx5: fix metadata storing for NEON Rx

[dpdk.git] / drivers / net / mlx5 / mlx5_rxtx_vec_neon.h

diff --git a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
index 3007c03..af924b7 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
+++ b/drivers/net/mlx5/mlx5_rxtx_vec_neon.h
@@ -145,6 +145,7 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
                                    -1UL << ((mcqe_n - pos) *
                                             sizeof(uint16_t) * 8) : 0);
 #endif
+
                for (i = 0; i < MLX5_VPMD_DESCS_PER_LOOP; ++i)
                        if (likely(pos + i < mcqe_n))
                                rte_prefetch0((void *)(cq + pos + i));
@@ -227,6 +228,8 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
                pos += MLX5_VPMD_DESCS_PER_LOOP;
                /* Move to next CQE and invalidate consumed CQEs. */
                if (!(pos & 0x7) && pos < mcqe_n) {
+                       if (pos + 8 < mcqe_n)
+                               rte_prefetch0((void *)(cq + pos + 8));
                        mcq = (void *)&(cq + pos)->pkt_info;
                        for (i = 0; i < 8; ++i)
                                cq[inv++].op_own = MLX5_CQE_INVALIDATE;
@@ -694,37 +697,59 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
                rxq_cq_to_ptype_oflags_v(rxq, ptype_info, flow_tag,
                                         opcode, &elts[pos]);
                if (rxq->hw_timestamp) {
-                       elts[pos]->timestamp =
-                               rte_be_to_cpu_64(
-                                       container_of(p0, struct mlx5_cqe,
-                                                    pkt_info)->timestamp);
-                       elts[pos + 1]->timestamp =
-                               rte_be_to_cpu_64(
-                                       container_of(p1, struct mlx5_cqe,
-                                                    pkt_info)->timestamp);
-                       elts[pos + 2]->timestamp =
-                               rte_be_to_cpu_64(
-                                       container_of(p2, struct mlx5_cqe,
-                                                    pkt_info)->timestamp);
-                       elts[pos + 3]->timestamp =
-                               rte_be_to_cpu_64(
-                                       container_of(p3, struct mlx5_cqe,
-                                                    pkt_info)->timestamp);
+                       if (rxq->rt_timestamp) {
+                               struct mlx5_dev_ctx_shared *sh = rxq->sh;
+                               uint64_t ts;
+
+                               ts = rte_be_to_cpu_64
+                                       (container_of(p0, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos]->timestamp =
+                                       mlx5_txpp_convert_rx_ts(sh, ts);
+                               ts = rte_be_to_cpu_64
+                                       (container_of(p1, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos + 1]->timestamp =
+                                       mlx5_txpp_convert_rx_ts(sh, ts);
+                               ts = rte_be_to_cpu_64
+                                       (container_of(p2, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos + 2]->timestamp =
+                                       mlx5_txpp_convert_rx_ts(sh, ts);
+                               ts = rte_be_to_cpu_64
+                                       (container_of(p3, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos + 3]->timestamp =
+                                       mlx5_txpp_convert_rx_ts(sh, ts);
+                       } else {
+                               elts[pos]->timestamp = rte_be_to_cpu_64
+                                       (container_of(p0, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos + 1]->timestamp = rte_be_to_cpu_64
+                                       (container_of(p1, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos + 2]->timestamp = rte_be_to_cpu_64
+                                       (container_of(p2, struct mlx5_cqe,
+                                                     pkt_info)->timestamp);
+                               elts[pos + 3]->timestamp = rte_be_to_cpu_64
+                                       (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 *))