mbuf: add namespace to offload flags
[dpdk.git] / drivers / net / mlx5 / mlx5_rxtx_vec_neon.h
index d122dad..aa36df2 100644 (file)
 /**
  * Store free buffers to RX SW ring.
  *
- * @param rxq
- *   Pointer to RX queue structure.
+ * @param elts
+ *   Pointer to SW ring to be filled.
  * @param pkts
  *   Pointer to array of packets to be stored.
  * @param pkts_n
  *   Number of packets to be stored.
  */
 static inline void
-rxq_copy_mbuf_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t n)
+rxq_copy_mbuf_v(struct rte_mbuf **elts, struct rte_mbuf **pkts, uint16_t n)
 {
-       const uint16_t q_mask = (1 << rxq->elts_n) - 1;
-       struct rte_mbuf **elts = &(*rxq->elts)[rxq->rq_pi & q_mask];
        unsigned int pos;
        uint16_t p = n & -2;
 
@@ -113,7 +111,8 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
                rxq->crc_present * RTE_ETHER_CRC_LEN, 0,
                0, 0
        };
-       const uint32_t flow_tag = t_pkt->hash.fdir.hi;
+       uint32x4_t ol_flags = {0, 0, 0, 0};
+       uint32x4_t ol_flags_mask = {0, 0, 0, 0};
 #ifdef MLX5_PMD_SOFT_COUNTERS
        uint32_t rcvd_byte = 0;
 #endif
