event/cnxk: improve Rx performance
[dpdk.git] / drivers / net / cnxk / cn10k_rx.h
index 68219b8..564e50f 100644 (file)
@@ -16,6 +16,8 @@
 #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)
+#define NIX_RX_OFFLOAD_SECURITY_F    BIT(6)
+#define NIX_RX_OFFLOAD_MAX          (NIX_RX_OFFLOAD_SECURITY_F << 1)
 
 /* Flags to control cqe_to_mbuf conversion function.
  * Defining it from backwards to denote its been
@@ -64,6 +66,130 @@ nix_get_mbuf_from_cqe(void *cq, const uint64_t data_off)
        return (struct rte_mbuf *)(buff - data_off);
 }
 
+static __rte_always_inline void
+nix_sec_flush_meta(uintptr_t laddr, uint16_t lmt_id, uint8_t loff,
+                  uintptr_t aura_handle)
+{
+       uint64_t pa;
+
+       /* laddr is pointing to first pointer */
+       laddr -= 8;
+
+       /* Trigger free either on lmtline full or different aura handle */
+       pa = roc_npa_aura_handle_to_base(aura_handle) + NPA_LF_AURA_BATCH_FREE0;
+
+       /* Update aura handle */
+       *(uint64_t *)laddr = (((uint64_t)(loff & 0x1) << 32) |
+                             roc_npa_aura_handle_to_aura(aura_handle));
+
+       pa |= ((loff >> 1) << 4);
+       roc_lmt_submit_steorl(lmt_id, pa);
+}
+
+static __rte_always_inline struct rte_mbuf *
+nix_sec_meta_to_mbuf_sc(uint64_t cq_w1, const uint64_t sa_base, uintptr_t laddr,
+                       uint8_t *loff, struct rte_mbuf *mbuf, uint16_t data_off)
+{
+       const void *__p = (void *)((uintptr_t)mbuf + (uint16_t)data_off);
+       const struct cpt_parse_hdr_s *hdr = (const struct cpt_parse_hdr_s *)__p;
+       struct cn10k_inb_priv_data *inb_priv;
+       struct rte_mbuf *inner;
+       uint32_t sa_idx;
+       void *inb_sa;
+       uint64_t w0;
+
+       if (cq_w1 & BIT(11)) {
+               inner = (struct rte_mbuf *)(rte_be_to_cpu_64(hdr->wqe_ptr) -
+                                           sizeof(struct rte_mbuf));
+
+               /* Get SPI from CPT_PARSE_S's cookie(already swapped) */
+               w0 = hdr->w0.u64;
+               sa_idx = w0 >> 32;
+
+               inb_sa = roc_nix_inl_ot_ipsec_inb_sa(sa_base, sa_idx);
+               inb_priv = roc_nix_inl_ot_ipsec_inb_sa_sw_rsvd(inb_sa);
+
+               /* Update dynamic field with userdata */
+               *rte_security_dynfield(inner) = (uint64_t)inb_priv->userdata;
+
+               /* Update l2 hdr length first */
+               inner->pkt_len = (hdr->w2.il3_off -
+                                 sizeof(struct cpt_parse_hdr_s) - (w0 & 0x7));
+
+               /* Store meta in lmtline to free
+                * Assume all meta's from same aura.
+                */
+               *(uint64_t *)(laddr + (*loff << 3)) = (uint64_t)mbuf;
+               *loff = *loff + 1;
+
+               return inner;
+       }
+       return mbuf;
+}
+
+#if defined(RTE_ARCH_ARM64)
+
+static __rte_always_inline struct rte_mbuf *
+nix_sec_meta_to_mbuf(uint64_t cq_w1, uintptr_t sa_base, uintptr_t laddr,
+                    uint8_t *loff, struct rte_mbuf *mbuf, uint16_t data_off,
+                    uint8x16_t *rx_desc_field1, uint64_t *ol_flags)
+{
+       const void *__p = (void *)((uintptr_t)mbuf + (uint16_t)data_off);
+       const struct cpt_parse_hdr_s *hdr = (const struct cpt_parse_hdr_s *)__p;
+       struct cn10k_inb_priv_data *inb_priv;
+       struct rte_mbuf *inner;
+       uint64_t *sg, res_w1;
+       uint32_t sa_idx;
+       void *inb_sa;
+       uint16_t len;
+       uint64_t w0;
+
+       if (cq_w1 & BIT(11)) {
+               inner = (struct rte_mbuf *)(rte_be_to_cpu_64(hdr->wqe_ptr) -
+                                           sizeof(struct rte_mbuf));
+               /* Get SPI from CPT_PARSE_S's cookie(already swapped) */
+               w0 = hdr->w0.u64;
+               sa_idx = w0 >> 32;
+
+               inb_sa = roc_nix_inl_ot_ipsec_inb_sa(sa_base, sa_idx);
+               inb_priv = roc_nix_inl_ot_ipsec_inb_sa_sw_rsvd(inb_sa);
+
+               /* Update dynamic field with userdata */
+               *rte_security_dynfield(inner) = (uint64_t)inb_priv->userdata;
+
+               /* CPT result(struct cpt_cn10k_res_s) is at
+                * after first IOVA in meta
+                */
+               sg = (uint64_t *)(inner + 1);
+               res_w1 = sg[10];
+
+               /* Clear checksum flags and update security flag */
+               *ol_flags &= ~(RTE_MBUF_F_RX_L4_CKSUM_MASK | RTE_MBUF_F_RX_IP_CKSUM_MASK);
+               *ol_flags |= (((res_w1 & 0xFF) == CPT_COMP_WARN) ?
+                             RTE_MBUF_F_RX_SEC_OFFLOAD :
+                             (RTE_MBUF_F_RX_SEC_OFFLOAD | RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED));
+               /* Calculate inner packet length */
+               len = ((res_w1 >> 16) & 0xFFFF) + hdr->w2.il3_off -
+                       sizeof(struct cpt_parse_hdr_s) - (w0 & 0x7);
+               /* Update pkt_len and data_len */
+               *rx_desc_field1 = vsetq_lane_u16(len, *rx_desc_field1, 2);
+               *rx_desc_field1 = vsetq_lane_u16(len, *rx_desc_field1, 4);
+
+               /* Store meta in lmtline to free
+                * Assume all meta's from same aura.
+                */
+               *(uint64_t *)(laddr + (*loff << 3)) = (uint64_t)mbuf;
+               *loff = *loff + 1;
+
+               /* Return inner mbuf */
+               return inner;
+       }
+
+       /* Return same mbuf as it is not a decrypted pkt */
+       return mbuf;
+}
+#endif
+
 static __rte_always_inline uint32_t
 nix_ptype_get(const void *const lookup_mem, const uint64_t in)
 {
@@ -104,9 +230,9 @@ nix_update_match_id(const uint16_t match_id, uint64_t ol_flags,
         * 0 to CNXK_FLOW_ACTION_FLAG_DEFAULT - 2
         */
        if (likely(match_id)) {
-               ol_flags |= PKT_RX_FDIR;
+               ol_flags |= RTE_MBUF_F_RX_FDIR;
                if (match_id != CNXK_FLOW_ACTION_FLAG_DEFAULT) {
-                       ol_flags |= PKT_RX_FDIR_ID;
+                       ol_flags |= RTE_MBUF_F_RX_FDIR_ID;
                        mbuf->hash.fdir.hi = match_id - 1;
                }
        }
@@ -151,7 +277,7 @@ nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx, struct rte_mbuf *mbuf,
                mbuf->next = ((struct rte_mbuf *)*iova_list) - 1;
                mbuf = mbuf->next;
 
-               __mempool_check_cookies(mbuf->pool, (void **)&mbuf, 1, 1);
+               RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1);
 
                mbuf->data_len = sg & 0xFFFF;
                sg = sg >> 16;
@@ -176,12 +302,12 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
 {
        const union nix_rx_parse_u *rx =
                (const union nix_rx_parse_u *)((const uint64_t *)cq + 1);
-       const uint16_t len = rx->pkt_lenm1 + 1;
        const uint64_t w1 = *(const uint64_t *)rx;
+       uint16_t len = rx->pkt_lenm1 + 1;
        uint64_t ol_flags = 0;
 
        /* Mark mempool obj as "get" as it is alloc'ed by NIX */
-       __mempool_check_cookies(mbuf->pool, (void **)&mbuf, 1, 1);
+       RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1);
 
        if (flag & NIX_RX_OFFLOAD_PTYPE_F)
                mbuf->packet_type = nix_ptype_get(lookup_mem, w1);
@@ -190,19 +316,41 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
 
        if (flag & NIX_RX_OFFLOAD_RSS_F) {
                mbuf->hash.rss = tag;
-               ol_flags |= PKT_RX_RSS_HASH;
+               ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
        }
 
-       if (flag & NIX_RX_OFFLOAD_CHECKSUM_F)
-               ol_flags |= nix_rx_olflags_get(lookup_mem, w1);
+       /* Process Security packets */
+       if (flag & NIX_RX_OFFLOAD_SECURITY_F) {
+               if (w1 & BIT(11)) {
+                       /* CPT result(struct cpt_cn10k_res_s) is at
+                        * after first IOVA in meta
+                        */
+                       const uint64_t *sg = (const uint64_t *)(mbuf + 1);
+                       const uint64_t res_w1 = sg[10];
+                       const uint16_t uc_cc = res_w1 & 0xFF;
+
+                       /* Rlen */
+                       len = ((res_w1 >> 16) & 0xFFFF) + mbuf->pkt_len;
+                       ol_flags |= ((uc_cc == CPT_COMP_WARN) ?
+                                                  RTE_MBUF_F_RX_SEC_OFFLOAD :
+                                                  (RTE_MBUF_F_RX_SEC_OFFLOAD |
+                                             RTE_MBUF_F_RX_SEC_OFFLOAD_FAILED));
+               } else {
+                       if (flag & NIX_RX_OFFLOAD_CHECKSUM_F)
+                               ol_flags |= nix_rx_olflags_get(lookup_mem, w1);
+               }
+       } else {
+               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;
+                       ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
                        mbuf->vlan_tci = rx->vtag0_tci;
                }
                if (rx->vtag1_gone) {
-                       ol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;
+                       ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;
                        mbuf->vlan_tci_outer = rx->vtag1_tci;
                }
        }
