net/cnxk: enable PTP processing in vector Rx
[dpdk.git] / drivers / net / cnxk / cn10k_rx.h
index 7bb9dd8..d9572b1 100644 (file)
@@ -7,11 +7,15 @@
 #include <rte_ether.h>
 #include <rte_vect.h>
 
+#include <cnxk_ethdev.h>
+
 #define NIX_RX_OFFLOAD_NONE         (0)
 #define NIX_RX_OFFLOAD_RSS_F        BIT(0)
 #define NIX_RX_OFFLOAD_PTYPE_F      BIT(1)
 #define NIX_RX_OFFLOAD_CHECKSUM_F    BIT(2)
 #define NIX_RX_OFFLOAD_MARK_UPDATE_F BIT(3)
+#define NIX_RX_OFFLOAD_TSTAMP_F             BIT(4)
+#define NIX_RX_OFFLOAD_VLAN_STRIP_F  BIT(5)
 
 /* Flags to control cqe_to_mbuf conversion function.
  * Defining it from backwards to denote its been
@@ -105,7 +109,7 @@ nix_update_match_id(const uint16_t match_id, uint64_t ol_flags,
 
 static __rte_always_inline void
 nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx, struct rte_mbuf *mbuf,
-                   uint64_t rearm)
+                   uint64_t rearm, const uint16_t flags)
 {
        const rte_iova_t *iova_list;
        struct rte_mbuf *head;
@@ -115,8 +119,17 @@ nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx, struct rte_mbuf *mbuf,
 
        sg = *(const uint64_t *)(rx + 1);
        nb_segs = (sg >> 48) & 0x3;
+
+       if (nb_segs == 1) {
+               mbuf->next = NULL;
+               return;
+       }
+
+       mbuf->pkt_len = (rx->pkt_lenm1 + 1) - (flags & NIX_RX_OFFLOAD_TSTAMP_F ?
+                                              CNXK_NIX_TIMESYNC_RX_OFFSET : 0);
+       mbuf->data_len = (sg & 0xFFFF) - (flags & NIX_RX_OFFLOAD_TSTAMP_F ?
+                                         CNXK_NIX_TIMESYNC_RX_OFFSET : 0);
        mbuf->nb_segs = nb_segs;
-       mbuf->data_len = sg & 0xFFFF;
        sg = sg >> 16;
 
        eol = ((const rte_iova_t *)(rx + 1) + ((rx->desc_sizem1 + 1) << 1));
@@ -176,19 +189,29 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
        if (flag & NIX_RX_OFFLOAD_CHECKSUM_F)
                ol_flags |= nix_rx_olflags_get(lookup_mem, w1);
 
+       if (flag & NIX_RX_OFFLOAD_VLAN_STRIP_F) {
+               if (rx->vtag0_gone) {
+                       ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+                       mbuf->vlan_tci = rx->vtag0_tci;
+               }
+               if (rx->vtag1_gone) {
+                       ol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;
+                       mbuf->vlan_tci_outer = rx->vtag1_tci;
+               }
+       }
+
        if (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)
                ol_flags = nix_update_match_id(rx->match_id, ol_flags, mbuf);
 
        mbuf->ol_flags = ol_flags;
-       *(uint64_t *)(&mbuf->rearm_data) = val;
        mbuf->pkt_len = len;
+       mbuf->data_len = len;
+       *(uint64_t *)(&mbuf->rearm_data) = val;
 
-       if (flag & NIX_RX_MULTI_SEG_F) {
-               nix_cqe_xtract_mseg(rx, mbuf, val);
-       } else {
-               mbuf->data_len = len;
+       if (flag & NIX_RX_MULTI_SEG_F)
+               nix_cqe_xtract_mseg(rx, mbuf, val, flag);
+       else
                mbuf->next = NULL;
-       }
 }
 
 static inline uint16_t
@@ -249,6 +272,11 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
 
                cn10k_nix_cqe_to_mbuf(cq, cq->tag, mbuf, lookup_mem, mbuf_init,
                                      flags);
+               cnxk_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
+                                       (flags & NIX_RX_OFFLOAD_TSTAMP_F),
+                                       (flags & NIX_RX_MULTI_SEG_F),
+                                       (uint64_t *)((uint8_t *)mbuf
+                                                               + data_off));
                rx_pkts[packets++] = mbuf;
                roc_prefetch_store_keep(mbuf);
                head++;
@@ -266,6 +294,28 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
 
 #if defined(RTE_ARCH_ARM64)
 
+static __rte_always_inline uint64_t
+nix_vlan_update(const uint64_t w2, uint64_t ol_flags, uint8x16_t *f)
+{
+       if (w2 & BIT_ULL(21) /* vtag0_gone */) {
+               ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+               *f = vsetq_lane_u16((uint16_t)(w2 >> 32), *f, 5);
+       }
+
+       return ol_flags;
+}
+
+static __rte_always_inline uint64_t
+nix_qinq_update(const uint64_t w2, uint64_t ol_flags, struct rte_mbuf *mbuf)
+{
+       if (w2 & BIT_ULL(23) /* vtag1_gone */) {
+               ol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;
+               mbuf->vlan_tci_outer = (uint16_t)(w2 >> 48);
+       }
+
+       return ol_flags;
+}
+
 static __rte_always_inline uint16_t
 cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
                           uint16_t pkts, const uint16_t flags)