@@ -200,11 +199,139 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
                rcvd_byte += vget_lane_u64(vpaddl_u32(vpaddl_u16(byte_cnt)), 0);
 #endif
                if (rxq->mark) {
-                       /* E.1 store flow tag (rte_flow mark). */
-                       elts[pos]->hash.fdir.hi = flow_tag;
-                       elts[pos + 1]->hash.fdir.hi = flow_tag;
-                       elts[pos + 2]->hash.fdir.hi = flow_tag;
-                       elts[pos + 3]->hash.fdir.hi = flow_tag;
+                       if (rxq->mcqe_format !=
+                           MLX5_CQE_RESP_FORMAT_FTAG_STRIDX) {
+                               const uint32_t flow_tag = t_pkt->hash.fdir.hi;
+
+                               /* E.1 store flow tag (rte_flow mark). */
+                               elts[pos]->hash.fdir.hi = flow_tag;
+                               elts[pos + 1]->hash.fdir.hi = flow_tag;
+                               elts[pos + 2]->hash.fdir.hi = flow_tag;
+                               elts[pos + 3]->hash.fdir.hi = flow_tag;
+                       }  else {
+                               const uint32x4_t flow_mark_adj = {
+                                       -1, -1, -1, -1 };
+                               const uint8x16_t flow_mark_shuf = {
+                                       28, 24, 25, -1,
+                                       20, 16, 17, -1,
+                                       12,  8,  9, -1,
+                                        4,  0,  1, -1};
+                               /* Extract flow_tag field. */
+                               const uint32x4_t ft_mask =
+                                       vdupq_n_u32(MLX5_FLOW_MARK_DEFAULT);
+                               const uint32x4_t fdir_flags =
+                                       vdupq_n_u32(RTE_MBUF_F_RX_FDIR);
+                               const uint32x4_t fdir_all_flags =
+                                       vdupq_n_u32(RTE_MBUF_F_RX_FDIR |
+                                                   RTE_MBUF_F_RX_FDIR_ID);
+                               uint32x4_t fdir_id_flags =
+                                       vdupq_n_u32(RTE_MBUF_F_RX_FDIR_ID);
+                               uint32x4_t invalid_mask, ftag;
+
+                               __asm__ volatile
+                               /* A.1 load mCQEs into a 128bit register. */
+                               ("ld1 {v16.16b - v17.16b}, [%[mcq]]\n\t"
+                               /* Extract flow_tag. */
+                                "tbl %[ftag].16b, {v16.16b - v17.16b}, %[flow_mark_shuf].16b\n\t"
+                               : [ftag]"=&w"(ftag)
+                               : [mcq]"r"(p),
+                                 [flow_mark_shuf]"w"(flow_mark_shuf)
+                               : "memory", "v16", "v17");
+                               invalid_mask = vceqzq_u32(ftag);
+                               ol_flags_mask = vorrq_u32(ol_flags_mask,
+                                                         fdir_all_flags);
+                               /* Set RTE_MBUF_F_RX_FDIR if flow tag is non-zero. */
+                               ol_flags = vorrq_u32(ol_flags,
+                                       vbicq_u32(fdir_flags, invalid_mask));
+                               /* Mask out invalid entries. */
+                               fdir_id_flags = vbicq_u32(fdir_id_flags,
+                                                         invalid_mask);
+                               /* Check if flow tag MLX5_FLOW_MARK_DEFAULT. */
+                               ol_flags = vorrq_u32(ol_flags,
+                                       vbicq_u32(fdir_id_flags,
+                                                 vceqq_u32(ftag, ft_mask)));
+                               ftag = vaddq_u32(ftag, flow_mark_adj);
+                               elts[pos]->hash.fdir.hi =
+                                       vgetq_lane_u32(ftag, 3);
+                               elts[pos + 1]->hash.fdir.hi =
+                                       vgetq_lane_u32(ftag, 2);
+                               elts[pos + 2]->hash.fdir.hi =
+                                       vgetq_lane_u32(ftag, 1);
+                               elts[pos + 3]->hash.fdir.hi =
+                                       vgetq_lane_u32(ftag, 0);
+                               }
+               }
+               if (unlikely(rxq->mcqe_format !=
+                            MLX5_CQE_RESP_FORMAT_HASH)) {
+                       if (rxq->mcqe_format ==
+                           MLX5_CQE_RESP_FORMAT_L34H_STRIDX) {
+                               const uint8_t pkt_info =
+                                       (cq->pkt_info & 0x3) << 6;
+                               const uint8_t pkt_hdr0 =
+                                       mcq[pos % 8].hdr_type;
+                               const uint8_t pkt_hdr1 =
+                                       mcq[pos % 8 + 1].hdr_type;
+                               const uint8_t pkt_hdr2 =
+                                       mcq[pos % 8 + 2].hdr_type;
+                               const uint8_t pkt_hdr3 =
+                                       mcq[pos % 8 + 3].hdr_type;
+                               const uint32x4_t vlan_mask =
+                                       vdupq_n_u32(RTE_MBUF_F_RX_VLAN |
+                                                   RTE_MBUF_F_RX_VLAN_STRIPPED);
+                               const uint32x4_t cv_mask =
+                                       vdupq_n_u32(MLX5_CQE_VLAN_STRIPPED);
+                               const uint32x4_t pkt_cv = {
+                                       pkt_hdr0 & 0x1, pkt_hdr1 & 0x1,
+                                       pkt_hdr2 & 0x1, pkt_hdr3 & 0x1};
+
+                               ol_flags_mask = vorrq_u32(ol_flags_mask,
+                                                         vlan_mask);
+                               ol_flags = vorrq_u32(ol_flags,
+                                               vandq_u32(vlan_mask,
+                                               vceqq_u32(pkt_cv, cv_mask)));
+                               elts[pos]->packet_type =
+                                       mlx5_ptype_table[(pkt_hdr0 >> 2) |
+                                                        pkt_info];
+                               elts[pos + 1]->packet_type =
+                                       mlx5_ptype_table[(pkt_hdr1 >> 2) |
+                                                        pkt_info];
+                               elts[pos + 2]->packet_type =
+                                       mlx5_ptype_table[(pkt_hdr2 >> 2) |
+                                                        pkt_info];
+                               elts[pos + 3]->packet_type =
+                                       mlx5_ptype_table[(pkt_hdr3 >> 2) |
+                                                        pkt_info];
+                               if (rxq->tunnel) {
+                                       elts[pos]->packet_type |=
+                                               !!(((pkt_hdr0 >> 2) |
+                                               pkt_info) & (1 << 6));
+                                       elts[pos + 1]->packet_type |=
+                                               !!(((pkt_hdr1 >> 2) |
+                                               pkt_info) & (1 << 6));
+                                       elts[pos + 2]->packet_type |=
+                                               !!(((pkt_hdr2 >> 2) |
+                                               pkt_info) & (1 << 6));
+                                       elts[pos + 3]->packet_type |=
+                                               !!(((pkt_hdr3 >> 2) |
+                                               pkt_info) & (1 << 6));
+                               }
+                       }
+                       const uint32x4_t hash_flags =
+                               vdupq_n_u32(RTE_MBUF_F_RX_RSS_HASH);
+                       const uint32x4_t rearm_flags =
+                               vdupq_n_u32((uint32_t)t_pkt->ol_flags);
+
+                       ol_flags_mask = vorrq_u32(ol_flags_mask, hash_flags);
+                       ol_flags = vorrq_u32(ol_flags,
+                                       vbicq_u32(rearm_flags, ol_flags_mask));
+                       elts[pos]->ol_flags = vgetq_lane_u32(ol_flags, 3);
+                       elts[pos + 1]->ol_flags = vgetq_lane_u32(ol_flags, 2);
+                       elts[pos + 2]->ol_flags = vgetq_lane_u32(ol_flags, 1);
+                       elts[pos + 3]->ol_flags = vgetq_lane_u32(ol_flags, 0);
+                       elts[pos]->hash.rss = 0;
+                       elts[pos + 1]->hash.rss = 0;
+                       elts[pos + 2]->hash.rss = 0;
+                       elts[pos + 3]->hash.rss = 0;
                }
                if (rxq->dynf_meta) {
                        int32_t offs = rxq->flow_meta_offset;
@@ -242,7 +369,6 @@ rxq_cq_decompress_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
        rxq->stats.ipackets += mcqe_n;
        rxq->stats.ibytes += rcvd_byte;
 #endif
-       rxq->cq_ci += mcqe_n;
        return mcqe_n;
 }
 