@@ -262,13 +410,28 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
        const uintptr_t desc = rxq->desc;
        const uint64_t wdata = rxq->wdata;
        const uint32_t qmask = rxq->qmask;
+       uint64_t lbase = rxq->lmt_base;
        uint16_t packets = 0, nb_pkts;
+       uint8_t loff = 0, lnum = 0;
        uint32_t head = rxq->head;
        struct nix_cqe_hdr_s *cq;
        struct rte_mbuf *mbuf;
+       uint64_t aura_handle;
+       uint64_t sa_base;
+       uint16_t lmt_id;
+       uint64_t laddr;
 
        nb_pkts = nix_rx_nb_pkts(rxq, wdata, pkts, qmask);
 
+       if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+               aura_handle = rxq->aura_handle;
+               sa_base = rxq->sa_base;
+               sa_base &= ~(ROC_NIX_INL_SA_BASE_ALIGN - 1);
+               ROC_LMT_BASE_ID_GET(lbase, lmt_id);
+               laddr = lbase;
+               laddr += 8;
+       }
+
        while (packets < nb_pkts) {
                /* Prefetch N desc ahead */
                rte_prefetch_non_temporal(
@@ -277,6 +440,14 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
 
                mbuf = nix_get_mbuf_from_cqe(cq, data_off);
 
+               /* Translate meta to mbuf */
+               if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+                       const uint64_t cq_w1 = *((const uint64_t *)cq + 1);
+
+                       mbuf = nix_sec_meta_to_mbuf_sc(cq_w1, sa_base, laddr,
+                                                      &loff, mbuf, data_off);
+               }
+
                cn10k_nix_cqe_to_mbuf(cq, cq->tag, mbuf, lookup_mem, mbuf_init,
                                      flags);
                cnxk_nix_mbuf_to_tstamp(mbuf, rxq->tstamp,
@@ -288,6 +459,20 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
                roc_prefetch_store_keep(mbuf);
                head++;
                head &= qmask;
+
+               if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+                       /* Flush when we don't have space for 4 meta */
+                       if ((15 - loff) < 1) {
+                               nix_sec_flush_meta(laddr, lmt_id + lnum, loff,
+                                                  aura_handle);
+                               lnum++;
+                               lnum &= BIT_ULL(ROC_LMT_LINES_PER_CORE_LOG2) -
+                                       1;
+                               /* First pointer starts at 8B offset */
+                               laddr = (uintptr_t)LMT_OFF(lbase, lnum, 8);
+                               loff = 0;
+                       }
+               }
        }
 
        rxq->head = head;