@@ -390,6 +440,23 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
                        ol_flags3 |= nix_rx_olflags_get(lookup_mem, cq3_w1);
                }
 
+               if (flags & NIX_RX_OFFLOAD_VLAN_STRIP_F) {
+                       uint64_t cq0_w2 = *(uint64_t *)(cq0 + CQE_SZ(0) + 16);
+                       uint64_t cq1_w2 = *(uint64_t *)(cq0 + CQE_SZ(1) + 16);
+                       uint64_t cq2_w2 = *(uint64_t *)(cq0 + CQE_SZ(2) + 16);
+                       uint64_t cq3_w2 = *(uint64_t *)(cq0 + CQE_SZ(3) + 16);
+
+                       ol_flags0 = nix_vlan_update(cq0_w2, ol_flags0, &f0);
+                       ol_flags1 = nix_vlan_update(cq1_w2, ol_flags1, &f1);
+                       ol_flags2 = nix_vlan_update(cq2_w2, ol_flags2, &f2);
+                       ol_flags3 = nix_vlan_update(cq3_w2, ol_flags3, &f3);
+
+                       ol_flags0 = nix_qinq_update(cq0_w2, ol_flags0, mbuf0);
+                       ol_flags1 = nix_qinq_update(cq1_w2, ol_flags1, mbuf1);
+                       ol_flags2 = nix_qinq_update(cq2_w2, ol_flags2, mbuf2);
+                       ol_flags3 = nix_qinq_update(cq3_w2, ol_flags3, mbuf3);
+               }
+
                if (flags & NIX_RX_OFFLOAD_MARK_UPDATE_F) {
                        ol_flags0 = nix_update_match_id(
                                *(uint16_t *)(cq0 + CQE_SZ(0) + 38), ol_flags0,
@@ -405,6 +472,99 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
                                mbuf3);
                }
 