@@ -270,22 +396,22 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq,
        uint16x4_t ptype;
        uint32x4_t pinfo, cv_flags;
        uint32x4_t ol_flags =
-               vdupq_n_u32(rxq->rss_hash * PKT_RX_RSS_HASH |
-                           rxq->hw_timestamp * PKT_RX_TIMESTAMP);
+               vdupq_n_u32(rxq->rss_hash * RTE_MBUF_F_RX_RSS_HASH |
+                           rxq->hw_timestamp * rxq->timestamp_rx_flag);
        const uint32x4_t ptype_ol_mask = { 0x106, 0x106, 0x106, 0x106 };
        const uint8x16_t cv_flag_sel = {
                0,
-               (uint8_t)(PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED),
-               (uint8_t)(PKT_RX_IP_CKSUM_GOOD >> 1),
+               (uint8_t)(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED),
+               (uint8_t)(RTE_MBUF_F_RX_IP_CKSUM_GOOD >> 1),
                0,
-               (uint8_t)(PKT_RX_L4_CKSUM_GOOD >> 1),
+               (uint8_t)(RTE_MBUF_F_RX_L4_CKSUM_GOOD >> 1),
                0,
-               (uint8_t)((PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD) >> 1),
+               (uint8_t)((RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD) >> 1),
                0, 0, 0, 0, 0, 0, 0, 0, 0
        };
        const uint32x4_t cv_mask =
-               vdupq_n_u32(PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_GOOD |
-                           PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED);
+               vdupq_n_u32(RTE_MBUF_F_RX_IP_CKSUM_GOOD | RTE_MBUF_F_RX_L4_CKSUM_GOOD |
+                           RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED);
        const uint64x2_t mbuf_init = vld1q_u64
                                ((const uint64_t *)&rxq->mbuf_initializer);
        uint64x2_t rearm0, rearm1, rearm2, rearm3;