@@ -296,6 +481,12 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,
        /* Free all the CQs that we've processed */
        plt_write64((wdata | nb_pkts), rxq->cq_door);
 
+       /* Free remaining meta buffers if any */
+       if (flags & NIX_RX_OFFLOAD_SECURITY_F && loff) {
+               nix_sec_flush_meta(laddr, lmt_id + lnum, loff, aura_handle);
+               plt_io_wmb();
+       }
+
        return nb_pkts;
 }
 
@@ -305,7 +496,7 @@ 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;
+               ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
                *f = vsetq_lane_u16((uint16_t)(w2 >> 32), *f, 5);
        }
 
@@ -316,7 +507,7 @@ 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;
+               ol_flags |= RTE_MBUF_F_RX_QINQ | RTE_MBUF_F_RX_QINQ_STRIPPED;
                mbuf->vlan_tci_outer = (uint16_t)(w2 >> 48);
        }
 
@@ -326,7 +517,8 @@ nix_qinq_update(const uint64_t w2, uint64_t ol_flags, struct rte_mbuf *mbuf)
 static __rte_always_inline uint16_t
 cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                           const uint16_t flags, void *lookup_mem,
-                          struct cnxk_timesync_info *tstamp)
+                          struct cnxk_timesync_info *tstamp,
+                          uintptr_t lmt_base)
 {
        struct cn10k_eth_rxq *rxq = args;
        const uint64_t mbuf_initializer = (flags & NIX_RX_VWQE_F) ?
@@ -345,9 +537,13 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
        uint64x2_t rearm2 = vdupq_n_u64(mbuf_initializer);
        uint64x2_t rearm3 = vdupq_n_u64(mbuf_initializer);
        struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3;
+       uint64_t aura_handle, lbase, laddr;
+       uint8_t loff = 0, lnum = 0;
        uint8x16_t f0, f1, f2, f3;
+       uint16_t lmt_id, d_off;
        uint16_t packets = 0;
        uint16_t pkts_left;
+       uintptr_t sa_base;
        uint32_t head;
        uintptr_t cq0;
 
@@ -365,6 +561,38 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                RTE_SET_USED(head);
        }
 