+               if (flags & NIX_RX_OFFLOAD_TSTAMP_F) {
+                       const uint16x8_t len_off = {
+                               0,                           /* ptype   0:15 */
+                               0,                           /* ptype  16:32 */
+                               CNXK_NIX_TIMESYNC_RX_OFFSET, /* pktlen  0:15*/
+                               0,                           /* pktlen 16:32 */
+                               CNXK_NIX_TIMESYNC_RX_OFFSET, /* datalen 0:15 */
+                               0,
+                               0,
+                               0};
+                       const uint32x4_t ptype = {RTE_PTYPE_L2_ETHER_TIMESYNC,
+                                                 RTE_PTYPE_L2_ETHER_TIMESYNC,
+                                                 RTE_PTYPE_L2_ETHER_TIMESYNC,
+                                                 RTE_PTYPE_L2_ETHER_TIMESYNC};
+                       const uint64_t ts_olf = PKT_RX_IEEE1588_PTP |
+                                               PKT_RX_IEEE1588_TMST |
+                                               rxq->tstamp->rx_tstamp_dynflag;
+                       const uint32x4_t and_mask = {0x1, 0x2, 0x4, 0x8};
+                       uint64x2_t ts01, ts23, mask;
+                       uint64_t ts[4];
+                       uint8_t res;
+
+                       /* Subtract timesync length from total pkt length. */
+                       f0 = vsubq_u16(f0, len_off);
+                       f1 = vsubq_u16(f1, len_off);
+                       f2 = vsubq_u16(f2, len_off);
+                       f3 = vsubq_u16(f3, len_off);
+
+                       /* Get the address of actual timestamp. */
+                       ts01 = vaddq_u64(mbuf01, data_off);
+                       ts23 = vaddq_u64(mbuf23, data_off);
+                       /* Load timestamp from address. */
+                       ts01 = vsetq_lane_u64(*(uint64_t *)vgetq_lane_u64(ts01,
+                                                                         0),
+                                             ts01, 0);
+                       ts01 = vsetq_lane_u64(*(uint64_t *)vgetq_lane_u64(ts01,
+                                                                         1),
+                                             ts01, 1);
+                       ts23 = vsetq_lane_u64(*(uint64_t *)vgetq_lane_u64(ts23,
+                                                                         0),
+                                             ts23, 0);
+                       ts23 = vsetq_lane_u64(*(uint64_t *)vgetq_lane_u64(ts23,
+                                                                         1),
+                                             ts23, 1);
+                       /* Convert from be to cpu byteorder. */
+                       ts01 = vrev64q_u8(ts01);
+                       ts23 = vrev64q_u8(ts23);
+                       /* Store timestamp into scalar for later use. */
+                       ts[0] = vgetq_lane_u64(ts01, 0);
+                       ts[1] = vgetq_lane_u64(ts01, 1);
+                       ts[2] = vgetq_lane_u64(ts23, 0);
+                       ts[3] = vgetq_lane_u64(ts23, 1);
+
+                       /* Store timestamp into dynfield. */
+                       *cnxk_nix_timestamp_dynfield(mbuf0, rxq->tstamp) =
+                               ts[0];
+                       *cnxk_nix_timestamp_dynfield(mbuf1, rxq->tstamp) =
+                               ts[1];
+                       *cnxk_nix_timestamp_dynfield(mbuf2, rxq->tstamp) =
+                               ts[2];
+                       *cnxk_nix_timestamp_dynfield(mbuf3, rxq->tstamp) =
+                               ts[3];
+
+                       /* Generate ptype mask to filter L2 ether timesync */
+                       mask = vdupq_n_u32(vgetq_lane_u32(f0, 0));
+                       mask = vsetq_lane_u32(vgetq_lane_u32(f1, 0), mask, 1);
+                       mask = vsetq_lane_u32(vgetq_lane_u32(f2, 0), mask, 2);
+                       mask = vsetq_lane_u32(vgetq_lane_u32(f3, 0), mask, 3);
+
+                       /* Match against L2 ether timesync. */
+                       mask = vceqq_u32(mask, ptype);
+                       /* Convert from vector from scalar mask */
+                       res = vaddvq_u32(vandq_u32(mask, and_mask));
+                       res &= 0xF;
+
+                       if (res) {
+                               /* Fill in the ol_flags for any packets that
+                                * matched.
+                                */
+                               ol_flags0 |= ((res & 0x1) ? ts_olf : 0);
+                               ol_flags1 |= ((res & 0x2) ? ts_olf : 0);
+                               ol_flags2 |= ((res & 0x4) ? ts_olf : 0);
+                               ol_flags3 |= ((res & 0x8) ? ts_olf : 0);
+
+                               /* Update Rxq timestamp with the latest
+                                * timestamp.
+                                */
+                               rxq->tstamp->rx_ready = 1;
+                               rxq->tstamp->rx_tstamp =
+                                       ts[31 - __builtin_clz(res)];
+                       }
+               }
+
                /* Form rearm_data with ol_flags */
                rearm0 = vsetq_lane_u64(ol_flags0, rearm0, 1);
                rearm1 = vsetq_lane_u64(ol_flags1, rearm1, 1);
@@ -423,16 +583,34 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
                vst1q_u64((uint64_t *)mbuf2->rearm_data, rearm2);
                vst1q_u64((uint64_t *)mbuf3->rearm_data, rearm3);
 
-               /* Update that no more segments */
-               mbuf0->next = NULL;
-               mbuf1->next = NULL;
-               mbuf2->next = NULL;
-               mbuf3->next = NULL;
-
                /* Store the mbufs to rx_pkts */
                vst1q_u64((uint64_t *)&rx_pkts[packets], mbuf01);
                vst1q_u64((uint64_t *)&rx_pkts[packets + 2], mbuf23);
 