@@ -293,11 +419,11 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq,
 
        if (rxq->mark) {
                const uint32x4_t ft_def = vdupq_n_u32(MLX5_FLOW_MARK_DEFAULT);
-               const uint32x4_t fdir_flags = vdupq_n_u32(PKT_RX_FDIR);
-               uint32x4_t fdir_id_flags = vdupq_n_u32(PKT_RX_FDIR_ID);
+               const uint32x4_t fdir_flags = vdupq_n_u32(RTE_MBUF_F_RX_FDIR);
+               uint32x4_t fdir_id_flags = vdupq_n_u32(RTE_MBUF_F_RX_FDIR_ID);
                uint32x4_t invalid_mask;
 
-               /* Check if flow tag is non-zero then set PKT_RX_FDIR. */
+               /* Check if flow tag is non-zero then set RTE_MBUF_F_RX_FDIR. */
                invalid_mask = vceqzq_u32(flow_tag);
                ol_flags = vorrq_u32(ol_flags,
                                     vbicq_u32(fdir_flags, invalid_mask));
@@ -368,12 +494,16 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq,
 }
 
 /**
- * Receive burst of packets. An errored completion also consumes a mbuf, but the
- * packet_type is set to be RTE_PTYPE_ALL_MASK. Marked mbufs should be freed
- * before returning to application.
+ * Process a non-compressed completion and fill in mbufs in RX SW ring
+ * with data extracted from the title completion descriptor.
  *
  * @param rxq
  *   Pointer to RX queue structure.
+ * @param cq
+ *   Pointer to completion array having a non-compressed completion at first.
+ * @param elts
+ *   Pointer to SW ring to be filled. The first mbuf has to be pre-built from
+ *   the title completion descriptor to be copied to the rest of mbufs.
  * @param[out] pkts
  *   Array to store received packets.
  * @param pkts_n
@@ -381,28 +511,23 @@ rxq_cq_to_ptype_oflags_v(struct mlx5_rxq_data *rxq,
  * @param[out] err
  *   Pointer to a flag. Set non-zero value if pkts array has at least one error
  *   packet to handle.
- * @param[out] no_cq
- *   Pointer to a boolean. Set true if no new CQE seen.
+ * @param[out] comp
+ *   Pointer to a index. Set it to the first compressed completion if any.
  *
  * @return
- *   Number of packets received including errors (<= pkts_n).
+ *   Number of CQEs successfully processed.
  */
 static inline uint16_t
-rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
-           uint64_t *err, bool *no_cq)
+rxq_cq_process_v(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cq,
+                struct rte_mbuf **elts, struct rte_mbuf **pkts,
+                uint16_t pkts_n, uint64_t *err, uint64_t *comp)
 {
        const uint16_t q_n = 1 << rxq->cqe_n;
        const uint16_t q_mask = q_n - 1;
-       volatile struct mlx5_cqe *cq;
-       struct rte_mbuf **elts;
        unsigned int pos;
-       uint64_t n;
-       uint16_t repl_n;
+       uint64_t n = 0;
        uint64_t comp_idx = MLX5_VPMD_DESCS_PER_LOOP;
        uint16_t nocmp_n = 0;
-       uint16_t rcvd_pkt = 0;
-       unsigned int cq_idx = rxq->cq_ci & q_mask;
-       unsigned int elts_idx;
        const uint16x4_t ownership = vdup_n_u16(!(rxq->cq_ci & (q_mask + 1)));
        const uint16x4_t owner_check = vcreate_u16(0x0001000100010001);
        const uint16x4_t opcode_check = vcreate_u16(0x00f000f000f000f0);
@@ -463,45 +588,12 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
        };
        const uint32x4_t flow_mark_adj = { 0, 0, 0, rxq->mark * (-1) };
 