+       if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+               if (flags & NIX_RX_VWQE_F) {
+                       uint16_t port;
+
+                       mbuf0 = (struct rte_mbuf *)((uintptr_t)mbufs[0] -
+                                                   sizeof(struct rte_mbuf));
+                       /* Pick first mbuf's aura handle assuming all
+                        * mbufs are from a vec and are from same RQ.
+                        */
+                       aura_handle = mbuf0->pool->pool_id;
+                       /* Calculate offset from mbuf to actual data area */
+                       d_off = ((uintptr_t)mbuf0->buf_addr - (uintptr_t)mbuf0);
+                       d_off += (mbuf_initializer & 0xFFFF);
+
+                       /* Get SA Base from lookup tbl using port_id */
+                       port = mbuf_initializer >> 48;
+                       sa_base = cnxk_nix_sa_base_get(port, lookup_mem);
+
+                       lbase = lmt_base;
+               } else {
+                       aura_handle = rxq->aura_handle;
+                       d_off = rxq->data_off;
+                       sa_base = rxq->sa_base;
+                       lbase = rxq->lmt_base;
+               }
+               sa_base &= ~(ROC_NIX_INL_SA_BASE_ALIGN - 1);
+               ROC_LMT_BASE_ID_GET(lbase, lmt_id);
+               lnum = 0;
+               laddr = lbase;
+               laddr += 8;
+       }
+
        while (packets < pkts) {
                if (!(flags & NIX_RX_VWQE_F)) {
                        /* Exit loop if head is about to wrap and become
@@ -382,10 +610,10 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                }
 
                /* Prefetch N desc ahead */
-               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 8, 0, flags));
-               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 9, 0, flags));
-               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 10, 0, flags));
-               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 11, 0, flags));
+               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 4, 64, flags));
+               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 5, 64, flags));
+               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 6, 64, flags));
+               rte_prefetch_non_temporal(CQE_PTR_OFF(cq0, 7, 64, flags));
 
                /* Get NIX_RX_SG_S for size and buffer pointer */
                cq0_w8 = vld1q_u64(CQE_PTR_OFF(cq0, 0, 64, flags));
@@ -427,6 +655,14 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                f2 = vqtbl1q_u8(cq2_w8, shuf_msk);
                f3 = vqtbl1q_u8(cq3_w8, shuf_msk);
 
+               if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+                       /* Prefetch probable CPT parse header area */
+                       rte_prefetch_non_temporal(RTE_PTR_ADD(mbuf0, d_off));
+                       rte_prefetch_non_temporal(RTE_PTR_ADD(mbuf1, d_off));
+                       rte_prefetch_non_temporal(RTE_PTR_ADD(mbuf2, d_off));
+                       rte_prefetch_non_temporal(RTE_PTR_ADD(mbuf3, d_off));
+               }
+
                /* Load CQE word0 and word 1 */
                const uint64_t cq0_w0 = *CQE_PTR_OFF(cq0, 0, 0, flags);
                const uint64_t cq0_w1 = *CQE_PTR_OFF(cq0, 0, 8, flags);
@@ -443,10 +679,10 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                        f1 = vsetq_lane_u32(cq1_w0, f1, 3);
                        f2 = vsetq_lane_u32(cq2_w0, f2, 3);
                        f3 = vsetq_lane_u32(cq3_w0, f3, 3);
-                       ol_flags0 = PKT_RX_RSS_HASH;
-                       ol_flags1 = PKT_RX_RSS_HASH;
-                       ol_flags2 = PKT_RX_RSS_HASH;
-                       ol_flags3 = PKT_RX_RSS_HASH;
+                       ol_flags0 = RTE_MBUF_F_RX_RSS_HASH;
+                       ol_flags1 = RTE_MBUF_F_RX_RSS_HASH;
+                       ol_flags2 = RTE_MBUF_F_RX_RSS_HASH;
+                       ol_flags3 = RTE_MBUF_F_RX_RSS_HASH;
                } else {
                        ol_flags0 = 0;
                        ol_flags1 = 0;
@@ -473,6 +709,30 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                        ol_flags3 |= nix_rx_olflags_get(lookup_mem, cq3_w1);
                }
 
