git.droids-corp.org / dpdk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 551712a)
net/octeontx2: add security in Rx
authorArchana Muniganti <marchana@marvell.com>
Tue, 4 Feb 2020 11:17:22 +0000 (16:47 +0530)
committerAkhil Goyal <akhil.goyal@nxp.com>
Wed, 5 Feb 2020 14:20:51 +0000 (15:20 +0100)
Added new flag for SECURITY in Rx compiler optimized fastpath
framework. With this, compiler autogenerates functions which
have security enabled.

Signed-off-by: Ankur Dwivedi <adwivedi@marvell.com>
Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Signed-off-by: Archana Muniganti <marchana@marvell.com>
Signed-off-by: Tejasree Kondoj <ktejasree@marvell.com>
Signed-off-by: Vamsi Attunuru <vattunuru@marvell.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
drivers/event/octeontx2/otx2_evdev.c patch | blob | history
drivers/event/octeontx2/otx2_evdev.h patch | blob | history
drivers/event/octeontx2/otx2_worker.c patch | blob | history
drivers/event/octeontx2/otx2_worker_dual.c patch | blob | history
drivers/net/octeontx2/otx2_ethdev.c patch | blob | history
drivers/net/octeontx2/otx2_rx.c patch | blob | history
drivers/net/octeontx2/otx2_rx.h patch | blob | history