-       MLX5_ASSERT(rxq->sges_n == 0);
-       MLX5_ASSERT(rxq->cqe_n == rxq->elts_n);
-       cq = &(*rxq->cqes)[cq_idx];
-       rte_prefetch_non_temporal(cq);
-       rte_prefetch_non_temporal(cq + 1);
-       rte_prefetch_non_temporal(cq + 2);
-       rte_prefetch_non_temporal(cq + 3);
-       pkts_n = RTE_MIN(pkts_n, MLX5_VPMD_RX_MAX_BURST);
-       repl_n = q_n - (rxq->rq_ci - rxq->rq_pi);
-       if (repl_n >= rxq->rq_repl_thresh)
-               mlx5_rx_replenish_bulk_mbuf(rxq, repl_n);
-       /* See if there're unreturned mbufs from compressed CQE. */
-       rcvd_pkt = rxq->decompressed;
-       if (rcvd_pkt > 0) {
-               rcvd_pkt = RTE_MIN(rcvd_pkt, pkts_n);
-               rxq_copy_mbuf_v(rxq, pkts, rcvd_pkt);
-               rxq->rq_pi += rcvd_pkt;
-               pkts += rcvd_pkt;
-               rxq->decompressed -= rcvd_pkt;
-       }
-       elts_idx = rxq->rq_pi & q_mask;
-       elts = &(*rxq->elts)[elts_idx];
-       /* Not to overflow pkts array. */
-       pkts_n = RTE_ALIGN_FLOOR(pkts_n - rcvd_pkt, MLX5_VPMD_DESCS_PER_LOOP);
-       /* Not to cross queue end. */
-       pkts_n = RTE_MIN(pkts_n, q_n - elts_idx);
-       pkts_n = RTE_MIN(pkts_n, q_n - cq_idx);
-       if (!pkts_n) {
-               *no_cq = !rcvd_pkt;
-               return rcvd_pkt;
-       }
-       /* At this point, there shouldn't be any remained packets. */
-       MLX5_ASSERT(rxq->decompressed == 0);
        /*
         * Note that vectors have reverse order - {v3, v2, v1, v0}, because
         * there's no instruction to count trailing zeros. __builtin_clzl() is
         * used instead.
         *
-        * A. copy 4 mbuf pointers from elts ring to returing pkts.
+        * A. copy 4 mbuf pointers from elts ring to returning pkts.
         * B. load 64B CQE and extract necessary fields
         *    Final 16bytes cqes[] extracted from original 64bytes CQE has the
         *    following structure:
@@ -675,16 +767,15 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
                comp_idx = __builtin_clzl(vget_lane_u64(vreinterpret_u64_u16(
                                          comp_mask), 0)) /
                                          (sizeof(uint16_t) * 8);
-               /* D.6 mask out entries after the compressed CQE. */
-               mask = vcreate_u16(comp_idx < MLX5_VPMD_DESCS_PER_LOOP ?
-                                  -1UL >> (comp_idx * sizeof(uint16_t) * 8) :
-                                  0);
-               invalid_mask = vorr_u16(invalid_mask, mask);
+               invalid_mask = vorr_u16(invalid_mask, comp_mask);
                /* D.7 count non-compressed valid CQEs. */
                n = __builtin_clzl(vget_lane_u64(vreinterpret_u64_u16(
                                   invalid_mask), 0)) / (sizeof(uint16_t) * 8);
                nocmp_n += n;
-               /* D.2 get the final invalid mask. */
+               /*
+                * D.2 mask out entries after the compressed CQE.
+                *     get the final invalid mask.
+                */
                mask = vcreate_u16(n < MLX5_VPMD_DESCS_PER_LOOP ?
                                   -1UL >> (n * sizeof(uint16_t) * 8) : 0);
                invalid_mask = vorr_u16(invalid_mask, mask);
@@ -697,6 +788,7 @@ 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) {
+                       int offset = rxq->timestamp_offset;
                        if (rxq->rt_timestamp) {
                                struct mlx5_dev_ctx_shared *sh = rxq->sh;
                                uint64_t ts;
@@ -704,54 +796,59 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
                                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);
+                               mlx5_timestamp_set(elts[pos], offset,
+                                       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);
+                               mlx5_timestamp_set(elts[pos + 1], offset,
+                                       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);
+                               mlx5_timestamp_set(elts[pos + 2], offset,
+                                       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);
+                               mlx5_timestamp_set(elts[pos + 3], offset,
+                                       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);
+                               mlx5_timestamp_set(elts[pos], offset,
+                                       rte_be_to_cpu_64(container_of(p0,
+                                       struct mlx5_cqe, pkt_info)->timestamp));
+                               mlx5_timestamp_set(elts[pos + 1], offset,
+                                       rte_be_to_cpu_64(container_of(p1,
+                                       struct mlx5_cqe, pkt_info)->timestamp));
+                               mlx5_timestamp_set(elts[pos + 2], offset,
+                                       rte_be_to_cpu_64(container_of(p2,
+                                       struct mlx5_cqe, pkt_info)->timestamp));
+                               mlx5_timestamp_set(elts[pos + 3], offset,
+                                       rte_be_to_cpu_64(container_of(p3,
+                                       struct mlx5_cqe, pkt_info)->timestamp));
                        }
                }
                if (rxq->dynf_meta) {
                        /* This code is subject for futher optimization. */
                        int32_t offs = rxq->flow_meta_offset;
+                       uint32_t mask = rxq->flow_meta_port_mask;
 
                        *RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *) =