+               /* Translate meta to mbuf */
+               if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+                       /* Checksum ol_flags will be cleared if mbuf is meta */
+                       mbuf0 = nix_sec_meta_to_mbuf(cq0_w1, sa_base, laddr,
+                                                    &loff, mbuf0, d_off, &f0,
+                                                    &ol_flags0);
+                       mbuf01 = vsetq_lane_u64((uint64_t)mbuf0, mbuf01, 0);
+
+                       mbuf1 = nix_sec_meta_to_mbuf(cq1_w1, sa_base, laddr,
+                                                    &loff, mbuf1, d_off, &f1,
+                                                    &ol_flags1);
+                       mbuf01 = vsetq_lane_u64((uint64_t)mbuf1, mbuf01, 1);
+
+                       mbuf2 = nix_sec_meta_to_mbuf(cq2_w1, sa_base, laddr,
+                                                    &loff, mbuf2, d_off, &f2,
+                                                    &ol_flags2);
+                       mbuf23 = vsetq_lane_u64((uint64_t)mbuf2, mbuf23, 0);
+
+                       mbuf3 = nix_sec_meta_to_mbuf(cq3_w1, sa_base, laddr,
+                                                    &loff, mbuf3, d_off, &f3,
+                                                    &ol_flags3);
+                       mbuf23 = vsetq_lane_u64((uint64_t)mbuf3, mbuf23, 1);
+               }
+
                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);
@@ -519,8 +779,8 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                                                  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 |
+                       const uint64_t ts_olf = RTE_MBUF_F_RX_IEEE1588_PTP |
+                                               RTE_MBUF_F_RX_IEEE1588_TMST |
                                                tstamp->rx_tstamp_dynflag;
                        const uint32x4_t and_mask = {0x1, 0x2, 0x4, 0x8};
                        uint64x2_t ts01, ts23, mask;
@@ -646,10 +906,10 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                roc_prefetch_store_keep(mbuf3);
 
                /* Mark mempool obj as "get" as it is alloc'ed by NIX */
-               __mempool_check_cookies(mbuf0->pool, (void **)&mbuf0, 1, 1);
-               __mempool_check_cookies(mbuf1->pool, (void **)&mbuf1, 1, 1);
-               __mempool_check_cookies(mbuf2->pool, (void **)&mbuf2, 1, 1);
-               __mempool_check_cookies(mbuf3->pool, (void **)&mbuf3, 1, 1);
+               RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1);
+               RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1);
+               RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1);
+               RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1);
 
                packets += NIX_DESCS_PER_LOOP;
 
@@ -658,6 +918,26 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
                        head += NIX_DESCS_PER_LOOP;
                        head &= qmask;
                }
+
+               if (flags & NIX_RX_OFFLOAD_SECURITY_F) {
+                       /* Flush when we don't have space for 4 meta */
+                       if ((15 - loff) < 4) {
+                               nix_sec_flush_meta(laddr, lmt_id + lnum, loff,
+                                                  aura_handle);
+                               lnum++;
+                               lnum &= BIT_ULL(ROC_LMT_LINES_PER_CORE_LOG2) -
+                                       1;
+                               /* First pointer starts at 8B offset */
+                               laddr = (uintptr_t)LMT_OFF(lbase, lnum, 8);
+                               loff = 0;
+                       }
+               }
+       }
+
+       if (flags & NIX_RX_OFFLOAD_SECURITY_F && loff) {
+               nix_sec_flush_meta(laddr, lmt_id + lnum, loff, aura_handle);
+               if (flags & NIX_RX_VWQE_F)
+                       plt_io_wmb();
        }
 
        if (flags & NIX_RX_VWQE_F)
@@ -680,16 +960,18 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
 #else
 
 static inline uint16_t
-cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
-                          uint16_t pkts, const uint16_t flags,
-                          void *lookup_mem, void *tstamp)
+cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts,
+                          const uint16_t flags, void *lookup_mem,
+                          struct cnxk_timesync_info *tstamp,
+                          uintptr_t lmt_base)
 {
-       RTE_SET_USED(lookup_mem);
-       RTE_SET_USED(rx_queue);
-       RTE_SET_USED(rx_pkts);
+       RTE_SET_USED(args);
+       RTE_SET_USED(mbufs);
        RTE_SET_USED(pkts);
        RTE_SET_USED(flags);
+       RTE_SET_USED(lookup_mem);
        RTE_SET_USED(tstamp);
+       RTE_SET_USED(lmt_base);
 
        return 0;
 }
@@ -703,111 +985,214 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
 #define MARK_F   NIX_RX_OFFLOAD_MARK_UPDATE_F
 #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)                                \