diff --git a/drivers/event/octeontx2/otx2_evdev.c b/drivers/event/octeontx2/otx2_evdev.c
index 2daeba4..f6c641a 100644 (file)
--- a/drivers/event/octeontx2/otx2_evdev.c
+++ b/drivers/event/octeontx2/otx2_evdev.c
@@ -44,61 +44,64 @@ sso_fastpath_fns_set(struct rte_eventdev *event_dev)
 {
        struct otx2_sso_evdev *dev = sso_pmd_priv(event_dev);
        /* Single WS modes */
-       const event_dequeue_t ssogws_deq[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_ ##name,
+       const event_dequeue_t ssogws_deq[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_burst_t ssogws_deq_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_burst_ ##name,
+       const event_dequeue_burst_t ssogws_deq_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_t ssogws_deq_timeout[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_timeout_ ##name,
+       const event_dequeue_t ssogws_deq_timeout[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_timeout_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
        const event_dequeue_burst_t
-               ssogws_deq_timeout_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] =                              \
+               ssogws_deq_timeout_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
                        otx2_ssogws_deq_timeout_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_t ssogws_deq_seg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_seg_ ##name,
+       const event_dequeue_t ssogws_deq_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_seg_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_burst_t ssogws_deq_seg_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_seg_burst_ ##name,
+       const event_dequeue_burst_t
+               ssogws_deq_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_deq_seg_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_t ssogws_deq_seg_timeout[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_deq_seg_timeout_ ##name,
+       const event_dequeue_t ssogws_deq_seg_timeout[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_deq_seg_timeout_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
        const event_dequeue_burst_t
-               ssogws_deq_seg_timeout_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] =                              \
+               ssogws_deq_seg_timeout_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
                                otx2_ssogws_deq_seg_timeout_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
@@ -106,64 +109,69 @@ SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 
 
        /* Dual WS modes */
-       const event_dequeue_t ssogws_dual_deq[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_ ##name,
+       const event_dequeue_t ssogws_dual_deq[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_burst_t ssogws_dual_deq_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_burst_ ##name,
+       const event_dequeue_burst_t
+               ssogws_dual_deq_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_dual_deq_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_t ssogws_dual_deq_timeout[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_timeout_ ##name,
+       const event_dequeue_t ssogws_dual_deq_timeout[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_dual_deq_timeout_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
        const event_dequeue_burst_t
-               ssogws_dual_deq_timeout_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_timeout_burst_ ##name,
+               ssogws_dual_deq_timeout_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =                                  \
+                       otx2_ssogws_dual_deq_timeout_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_t ssogws_dual_deq_seg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_seg_ ##name,
+       const event_dequeue_t ssogws_dual_deq_seg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] = otx2_ssogws_dual_deq_seg_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
        const event_dequeue_burst_t
-               ssogws_dual_deq_seg_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] =                              \
-                               otx2_ssogws_dual_deq_seg_burst_ ##name,
+               ssogws_dual_deq_seg_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_dual_deq_seg_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
-       const event_dequeue_t ssogws_dual_deq_seg_timeout[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-               [f5][f4][f3][f2][f1][f0] =                              \
-                               otx2_ssogws_dual_deq_seg_timeout_ ##name,
+       const event_dequeue_t
+               ssogws_dual_deq_seg_timeout[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_dual_deq_seg_timeout_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
 
        const event_dequeue_burst_t
-               ssogws_dual_deq_seg_timeout_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =                                      \
-               otx2_ssogws_dual_deq_seg_timeout_burst_ ##name,
+               ssogws_dual_deq_seg_timeout_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+               [f6][f5][f4][f3][f2][f1][f0] =                          \
+                       otx2_ssogws_dual_deq_seg_timeout_burst_ ##name,
 SSO_RX_ADPTR_ENQ_FASTPATH_FUNC
 #undef R
        };
@@ -209,6 +217,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
        event_dev->enqueue_forward_burst        = otx2_ssogws_enq_fwd_burst;
        if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
                event_dev->dequeue              = ssogws_deq_seg
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -216,6 +225,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                event_dev->dequeue_burst        = ssogws_deq_seg_burst
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -224,6 +234,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                if (dev->is_timeout_deq) {
                        event_dev->dequeue      = ssogws_deq_seg_timeout
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -232,6 +243,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                        event_dev->dequeue_burst        =
                                ssogws_deq_seg_timeout_burst
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -241,6 +253,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                }
        } else {
                event_dev->dequeue                      = ssogws_deq
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -248,6 +261,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                event_dev->dequeue_burst                = ssogws_deq_burst
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -256,6 +270,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                if (dev->is_timeout_deq) {
                        event_dev->dequeue              = ssogws_deq_timeout
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -264,6 +279,7 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                        event_dev->dequeue_burst        =
                                ssogws_deq_timeout_burst
+                       [!!(dev->rx_offloads & NIX_RX_OFFLOAD_SECURITY_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                        [!!(dev->rx_offloads & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -302,6 +318,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
 
                if (dev->rx_offloads & NIX_RX_MULTI_SEG_F) {
                        event_dev->dequeue      = ssogws_dual_deq_seg
+                               [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                [!!(dev->rx_offloads &
@@ -313,6 +331,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                                [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
                                [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                        event_dev->dequeue_burst = ssogws_dual_deq_seg_burst
+                               [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                [!!(dev->rx_offloads & NIX_RX_OFFLOAD_TSTAMP_F)]
                                [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_MARK_UPDATE_F)]
@@ -325,6 +345,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        if (dev->is_timeout_deq) {
                                event_dev->dequeue      =
                                        ssogws_dual_deq_seg_timeout
+                                       [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                        [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                        [!!(dev->rx_offloads &
@@ -339,6 +361,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                                                        NIX_RX_OFFLOAD_RSS_F)];
                                event_dev->dequeue_burst =
                                        ssogws_dual_deq_seg_timeout_burst
+                                       [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                        [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                        [!!(dev->rx_offloads &
@@ -354,6 +378,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        }
                } else {
                        event_dev->dequeue              = ssogws_dual_deq
+                               [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                [!!(dev->rx_offloads &
@@ -365,6 +391,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                                [!!(dev->rx_offloads & NIX_RX_OFFLOAD_PTYPE_F)]
                                [!!(dev->rx_offloads & NIX_RX_OFFLOAD_RSS_F)];
                        event_dev->dequeue_burst        = ssogws_dual_deq_burst
+                               [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                [!!(dev->rx_offloads &
@@ -378,6 +406,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                        if (dev->is_timeout_deq) {
                                event_dev->dequeue      =
                                        ssogws_dual_deq_timeout
+                                       [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                        [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                        [!!(dev->rx_offloads &
@@ -392,6 +422,8 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC
                                                        NIX_RX_OFFLOAD_RSS_F)];
                                event_dev->dequeue_burst =
                                        ssogws_dual_deq_timeout_burst
+                                       [!!(dev->rx_offloads &
+                                               NIX_RX_OFFLOAD_SECURITY_F)]
                                        [!!(dev->rx_offloads &
                                                NIX_RX_OFFLOAD_TSTAMP_F)]
                                        [!!(dev->rx_offloads &
diff --git a/drivers/event/octeontx2/otx2_evdev.h b/drivers/event/octeontx2/otx2_evdev.h
index ef523dc..5a44fd3 100644 (file)
--- a/drivers/event/octeontx2/otx2_evdev.h
+++ b/drivers/event/octeontx2/otx2_evdev.h
@@ -278,7 +278,7 @@ uint16_t otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
                                        uint16_t nb_events);
 
 /* Auto generated API's */
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                                \
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                            \
 uint16_t otx2_ssogws_deq_ ##name(void *port, struct rte_event *ev,            \
                                 uint64_t timeout_ticks);                      \
 uint16_t otx2_ssogws_deq_burst_ ##name(void *port, struct rte_event ev[],      \
diff --git a/drivers/event/octeontx2/otx2_worker.c b/drivers/event/octeontx2/otx2_worker.c
index 34d39f4..12445d9 100644 (file)
--- a/drivers/event/octeontx2/otx2_worker.c
+++ b/drivers/event/octeontx2/otx2_worker.c
@@ -81,7 +81,7 @@ otx2_ssogws_release_event(struct otx2_ssogws *ws)
        otx2_ssogws_swtag_flush(ws);
 }
 
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
 uint16_t __hot                                                         \
 otx2_ssogws_deq_ ##name(void *port, struct rte_event *ev,              \
                        uint64_t timeout_ticks)                         \
diff --git a/drivers/event/octeontx2/otx2_worker_dual.c b/drivers/event/octeontx2/otx2_worker_dual.c
index 7016eee..22a4889 100644 (file)
--- a/drivers/event/octeontx2/otx2_worker_dual.c
+++ b/drivers/event/octeontx2/otx2_worker_dual.c
@@ -140,7 +140,7 @@ otx2_ssogws_dual_enq_fwd_burst(void *port, const struct rte_event ev[],
        return 1;
 }
 
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
 uint16_t __hot                                                         \
 otx2_ssogws_dual_deq_ ##name(void *port, struct rte_event *ev,         \
                             uint64_t timeout_ticks)                    \
diff --git a/drivers/net/octeontx2/otx2_ethdev.c b/drivers/net/octeontx2/otx2_ethdev.c
index e73033e..48d599f 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -634,6 +634,9 @@ nix_rx_offload_flags(struct rte_eth_dev *eth_dev)
        if ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP))
                flags |= NIX_RX_OFFLOAD_TSTAMP_F;
 
+       if (dev->rx_offloads & DEV_RX_OFFLOAD_SECURITY)
+               flags |= NIX_RX_OFFLOAD_SECURITY_F;
+
        if (!dev->ptype_disable)
                flags |= NIX_RX_OFFLOAD_PTYPE_F;
 
diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
index dbf6ea6..47641c7 100644 (file)
--- a/drivers/net/octeontx2/otx2_rx.c
+++ b/drivers/net/octeontx2/otx2_rx.c
@@ -330,7 +330,7 @@ nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
 
 #endif
 
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                            \
 static uint16_t __rte_noinline __hot                                          \
 otx2_nix_recv_pkts_ ## name(void *rx_queue,                                   \
                        struct rte_mbuf **rx_pkts, uint16_t pkts)              \
@@ -361,12 +361,13 @@ NIX_RX_FASTPATH_MODES
 
 static inline void
 pick_rx_func(struct rte_eth_dev *eth_dev,
-            const eth_rx_burst_t rx_burst[2][2][2][2][2][2])
+            const eth_rx_burst_t rx_burst[2][2][2][2][2][2][2])
 {
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-       /* [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
+       /* [SEC] [TSTMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
        eth_dev->rx_pkt_burst = rx_burst
+               [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_SECURITY_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]
                [!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]
@@ -380,25 +381,25 @@ otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
 {
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
 
-       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_ ## name,
+       const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
+       const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
        };
 
-       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2] = {
-#define R(name, f5, f4, f3, f2, f1, f0, flags)                         \
-       [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
+       const eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2][2] = {
+#define R(name, f6, f5, f4, f3, f2, f1, f0, flags)                     \
+       [f6][f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_vec_ ## name,
 
 NIX_RX_FASTPATH_MODES
 #undef R
@@ -418,6 +419,6 @@ NIX_RX_FASTPATH_MODES
        /* Copy multi seg version with no offload for tear down sequence */
        if (rte_eal_process_type() == RTE_PROC_PRIMARY)
                dev->rx_pkt_burst_no_offload =
-                       nix_eth_rx_burst_mseg[0][0][0][0][0][0];
+                       nix_eth_rx_burst_mseg[0][0][0][0][0][0][0];
        rte_mb();
 }
diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h
index eac4717..d8648b6 100644 (file)
--- a/drivers/net/octeontx2/otx2_rx.h
+++ b/drivers/net/octeontx2/otx2_rx.h
@@ -29,6 +29,7 @@
 #define NIX_RX_OFFLOAD_VLAN_STRIP_F    BIT(3)
 #define NIX_RX_OFFLOAD_MARK_UPDATE_F   BIT(4)
 #define NIX_RX_OFFLOAD_TSTAMP_F        BIT(5)
+#define NIX_RX_OFFLOAD_SECURITY_F      BIT(6)
 
 /* Flags to control cqe_to_mbuf conversion function.
  * Defining it from backwards to denote its been
@@ -297,7 +298,8 @@ otx2_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
        if (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)
                ol_flags = nix_update_match_id(rx->match_id, ol_flags, mbuf);
 
-       if (cq->cqe_type == NIX_XQE_TYPE_RX_IPSECH) {
+       if ((flag & NIX_RX_OFFLOAD_SECURITY_F) &&
+           cq->cqe_type == NIX_XQE_TYPE_RX_IPSECH) {
                *(uint64_t *)(&mbuf->rearm_data) = val;
                ol_flags |= nix_rx_sec_mbuf_update(cq, mbuf, lookup_mem);
                mbuf->ol_flags = ol_flags;
@@ -320,94 +322,220 @@ otx2_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,
 #define RX_VLAN_F  NIX_RX_OFFLOAD_VLAN_STRIP_F
 #define MARK_F  NIX_RX_OFFLOAD_MARK_UPDATE_F
 #define TS_F   NIX_RX_OFFLOAD_TSTAMP_F
+#define RX_SEC_F   NIX_RX_OFFLOAD_SECURITY_F
 
-/* [TSMP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */
+/* [SEC] [TSMP] [MARK] [VLAN] [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(vlan,                                0, 0, 1, 0, 0, 0, RX_VLAN_F)            \
-R(vlan_rss,                    0, 0, 1, 0, 0, 1, RX_VLAN_F | RSS_F)    \
-R(vlan_ptype,                  0, 0, 1, 0, 1, 0, RX_VLAN_F | PTYPE_F)  \
-R(vlan_ptype_rss,              0, 0, 1, 0, 1, 1, RX_VLAN_F | PTYPE_F | RSS_F)\
-R(vlan_cksum,                  0, 0, 1, 1, 0, 0, RX_VLAN_F | CKSUM_F)  \
-R(vlan_cksum_rss,              0, 0, 1, 1, 0, 1, RX_VLAN_F | CKSUM_F | RSS_F)\
-R(vlan_cksum_ptype,            0, 0, 1, 1, 1, 0,                       \
-                       RX_VLAN_F | CKSUM_F | PTYPE_F)                  \
-R(vlan_cksum_ptype_rss,                0, 0, 1, 1, 1, 1,                       \
-                       RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)          \
-R(mark,                                0, 1, 0, 0, 0, 0, MARK_F)               \
-R(mark_rss,                    0, 1, 0, 0, 0, 1, MARK_F | RSS_F)       \
-R(mark_ptype,                  0, 1, 0, 0, 1, 0, MARK_F | PTYPE_F)     \
-R(mark_ptype_rss,              0, 1, 0, 0, 1, 1, MARK_F | PTYPE_F | RSS_F)\
-R(mark_cksum,                  0, 1, 0, 1, 0, 0, MARK_F | CKSUM_F)     \
-R(mark_cksum_rss,              0, 1, 0, 1, 0, 1, MARK_F | CKSUM_F | RSS_F)\
-R(mark_cksum_ptype,            0, 1, 0, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F)\
-R(mark_cksum_ptype_rss,                0, 1, 0, 1, 1, 1,                       \
-                       MARK_F | CKSUM_F | PTYPE_F | RSS_F)             \
-R(mark_vlan,                   0, 1, 1, 0, 0, 0, MARK_F | RX_VLAN_F)   \
-R(mark_vlan_rss,               0, 1, 1, 0, 0, 1, MARK_F | RX_VLAN_F | RSS_F)\
-R(mark_vlan_ptype,             0, 1, 1, 0, 1, 0,                       \
-                       MARK_F | RX_VLAN_F | PTYPE_F)                   \
-R(mark_vlan_ptype_rss,         0, 1, 1, 0, 1, 1,                       \
-                       MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)           \
-R(mark_vlan_cksum,             0, 1, 1, 1, 0, 0,                       \
-                       MARK_F | RX_VLAN_F | CKSUM_F)                   \
-R(mark_vlan_cksum_rss,         0, 1, 1, 1, 0, 1,                       \
-                       MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)           \
-R(mark_vlan_cksum_ptype,       0, 1, 1, 1, 1, 0,                       \
-                       MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)         \
-R(mark_vlan_cksum_ptype_rss,   0, 1, 1, 1, 1, 1,                       \
-                       MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F) \
-R(ts,                          1, 0, 0, 0, 0, 0, TS_F)                 \
-R(ts_rss,                      1, 0, 0, 0, 0, 1, TS_F | RSS_F)         \
-R(ts_ptype,                    1, 0, 0, 0, 1, 0, TS_F | PTYPE_F)       \
-R(ts_ptype_rss,                        1, 0, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F)\
-R(ts_cksum,                    1, 0, 0, 1, 0, 0, TS_F | CKSUM_F)       \
-R(ts_cksum_rss,                        1, 0, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F)\
-R(ts_cksum_ptype,              1, 0, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F)\
-R(ts_cksum_ptype_rss,          1, 0, 0, 1, 1, 1,                       \
-                       TS_F | CKSUM_F | PTYPE_F | RSS_F)               \
-R(ts_vlan,                     1, 0, 1, 0, 0, 0, TS_F | RX_VLAN_F)     \
-R(ts_vlan_rss,                 1, 0, 1, 0, 0, 1, TS_F | RX_VLAN_F | RSS_F)\
-R(ts_vlan_ptype,               1, 0, 1, 0, 1, 0, TS_F | RX_VLAN_F | PTYPE_F)\
-R(ts_vlan_ptype_rss,           1, 0, 1, 0, 1, 1,                       \
-                       TS_F | RX_VLAN_F | PTYPE_F | RSS_F)             \
-R(ts_vlan_cksum,               1, 0, 1, 1, 0, 0,                       \
-                       TS_F | RX_VLAN_F | CKSUM_F)                     \
-R(ts_vlan_cksum_rss,           1, 0, 1, 1, 0, 1,                       \
-                       MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)           \
-R(ts_vlan_cksum_ptype,         1, 0, 1, 1, 1, 0,                       \
-                       TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F)           \
-R(ts_vlan_cksum_ptype_rss,     1, 0, 1, 1, 1, 1,                       \
-                       TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)   \
-R(ts_mark,                     1, 1, 0, 0, 0, 0, TS_F | MARK_F)        \
-R(ts_mark_rss,                 1, 1, 0, 0, 0, 1, TS_F | MARK_F | RSS_F)\
-R(ts_mark_ptype,               1, 1, 0, 0, 1, 0, TS_F | MARK_F | PTYPE_F)\
-R(ts_mark_ptype_rss,           1, 1, 0, 0, 1, 1,                       \
-                       TS_F | MARK_F | PTYPE_F | RSS_F)                \
-R(ts_mark_cksum,               1, 1, 0, 1, 0, 0, TS_F | MARK_F | CKSUM_F)\
-R(ts_mark_cksum_rss,           1, 1, 0, 1, 0, 1,                       \
-                       TS_F | MARK_F | CKSUM_F | RSS_F)\
-R(ts_mark_cksum_ptype,         1, 1, 0, 1, 1, 0,                       \
-                       TS_F | MARK_F | CKSUM_F | PTYPE_F)              \
-R(ts_mark_cksum_ptype_rss,     1, 1, 0, 1, 1, 1,                       \
-                       TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)      \
-R(ts_mark_vlan,                        1, 1, 1, 0, 0, 0, TS_F | MARK_F | RX_VLAN_F)\
-R(ts_mark_vlan_rss,            1, 1, 1, 0, 0, 1,                       \
-                       TS_F | MARK_F | RX_VLAN_F | RSS_F)\
-R(ts_mark_vlan_ptype,          1, 1, 1, 0, 1, 0,                       \
-                       TS_F | MARK_F | RX_VLAN_F | PTYPE_F)            \
-R(ts_mark_vlan_ptype_rss,      1, 1, 1, 0, 1, 1,                       \
-                       TS_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)    \
-R(ts_mark_vlan_cksum_ptype,    1, 1, 1, 1, 1, 0,                       \
-                       TS_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)  \
-R(ts_mark_vlan_cksum_ptype_rss,        1, 1, 1, 1, 1, 1,                       \
-                       TS_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)
-
+R(no_offload,                  0, 0, 0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)      \
+R(rss,                         0, 0, 0, 0, 0, 0, 1, RSS_F)                    \
+R(ptype,                       0, 0, 0, 0, 0, 1, 0, PTYPE_F)                  \
+R(ptype_rss,                   0, 0, 0, 0, 0, 1, 1, PTYPE_F | RSS_F)          \
+R(cksum,                       0, 0, 0, 0, 1, 0, 0, CKSUM_F)                  \
+R(cksum_rss,                   0, 0, 0, 0, 1, 0, 1, CKSUM_F | RSS_F)          \
+R(cksum_ptype,                 0, 0, 0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)        \
+R(cksum_ptype_rss,             0, 0, 0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F)\
+R(vlan,                                0, 0, 0, 1, 0, 0, 0, RX_VLAN_F)                \
+R(vlan_rss,                    0, 0, 0, 1, 0, 0, 1, RX_VLAN_F | RSS_F)        \
+R(vlan_ptype,                  0, 0, 0, 1, 0, 1, 0, RX_VLAN_F | PTYPE_F)      \
+R(vlan_ptype_rss,              0, 0, 0, 1, 0, 1, 1,                           \
+                       RX_VLAN_F | PTYPE_F | RSS_F)                           \
+R(vlan_cksum,                  0, 0, 0, 1, 1, 0, 0, RX_VLAN_F | CKSUM_F)      \
+R(vlan_cksum_rss,              0, 0, 0, 1, 1, 0, 1,                           \
+                       RX_VLAN_F | CKSUM_F | RSS_F)                           \
+R(vlan_cksum_ptype,            0, 0, 0, 1, 1, 1, 0,                           \
+                       RX_VLAN_F | CKSUM_F | PTYPE_F)                         \
+R(vlan_cksum_ptype_rss,                0, 0, 0, 1, 1, 1, 1,                           \
+                       RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)                 \
+R(mark,                                0, 0, 1, 0, 0, 0, 0, MARK_F)                   \
+R(mark_rss,                    0, 0, 1, 0, 0, 0, 1, MARK_F | RSS_F)           \
+R(mark_ptype,                  0, 0, 1, 0, 0, 1, 0, MARK_F | PTYPE_F)         \
+R(mark_ptype_rss,              0, 0, 1, 0, 0, 1, 1, MARK_F | PTYPE_F | RSS_F) \
+R(mark_cksum,                  0, 0, 1, 0, 1, 0, 0, MARK_F | CKSUM_F)         \
+R(mark_cksum_rss,              0, 0, 1, 0, 1, 0, 1, MARK_F | CKSUM_F | RSS_F) \
+R(mark_cksum_ptype,            0, 0, 1, 0, 1, 1, 0,                           \
+                       MARK_F | CKSUM_F | PTYPE_F)                            \
+R(mark_cksum_ptype_rss,                0, 0, 1, 0, 1, 1, 1,                           \
+                       MARK_F | CKSUM_F | PTYPE_F | RSS_F)                    \
+R(mark_vlan,                   0, 0, 1, 1, 0, 0, 0, MARK_F | RX_VLAN_F)       \
+R(mark_vlan_rss,               0, 0, 1, 1, 0, 0, 1,                           \
+                       MARK_F | RX_VLAN_F | RSS_F)                            \
+R(mark_vlan_ptype,             0, 0, 1, 1, 0, 1, 0,                           \
+                       MARK_F | RX_VLAN_F | PTYPE_F)                          \
+R(mark_vlan_ptype_rss,         0, 0, 1, 1, 0, 1, 1,                           \
+                       MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)                  \
+R(mark_vlan_cksum,             0, 0, 1, 1, 1, 0, 0,                           \
+                       MARK_F | RX_VLAN_F | CKSUM_F)                          \
+R(mark_vlan_cksum_rss,         0, 0, 1, 1, 1, 0, 1,                           \
+                       MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)                  \
+R(mark_vlan_cksum_ptype,       0, 0, 1, 1, 1, 1, 0,                           \
+                       MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)                \
+R(mark_vlan_cksum_ptype_rss,   0, 0, 1, 1, 1, 1, 1,                           \
+                       MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)        \
+R(ts,                          0, 1, 0, 0, 0, 0, 0, TS_F)                     \
+R(ts_rss,                      0, 1, 0, 0, 0, 0, 1, TS_F | RSS_F)             \
+R(ts_ptype,                    0, 1, 0, 0, 0, 1, 0, TS_F | PTYPE_F)           \
+R(ts_ptype_rss,                        0, 1, 0, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F)   \
+R(ts_cksum,                    0, 1, 0, 0, 1, 0, 0, TS_F | CKSUM_F)           \
+R(ts_cksum_rss,                        0, 1, 0, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F)   \
+R(ts_cksum_ptype,              0, 1, 0, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F) \
+R(ts_cksum_ptype_rss,          0, 1, 0, 0, 1, 1, 1,                           \
+                       TS_F | CKSUM_F | PTYPE_F | RSS_F)                      \
+R(ts_vlan,                     0, 1, 0, 1, 0, 0, 0, TS_F | RX_VLAN_F)         \
+R(ts_vlan_rss,                 0, 1, 0, 1, 0, 0, 1, TS_F | RX_VLAN_F | RSS_F) \
+R(ts_vlan_ptype,               0, 1, 0, 1, 0, 1, 0,                           \
+                       TS_F | RX_VLAN_F | PTYPE_F)                            \
+R(ts_vlan_ptype_rss,           0, 1, 0, 1, 0, 1, 1,                           \
+                       TS_F | RX_VLAN_F | PTYPE_F | RSS_F)                    \
+R(ts_vlan_cksum,               0, 1, 0, 1, 1, 0, 0,                           \
+                       TS_F | RX_VLAN_F | CKSUM_F)                            \
+R(ts_vlan_cksum_rss,           0, 1, 0, 1, 1, 0, 1,                           \
+                       MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)                  \
+R(ts_vlan_cksum_ptype,         0, 1, 0, 1, 1, 1, 0,                           \
+                       TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F)                  \
+R(ts_vlan_cksum_ptype_rss,     0, 1, 0, 1, 1, 1, 1,                           \
+                       TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)          \
+R(ts_mark,                     0, 1, 1, 0, 0, 0, 0, TS_F | MARK_F)            \
+R(ts_mark_rss,                 0, 1, 1, 0, 0, 0, 1, TS_F | MARK_F | RSS_F)    \
+R(ts_mark_ptype,               0, 1, 1, 0, 0, 1, 0, TS_F | MARK_F | PTYPE_F)  \
+R(ts_mark_ptype_rss,           0, 1, 1, 0, 0, 1, 1,                           \
+                       TS_F | MARK_F | PTYPE_F | RSS_F)                       \
+R(ts_mark_cksum,               0, 1, 1, 0, 1, 0, 0, TS_F | MARK_F | CKSUM_F)  \
+R(ts_mark_cksum_rss,           0, 1, 1, 0, 1, 0, 1,                           \
+                       TS_F | MARK_F | CKSUM_F | RSS_F)                       \
+R(ts_mark_cksum_ptype,         0, 1, 1, 0, 1, 1, 0,                           \
+                       TS_F | MARK_F | CKSUM_F | PTYPE_F)                     \
+R(ts_mark_cksum_ptype_rss,     0, 1, 1, 0, 1, 1, 1,                           \
+                       TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)             \
+R(ts_mark_vlan,                        0, 1, 1, 1, 0, 0, 0, TS_F | MARK_F | RX_VLAN_F)\
+R(ts_mark_vlan_rss,            0, 1, 1, 1, 0, 0, 1,                           \
+                       TS_F | MARK_F | RX_VLAN_F | RSS_F)                     \
+R(ts_mark_vlan_ptype,          0, 1, 1, 1, 0, 1, 0,                           \
+                       TS_F | MARK_F | RX_VLAN_F | PTYPE_F)                   \
+R(ts_mark_vlan_ptype_rss,      0, 1, 1, 1, 0, 1, 1,                           \
+                       TS_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)           \
+R(ts_mark_vlan_cksum_ptype,    0, 1, 1, 1, 1, 1, 0,                           \
+                       TS_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)         \
+R(ts_mark_vlan_cksum_ptype_rss,        0, 1, 1, 1, 1, 1, 1,                           \
+                       TS_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F) \
+R(sec,                         1, 0, 0, 0, 0, 0, 0, RX_SEC_F)                 \
+R(sec_rss,                     1, 0, 0, 0, 0, 0, 1, RX_SEC_F | RSS_F)         \
+R(sec_ptype,                   1, 0, 0, 0, 0, 1, 0, RX_SEC_F | PTYPE_F)       \
+R(sec_ptype_rss,               1, 0, 0, 0, 0, 1, 1,                           \
+                       RX_SEC_F | PTYPE_F | RSS_F)                            \
+R(sec_cksum,                   1, 0, 0, 0, 1, 0, 0, RX_SEC_F | CKSUM_F)       \
+R(sec_cksum_rss,               1, 0, 0, 0, 1, 0, 1,                           \
+                       RX_SEC_F | CKSUM_F | RSS_F)                            \
+R(sec_cksum_ptype,             1, 0, 0, 0, 1, 1, 0,                           \
+                       RX_SEC_F | CKSUM_F | PTYPE_F)                          \
+R(sec_cksum_ptype_rss,         1, 0, 0, 0, 1, 1, 1,                           \
+                       RX_SEC_F | CKSUM_F | PTYPE_F | RSS_F)                  \
+R(sec_vlan,                    1, 0, 0, 1, 0, 0, 0, RX_SEC_F | RX_VLAN_F)     \
+R(sec_vlan_rss,                        1, 0, 0, 1, 0, 0, 1,                           \
+                       RX_SEC_F | RX_VLAN_F | RSS_F)                          \
+R(sec_vlan_ptype,              1, 0, 0, 1, 0, 1, 0,                           \
+                       RX_SEC_F | RX_VLAN_F | PTYPE_F)                        \
+R(sec_vlan_ptype_rss,          1, 0, 0, 1, 0, 1, 1,                           \
+                       RX_SEC_F | RX_VLAN_F | PTYPE_F | RSS_F)                \
+R(sec_vlan_cksum,              1, 0, 0, 1, 1, 0, 0,                           \
+                       RX_SEC_F | RX_VLAN_F | CKSUM_F)                        \
+R(sec_vlan_cksum_rss,          1, 0, 0, 1, 1, 0, 1,                           \
+                       RX_SEC_F | RX_VLAN_F | CKSUM_F | RSS_F)                \
+R(sec_vlan_cksum_ptype,                1, 0, 0, 1, 1, 1, 0,                           \
+                       RX_SEC_F | RX_VLAN_F | CKSUM_F | PTYPE_F)              \
+R(sec_vlan_cksum_ptype_rss,    1, 0, 0, 1, 1, 1, 1,                           \
+                       RX_SEC_F | RX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)      \
+R(sec_mark,                    1, 0, 1, 0, 0, 0, 0, RX_SEC_F | MARK_F)        \
+R(sec_mark_rss,                        1, 0, 1, 0, 0, 0, 1, RX_SEC_F | MARK_F | RSS_F)\
+R(sec_mark_ptype,              1, 0, 1, 0, 0, 1, 0,                           \
+                       RX_SEC_F | MARK_F | PTYPE_F)                           \
+R(sec_mark_ptype_rss,          1, 0, 1, 0, 0, 1, 1,                           \
+                       RX_SEC_F | MARK_F | PTYPE_F | RSS_F)                   \
+R(sec_mark_cksum,              1, 0, 1, 0, 1, 0, 0,                           \
+                       RX_SEC_F | MARK_F | CKSUM_F)                           \
+R(sec_mark_cksum_rss,          1, 0, 1, 0, 1, 0, 1,                           \
+                       RX_SEC_F | MARK_F | CKSUM_F | RSS_F)                   \
+R(sec_mark_cksum_ptype,                1, 0, 1, 0, 1, 1, 0,                           \
+                       RX_SEC_F | MARK_F | CKSUM_F | PTYPE_F)                 \
+R(sec_mark_cksum_ptype_rss,    1, 0, 1, 0, 1, 1, 1,                           \
+                       RX_SEC_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)         \
+R(sec_mark_vlan,               1, 0, 1, 1, 0, 0, 0, RX_SEC_F | RX_VLAN_F)     \
+R(sec_mark_vlan_rss,           1, 0, 1, 1, 0, 0, 1,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | RSS_F)                 \
+R(sec_mark_vlan_ptype,         1, 0, 1, 1, 0, 1, 0,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | PTYPE_F)               \
+R(sec_mark_vlan_ptype_rss,     1, 0, 1, 1, 0, 1, 1,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)       \
+R(sec_mark_vlan_cksum,         1, 0, 1, 1, 1, 0, 0,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F)               \
+R(sec_mark_vlan_cksum_rss,     1, 0, 1, 1, 1, 0, 1,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)       \
+R(sec_mark_vlan_cksum_ptype,   1, 0, 1, 1, 1, 1, 0,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F)     \
+R(sec_mark_vlan_cksum_ptype_rss,                                              \
+                               1, 0, 1, 1, 1, 1, 1,                           \
+                       RX_SEC_F | MARK_F | RX_VLAN_F | CKSUM_F | PTYPE_F |    \
+                       RSS_F)                                                 \
+R(sec_ts,                      1, 1, 0, 0, 0, 0, 0, RX_SEC_F | TS_F)          \
+R(sec_ts_rss,                  1, 1, 0, 0, 0, 0, 1, RX_SEC_F | TS_F | RSS_F)  \
+R(sec_ts_ptype,                        1, 1, 0, 0, 0, 1, 0, RX_SEC_F | TS_F | PTYPE_F)\
+R(sec_ts_ptype_rss,            1, 1, 0, 0, 0, 1, 1,                           \
+                       RX_SEC_F | TS_F | PTYPE_F | RSS_F)                     \
+R(sec_ts_cksum,                        1, 1, 0, 0, 1, 0, 0, RX_SEC_F | TS_F | CKSUM_F)\
+R(sec_ts_cksum_rss,            1, 1, 0, 0, 1, 0, 1,                           \
+                       RX_SEC_F | TS_F | CKSUM_F | RSS_F)                     \
+R(sec_ts_cksum_ptype,          1, 1, 0, 0, 1, 1, 0,                           \
+                       RX_SEC_F | CKSUM_F | PTYPE_F)                          \
+R(sec_ts_cksum_ptype_rss,      1, 1, 0, 0, 1, 1, 1,                           \
+                       RX_SEC_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)           \
+R(sec_ts_vlan,                 1, 1, 0, 1, 0, 0, 0,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F)                           \
+R(sec_ts_vlan_rss,             1, 1, 0, 1, 0, 0, 1,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | RSS_F)                   \
+R(sec_ts_vlan_ptype,           1, 1, 0, 1, 0, 1, 0,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | PTYPE_F)                 \
+R(sec_ts_vlan_ptype_rss,       1, 1, 0, 1, 0, 1, 1,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | PTYPE_F | RSS_F)         \
+R(sec_ts_vlan_cksum,           1, 1, 0, 1, 1, 0, 0,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F)                 \
+R(sec_ts_vlan_cksum_rss,       1, 1, 0, 1, 1, 0, 1,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F | RSS_F)         \
+R(sec_ts_vlan_cksum_ptype,     1, 1, 0, 1, 1, 1, 0,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F)       \
+R(sec_ts_vlan_cksum_ptype_rss, 1, 1, 0, 1, 1, 1, 1,                           \
+                       RX_SEC_F | TS_F | RX_VLAN_F | CKSUM_F | PTYPE_F |      \
+                       RSS_F)                                                 \
+R(sec_ts_mark,                 1, 1, 1, 0, 0, 0, 0, RX_SEC_F | TS_F | MARK_F) \
+R(sec_ts_mark_rss,             1, 1, 1, 0, 0, 0, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | RSS_F)                      \
+R(sec_ts_mark_ptype,           1, 1, 1, 0, 0, 1, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | PTYPE_F)                    \
+R(sec_ts_mark_ptype_rss,       1, 1, 1, 0, 0, 1, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | PTYPE_F | RSS_F)            \
+R(sec_ts_mark_cksum,           1, 1, 1, 0, 1, 0, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | CKSUM_F)                    \
+R(sec_ts_mark_cksum_rss,       1, 1, 1, 0, 1, 0, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | CKSUM_F | RSS_F)            \
+R(sec_ts_mark_cksum_ptype,     1, 1, 1, 0, 1, 1, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)          \
+R(sec_ts_mark_cksum_ptype_rss, 1, 1, 1, 0, 1, 1, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)  \
+R(sec_ts_mark_vlan,            1, 1, 1, 1, 0, 0, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F)                  \
+R(sec_ts_mark_vlan_rss,                1, 1, 1, 1, 0, 0, 1,                           \
+                       RX_SEC_F | RX_VLAN_F | RSS_F)                          \
+R(sec_ts_mark_vlan_ptype,      1, 1, 1, 1, 0, 1, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | PTYPE_F)        \
+R(sec_ts_mark_vlan_ptype_rss,  1, 1, 1, 1, 0, 1, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | PTYPE_F | RSS_F)\
+R(sec_ts_mark_vlan_cksum,      1, 1, 1, 1, 1, 0, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F)        \
+R(sec_ts_mark_vlan_cksum_rss,  1, 1, 1, 1, 1, 0, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F | RSS_F)\
+R(sec_ts_mark_vlan_cksum_ptype,        1, 1, 1, 1, 1, 1, 0,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F |       \
+                       PTYPE_F)                                               \
+R(sec_ts_mark_vlan_cksum_ptype_rss,                                           \
+                               1, 1, 1, 1, 1, 1, 1,                           \
+                       RX_SEC_F | TS_F | MARK_F | RX_VLAN_F | CKSUM_F |       \
+                       PTYPE_F | RSS_F)
 #endif /* __OTX2_RX_H__ */
DPDK repo used for reviews