-                               container_of(p0, struct mlx5_cqe,
-                                            pkt_info)->flow_table_metadata;
+                               rte_be_to_cpu_32(container_of
+                               (p0, struct mlx5_cqe,
+                               pkt_info)->flow_table_metadata) & mask;
                        *RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *) =
-                               container_of(p1, struct mlx5_cqe,
-                                            pkt_info)->flow_table_metadata;
+                               rte_be_to_cpu_32(container_of
+                               (p1, struct mlx5_cqe,
+                               pkt_info)->flow_table_metadata) & mask;
                        *RTE_MBUF_DYNFIELD(pkts[pos + 2], offs, uint32_t *) =
-                               container_of(p2, struct mlx5_cqe,
-                                            pkt_info)->flow_table_metadata;
+                               rte_be_to_cpu_32(container_of
+                               (p2, struct mlx5_cqe,
+                               pkt_info)->flow_table_metadata) & mask;
                        *RTE_MBUF_DYNFIELD(pkts[pos + 3], offs, uint32_t *) =
-                               container_of(p3, struct mlx5_cqe,
-                                            pkt_info)->flow_table_metadata;
+                               rte_be_to_cpu_32(container_of
+                               (p3, struct mlx5_cqe,
+                               pkt_info)->flow_table_metadata) & mask;
                        if (*RTE_MBUF_DYNFIELD(pkts[pos], offs, uint32_t *))
                                elts[pos]->ol_flags |= rxq->flow_meta_mask;
                        if (*RTE_MBUF_DYNFIELD(pkts[pos + 1], offs, uint32_t *))
@@ -773,40 +870,13 @@ rxq_burst_v(struct mlx5_rxq_data *rxq, struct rte_mbuf **pkts, uint16_t pkts_n,
                if (n != MLX5_VPMD_DESCS_PER_LOOP)
                        break;
        }
-       /* If no new CQE seen, return without updating cq_db. */
-       if (unlikely(!nocmp_n && comp_idx == MLX5_VPMD_DESCS_PER_LOOP)) {
-               *no_cq = true;
-               return rcvd_pkt;
-       }
-       /* Update the consumer indexes for non-compressed CQEs. */
-       MLX5_ASSERT(nocmp_n <= pkts_n);
-       rxq->cq_ci += nocmp_n;
-       rxq->rq_pi += nocmp_n;
-       rcvd_pkt += nocmp_n;
 #ifdef MLX5_PMD_SOFT_COUNTERS
        rxq->stats.ipackets += nocmp_n;
        rxq->stats.ibytes += rcvd_byte;
 #endif
-       /* Decompress the last CQE if compressed. */
-       if (comp_idx < MLX5_VPMD_DESCS_PER_LOOP && comp_idx == n) {
-               MLX5_ASSERT(comp_idx == (nocmp_n % MLX5_VPMD_DESCS_PER_LOOP));
-               rxq->decompressed = rxq_cq_decompress_v(rxq, &cq[nocmp_n],
-                                                       &elts[nocmp_n]);
-               /* Return more packets if needed. */
-               if (nocmp_n < pkts_n) {
-                       uint16_t n = rxq->decompressed;
-
-                       n = RTE_MIN(n, pkts_n - nocmp_n);
-                       rxq_copy_mbuf_v(rxq, &pkts[nocmp_n], n);
-                       rxq->rq_pi += n;
-                       rcvd_pkt += n;
-                       rxq->decompressed -= n;
-               }
-       }
-       rte_io_wmb();
-       *rxq->cq_db = rte_cpu_to_be_32(rxq->cq_ci);
-       *no_cq = !rcvd_pkt;
-       return rcvd_pkt;
+       if (comp_idx == n)
+               *comp = comp_idx;
+       return nocmp_n;
 }
 
 #endif /* RTE_PMD_MLX5_RXTX_VEC_NEON_H_ */