Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94471/?format=api
{ "id": 94471, "url": "https://patches.dpdk.org/api/patches/94471/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210618103741.26526-63-ndabilpuram@marvell.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210618103741.26526-63-ndabilpuram@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210618103741.26526-63-ndabilpuram@marvell.com", "date": "2021-06-18T10:37:41", "name": "[v3,62/62] net/cnxk: add marking and VLAN tagging support", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "772a0206f27eec4a0ae1cb2f1d8acfc8516e856a", "submitter": { "id": 1202, "url": "https://patches.dpdk.org/api/people/1202/?format=api", "name": "Nithin Dabilpuram", "email": "ndabilpuram@marvell.com" }, "delegate": { "id": 310, "url": "https://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210618103741.26526-63-ndabilpuram@marvell.com/mbox/", "series": [ { "id": 17394, "url": "https://patches.dpdk.org/api/series/17394/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17394", "date": "2021-06-18T10:36:39", "name": "Marvell CNXK Ethdev Driver", "version": 3, "mbox": "https://patches.dpdk.org/series/17394/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94471/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/94471/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5F9D0A0C46;\n\tFri, 18 Jun 2021 12:46:28 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 09FFE41235;\n\tFri, 18 Jun 2021 12:42:18 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id 13136410F4\n for <dev@dpdk.org>; Fri, 18 Jun 2021 12:42:16 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id\n 15IAYhNu029389 for <dev@dpdk.org>; Fri, 18 Jun 2021 03:42:16 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com with ESMTP id 398r750dat-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)\n for <dev@dpdk.org>; Fri, 18 Jun 2021 03:42:16 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Fri, 18 Jun 2021 03:42:14 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend\n Transport; Fri, 18 Jun 2021 03:42:14 -0700", "from hyd1588t430.marvell.com (unknown [10.29.52.204])\n by maili.marvell.com (Postfix) with ESMTP id 468E25B69B8;\n Fri, 18 Jun 2021 03:41:46 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-type; s=pfpt0220; bh=Bw/JVXZURICslFLWddAqPEEpa2TE9xGTFvq/jj0bXhk=;\n b=S0SCB6CkKP7pAc0vCXYQFprJtyJZole338T52NHqBWQ9z+z9GrFBxXXIrQpWIvSVuLaU\n OOI/DvZN/6/PFV1rhiqVogEc8RIjzlCZC/P8C13MIX2wiz2t/C0NMhdHJkTSclgWZU8S\n /E5eCiQcpnjOUB4F5pWCQwQjqSs6AqKeIXLzBsVfjcuKzwPoT5/tgv+p8zqAGrx/gvwp\n ndrfaerBBQXHycqU3S7sRxlMxM2R5v2imIEEn4sc2/ovFPb3gHmtQBToyZpTLk/buLds\n 0yv4fJv/oSY0HEixu9jyKQNIPIUES8wOiD+ehda2KyUiNl9KD1yhm3fmo2vEczUUL+jJ 7g==", "From": "Nithin Dabilpuram <ndabilpuram@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<jerinj@marvell.com>, <skori@marvell.com>, <skoteshwar@marvell.com>,\n <pbhagavatula@marvell.com>, <kirankumark@marvell.com>,\n <psatheesh@marvell.com>, <asekhar@marvell.com>, <hkalra@marvell.com>", "Date": "Fri, 18 Jun 2021 16:07:41 +0530", "Message-ID": "<20210618103741.26526-63-ndabilpuram@marvell.com>", "X-Mailer": "git-send-email 2.8.4", "In-Reply-To": "<20210618103741.26526-1-ndabilpuram@marvell.com>", "References": "<20210306153404.10781-1-ndabilpuram@marvell.com>\n <20210618103741.26526-1-ndabilpuram@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-ORIG-GUID": "le59lhUd1Cx8NrE01s9sdypQsqGgpF0c", "X-Proofpoint-GUID": "le59lhUd1Cx8NrE01s9sdypQsqGgpF0c", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.391, 18.0.790\n definitions=2021-06-18_04:2021-06-18,\n 2021-06-18 signatures=0", "Subject": "[dpdk-dev] [PATCH v3 62/62] net/cnxk: add marking and VLAN tagging\n support", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Satheesh Paul <psatheesh@marvell.com>\n\nThis patch adds support for mark, flag, VLAN pop and\npush flow actions.\n\nSigned-off-by: Satheesh Paul <psatheesh@marvell.com>\n---\n doc/guides/nics/features/cnxk.ini | 5 ++\n drivers/net/cnxk/cn10k_rte_flow.c | 42 +++++++++\n drivers/net/cnxk/cn10k_rx.c | 27 +++---\n drivers/net/cnxk/cn10k_rx.h | 175 ++++++++++++++++++++++++++++++--------\n drivers/net/cnxk/cn10k_rx_mseg.c | 2 +-\n drivers/net/cnxk/cn10k_rx_vec.c | 2 +-\n drivers/net/cnxk/cn9k_rte_flow.c | 42 +++++++++\n drivers/net/cnxk/cn9k_rx.c | 27 +++---\n drivers/net/cnxk/cn9k_rx.h | 175 ++++++++++++++++++++++++++++++--------\n drivers/net/cnxk/cn9k_rx_mseg.c | 2 +-\n drivers/net/cnxk/cn9k_rx_vec.c | 2 +-\n drivers/net/cnxk/cnxk_ethdev.c | 1 +\n drivers/net/cnxk/cnxk_ethdev.h | 3 +-\n drivers/net/cnxk/cnxk_rte_flow.c | 17 ++++\n 14 files changed, 423 insertions(+), 99 deletions(-)", "diff": "diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini\nindex c686ceb..337ad24 100644\n--- a/doc/guides/nics/features/cnxk.ini\n+++ b/doc/guides/nics/features/cnxk.ini\n@@ -77,6 +77,11 @@ vxlan_gpe = Y\n count = Y\n drop = Y\n flag = Y\n+mark = Y\n+of_pop_vlan = Y\n+of_push_vlan = Y\n+of_set_vlan_pcp = Y\n+of_set_vlan_vid = Y\n pf = Y\n port_id = Y\n queue = Y\ndiff --git a/drivers/net/cnxk/cn10k_rte_flow.c b/drivers/net/cnxk/cn10k_rte_flow.c\nindex 65893cc..b04de6a 100644\n--- a/drivers/net/cnxk/cn10k_rte_flow.c\n+++ b/drivers/net/cnxk/cn10k_rte_flow.c\n@@ -4,6 +4,7 @@\n #include <cnxk_rte_flow.h>\n #include \"cn10k_rte_flow.h\"\n #include \"cn10k_ethdev.h\"\n+#include \"cn10k_rx.h\"\n \n struct rte_flow *\n cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n@@ -11,12 +12,29 @@ cn10k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n \t\t const struct rte_flow_action actions[],\n \t\t struct rte_flow_error *error)\n {\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tint mark_actions = 0, vtag_actions = 0;\n+\tstruct roc_npc *npc = &dev->npc;\n \tstruct roc_npc_flow *flow;\n \n \tflow = cnxk_flow_create(eth_dev, attr, pattern, actions, error);\n \tif (!flow)\n \t\treturn NULL;\n \n+\tmark_actions = roc_npc_mark_actions_get(npc);\n+\n+\tif (mark_actions) {\n+\t\tdev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;\n+\t\tcn10k_eth_set_rx_function(eth_dev);\n+\t}\n+\n+\tvtag_actions = roc_npc_vtag_actions_get(npc);\n+\n+\tif (vtag_actions) {\n+\t\tdev->rx_offload_flags |= NIX_RX_OFFLOAD_VLAN_STRIP_F;\n+\t\tcn10k_eth_set_rx_function(eth_dev);\n+\t}\n+\n \treturn (struct rte_flow *)flow;\n }\n \n@@ -25,6 +43,30 @@ cn10k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,\n \t\t struct rte_flow_error *error)\n {\n \tstruct roc_npc_flow *flow = (struct roc_npc_flow *)rte_flow;\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tint mark_actions = 0, vtag_actions = 0;\n+\tstruct roc_npc *npc = &dev->npc;\n+\n+\tmark_actions = roc_npc_mark_actions_get(npc);\n+\tif (mark_actions) {\n+\t\tmark_actions = roc_npc_mark_actions_sub_return(npc, 1);\n+\t\tif (mark_actions == 0) {\n+\t\t\tdev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;\n+\t\t\tcn10k_eth_set_rx_function(eth_dev);\n+\t\t}\n+\t}\n+\n+\tvtag_actions = roc_npc_vtag_actions_get(npc);\n+\tif (vtag_actions) {\n+\t\tif (flow->nix_intf == ROC_NPC_INTF_RX) {\n+\t\t\tvtag_actions = roc_npc_vtag_actions_sub_return(npc, 1);\n+\t\t\tif (vtag_actions == 0) {\n+\t\t\t\tdev->rx_offload_flags &=\n+\t\t\t\t\t~NIX_RX_OFFLOAD_VLAN_STRIP_F;\n+\t\t\t\tcn10k_eth_set_rx_function(eth_dev);\n+\t\t\t}\n+\t\t}\n+\t}\n \n \treturn cnxk_flow_destroy(eth_dev, flow, error);\n }\ndiff --git a/drivers/net/cnxk/cn10k_rx.c b/drivers/net/cnxk/cn10k_rx.c\nindex c9744e2..5c956c0 100644\n--- a/drivers/net/cnxk/cn10k_rx.c\n+++ b/drivers/net/cnxk/cn10k_rx.c\n@@ -5,7 +5,7 @@\n #include \"cn10k_ethdev.h\"\n #include \"cn10k_rx.h\"\n \n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n \tuint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name(\t \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \\\n \t{ \\\n@@ -17,12 +17,13 @@ NIX_RX_FASTPATH_MODES\n \n static inline void\n pick_rx_func(struct rte_eth_dev *eth_dev,\n-\t const eth_rx_burst_t rx_burst[2][2][2][2][2])\n+\t const eth_rx_burst_t rx_burst[2][2][2][2][2][2])\n {\n \tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n \n-\t/* [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */\n+\t/* [VLAN] [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */\n \teth_dev->rx_pkt_burst = rx_burst\n+\t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]\n \t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]\n \t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]\n \t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)]\n@@ -35,25 +36,25 @@ cn10k_eth_set_rx_function(struct rte_eth_dev *eth_dev)\n {\n \tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n \n-\tconst eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2] = {\n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n-\t[f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_##name,\n+\tconst eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+\t[f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_##name,\n \n \t\tNIX_RX_FASTPATH_MODES\n #undef R\n \t};\n \n-\tconst eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2] = {\n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n-\t[f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_mseg_##name,\n+\tconst eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+\t[f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_mseg_##name,\n \n \t\tNIX_RX_FASTPATH_MODES\n #undef R\n \t};\n \n-\tconst eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2] = {\n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n-\t[f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_##name,\n+\tconst eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+\t[f5][f4][f3][f2][f1][f0] = cn10k_nix_recv_pkts_vec_##name,\n \n \t\tNIX_RX_FASTPATH_MODES\n #undef R\n@@ -73,6 +74,6 @@ cn10k_eth_set_rx_function(struct rte_eth_dev *eth_dev)\n \t/* Copy multi seg version with no offload for tear down sequence */\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n \t\tdev->rx_pkt_burst_no_offload =\n-\t\t\tnix_eth_rx_burst_mseg[0][0][0][0][0];\n+\t\t\tnix_eth_rx_burst_mseg[0][0][0][0][0][0];\n \trte_mb();\n }\ndiff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h\nindex c09ccdf..1cc37cb 100644\n--- a/drivers/net/cnxk/cn10k_rx.h\n+++ b/drivers/net/cnxk/cn10k_rx.h\n@@ -15,6 +15,7 @@\n #define NIX_RX_OFFLOAD_CHECKSUM_F BIT(2)\n #define NIX_RX_OFFLOAD_MARK_UPDATE_F BIT(3)\n #define NIX_RX_OFFLOAD_TSTAMP_F\t BIT(4)\n+#define NIX_RX_OFFLOAD_VLAN_STRIP_F BIT(5)\n \n /* Flags to control cqe_to_mbuf conversion function.\n * Defining it from backwards to denote its been\n@@ -179,6 +180,17 @@ cn10k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,\n \tif (flag & NIX_RX_OFFLOAD_CHECKSUM_F)\n \t\tol_flags |= nix_rx_olflags_get(lookup_mem, w1);\n \n+\tif (flag & NIX_RX_OFFLOAD_VLAN_STRIP_F) {\n+\t\tif (rx->vtag0_gone) {\n+\t\t\tol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;\n+\t\t\tmbuf->vlan_tci = rx->vtag0_tci;\n+\t\t}\n+\t\tif (rx->vtag1_gone) {\n+\t\t\tol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;\n+\t\t\tmbuf->vlan_tci_outer = rx->vtag1_tci;\n+\t\t}\n+\t}\n+\n \tif (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)\n \t\tol_flags = nix_update_match_id(rx->match_id, ol_flags, mbuf);\n \n@@ -273,6 +285,28 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,\n \n #if defined(RTE_ARCH_ARM64)\n \n+static __rte_always_inline uint64_t\n+nix_vlan_update(const uint64_t w2, uint64_t ol_flags, uint8x16_t *f)\n+{\n+\tif (w2 & BIT_ULL(21) /* vtag0_gone */) {\n+\t\tol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;\n+\t\t*f = vsetq_lane_u16((uint16_t)(w2 >> 32), *f, 5);\n+\t}\n+\n+\treturn ol_flags;\n+}\n+\n+static __rte_always_inline uint64_t\n+nix_qinq_update(const uint64_t w2, uint64_t ol_flags, struct rte_mbuf *mbuf)\n+{\n+\tif (w2 & BIT_ULL(23) /* vtag1_gone */) {\n+\t\tol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;\n+\t\tmbuf->vlan_tci_outer = (uint16_t)(w2 >> 48);\n+\t}\n+\n+\treturn ol_flags;\n+}\n+\n static __rte_always_inline uint16_t\n cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t uint16_t pkts, const uint16_t flags)\n@@ -397,6 +431,23 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tol_flags3 |= nix_rx_olflags_get(lookup_mem, cq3_w1);\n \t\t}\n \n+\t\tif (flags & NIX_RX_OFFLOAD_VLAN_STRIP_F) {\n+\t\t\tuint64_t cq0_w2 = *(uint64_t *)(cq0 + CQE_SZ(0) + 16);\n+\t\t\tuint64_t cq1_w2 = *(uint64_t *)(cq0 + CQE_SZ(1) + 16);\n+\t\t\tuint64_t cq2_w2 = *(uint64_t *)(cq0 + CQE_SZ(2) + 16);\n+\t\t\tuint64_t cq3_w2 = *(uint64_t *)(cq0 + CQE_SZ(3) + 16);\n+\n+\t\t\tol_flags0 = nix_vlan_update(cq0_w2, ol_flags0, &f0);\n+\t\t\tol_flags1 = nix_vlan_update(cq1_w2, ol_flags1, &f1);\n+\t\t\tol_flags2 = nix_vlan_update(cq2_w2, ol_flags2, &f2);\n+\t\t\tol_flags3 = nix_vlan_update(cq3_w2, ol_flags3, &f3);\n+\n+\t\t\tol_flags0 = nix_qinq_update(cq0_w2, ol_flags0, mbuf0);\n+\t\t\tol_flags1 = nix_qinq_update(cq1_w2, ol_flags1, mbuf1);\n+\t\t\tol_flags2 = nix_qinq_update(cq2_w2, ol_flags2, mbuf2);\n+\t\t\tol_flags3 = nix_qinq_update(cq3_w2, ol_flags3, mbuf3);\n+\t\t}\n+\n \t\tif (flags & NIX_RX_OFFLOAD_MARK_UPDATE_F) {\n \t\t\tol_flags0 = nix_update_match_id(\n \t\t\t\t*(uint16_t *)(cq0 + CQE_SZ(0) + 38), ol_flags0,\n@@ -494,43 +545,99 @@ cn10k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,\n #define CKSUM_F\t NIX_RX_OFFLOAD_CHECKSUM_F\n #define MARK_F\t NIX_RX_OFFLOAD_MARK_UPDATE_F\n #define TS_F NIX_RX_OFFLOAD_TSTAMP_F\n+#define RX_VLAN_F NIX_RX_OFFLOAD_VLAN_STRIP_F\n \n-/* [TS] [MARK] [CKSUM] [PTYPE] [RSS] */\n+/* [RX_VLAN_F] [TS] [MARK] [CKSUM] [PTYPE] [RSS] */\n #define NIX_RX_FASTPATH_MODES\t\t\t\t\t\t \\\n-R(no_offload,\t\t\t0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)\t \\\n-R(rss,\t\t\t\t0, 0, 0, 0, 1, RSS_F)\t\t\t \\\n-R(ptype,\t\t\t0, 0, 0, 1, 0, PTYPE_F)\t\t\t \\\n-R(ptype_rss,\t\t\t0, 0, 0, 1, 1, PTYPE_F | RSS_F)\t\t \\\n-R(cksum,\t\t\t0, 0, 1, 0, 0, CKSUM_F)\t\t\t \\\n-R(cksum_rss,\t\t\t0, 0, 1, 0, 1, CKSUM_F | RSS_F)\t\t \\\n-R(cksum_ptype,\t\t\t0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)\t \\\n-R(cksum_ptype_rss,\t\t0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F) \\\n-R(mark,\t\t\t\t0, 1, 0, 0, 0, MARK_F)\t\t\t \\\n-R(mark_rss,\t\t\t0, 1, 0, 0, 1, MARK_F | RSS_F)\t\t \\\n-R(mark_ptype,\t\t\t0, 1, 0, 1, 0, MARK_F | PTYPE_F)\t \\\n-R(mark_ptype_rss,\t\t0, 1, 0, 1, 1, MARK_F | PTYPE_F | RSS_F) \\\n-R(mark_cksum,\t\t\t0, 1, 1, 0, 0, MARK_F | CKSUM_F)\t \\\n-R(mark_cksum_rss,\t\t0, 1, 1, 0, 1, MARK_F | CKSUM_F | RSS_F) \\\n-R(mark_cksum_ptype,\t\t0, 1, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F) \\\n-R(mark_cksum_ptype_rss,\t\t0, 1, 1, 1, 1, MARK_F | CKSUM_F | PTYPE_F | RSS_F)\\\n-R(ts,\t\t\t\t1, 0, 0, 0, 0, TS_F)\t\t\t \\\n-R(ts_rss,\t\t\t1, 0, 0, 0, 1, TS_F | RSS_F)\t\t \\\n-R(ts_ptype,\t\t\t1, 0, 0, 1, 0, TS_F | PTYPE_F)\t\t \\\n-R(ts_ptype_rss,\t\t\t1, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F)\t \\\n-R(ts_cksum,\t\t\t1, 0, 1, 0, 0, TS_F | CKSUM_F)\t\t \\\n-R(ts_cksum_rss,\t\t\t1, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F)\t \\\n-R(ts_cksum_ptype,\t\t1, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F) \\\n-R(ts_cksum_ptype_rss,\t\t1, 0, 1, 1, 1, TS_F | CKSUM_F | PTYPE_F | RSS_F)\\\n-R(ts_mark,\t\t\t1, 1, 0, 0, 0, TS_F | MARK_F)\t\t \\\n-R(ts_mark_rss,\t\t\t1, 1, 0, 0, 1, TS_F | MARK_F | RSS_F)\t \\\n-R(ts_mark_ptype,\t\t1, 1, 0, 1, 0, TS_F | MARK_F | PTYPE_F)\t \\\n-R(ts_mark_ptype_rss,\t\t1, 1, 0, 1, 1, TS_F | MARK_F | PTYPE_F | RSS_F)\\\n-R(ts_mark_cksum,\t\t1, 1, 1, 0, 0, TS_F | MARK_F | CKSUM_F)\t \\\n-R(ts_mark_cksum_rss,\t\t1, 1, 1, 0, 1, TS_F | MARK_F | CKSUM_F | RSS_F)\\\n-R(ts_mark_cksum_ptype,\t\t1, 1, 1, 1, 0, TS_F | MARK_F | CKSUM_F | PTYPE_F)\\\n-R(ts_mark_cksum_ptype_rss,\t1, 1, 1, 1, 1, TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\n+R(no_offload,\t\t\t0, 0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)\t \\\n+R(rss,\t\t\t\t0, 0, 0, 0, 0, 1, RSS_F)\t\t \\\n+R(ptype,\t\t\t0, 0, 0, 0, 1, 0, PTYPE_F)\t\t \\\n+R(ptype_rss,\t\t\t0, 0, 0, 0, 1, 1, PTYPE_F | RSS_F)\t \\\n+R(cksum,\t\t\t0, 0, 0, 1, 0, 0, CKSUM_F)\t\t \\\n+R(cksum_rss,\t\t\t0, 0, 0, 1, 0, 1, CKSUM_F | RSS_F)\t \\\n+R(cksum_ptype,\t\t\t0, 0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)\t \\\n+R(cksum_ptype_rss,\t\t0, 0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F) \\\n+R(mark,\t\t\t\t0, 0, 1, 0, 0, 0, MARK_F)\t\t \\\n+R(mark_rss,\t\t\t0, 0, 1, 0, 0, 1, MARK_F | RSS_F)\t \\\n+R(mark_ptype,\t\t\t0, 0, 1, 0, 1, 0, MARK_F | PTYPE_F)\t \\\n+R(mark_ptype_rss,\t\t0, 0, 1, 0, 1, 1, MARK_F | PTYPE_F | RSS_F) \\\n+R(mark_cksum,\t\t\t0, 0, 1, 1, 0, 0, MARK_F | CKSUM_F)\t \\\n+R(mark_cksum_rss,\t\t0, 0, 1, 1, 0, 1, MARK_F | CKSUM_F | RSS_F) \\\n+R(mark_cksum_ptype,\t\t0, 0, 1, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F) \\\n+R(mark_cksum_ptype_rss,\t\t0, 0, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tMARK_F | CKSUM_F | PTYPE_F | RSS_F)\t\t \\\n+R(ts,\t\t\t\t0, 1, 0, 0, 0, 0, TS_F)\t\t\t \\\n+R(ts_rss,\t\t\t0, 1, 0, 0, 0, 1, TS_F | RSS_F)\t\t \\\n+R(ts_ptype,\t\t\t0, 1, 0, 0, 1, 0, TS_F | PTYPE_F)\t \\\n+R(ts_ptype_rss,\t\t\t0, 1, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F) \\\n+R(ts_cksum,\t\t\t0, 1, 0, 1, 0, 0, TS_F | CKSUM_F)\t \\\n+R(ts_cksum_rss,\t\t\t0, 1, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F) \\\n+R(ts_cksum_ptype,\t\t0, 1, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F) \\\n+R(ts_cksum_ptype_rss,\t\t0, 1, 0, 1, 1, 1,\t\t\t \\\n+\t\t\tTS_F | CKSUM_F | PTYPE_F | RSS_F)\t\t \\\n+R(ts_mark,\t\t\t0, 1, 1, 0, 0, 0, TS_F | MARK_F)\t \\\n+R(ts_mark_rss,\t\t\t0, 1, 1, 0, 0, 1, TS_F | MARK_F | RSS_F) \\\n+R(ts_mark_ptype,\t\t0, 1, 1, 0, 1, 0, TS_F | MARK_F | PTYPE_F) \\\n+R(ts_mark_ptype_rss,\t\t0, 1, 1, 0, 1, 1,\t\t\t \\\n+\t\t\tTS_F | MARK_F | PTYPE_F | RSS_F)\t\t \\\n+R(ts_mark_cksum,\t\t0, 1, 1, 1, 0, 0, TS_F | MARK_F | CKSUM_F) \\\n+R(ts_mark_cksum_rss,\t\t0, 1, 1, 1, 0, 1,\t\t\t \\\n+\t\t\tTS_F | MARK_F | CKSUM_F | RSS_F)\t\t \\\n+R(ts_mark_cksum_ptype,\t\t0, 1, 1, 1, 1, 0,\t\t\t \\\n+\t\t\tTS_F | MARK_F | CKSUM_F | PTYPE_F)\t\t \\\n+R(ts_mark_cksum_ptype_rss,\t0, 1, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tTS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\t \\\n+R(vlan,\t\t\t\t1, 0, 0, 0, 0, 0, RX_VLAN_F)\t\t \\\n+R(vlan_rss,\t\t\t1, 0, 0, 0, 0, 1, RX_VLAN_F | RSS_F)\t \\\n+R(vlan_ptype,\t\t\t1, 0, 0, 0, 1, 0, RX_VLAN_F | PTYPE_F)\t \\\n+R(vlan_ptype_rss,\t\t1, 0, 0, 0, 1, 1, RX_VLAN_F | PTYPE_F | RSS_F) \\\n+R(vlan_cksum,\t\t\t1, 0, 0, 1, 0, 0, RX_VLAN_F | CKSUM_F)\t \\\n+R(vlan_cksum_rss,\t\t1, 0, 0, 1, 0, 1, RX_VLAN_F | CKSUM_F | RSS_F) \\\n+R(vlan_cksum_ptype,\t\t1, 0, 0, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | CKSUM_F | PTYPE_F)\t\t\t \\\n+R(vlan_cksum_ptype_rss,\t\t1, 0, 0, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)\t\t \\\n+R(vlan_mark,\t\t\t1, 0, 1, 0, 0, 0, RX_VLAN_F | MARK_F)\t \\\n+R(vlan_mark_rss,\t\t1, 0, 1, 0, 0, 1, RX_VLAN_F | MARK_F | RSS_F) \\\n+R(vlan_mark_ptype,\t\t1, 0, 1, 0, 1, 0, RX_VLAN_F | MARK_F | PTYPE_F)\\\n+R(vlan_mark_ptype_rss,\t\t1, 0, 1, 0, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | PTYPE_F | RSS_F)\t\t \\\n+R(vlan_mark_cksum,\t\t1, 0, 1, 1, 0, 0, RX_VLAN_F | MARK_F | CKSUM_F)\\\n+R(vlan_mark_cksum_rss,\t\t1, 0, 1, 1, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | CKSUM_F | RSS_F)\t\t \\\n+R(vlan_mark_cksum_ptype,\t1, 0, 1, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F)\t\t \\\n+R(vlan_mark_cksum_ptype_rss,\t1, 0, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\t \\\n+R(vlan_ts,\t\t\t1, 1, 0, 0, 0, 0, RX_VLAN_F | TS_F)\t \\\n+R(vlan_ts_rss,\t\t\t1, 1, 0, 0, 0, 1, RX_VLAN_F | TS_F | RSS_F) \\\n+R(vlan_ts_ptype,\t\t1, 1, 0, 0, 1, 0, RX_VLAN_F | TS_F | PTYPE_F) \\\n+R(vlan_ts_ptype_rss,\t\t1, 1, 0, 0, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | PTYPE_F | RSS_F)\t\t \\\n+R(vlan_ts_cksum,\t\t1, 1, 0, 1, 0, 0, RX_VLAN_F | TS_F | CKSUM_F) \\\n+R(vlan_ts_cksum_rss,\t\t1, 1, 0, 1, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | CKSUM_F | RSS_F)\t\t \\\n+R(vlan_ts_cksum_ptype,\t\t1, 1, 0, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | CKSUM_F | PTYPE_F)\t\t \\\n+R(vlan_ts_cksum_ptype_rss,\t1, 1, 0, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)\t \\\n+R(vlan_ts_mark,\t\t\t1, 1, 1, 0, 0, 0, RX_VLAN_F | TS_F | MARK_F) \\\n+R(vlan_ts_mark_rss,\t\t1, 1, 1, 0, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | RSS_F)\t\t \\\n+R(vlan_ts_mark_ptype,\t\t1, 1, 1, 0, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | PTYPE_F)\t\t \\\n+R(vlan_ts_mark_ptype_rss,\t1, 1, 1, 0, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | PTYPE_F | RSS_F)\t \\\n+R(vlan_ts_mark_cksum,\t\t1, 1, 1, 1, 0, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F)\t\t \\\n+R(vlan_ts_mark_cksum_rss,\t1, 1, 1, 1, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F | RSS_F)\t \\\n+R(vlan_ts_mark_cksum_ptype,\t1, 1, 1, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)\t \\\n+R(vlan_ts_mark_cksum_ptype_rss,\t1, 1, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\n \n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n \tuint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_##name( \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts); \\\n \t\t\t\t\t\t\t\t\t \\\ndiff --git a/drivers/net/cnxk/cn10k_rx_mseg.c b/drivers/net/cnxk/cn10k_rx_mseg.c\nindex b67d21f..3340771 100644\n--- a/drivers/net/cnxk/cn10k_rx_mseg.c\n+++ b/drivers/net/cnxk/cn10k_rx_mseg.c\n@@ -5,7 +5,7 @@\n #include \"cn10k_ethdev.h\"\n #include \"cn10k_rx.h\"\n \n-#define R(name, f4, f3, f2, f1, f0, flags) \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags) \\\n \tuint16_t __rte_noinline __rte_hot cn10k_nix_recv_pkts_mseg_##name( \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \\\n \t{ \\\ndiff --git a/drivers/net/cnxk/cn10k_rx_vec.c b/drivers/net/cnxk/cn10k_rx_vec.c\nindex 1330235..65ffa97 100644\n--- a/drivers/net/cnxk/cn10k_rx_vec.c\n+++ b/drivers/net/cnxk/cn10k_rx_vec.c\n@@ -5,7 +5,7 @@\n #include \"cn10k_ethdev.h\"\n #include \"cn10k_rx.h\"\n \n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n \tuint16_t __rte_noinline __rte_hot\t\t\t\t \\\n \t\tcn10k_nix_recv_pkts_vec_##name(void *rx_queue, \\\n \t\t\t\t\t struct rte_mbuf **rx_pkts, \\\ndiff --git a/drivers/net/cnxk/cn9k_rte_flow.c b/drivers/net/cnxk/cn9k_rte_flow.c\nindex 24e1b92..b94d29e 100644\n--- a/drivers/net/cnxk/cn9k_rte_flow.c\n+++ b/drivers/net/cnxk/cn9k_rte_flow.c\n@@ -4,6 +4,7 @@\n #include <cnxk_rte_flow.h>\n #include \"cn9k_ethdev.h\"\n #include \"cn9k_rte_flow.h\"\n+#include \"cn9k_rx.h\"\n \n struct rte_flow *\n cn9k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n@@ -11,12 +12,29 @@ cn9k_flow_create(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n \t\t const struct rte_flow_action actions[],\n \t\t struct rte_flow_error *error)\n {\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tint mark_actions = 0, vtag_actions = 0;\n+\tstruct roc_npc *npc = &dev->npc;\n \tstruct roc_npc_flow *flow;\n \n \tflow = cnxk_flow_create(eth_dev, attr, pattern, actions, error);\n \tif (!flow)\n \t\treturn NULL;\n \n+\tmark_actions = roc_npc_mark_actions_get(npc);\n+\n+\tif (mark_actions) {\n+\t\tdev->rx_offload_flags |= NIX_RX_OFFLOAD_MARK_UPDATE_F;\n+\t\tcn9k_eth_set_rx_function(eth_dev);\n+\t}\n+\n+\tvtag_actions = roc_npc_vtag_actions_get(npc);\n+\n+\tif (vtag_actions) {\n+\t\tdev->rx_offload_flags |= NIX_RX_OFFLOAD_VLAN_STRIP_F;\n+\t\tcn9k_eth_set_rx_function(eth_dev);\n+\t}\n+\n \treturn (struct rte_flow *)flow;\n }\n \n@@ -25,6 +43,30 @@ cn9k_flow_destroy(struct rte_eth_dev *eth_dev, struct rte_flow *rte_flow,\n \t\t struct rte_flow_error *error)\n {\n \tstruct roc_npc_flow *flow = (struct roc_npc_flow *)rte_flow;\n+\tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n+\tint mark_actions = 0, vtag_actions = 0;\n+\tstruct roc_npc *npc = &dev->npc;\n+\n+\tmark_actions = roc_npc_mark_actions_get(npc);\n+\tif (mark_actions) {\n+\t\tmark_actions = roc_npc_mark_actions_sub_return(npc, 1);\n+\t\tif (mark_actions == 0) {\n+\t\t\tdev->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;\n+\t\t\tcn9k_eth_set_rx_function(eth_dev);\n+\t\t}\n+\t}\n+\n+\tvtag_actions = roc_npc_vtag_actions_get(npc);\n+\tif (vtag_actions) {\n+\t\tif (flow->nix_intf == ROC_NPC_INTF_RX) {\n+\t\t\tvtag_actions = roc_npc_vtag_actions_sub_return(npc, 1);\n+\t\t\tif (vtag_actions == 0) {\n+\t\t\t\tdev->rx_offload_flags &=\n+\t\t\t\t\t~NIX_RX_OFFLOAD_VLAN_STRIP_F;\n+\t\t\t\tcn9k_eth_set_rx_function(eth_dev);\n+\t\t\t}\n+\t\t}\n+\t}\n \n \treturn cnxk_flow_destroy(eth_dev, flow, error);\n }\ndiff --git a/drivers/net/cnxk/cn9k_rx.c b/drivers/net/cnxk/cn9k_rx.c\nindex a15428d..0acedd0 100644\n--- a/drivers/net/cnxk/cn9k_rx.c\n+++ b/drivers/net/cnxk/cn9k_rx.c\n@@ -5,7 +5,7 @@\n #include \"cn9k_ethdev.h\"\n #include \"cn9k_rx.h\"\n \n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n \tuint16_t __rte_noinline __rte_hot cn9k_nix_recv_pkts_##name(\t \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \\\n \t{ \\\n@@ -17,12 +17,13 @@ NIX_RX_FASTPATH_MODES\n \n static inline void\n pick_rx_func(struct rte_eth_dev *eth_dev,\n-\t const eth_rx_burst_t rx_burst[2][2][2][2][2])\n+\t const eth_rx_burst_t rx_burst[2][2][2][2][2][2])\n {\n \tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n \n-\t/* [TSP] [MARK] [CKSUM] [PTYPE] [RSS] */\n+\t/* [TSP] [MARK] [VLAN] [CKSUM] [PTYPE] [RSS] */\n \teth_dev->rx_pkt_burst = rx_burst\n+\t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_VLAN_STRIP_F)]\n \t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_TSTAMP_F)]\n \t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_MARK_UPDATE_F)]\n \t\t[!!(dev->rx_offload_flags & NIX_RX_OFFLOAD_CHECKSUM_F)]\n@@ -35,25 +36,25 @@ cn9k_eth_set_rx_function(struct rte_eth_dev *eth_dev)\n {\n \tstruct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);\n \n-\tconst eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2] = {\n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n-\t[f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_##name,\n+\tconst eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_##name,\n \n \t\tNIX_RX_FASTPATH_MODES\n #undef R\n \t};\n \n-\tconst eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2] = {\n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n-\t[f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_mseg_##name,\n+\tconst eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_mseg_##name,\n \n \t\tNIX_RX_FASTPATH_MODES\n #undef R\n \t};\n \n-\tconst eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2] = {\n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n-\t[f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_vec_##name,\n+\tconst eth_rx_burst_t nix_eth_rx_vec_burst[2][2][2][2][2][2] = {\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+\t[f5][f4][f3][f2][f1][f0] = cn9k_nix_recv_pkts_vec_##name,\n \n \t\tNIX_RX_FASTPATH_MODES\n #undef R\n@@ -73,6 +74,6 @@ cn9k_eth_set_rx_function(struct rte_eth_dev *eth_dev)\n \t/* Copy multi seg version with no offload for tear down sequence */\n \tif (rte_eal_process_type() == RTE_PROC_PRIMARY)\n \t\tdev->rx_pkt_burst_no_offload =\n-\t\t\tnix_eth_rx_burst_mseg[0][0][0][0][0];\n+\t\t\tnix_eth_rx_burst_mseg[0][0][0][0][0][0];\n \trte_mb();\n }\ndiff --git a/drivers/net/cnxk/cn9k_rx.h b/drivers/net/cnxk/cn9k_rx.h\nindex c5ad5db..10ef5c6 100644\n--- a/drivers/net/cnxk/cn9k_rx.h\n+++ b/drivers/net/cnxk/cn9k_rx.h\n@@ -16,6 +16,7 @@\n #define NIX_RX_OFFLOAD_CHECKSUM_F BIT(2)\n #define NIX_RX_OFFLOAD_MARK_UPDATE_F BIT(3)\n #define NIX_RX_OFFLOAD_TSTAMP_F\t BIT(4)\n+#define NIX_RX_OFFLOAD_VLAN_STRIP_F BIT(5)\n \n /* Flags to control cqe_to_mbuf conversion function.\n * Defining it from backwards to denote its been\n@@ -181,6 +182,17 @@ cn9k_nix_cqe_to_mbuf(const struct nix_cqe_hdr_s *cq, const uint32_t tag,\n \tif (flag & NIX_RX_OFFLOAD_CHECKSUM_F)\n \t\tol_flags |= nix_rx_olflags_get(lookup_mem, w1);\n \n+\tif (flag & NIX_RX_OFFLOAD_VLAN_STRIP_F) {\n+\t\tif (rx->cn9k.vtag0_gone) {\n+\t\t\tol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;\n+\t\t\tmbuf->vlan_tci = rx->cn9k.vtag0_tci;\n+\t\t}\n+\t\tif (rx->cn9k.vtag1_gone) {\n+\t\t\tol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;\n+\t\t\tmbuf->vlan_tci_outer = rx->cn9k.vtag1_tci;\n+\t\t}\n+\t}\n+\n \tif (flag & NIX_RX_OFFLOAD_MARK_UPDATE_F)\n \t\tol_flags =\n \t\t\tnix_update_match_id(rx->cn9k.match_id, ol_flags, mbuf);\n@@ -276,6 +288,28 @@ cn9k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,\n \n #if defined(RTE_ARCH_ARM64)\n \n+static __rte_always_inline uint64_t\n+nix_vlan_update(const uint64_t w2, uint64_t ol_flags, uint8x16_t *f)\n+{\n+\tif (w2 & BIT_ULL(21) /* vtag0_gone */) {\n+\t\tol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;\n+\t\t*f = vsetq_lane_u16((uint16_t)(w2 >> 32), *f, 5);\n+\t}\n+\n+\treturn ol_flags;\n+}\n+\n+static __rte_always_inline uint64_t\n+nix_qinq_update(const uint64_t w2, uint64_t ol_flags, struct rte_mbuf *mbuf)\n+{\n+\tif (w2 & BIT_ULL(23) /* vtag1_gone */) {\n+\t\tol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;\n+\t\tmbuf->vlan_tci_outer = (uint16_t)(w2 >> 48);\n+\t}\n+\n+\treturn ol_flags;\n+}\n+\n static __rte_always_inline uint16_t\n cn9k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t uint16_t pkts, const uint16_t flags)\n@@ -400,6 +434,23 @@ cn9k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tol_flags3 |= nix_rx_olflags_get(lookup_mem, cq3_w1);\n \t\t}\n \n+\t\tif (flags & NIX_RX_OFFLOAD_VLAN_STRIP_F) {\n+\t\t\tuint64_t cq0_w2 = *(uint64_t *)(cq0 + CQE_SZ(0) + 16);\n+\t\t\tuint64_t cq1_w2 = *(uint64_t *)(cq0 + CQE_SZ(1) + 16);\n+\t\t\tuint64_t cq2_w2 = *(uint64_t *)(cq0 + CQE_SZ(2) + 16);\n+\t\t\tuint64_t cq3_w2 = *(uint64_t *)(cq0 + CQE_SZ(3) + 16);\n+\n+\t\t\tol_flags0 = nix_vlan_update(cq0_w2, ol_flags0, &f0);\n+\t\t\tol_flags1 = nix_vlan_update(cq1_w2, ol_flags1, &f1);\n+\t\t\tol_flags2 = nix_vlan_update(cq2_w2, ol_flags2, &f2);\n+\t\t\tol_flags3 = nix_vlan_update(cq3_w2, ol_flags3, &f3);\n+\n+\t\t\tol_flags0 = nix_qinq_update(cq0_w2, ol_flags0, mbuf0);\n+\t\t\tol_flags1 = nix_qinq_update(cq1_w2, ol_flags1, mbuf1);\n+\t\t\tol_flags2 = nix_qinq_update(cq2_w2, ol_flags2, mbuf2);\n+\t\t\tol_flags3 = nix_qinq_update(cq3_w2, ol_flags3, mbuf3);\n+\t\t}\n+\n \t\tif (flags & NIX_RX_OFFLOAD_MARK_UPDATE_F) {\n \t\t\tol_flags0 = nix_update_match_id(\n \t\t\t\t*(uint16_t *)(cq0 + CQE_SZ(0) + 38), ol_flags0,\n@@ -496,43 +547,99 @@ cn9k_nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,\n #define CKSUM_F\t NIX_RX_OFFLOAD_CHECKSUM_F\n #define MARK_F\t NIX_RX_OFFLOAD_MARK_UPDATE_F\n #define TS_F\t NIX_RX_OFFLOAD_TSTAMP_F\n+#define RX_VLAN_F NIX_RX_OFFLOAD_VLAN_STRIP_F\n \n-/* [TS] [MARK] [CKSUM] [PTYPE] [RSS] */\n+/* [RX_VLAN_F] [TS] [MARK] [CKSUM] [PTYPE] [RSS] */\n #define NIX_RX_FASTPATH_MODES\t\t\t\t\t\t \\\n-R(no_offload,\t\t\t0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)\t \\\n-R(rss,\t\t\t\t0, 0, 0, 0, 1, RSS_F)\t\t\t \\\n-R(ptype,\t\t\t0, 0, 0, 1, 0, PTYPE_F)\t\t\t \\\n-R(ptype_rss,\t\t\t0, 0, 0, 1, 1, PTYPE_F | RSS_F)\t\t \\\n-R(cksum,\t\t\t0, 0, 1, 0, 0, CKSUM_F)\t\t\t \\\n-R(cksum_rss,\t\t\t0, 0, 1, 0, 1, CKSUM_F | RSS_F)\t\t \\\n-R(cksum_ptype,\t\t\t0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)\t \\\n-R(cksum_ptype_rss,\t\t0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F) \\\n-R(mark,\t\t\t\t0, 1, 0, 0, 0, MARK_F)\t\t\t \\\n-R(mark_rss,\t\t\t0, 1, 0, 0, 1, MARK_F | RSS_F)\t\t \\\n-R(mark_ptype,\t\t\t0, 1, 0, 1, 0, MARK_F | PTYPE_F)\t \\\n-R(mark_ptype_rss,\t\t0, 1, 0, 1, 1, MARK_F | PTYPE_F | RSS_F) \\\n-R(mark_cksum,\t\t\t0, 1, 1, 0, 0, MARK_F | CKSUM_F)\t \\\n-R(mark_cksum_rss,\t\t0, 1, 1, 0, 1, MARK_F | CKSUM_F | RSS_F) \\\n-R(mark_cksum_ptype,\t\t0, 1, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F) \\\n-R(mark_cksum_ptype_rss,\t\t0, 1, 1, 1, 1, MARK_F | CKSUM_F | PTYPE_F | RSS_F)\\\n-R(ts,\t\t\t\t1, 0, 0, 0, 0, TS_F)\t\t\t \\\n-R(ts_rss,\t\t\t1, 0, 0, 0, 1, TS_F | RSS_F)\t\t \\\n-R(ts_ptype,\t\t\t1, 0, 0, 1, 0, TS_F | PTYPE_F)\t\t \\\n-R(ts_ptype_rss,\t\t\t1, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F)\t \\\n-R(ts_cksum,\t\t\t1, 0, 1, 0, 0, TS_F | CKSUM_F)\t\t \\\n-R(ts_cksum_rss,\t\t\t1, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F)\t \\\n-R(ts_cksum_ptype,\t\t1, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F) \\\n-R(ts_cksum_ptype_rss,\t\t1, 0, 1, 1, 1, TS_F | CKSUM_F | PTYPE_F | RSS_F)\\\n-R(ts_mark,\t\t\t1, 1, 0, 0, 0, TS_F | MARK_F)\t\t \\\n-R(ts_mark_rss,\t\t\t1, 1, 0, 0, 1, TS_F | MARK_F | RSS_F)\t \\\n-R(ts_mark_ptype,\t\t1, 1, 0, 1, 0, TS_F | MARK_F | PTYPE_F)\t \\\n-R(ts_mark_ptype_rss,\t\t1, 1, 0, 1, 1, TS_F | MARK_F | PTYPE_F | RSS_F)\\\n-R(ts_mark_cksum,\t\t1, 1, 1, 0, 0, TS_F | MARK_F | CKSUM_F)\t \\\n-R(ts_mark_cksum_rss,\t\t1, 1, 1, 0, 1, TS_F | MARK_F | CKSUM_F | RSS_F)\\\n-R(ts_mark_cksum_ptype,\t\t1, 1, 1, 1, 0, TS_F | MARK_F | CKSUM_F | PTYPE_F)\\\n-R(ts_mark_cksum_ptype_rss,\t1, 1, 1, 1, 1, TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\n+R(no_offload,\t\t\t0, 0, 0, 0, 0, 0, NIX_RX_OFFLOAD_NONE)\t \\\n+R(rss,\t\t\t\t0, 0, 0, 0, 0, 1, RSS_F)\t\t \\\n+R(ptype,\t\t\t0, 0, 0, 0, 1, 0, PTYPE_F)\t\t \\\n+R(ptype_rss,\t\t\t0, 0, 0, 0, 1, 1, PTYPE_F | RSS_F)\t \\\n+R(cksum,\t\t\t0, 0, 0, 1, 0, 0, CKSUM_F)\t\t \\\n+R(cksum_rss,\t\t\t0, 0, 0, 1, 0, 1, CKSUM_F | RSS_F)\t \\\n+R(cksum_ptype,\t\t\t0, 0, 0, 1, 1, 0, CKSUM_F | PTYPE_F)\t \\\n+R(cksum_ptype_rss,\t\t0, 0, 0, 1, 1, 1, CKSUM_F | PTYPE_F | RSS_F) \\\n+R(mark,\t\t\t\t0, 0, 1, 0, 0, 0, MARK_F)\t\t \\\n+R(mark_rss,\t\t\t0, 0, 1, 0, 0, 1, MARK_F | RSS_F)\t \\\n+R(mark_ptype,\t\t\t0, 0, 1, 0, 1, 0, MARK_F | PTYPE_F)\t \\\n+R(mark_ptype_rss,\t\t0, 0, 1, 0, 1, 1, MARK_F | PTYPE_F | RSS_F) \\\n+R(mark_cksum,\t\t\t0, 0, 1, 1, 0, 0, MARK_F | CKSUM_F)\t \\\n+R(mark_cksum_rss,\t\t0, 0, 1, 1, 0, 1, MARK_F | CKSUM_F | RSS_F) \\\n+R(mark_cksum_ptype,\t\t0, 0, 1, 1, 1, 0, MARK_F | CKSUM_F | PTYPE_F) \\\n+R(mark_cksum_ptype_rss,\t\t0, 0, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tMARK_F | CKSUM_F | PTYPE_F | RSS_F)\t\t \\\n+R(ts,\t\t\t\t0, 1, 0, 0, 0, 0, TS_F)\t\t\t \\\n+R(ts_rss,\t\t\t0, 1, 0, 0, 0, 1, TS_F | RSS_F)\t\t \\\n+R(ts_ptype,\t\t\t0, 1, 0, 0, 1, 0, TS_F | PTYPE_F)\t \\\n+R(ts_ptype_rss,\t\t\t0, 1, 0, 0, 1, 1, TS_F | PTYPE_F | RSS_F) \\\n+R(ts_cksum,\t\t\t0, 1, 0, 1, 0, 0, TS_F | CKSUM_F)\t \\\n+R(ts_cksum_rss,\t\t\t0, 1, 0, 1, 0, 1, TS_F | CKSUM_F | RSS_F) \\\n+R(ts_cksum_ptype,\t\t0, 1, 0, 1, 1, 0, TS_F | CKSUM_F | PTYPE_F) \\\n+R(ts_cksum_ptype_rss,\t\t0, 1, 0, 1, 1, 1,\t\t\t \\\n+\t\t\tTS_F | CKSUM_F | PTYPE_F | RSS_F)\t\t \\\n+R(ts_mark,\t\t\t0, 1, 1, 0, 0, 0, TS_F | MARK_F)\t \\\n+R(ts_mark_rss,\t\t\t0, 1, 1, 0, 0, 1, TS_F | MARK_F | RSS_F) \\\n+R(ts_mark_ptype,\t\t0, 1, 1, 0, 1, 0, TS_F | MARK_F | PTYPE_F) \\\n+R(ts_mark_ptype_rss,\t\t0, 1, 1, 0, 1, 1,\t\t\t \\\n+\t\t\tTS_F | MARK_F | PTYPE_F | RSS_F)\t\t \\\n+R(ts_mark_cksum,\t\t0, 1, 1, 1, 0, 0, TS_F | MARK_F | CKSUM_F) \\\n+R(ts_mark_cksum_rss,\t\t0, 1, 1, 1, 0, 1,\t\t\t \\\n+\t\t\tTS_F | MARK_F | CKSUM_F | RSS_F)\t\t \\\n+R(ts_mark_cksum_ptype,\t\t0, 1, 1, 1, 1, 0,\t\t\t \\\n+\t\t\tTS_F | MARK_F | CKSUM_F | PTYPE_F)\t\t \\\n+R(ts_mark_cksum_ptype_rss,\t0, 1, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tTS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\t \\\n+R(vlan,\t\t\t\t1, 0, 0, 0, 0, 0, RX_VLAN_F)\t\t \\\n+R(vlan_rss,\t\t\t1, 0, 0, 0, 0, 1, RX_VLAN_F | RSS_F)\t \\\n+R(vlan_ptype,\t\t\t1, 0, 0, 0, 1, 0, RX_VLAN_F | PTYPE_F)\t \\\n+R(vlan_ptype_rss,\t\t1, 0, 0, 0, 1, 1, RX_VLAN_F | PTYPE_F | RSS_F) \\\n+R(vlan_cksum,\t\t\t1, 0, 0, 1, 0, 0, RX_VLAN_F | CKSUM_F)\t \\\n+R(vlan_cksum_rss,\t\t1, 0, 0, 1, 0, 1, RX_VLAN_F | CKSUM_F | RSS_F) \\\n+R(vlan_cksum_ptype,\t\t1, 0, 0, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | CKSUM_F | PTYPE_F)\t\t\t \\\n+R(vlan_cksum_ptype_rss,\t\t1, 0, 0, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | CKSUM_F | PTYPE_F | RSS_F)\t\t \\\n+R(vlan_mark,\t\t\t1, 0, 1, 0, 0, 0, RX_VLAN_F | MARK_F)\t \\\n+R(vlan_mark_rss,\t\t1, 0, 1, 0, 0, 1, RX_VLAN_F | MARK_F | RSS_F) \\\n+R(vlan_mark_ptype,\t\t1, 0, 1, 0, 1, 0, RX_VLAN_F | MARK_F | PTYPE_F)\\\n+R(vlan_mark_ptype_rss,\t\t1, 0, 1, 0, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | PTYPE_F | RSS_F)\t\t \\\n+R(vlan_mark_cksum,\t\t1, 0, 1, 1, 0, 0, RX_VLAN_F | MARK_F | CKSUM_F)\\\n+R(vlan_mark_cksum_rss,\t\t1, 0, 1, 1, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | CKSUM_F | RSS_F)\t\t \\\n+R(vlan_mark_cksum_ptype,\t1, 0, 1, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F)\t\t \\\n+R(vlan_mark_cksum_ptype_rss,\t1, 0, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\t \\\n+R(vlan_ts,\t\t\t1, 1, 0, 0, 0, 0, RX_VLAN_F | TS_F)\t \\\n+R(vlan_ts_rss,\t\t\t1, 1, 0, 0, 0, 1, RX_VLAN_F | TS_F | RSS_F) \\\n+R(vlan_ts_ptype,\t\t1, 1, 0, 0, 1, 0, RX_VLAN_F | TS_F | PTYPE_F) \\\n+R(vlan_ts_ptype_rss,\t\t1, 1, 0, 0, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | PTYPE_F | RSS_F)\t\t \\\n+R(vlan_ts_cksum,\t\t1, 1, 0, 1, 0, 0, RX_VLAN_F | TS_F | CKSUM_F) \\\n+R(vlan_ts_cksum_rss,\t\t1, 1, 0, 1, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | CKSUM_F | RSS_F)\t\t \\\n+R(vlan_ts_cksum_ptype,\t\t1, 1, 0, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | CKSUM_F | PTYPE_F)\t\t \\\n+R(vlan_ts_cksum_ptype_rss,\t1, 1, 0, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | CKSUM_F | PTYPE_F | RSS_F)\t \\\n+R(vlan_ts_mark,\t\t\t1, 1, 1, 0, 0, 0, RX_VLAN_F | TS_F | MARK_F) \\\n+R(vlan_ts_mark_rss,\t\t1, 1, 1, 0, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | RSS_F)\t\t \\\n+R(vlan_ts_mark_ptype,\t\t1, 1, 1, 0, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | PTYPE_F)\t\t \\\n+R(vlan_ts_mark_ptype_rss,\t1, 1, 1, 0, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | PTYPE_F | RSS_F)\t \\\n+R(vlan_ts_mark_cksum,\t\t1, 1, 1, 1, 0, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F)\t\t \\\n+R(vlan_ts_mark_cksum_rss,\t1, 1, 1, 1, 0, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F | RSS_F)\t \\\n+R(vlan_ts_mark_cksum_ptype,\t1, 1, 1, 1, 1, 0,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F)\t \\\n+R(vlan_ts_mark_cksum_ptype_rss,\t1, 1, 1, 1, 1, 1,\t\t\t \\\n+\t\t\tRX_VLAN_F | TS_F | MARK_F | CKSUM_F | PTYPE_F | RSS_F)\n \n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n \tuint16_t __rte_noinline __rte_hot cn9k_nix_recv_pkts_##name( \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts); \\\n \t\t\t\t\t\t\t\t\t \\\ndiff --git a/drivers/net/cnxk/cn9k_rx_mseg.c b/drivers/net/cnxk/cn9k_rx_mseg.c\nindex 3b26962..d7e19b1 100644\n--- a/drivers/net/cnxk/cn9k_rx_mseg.c\n+++ b/drivers/net/cnxk/cn9k_rx_mseg.c\n@@ -5,7 +5,7 @@\n #include \"cn9k_ethdev.h\"\n #include \"cn9k_rx.h\"\n \n-#define R(name, f4, f3, f2, f1, f0, flags) \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags) \\\n \tuint16_t __rte_noinline __rte_hot cn9k_nix_recv_pkts_mseg_##name( \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \\\n \t{ \\\ndiff --git a/drivers/net/cnxk/cn9k_rx_vec.c b/drivers/net/cnxk/cn9k_rx_vec.c\nindex b19c7f3..e61c222 100644\n--- a/drivers/net/cnxk/cn9k_rx_vec.c\n+++ b/drivers/net/cnxk/cn9k_rx_vec.c\n@@ -5,7 +5,7 @@\n #include \"cn9k_ethdev.h\"\n #include \"cn9k_rx.h\"\n \n-#define R(name, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n+#define R(name, f5, f4, f3, f2, f1, f0, flags)\t\t\t\t \\\n \tuint16_t __rte_noinline __rte_hot cn9k_nix_recv_pkts_vec_##name( \\\n \t\tvoid *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts) \\\n \t{ \\\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c\nindex 1edea35..93d7ec7 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.c\n+++ b/drivers/net/cnxk/cnxk_ethdev.c\n@@ -1287,6 +1287,7 @@ cnxk_eth_dev_init(struct rte_eth_dev *eth_dev)\n \n \t/* Initialize base roc nix */\n \tnix->pci_dev = pci_dev;\n+\tnix->hw_vlan_ins = true;\n \trc = roc_nix_dev_init(nix);\n \tif (rc) {\n \t\tplt_err(\"Failed to initialize roc nix rc=%d\", rc);\ndiff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h\nindex c07e988..67b1f42 100644\n--- a/drivers/net/cnxk/cnxk_ethdev.h\n+++ b/drivers/net/cnxk/cnxk_ethdev.h\n@@ -76,7 +76,8 @@\n \t(DEV_RX_OFFLOAD_CHECKSUM | DEV_RX_OFFLOAD_SCTP_CKSUM | \\\n \t DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM | DEV_RX_OFFLOAD_SCATTER | \\\n \t DEV_RX_OFFLOAD_JUMBO_FRAME | DEV_RX_OFFLOAD_OUTER_UDP_CKSUM | \\\n-\t DEV_RX_OFFLOAD_RSS_HASH | DEV_RX_OFFLOAD_TIMESTAMP)\n+\t DEV_RX_OFFLOAD_RSS_HASH | DEV_RX_OFFLOAD_TIMESTAMP | \\\n+\t DEV_RX_OFFLOAD_VLAN_STRIP)\n \n #define RSS_IPV4_ENABLE \\\n \t(ETH_RSS_IPV4 | ETH_RSS_FRAG_IPV4 | ETH_RSS_NONFRAG_IPV4_UDP | \\\ndiff --git a/drivers/net/cnxk/cnxk_rte_flow.c b/drivers/net/cnxk/cnxk_rte_flow.c\nindex c61618a..213125b 100644\n--- a/drivers/net/cnxk/cnxk_rte_flow.c\n+++ b/drivers/net/cnxk/cnxk_rte_flow.c\n@@ -178,6 +178,23 @@ cnxk_map_actions(struct rte_eth_dev *eth_dev, const struct rte_flow_attr *attr,\n \t\tcase RTE_FLOW_ACTION_TYPE_SECURITY:\n \t\t\tin_actions[i].type = ROC_NPC_ACTION_TYPE_SEC;\n \t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_OF_POP_VLAN:\n+\t\t\tin_actions[i].type = ROC_NPC_ACTION_TYPE_VLAN_STRIP;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:\n+\t\t\tin_actions[i].type = ROC_NPC_ACTION_TYPE_VLAN_INSERT;\n+\t\t\tin_actions[i].conf = actions->conf;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:\n+\t\t\tin_actions[i].type =\n+\t\t\t\tROC_NPC_ACTION_TYPE_VLAN_ETHTYPE_INSERT;\n+\t\t\tin_actions[i].conf = actions->conf;\n+\t\t\tbreak;\n+\t\tcase RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_PCP:\n+\t\t\tin_actions[i].type =\n+\t\t\t\tROC_NPC_ACTION_TYPE_VLAN_PCP_INSERT;\n+\t\t\tin_actions[i].conf = actions->conf;\n+\t\t\tbreak;\n \t\tdefault:\n \t\t\tplt_npc_dbg(\"Action is not supported = %d\",\n \t\t\t\t actions->type);\n", "prefixes": [ "v3", "62/62" ] }