+#define R_SEC_F   NIX_RX_OFFLOAD_SECURITY_F
+
+/* [R_SEC_F] [RX_VLAN_F] [TS] [MARK] [CKSUM] [PTYPE] [RSS] */
+#define NIX_RX_FASTPATH_MODES_0_15                                             \
+       R(no_offload, NIX_RX_OFFLOAD_NONE)                                     \
+       R(rss, RSS_F)                                                          \
+       R(ptype, PTYPE_F)                                                      \
+       R(ptype_rss, PTYPE_F | RSS_F)                                          \
+       R(cksum, CKSUM_F)                                                      \
+       R(cksum_rss, CKSUM_F | RSS_F)                                          \
+       R(cksum_ptype, CKSUM_F | PTYPE_F)                                      \
+       R(cksum_ptype_rss, CKSUM_F | PTYPE_F | RSS_F)                          \
+       R(mark, MARK_F)                                                        \
+       R(mark_rss, MARK_F | RSS_F)                                            \
+       R(mark_ptype, MARK_F | PTYPE_F)                                        \
+       R(mark_ptype_rss, MARK_F | PTYPE_F | RSS_F)                            \
+       R(mark_cksum, MARK_F | CKSUM_F)                                        \
+       R(mark_cksum_rss, MARK_F | CKSUM_F | RSS_F)                            \
+       R(mark_cksum_ptype, MARK_F | CKSUM_F | PTYPE_F)                        \
+       R(mark_cksum_ptype_rss, MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_16_31                                            \
+       R(ts, TS_F)                                                            \
+       R(ts_rss, TS_F | RSS_F)                                                \
+       R(ts_ptype, TS_F | PTYPE_F)                                            \
+       R(ts_ptype_rss, TS_F | PTYPE_F | RSS_F)                                \
+       R(ts_cksum, TS_F | CKSUM_F)                                            \
+       R(ts_cksum_rss, TS_F | CKSUM_F | RSS_F)                                \
+       R(ts_cksum_ptype, TS_F | CKSUM_F | PTYPE_F)                            \
+       R(ts_cksum_ptype_rss, TS_F | CKSUM_F | PTYPE_F | RSS_F)                \
+       R(ts_mark, TS_F | MARK_F)                                              \
+       R(ts_mark_rss, TS_F | MARK_F | RSS_F)                                  \
+       R(ts_mark_ptype, TS_F | MARK_F | PTYPE_F)                              \
+       R(ts_mark_ptype_rss, TS_F | MARK_F | PTYPE_F | RSS_F)                  \
+       R(ts_mark_cksum, TS_F | MARK_F | CKSUM_F)                              \
+       R(ts_mark_cksum_rss, TS_F | MARK_F | CKSUM_F | RSS_F)                  \
+       R(ts_mark_cksum_ptype, TS_F | MARK_F | CKSUM_F | PTYPE_F)              \
+       R(ts_mark_cksum_ptype_rss, TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_32_47                                            \
+       R(vlan, RX_VLAN_F)                                                     \
+       R(vlan_rss, RX_VLAN_F | RSS_F)                                         \
+       R(vlan_ptype, RX_VLAN_F | PTYPE_F)                                     \
+       R(vlan_ptype_rss, RX_VLAN_F | PTYPE_F | RSS_F)                         \
+       R(vlan_cksum, RX_VLAN_F | CKSUM_F)                                     \
+       R(vlan_cksum_rss, RX_VLAN_F | CKSUM_F | RSS_F)                         \
+       R(vlan_cksum_ptype, RX_VLAN_F | CKSUM_F | PTYPE_F)                     \
+       R(vlan_cksum_ptype_rss, RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)         \
+       R(vlan_mark, RX_VLAN_F | MARK_F)                                       \
+       R(vlan_mark_rss, RX_VLAN_F | MARK_F | RSS_F)                           \
+       R(vlan_mark_ptype, RX_VLAN_F | MARK_F | PTYPE_F)                       \
+       R(vlan_mark_ptype_rss, RX_VLAN_F | MARK_F | PTYPE_F | RSS_F)           \
+       R(vlan_mark_cksum, RX_VLAN_F | MARK_F | CKSUM_F)                       \
+       R(vlan_mark_cksum_rss, RX_VLAN_F | MARK_F | CKSUM_F | RSS_F)           \
+       R(vlan_mark_cksum_ptype, RX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F)       \
+       R(vlan_mark_cksum_ptype_rss,                                           \
+         RX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_48_63                                            \
+       R(vlan_ts, RX_VLAN_F | TS_F)                                           \
+       R(vlan_ts_rss, RX_VLAN_F | TS_F | RSS_F)                               \
+       R(vlan_ts_ptype, RX_VLAN_F | TS_F | PTYPE_F)                           \
+       R(vlan_ts_ptype_rss, RX_VLAN_F | TS_F | PTYPE_F | RSS_F)               \
+       R(vlan_ts_cksum, RX_VLAN_F | TS_F | CKSUM_F)                           \
+       R(vlan_ts_cksum_rss, RX_VLAN_F | TS_F | CKSUM_F | RSS_F)               \
+       R(vlan_ts_cksum_ptype, RX_VLAN_F | TS_F | CKSUM_F | PTYPE_F)           \
+       R(vlan_ts_cksum_ptype_rss,                                             \
+         RX_VLAN_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)                        \
+       R(vlan_ts_mark, RX_VLAN_F | TS_F | MARK_F)                             \
+       R(vlan_ts_mark_rss, RX_VLAN_F | TS_F | MARK_F | RSS_F)                 \
+       R(vlan_ts_mark_ptype, RX_VLAN_F | TS_F | MARK_F | PTYPE_F)             \
+       R(vlan_ts_mark_ptype_rss, RX_VLAN_F | TS_F | MARK_F | PTYPE_F | RSS_F) \
+       R(vlan_ts_mark_cksum, RX_VLAN_F | TS_F | MARK_F | CKSUM_F)             \
+       R(vlan_ts_mark_cksum_rss, RX_VLAN_F | TS_F | MARK_F | CKSUM_F | RSS_F) \
+       R(vlan_ts_mark_cksum_ptype,                                            \
+         RX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)                       \
+       R(vlan_ts_mark_cksum_ptype_rss,                                        \
+         RX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_64_79                                            \
+       R(sec, R_SEC_F)                                                        \
+       R(sec_rss, R_SEC_F | RSS_F)                                            \
+       R(sec_ptype, R_SEC_F | PTYPE_F)                                        \
+       R(sec_ptype_rss, R_SEC_F | PTYPE_F | RSS_F)                            \
+       R(sec_cksum, R_SEC_F | CKSUM_F)                                        \
+       R(sec_cksum_rss, R_SEC_F | CKSUM_F | RSS_F)                            \
+       R(sec_cksum_ptype, R_SEC_F | CKSUM_F | PTYPE_F)                        \
+       R(sec_cksum_ptype_rss, R_SEC_F | CKSUM_F | PTYPE_F | RSS_F)            \
+       R(sec_mark, R_SEC_F | MARK_F)                                          \
+       R(sec_mark_rss, R_SEC_F | MARK_F | RSS_F)                              \
+       R(sec_mark_ptype, R_SEC_F | MARK_F | PTYPE_F)                          \
+       R(sec_mark_ptype_rss, R_SEC_F | MARK_F | PTYPE_F | RSS_F)              \
+       R(sec_mark_cksum, R_SEC_F | MARK_F | CKSUM_F)                          \
+       R(sec_mark_cksum_rss, R_SEC_F | MARK_F | CKSUM_F | RSS_F)              \
+       R(sec_mark_cksum_ptype, R_SEC_F | MARK_F | CKSUM_F | PTYPE_F)          \
+       R(sec_mark_cksum_ptype_rss,                                            \
+         R_SEC_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_80_95                                            \
+       R(sec_ts, R_SEC_F | TS_F)                                              \
+       R(sec_ts_rss, R_SEC_F | TS_F | RSS_F)                                  \
+       R(sec_ts_ptype, R_SEC_F | TS_F | PTYPE_F)                              \
+       R(sec_ts_ptype_rss, R_SEC_F | TS_F | PTYPE_F | RSS_F)                  \
+       R(sec_ts_cksum, R_SEC_F | TS_F | CKSUM_F)                              \
+       R(sec_ts_cksum_rss, R_SEC_F | TS_F | CKSUM_F | RSS_F)                  \
+       R(sec_ts_cksum_ptype, R_SEC_F | TS_F | CKSUM_F | PTYPE_F)              \
+       R(sec_ts_cksum_ptype_rss, R_SEC_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)  \
+       R(sec_ts_mark, R_SEC_F | TS_F | MARK_F)                                \
+       R(sec_ts_mark_rss, R_SEC_F | TS_F | MARK_F | RSS_F)                    \
+       R(sec_ts_mark_ptype, R_SEC_F | TS_F | MARK_F | PTYPE_F)                \
+       R(sec_ts_mark_ptype_rss, R_SEC_F | TS_F | MARK_F | PTYPE_F | RSS_F)    \
+       R(sec_ts_mark_cksum, R_SEC_F | TS_F | MARK_F | CKSUM_F)                \
+       R(sec_ts_mark_cksum_rss, R_SEC_F | TS_F | MARK_F | CKSUM_F | RSS_F)    \
+       R(sec_ts_mark_cksum_ptype,                                             \
+         R_SEC_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)                         \
+       R(sec_ts_mark_cksum_ptype_rss,                                         \
+         R_SEC_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_96_111                                           \
+       R(sec_vlan, R_SEC_F | RX_VLAN_F)                                       \
+       R(sec_vlan_rss, R_SEC_F | RX_VLAN_F | RSS_F)                           \
+       R(sec_vlan_ptype, R_SEC_F | RX_VLAN_F | PTYPE_F)                       \
+       R(sec_vlan_ptype_rss, R_SEC_F | RX_VLAN_F | PTYPE_F | RSS_F)           \
+       R(sec_vlan_cksum, R_SEC_F | RX_VLAN_F | CKSUM_F)                       \
+       R(sec_vlan_cksum_rss, R_SEC_F | RX_VLAN_F | CKSUM_F | RSS_F)           \
+       R(sec_vlan_cksum_ptype, R_SEC_F | RX_VLAN_F | CKSUM_F | PTYPE_F)       \
+       R(sec_vlan_cksum_ptype_rss,                                            \
+         R_SEC_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)                     \
+       R(sec_vlan_mark, R_SEC_F | RX_VLAN_F | MARK_F)                         \
+       R(sec_vlan_mark_rss, R_SEC_F | RX_VLAN_F | MARK_F | RSS_F)             \
+       R(sec_vlan_mark_ptype, R_SEC_F | RX_VLAN_F | MARK_F | PTYPE_F)         \
+       R(sec_vlan_mark_ptype_rss,                                             \
+         R_SEC_F | RX_VLAN_F | MARK_F | PTYPE_F | RSS_F)                      \
+       R(sec_vlan_mark_cksum, R_SEC_F | RX_VLAN_F | MARK_F | CKSUM_F)         \
+       R(sec_vlan_mark_cksum_rss,                                             \
+         R_SEC_F | RX_VLAN_F | MARK_F | CKSUM_F | RSS_F)                      \
+       R(sec_vlan_mark_cksum_ptype,                                           \
+         R_SEC_F | RX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F)                    \
+       R(sec_vlan_mark_cksum_ptype_rss,                                       \
+         R_SEC_F | RX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES_112_127                                          \
+       R(sec_vlan_ts, R_SEC_F | RX_VLAN_F | TS_F)                             \
+       R(sec_vlan_ts_rss, R_SEC_F | RX_VLAN_F | TS_F | RSS_F)                 \
+       R(sec_vlan_ts_ptype, R_SEC_F | RX_VLAN_F | TS_F | PTYPE_F)             \
+       R(sec_vlan_ts_ptype_rss, R_SEC_F | RX_VLAN_F | TS_F | PTYPE_F | RSS_F) \
+       R(sec_vlan_ts_cksum, R_SEC_F | RX_VLAN_F | TS_F | CKSUM_F)             \
+       R(sec_vlan_ts_cksum_rss, R_SEC_F | RX_VLAN_F | TS_F | CKSUM_F | RSS_F) \
+       R(sec_vlan_ts_cksum_ptype,                                             \
+         R_SEC_F | RX_VLAN_F | TS_F | CKSUM_F | PTYPE_F)                      \
+       R(sec_vlan_ts_cksum_ptype_rss,                                         \
+         R_SEC_F | RX_VLAN_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)              \
+       R(sec_vlan_ts_mark, R_SEC_F | RX_VLAN_F | TS_F | MARK_F)               \
+       R(sec_vlan_ts_mark_rss, R_SEC_F | RX_VLAN_F | TS_F | MARK_F | RSS_F)   \
+       R(sec_vlan_ts_mark_ptype,                                              \
+         R_SEC_F | RX_VLAN_F | TS_F | MARK_F | PTYPE_F)                       \
+       R(sec_vlan_ts_mark_ptype_rss,                                          \
+         R_SEC_F | RX_VLAN_F | TS_F | MARK_F | PTYPE_F | RSS_F)               \
+       R(sec_vlan_ts_mark_cksum,                                              \
+         R_SEC_F | RX_VLAN_F | TS_F | MARK_F | CKSUM_F)                       \
+       R(sec_vlan_ts_mark_cksum_rss,                                          \
+         R_SEC_F | RX_VLAN_F | TS_F | MARK_F | CKSUM_F | RSS_F)               \
+       R(sec_vlan_ts_mark_cksum_ptype,                                        \
+         R_SEC_F | RX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)             \
+       R(sec_vlan_ts_mark_cksum_ptype_rss,                                    \
+         R_SEC_F | RX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)
+
+#define NIX_RX_FASTPATH_MODES                                                  \
+       NIX_RX_FASTPATH_MODES_0_15                                             \
+       NIX_RX_FASTPATH_MODES_16_31                                            \
+       NIX_RX_FASTPATH_MODES_32_47                                            \
+       NIX_RX_FASTPATH_MODES_48_63                                            \
+       NIX_RX_FASTPATH_MODES_64_79                                            \
+       NIX_RX_FASTPATH_MODES_80_95                                            \
+       NIX_RX_FASTPATH_MODES_96_111                                           \
+       NIX_RX_FASTPATH_MODES_112_127
+
+#define R(name, flags)                                                         \
        uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name(          \
                void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts);     \
-                                                                              \
        uint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_mseg_##name(     \
                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
 #undef R
 
+#define NIX_RX_RECV(fn, flags)                                                 \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               return cn10k_nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));  \
+       }
+
+#define NIX_RX_RECV_MSEG(fn, flags) NIX_RX_RECV(fn, flags | NIX_RX_MULTI_SEG_F)
+
+#define NIX_RX_RECV_VEC(fn, flags)                                             \
+       uint16_t __rte_noinline __rte_hot fn(                                  \
+               void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)      \
+       {                                                                      \
+               return cn10k_nix_recv_pkts_vector(rx_queue, rx_pkts, pkts,     \
+                                                 (flags), NULL, NULL, 0);     \
+       }
+
+#define NIX_RX_RECV_VEC_MSEG(fn, flags)                                        \
+       NIX_RX_RECV_VEC(fn, flags | NIX_RX_MULTI_SEG_F)
+
 #endif /* __CN10K_RX_H__ */