+               if (flags & NIX_RX_MULTI_SEG_F) {
+                       /* Multi segment is enable build mseg list for
+                        * individual mbufs in scalar mode.
+                        */
+                       nix_cqe_xtract_mseg((union nix_rx_parse_u *)
+                                               (cq0 + CQE_SZ(0) + 8), mbuf0,
+                                           mbuf_initializer, flags);
+                       nix_cqe_xtract_mseg((union nix_rx_parse_u *)
+                                               (cq0 + CQE_SZ(1) + 8), mbuf1,
+                                           mbuf_initializer, flags);
+                       nix_cqe_xtract_mseg((union nix_rx_parse_u *)
+                                               (cq0 + CQE_SZ(2) + 8), mbuf2,
+                                           mbuf_initializer, flags);
+                       nix_cqe_xtract_mseg((union nix_rx_parse_u *)
+                                               (cq0 + CQE_SZ(3) + 8), mbuf3,
+                                           mbuf_initializer, flags);
+               } else {
+                       /* Update that no more segments */
+                       mbuf0->next = NULL;
+                       mbuf1->next = NULL;
+                       mbuf2->next = NULL;
+                       mbuf3->next = NULL;
+               }
+
                /* Prefetch mbufs */
                roc_prefetch_store_keep(mbuf0);
                roc_prefetch_store_keep(mbuf1);
@@ -486,27 +664,100 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
 #define PTYPE_F          NIX_RX_OFFLOAD_PTYPE_F
 #define CKSUM_F          NIX_RX_OFFLOAD_CHECKSUM_F
 #define MARK_F   NIX_RX_OFFLOAD_MARK_UPDATE_F
-
-/* [MARK] [CKSUM] [PTYPE] [RSS] */
-#define NIX_RX_FASTPATH_MODES                                         \
-R(no_offload,                  0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)       \
-R(rss,                         0, 0, 0, 1, RSS_F)                     \
-R(ptype,                       0, 0, 1, 0, PTYPE_F)                   \
-R(ptype_rss,                   0, 0, 1, 1, PTYPE_F | RSS_F)           \
-R(cksum,                       0, 1, 0, 0, CKSUM_F)                   \
-R(cksum_rss,                   0, 1, 0, 1, CKSUM_F | RSS_F)           \
-R(cksum_ptype,                 0, 1, 1, 0, CKSUM_F | PTYPE_F)         \
-R(cksum_ptype_rss,             0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F) \
-R(mark,                                1, 0, 0, 0, MARK_F)                    \
-R(mark_rss,                    1, 0, 0, 1, MARK_F | RSS_F)            \
-R(mark_ptype,                  1, 0, 1, 0, MARK_F | PTYPE_F)          \
-R(mark_ptype_rss,              1, 0, 1, 1, MARK_F | PTYPE_F | RSS_F)  \
-R(mark_cksum,                  1, 1, 0, 0, MARK_F | CKSUM_F)          \
-R(mark_cksum_rss,              1, 1, 0, 1, MARK_F | CKSUM_F | RSS_F)  \
-R(mark_cksum_ptype,            1, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F)\
-R(mark_cksum_ptype_rss,                1, 1, 1, 1, MARK_F | CKSUM_F | PTYPE_F | RSS_F)
-
-#define R(name, f3, f2, f1, f0, flags)                                         \
+#define TS_F      NIX_RX_OFFLOAD_TSTAMP_F
+#define RX_VLAN_F NIX_RX_OFFLOAD_VLAN_STRIP_F
+
+/* [RX_VLAN_F] [TS] [MARK] [CKSUM] [PTYPE] [RSS] */
+#define NIX_RX_FASTPATH_MODES                                                 \
+R(no_offload,                  0, 0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)         \
+R(rss,                         0, 0, 0, 0, 0, 1, RSS_F)                       \
+R(ptype,                       0, 0, 0, 0, 1, 0, PTYPE_F)                     \
+R(ptype_rss,                   0, 0, 0, 0, 1, 1, PTYPE_F | RSS_F)             \
+R(cksum,                       0, 0, 0, 1, 0, 0, CKSUM_F)                     \
+R(cksum_rss,                   0, 0, 0, 1, 0, 1, CKSUM_F | RSS_F)             \
+R(cksum_ptype,                 0, 0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)           \
+R(cksum_ptype_rss,             0, 0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F)   \
+R(mark,                                0, 0, 1, 0, 0, 0, MARK_F)                      \
+R(mark_rss,                    0, 0, 1, 0, 0, 1, MARK_F | RSS_F)              \
+R(mark_ptype,                  0, 0, 1, 0, 1, 0, MARK_F | PTYPE_F)            \
+R(mark_ptype_rss,              0, 0, 1, 0, 1, 1, MARK_F | PTYPE_F | RSS_F)    \
+R(mark_cksum,                  0, 0, 1, 1, 0, 0, MARK_F | CKSUM_F)            \
+R(mark_cksum_rss,              0, 0, 1, 1, 0, 1, MARK_F | CKSUM_F | RSS_F)    \
+R(mark_cksum_ptype,            0, 0, 1, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F)  \
+R(mark_cksum_ptype_rss,                0, 0, 1, 1, 1, 1,                              \
+                       MARK_F | CKSUM_F | PTYPE_F | RSS_F)                    \
+R(ts,                          0, 1, 0, 0, 0, 0, TS_F)                        \
+R(ts_rss,                      0, 1, 0, 0, 0, 1, TS_F | RSS_F)                \
+R(ts_ptype,                    0, 1, 0, 0, 1, 0, TS_F | PTYPE_F)              \
+R(ts_ptype_rss,                        0, 1, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F)      \
+R(ts_cksum,                    0, 1, 0, 1, 0, 0, TS_F | CKSUM_F)              \
+R(ts_cksum_rss,                        0, 1, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F)      \
+R(ts_cksum_ptype,              0, 1, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F)    \
+R(ts_cksum_ptype_rss,          0, 1, 0, 1, 1, 1,                              \
+                       TS_F | CKSUM_F | PTYPE_F | RSS_F)                      \
+R(ts_mark,                     0, 1, 1, 0, 0, 0, TS_F | MARK_F)               \
+R(ts_mark_rss,                 0, 1, 1, 0, 0, 1, TS_F | MARK_F | RSS_F)       \
+R(ts_mark_ptype,               0, 1, 1, 0, 1, 0, TS_F | MARK_F | PTYPE_F)     \
+R(ts_mark_ptype_rss,           0, 1, 1, 0, 1, 1,                              \
+                       TS_F | MARK_F | PTYPE_F | RSS_F)                       \
+R(ts_mark_cksum,               0, 1, 1, 1, 0, 0, TS_F | MARK_F | CKSUM_F)     \
+R(ts_mark_cksum_rss,           0, 1, 1, 1, 0, 1,                              \
+                       TS_F | MARK_F | CKSUM_F | RSS_F)                       \
+R(ts_mark_cksum_ptype,         0, 1, 1, 1, 1, 0,                              \
+                       TS_F | MARK_F | CKSUM_F | PTYPE_F)                     \
+R(ts_mark_cksum_ptype_rss,     0, 1, 1, 1, 1, 1,                              \
+                       TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)             \
+R(vlan,                                1, 0, 0, 0, 0, 0, RX_VLAN_F)                   \
+R(vlan_rss,                    1, 0, 0, 0, 0, 1, RX_VLAN_F | RSS_F)           \
+R(vlan_ptype,                  1, 0, 0, 0, 1, 0, RX_VLAN_F | PTYPE_F)         \
+R(vlan_ptype_rss,              1, 0, 0, 0, 1, 1, RX_VLAN_F | PTYPE_F | RSS_F) \
+R(vlan_cksum,                  1, 0, 0, 1, 0, 0, RX_VLAN_F | CKSUM_F)         \
+R(vlan_cksum_rss,              1, 0, 0, 1, 0, 1, RX_VLAN_F | CKSUM_F | RSS_F) \
+R(vlan_cksum_ptype,            1, 0, 0, 1, 1, 0,                              \
+                       RX_VLAN_F | CKSUM_F | PTYPE_F)                         \
+R(vlan_cksum_ptype_rss,                1, 0, 0, 1, 1, 1,                              \
+                       RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)                 \
+R(vlan_mark,                   1, 0, 1, 0, 0, 0, RX_VLAN_F | MARK_F)          \
+R(vlan_mark_rss,               1, 0, 1, 0, 0, 1, RX_VLAN_F | MARK_F | RSS_F)  \
+R(vlan_mark_ptype,             1, 0, 1, 0, 1, 0, RX_VLAN_F | MARK_F | PTYPE_F)\
+R(vlan_mark_ptype_rss,         1, 0, 1, 0, 1, 1,                              \
+                       RX_VLAN_F | MARK_F | PTYPE_F | RSS_F)                  \
+R(vlan_mark_cksum,             1, 0, 1, 1, 0, 0, RX_VLAN_F | MARK_F | CKSUM_F)\
+R(vlan_mark_cksum_rss,         1, 0, 1, 1, 0, 1,                              \
+                       RX_VLAN_F | MARK_F | CKSUM_F | RSS_F)                  \
+R(vlan_mark_cksum_ptype,       1, 0, 1, 1, 1, 0,                              \
+                       RX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F)                \
+R(vlan_mark_cksum_ptype_rss,   1, 0, 1, 1, 1, 1,                              \
+                       RX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)        \
+R(vlan_ts,                     1, 1, 0, 0, 0, 0, RX_VLAN_F | TS_F)            \
+R(vlan_ts_rss,                 1, 1, 0, 0, 0, 1, RX_VLAN_F | TS_F | RSS_F)    \
+R(vlan_ts_ptype,               1, 1, 0, 0, 1, 0, RX_VLAN_F | TS_F | PTYPE_F)  \
+R(vlan_ts_ptype_rss,           1, 1, 0, 0, 1, 1,                              \
+                       RX_VLAN_F | TS_F | PTYPE_F | RSS_F)                    \
+R(vlan_ts_cksum,               1, 1, 0, 1, 0, 0, RX_VLAN_F | TS_F | CKSUM_F)  \
+R(vlan_ts_cksum_rss,           1, 1, 0, 1, 0, 1,                              \
+                       RX_VLAN_F | TS_F | CKSUM_F | RSS_F)                    \
+R(vlan_ts_cksum_ptype,         1, 1, 0, 1, 1, 0,                              \
+                       RX_VLAN_F | TS_F | CKSUM_F | PTYPE_F)                  \
+R(vlan_ts_cksum_ptype_rss,     1, 1, 0, 1, 1, 1,                              \
+                       RX_VLAN_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)          \
+R(vlan_ts_mark,                        1, 1, 1, 0, 0, 0, RX_VLAN_F | TS_F | MARK_F)   \
+R(vlan_ts_mark_rss,            1, 1, 1, 0, 0, 1,                              \
+                       RX_VLAN_F | TS_F | MARK_F | RSS_F)                     \
+R(vlan_ts_mark_ptype,          1, 1, 1, 0, 1, 0,                              \
+                       RX_VLAN_F | TS_F | MARK_F | PTYPE_F)                   \
+R(vlan_ts_mark_ptype_rss,      1, 1, 1, 0, 1, 1,                              \
+                       RX_VLAN_F | TS_F | MARK_F | PTYPE_F | RSS_F)           \
+R(vlan_ts_mark_cksum,          1, 1, 1, 1, 0, 0,                              \
+                       RX_VLAN_F | TS_F | MARK_F | CKSUM_F)                   \
+R(vlan_ts_mark_cksum_rss,      1, 1, 1, 1, 0, 1,                              \
+                       RX_VLAN_F | TS_F | MARK_F | CKSUM_F | RSS_F)           \
+R(vlan_ts_mark_cksum_ptype,    1, 1, 1, 1, 1, 0,                              \
+                       RX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)         \
+R(vlan_ts_mark_cksum_ptype_rss,        1, 1, 1, 1, 1, 1,                              \
+                       RX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define R(name, f5, f4, f3, f2, f1, f0, flags)                                \
        uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name(          \
                void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts);     \
                                                                               \
@@ -514,6 +765,9 @@ R(mark_cksum_ptype_rss,             1, 1, 1, 1, MARK_F | CKSUM_F | PTYPE_F | RSS_F)
                void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts);     \
                                                                               \
        uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_vec_##name(      \
+               void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts);     \
+                                                                              \
+       uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_vec_mseg_##name( \
                void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts);
 
 NIX_RX_FASTPATH_MODES