Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/114943/?format=api
{ "id": 114943, "url": "https://patches.dpdk.org/api/patches/114943/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220812191827.3187441-12-ivan.malov@oktetlabs.ru/", "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": "<20220812191827.3187441-12-ivan.malov@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20220812191827.3187441-12-ivan.malov@oktetlabs.ru", "date": "2022-08-12T19:18:25", "name": "[11/13] ethdev: remove deprecated flow item VF", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "d9586d78e412c752b52df93e5587125afd1e35b4", "submitter": { "id": 869, "url": "https://patches.dpdk.org/api/people/869/?format=api", "name": "Ivan Malov", "email": "Ivan.Malov@oktetlabs.ru" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220812191827.3187441-12-ivan.malov@oktetlabs.ru/mbox/", "series": [ { "id": 24302, "url": "https://patches.dpdk.org/api/series/24302/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=24302", "date": "2022-08-12T19:18:15", "name": "ethdev: proceed with flow subsystem rework", "version": 1, "mbox": "https://patches.dpdk.org/series/24302/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/114943/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/114943/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 B32F0A0543;\n\tFri, 12 Aug 2022 21:19:36 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 71A1242C5D;\n\tFri, 12 Aug 2022 21:18:40 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 0CFFB410F1\n for <dev@dpdk.org>; Fri, 12 Aug 2022 21:18:32 +0200 (CEST)", "from bree.oktetlabs.ru (bree.oktetlabs.ru [192.168.34.5])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by shelob.oktetlabs.ru (Postfix) with ESMTPS id C9938C7;\n Fri, 12 Aug 2022 22:18:31 +0300 (MSK)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru C9938C7", "Authentication-Results": "shelob.oktetlabs.ru/C9938C7; dkim=none;\n dkim-atps=neutral", "From": "Ivan Malov <ivan.malov@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Ori Kam <orika@nvidia.com>, Eli Britstein <elibr@nvidia.com>,\n Ilya Maximets <i.maximets@ovn.org>, Thomas Monjalon <thomas@monjalon.net>,\n Stephen Hemminger <stephen@networkplumber.org>,\n Jerin Jacob <jerinj@marvell.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Aman Singh <aman.deep.singh@intel.com>,\n Yuying Zhang <yuying.zhang@intel.com>,\n Ajit Khaparde <ajit.khaparde@broadcom.com>,\n Somnath Kotur <somnath.kotur@broadcom.com>,\n Rahul Lakkireddy <rahul.lakkireddy@chelsio.com>,\n Ferruh Yigit <ferruh.yigit@xilinx.com>, Beilei Xing <beilei.xing@intel.com>", "Subject": "[PATCH 11/13] ethdev: remove deprecated flow item VF", "Date": "Fri, 12 Aug 2022 22:18:25 +0300", "Message-Id": "<20220812191827.3187441-12-ivan.malov@oktetlabs.ru>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20220812191827.3187441-1-ivan.malov@oktetlabs.ru>", "References": "<20220812191827.3187441-1-ivan.malov@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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" }, "content": "Such deprecation was commenced in DPDK 21.11.\nSince then, no parties have objected. Remove.\n\nThe patch breaks ABI.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nReviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n app/test-pmd/cmdline_flow.c | 25 -\n doc/guides/nics/features/bnxt.ini | 1 -\n doc/guides/nics/features/cxgbe.ini | 1 -\n doc/guides/nics/features/default.ini | 1 -\n doc/guides/nics/features/i40e.ini | 1 -\n doc/guides/nics/features/sfc.ini | 1 -\n doc/guides/nics/sfc_efx.rst | 2 -\n doc/guides/prog_guide/rte_flow.rst | 40 +-\n doc/guides/rel_notes/release_22_11.rst | 3 +\n doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 -\n drivers/net/bnxt/bnxt_flow.c | 58 +-\n drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c | 4 -\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.c | 34 -\n drivers/net/bnxt/tf_ulp/ulp_rte_parser.h | 5 -\n drivers/net/cxgbe/cxgbe_flow.c | 36 -\n drivers/net/i40e/i40e_flow.c | 987 ++----------------\n drivers/net/sfc/sfc_mae.c | 77 --\n lib/ethdev/rte_flow.c | 1 -\n lib/ethdev/rte_flow.h | 46 -\n 19 files changed, 110 insertions(+), 1217 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c\nindex 2722d5a48d..31b906178c 100644\n--- a/app/test-pmd/cmdline_flow.c\n+++ b/app/test-pmd/cmdline_flow.c\n@@ -249,8 +249,6 @@ enum index {\n \tITEM_INVERT,\n \tITEM_ANY,\n \tITEM_ANY_NUM,\n-\tITEM_VF,\n-\tITEM_VF_ID,\n \tITEM_PHY_PORT,\n \tITEM_PHY_PORT_INDEX,\n \tITEM_PORT_ID,\n@@ -1277,7 +1275,6 @@ static const enum index next_item[] = {\n \tITEM_VOID,\n \tITEM_INVERT,\n \tITEM_ANY,\n-\tITEM_VF,\n \tITEM_PHY_PORT,\n \tITEM_PORT_ID,\n \tITEM_MARK,\n@@ -1348,12 +1345,6 @@ static const enum index item_any[] = {\n \tZERO,\n };\n \n-static const enum index item_vf[] = {\n-\tITEM_VF_ID,\n-\tITEM_NEXT,\n-\tZERO,\n-};\n-\n static const enum index item_phy_port[] = {\n \tITEM_PHY_PORT_INDEX,\n \tITEM_NEXT,\n@@ -3459,19 +3450,6 @@ static const struct token token_list[] = {\n \t\t.next = NEXT(item_any, NEXT_ENTRY(COMMON_UNSIGNED), item_param),\n \t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_item_any, num)),\n \t},\n-\t[ITEM_VF] = {\n-\t\t.name = \"vf\",\n-\t\t.help = \"match traffic from/to a virtual function ID\",\n-\t\t.priv = PRIV_ITEM(VF, sizeof(struct rte_flow_item_vf)),\n-\t\t.next = NEXT(item_vf),\n-\t\t.call = parse_vc,\n-\t},\n-\t[ITEM_VF_ID] = {\n-\t\t.name = \"id\",\n-\t\t.help = \"VF ID\",\n-\t\t.next = NEXT(item_vf, NEXT_ENTRY(COMMON_UNSIGNED), item_param),\n-\t\t.args = ARGS(ARGS_ENTRY(struct rte_flow_item_vf, id)),\n-\t},\n \t[ITEM_PHY_PORT] = {\n \t\t.name = \"phy_port\",\n \t\t.help = \"match traffic from/to a specific physical port\",\n@@ -10669,9 +10647,6 @@ flow_item_default_mask(const struct rte_flow_item *item)\n \tcase RTE_FLOW_ITEM_TYPE_ANY:\n \t\tmask = &rte_flow_item_any_mask;\n \t\tbreak;\n-\tcase RTE_FLOW_ITEM_TYPE_VF:\n-\t\tmask = &rte_flow_item_vf_mask;\n-\t\tbreak;\n \tcase RTE_FLOW_ITEM_TYPE_PORT_ID:\n \t\tmask = &rte_flow_item_port_id_mask;\n \t\tbreak;\ndiff --git a/doc/guides/nics/features/bnxt.ini b/doc/guides/nics/features/bnxt.ini\nindex 259480d1df..860a0a8cf6 100644\n--- a/doc/guides/nics/features/bnxt.ini\n+++ b/doc/guides/nics/features/bnxt.ini\n@@ -69,7 +69,6 @@ port_representor = Y\n represented_port = Y\n tcp = Y\n udp = Y\n-vf = Y\n vlan = Y\n vxlan = Y\n \ndiff --git a/doc/guides/nics/features/cxgbe.ini b/doc/guides/nics/features/cxgbe.ini\nindex d869f2100f..3f11cc2ac0 100644\n--- a/doc/guides/nics/features/cxgbe.ini\n+++ b/doc/guides/nics/features/cxgbe.ini\n@@ -42,7 +42,6 @@ ipv6 = Y\n phy_port = Y\n tcp = Y\n udp = Y\n-vf = Y\n vlan = Y\n \n [rte_flow actions]\ndiff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini\nindex aff236134e..8fbe1de46a 100644\n--- a/doc/guides/nics/features/default.ini\n+++ b/doc/guides/nics/features/default.ini\n@@ -135,7 +135,6 @@ sctp =\n tag =\n tcp =\n udp =\n-vf =\n vlan =\n vxlan =\n vxlan_gpe =\ndiff --git a/doc/guides/nics/features/i40e.ini b/doc/guides/nics/features/i40e.ini\nindex dd18fec217..95e39aaba0 100644\n--- a/doc/guides/nics/features/i40e.ini\n+++ b/doc/guides/nics/features/i40e.ini\n@@ -68,7 +68,6 @@ raw = Y\n sctp = Y\n tcp = Y\n udp = Y\n-vf = Y\n vlan = Y\n vxlan = Y\n \ndiff --git a/doc/guides/nics/features/sfc.ini b/doc/guides/nics/features/sfc.ini\nindex 355174d5c2..363fc6d0ec 100644\n--- a/doc/guides/nics/features/sfc.ini\n+++ b/doc/guides/nics/features/sfc.ini\n@@ -55,7 +55,6 @@ pppoes = Y\n represented_port = Y\n tcp = Y\n udp = Y\n-vf = Y\n vlan = Y\n vxlan = Y\n \ndiff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst\nindex 2dbc59e8f7..0e0088b09f 100644\n--- a/doc/guides/nics/sfc_efx.rst\n+++ b/doc/guides/nics/sfc_efx.rst\n@@ -200,8 +200,6 @@ Supported pattern items (***transfer*** rules):\n \n - PHY_PORT (cannot repeat; conflicts with other traffic source items)\n \n-- VF (cannot repeat; conflicts with other traffic source items)\n-\n - ETH\n \n - VLAN (double-tagging is supported)\ndiff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst\nindex 72f0c3d346..85bf2bf123 100644\n--- a/doc/guides/prog_guide/rte_flow.rst\n+++ b/doc/guides/prog_guide/rte_flow.rst\n@@ -535,40 +535,6 @@ Usage example, matching non-TCPv4 packets only:\n | 4 | END |\n +-------+----------+\n \n-Item: ``VF``\n-^^^^^^^^^^^^\n-\n-This item is deprecated. Consider:\n- - `Item: PORT_REPRESENTOR`_\n- - `Item: REPRESENTED_PORT`_\n-\n-Matches traffic originating from (ingress) or going to (egress) a given\n-virtual function of the current device.\n-\n-If supported, should work even if the virtual function is not managed by the\n-application and thus not associated with a DPDK port ID.\n-\n-Note this pattern item does not match VF representors traffic which, as\n-separate entities, should be addressed through their own DPDK port IDs.\n-\n-- Can be specified multiple times to match traffic addressed to several VF\n- IDs.\n-- Default ``mask`` matches any VF ID.\n-\n-.. _table_rte_flow_item_vf:\n-\n-.. table:: VF\n-\n- +----------+----------+---------------------------+\n- | Field | Subfield | Value |\n- +==========+==========+===========================+\n- | ``spec`` | ``id`` | destination VF ID |\n- +----------+----------+---------------------------+\n- | ``last`` | ``id`` | upper range value |\n- +----------+----------+---------------------------+\n- | ``mask`` | ``id`` | zeroed to match any VF ID |\n- +----------+----------+---------------------------+\n-\n Item: ``PHY_PORT``\n ^^^^^^^^^^^^^^^^^^\n \n@@ -2063,13 +2029,11 @@ This action is deprecated. Consider:\n \n Directs matching traffic to a given virtual function of the current device.\n \n-Packets matched by a VF pattern item can be redirected to their original VF\n-ID instead of the specified one. This parameter may not be available and is\n+Packets can be redirected to the VF they originate from,\n+instead of the specified one. This parameter may not be available and is\n not guaranteed to work properly if the VF part is matched by a prior flow\n rule or if packets are not addressed to a VF in the first place.\n \n-See `Item: VF`_.\n-\n .. _table_rte_flow_action_vf:\n \n .. table:: VF\ndiff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst\nindex b7469708af..cf3d6e4efb 100644\n--- a/doc/guides/rel_notes/release_22_11.rst\n+++ b/doc/guides/rel_notes/release_22_11.rst\n@@ -79,6 +79,9 @@ Removed Items\n * ethdev: removed ``RTE_FLOW_ITEM_TYPE_PF``;\n use ``RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT``.\n \n+* ethdev: removed ``RTE_FLOW_ITEM_TYPE_VF``;\n+ use ``RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT``.\n+\n \n API Changes\n -----------\ndiff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\nindex 4446560369..17049e59f8 100644\n--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst\n@@ -3665,10 +3665,6 @@ This section lists supported pattern items and their attributes, if any.\n \n - ``num {unsigned}``: number of layers covered.\n \n-- ``vf``: match traffic from/to a virtual function ID.\n-\n- - ``id {unsigned}``: VF ID.\n-\n - ``phy_port``: match traffic from/to a specific physical port.\n \n - ``index {unsigned}``: physical port index.\ndiff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c\nindex f8e10968e3..96ef00460c 100644\n--- a/drivers/net/bnxt/bnxt_flow.c\n+++ b/drivers/net/bnxt/bnxt_flow.c\n@@ -126,8 +126,7 @@ bnxt_filter_type_check(const struct rte_flow_item pattern[],\n }\n \n static int\n-bnxt_validate_and_parse_flow_type(struct bnxt *bp,\n-\t\t\t\t const struct rte_flow_attr *attr,\n+bnxt_validate_and_parse_flow_type(const struct rte_flow_attr *attr,\n \t\t\t\t const struct rte_flow_item pattern[],\n \t\t\t\t struct rte_flow_error *error,\n \t\t\t\t struct bnxt_filter_info *filter)\n@@ -148,16 +147,13 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,\n \tconst struct rte_flow_item_vxlan *vxlan_mask;\n \tuint8_t vni_mask[] = {0xFF, 0xFF, 0xFF};\n \tuint8_t tni_mask[] = {0xFF, 0xFF, 0xFF};\n-\tconst struct rte_flow_item_vf *vf_spec;\n \tuint32_t tenant_id_be = 0, valid_flags = 0;\n \tbool vni_masked = 0;\n \tbool tni_masked = 0;\n \tuint32_t en_ethertype;\n \tuint8_t inner = 0;\n-\tuint32_t vf = 0;\n \tuint32_t en = 0;\n \tint use_ntuple;\n-\tint dflt_vnic;\n \n \tuse_ntuple = bnxt_filter_type_check(pattern, error);\n \tif (use_ntuple < 0)\n@@ -680,56 +676,6 @@ bnxt_validate_and_parse_flow_type(struct bnxt *bp,\n \t\t\t}\n \t\t\tbreak;\n \n-\t\tcase RTE_FLOW_ITEM_TYPE_VF:\n-\t\t\tvf_spec = item->spec;\n-\t\t\tvf = vf_spec->id;\n-\t\t\tif (!BNXT_PF(bp)) {\n-\t\t\t\trte_flow_error_set(error,\n-\t\t\t\t\t\t EINVAL,\n-\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t item,\n-\t\t\t\t\t\t \"Configuring on a VF!\");\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\n-\t\t\tif (vf >= bp->pdev->max_vfs) {\n-\t\t\t\trte_flow_error_set(error,\n-\t\t\t\t\t\t EINVAL,\n-\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t item,\n-\t\t\t\t\t\t \"Incorrect VF id!\");\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\n-\t\t\tif (!attr->transfer) {\n-\t\t\t\trte_flow_error_set(error,\n-\t\t\t\t\t\t ENOTSUP,\n-\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t item,\n-\t\t\t\t\t\t \"Matching VF traffic without\"\n-\t\t\t\t\t\t \" affecting it (transfer attribute)\"\n-\t\t\t\t\t\t \" is unsupported\");\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\n-\t\t\tfilter->mirror_vnic_id =\n-\t\t\tdflt_vnic = bnxt_hwrm_func_qcfg_vf_dflt_vnic_id(bp, vf);\n-\t\t\tif (dflt_vnic < 0) {\n-\t\t\t\t/* This simply indicates there's no driver\n-\t\t\t\t * loaded. This is not an error.\n-\t\t\t\t */\n-\t\t\t\trte_flow_error_set\n-\t\t\t\t\t(error,\n-\t\t\t\t\t EINVAL,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t item,\n-\t\t\t\t\t \"Unable to get default VNIC for VF\");\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\n-\t\t\tfilter->mirror_vnic_id = dflt_vnic;\n-\t\t\ten |= NTUPLE_FLTR_ALLOC_INPUT_EN_MIRROR_VNIC_ID;\n-\t\t\tbreak;\n \t\tdefault:\n \t\t\tbreak;\n \t\t}\n@@ -1298,7 +1244,7 @@ bnxt_validate_and_parse_flow(struct rte_eth_dev *dev,\n \tint rc, use_ntuple;\n \n \trc =\n-\tbnxt_validate_and_parse_flow_type(bp, attr, pattern, error, filter);\n+\tbnxt_validate_and_parse_flow_type(attr, pattern, error, filter);\n \tif (rc != 0)\n \t\tgoto ret;\n \ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c\nindex 17216426d8..23081fc99b 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_handler_tbl.c\n@@ -260,10 +260,6 @@ struct bnxt_ulp_rte_hdr_info ulp_hdr_info[] = {\n \t.hdr_type = BNXT_ULP_HDR_TYPE_SUPPORTED,\n \t.proto_hdr_func = ulp_rte_item_any_handler\n \t},\n-\t[RTE_FLOW_ITEM_TYPE_VF] = {\n-\t.hdr_type = BNXT_ULP_HDR_TYPE_SUPPORTED,\n-\t.proto_hdr_func = ulp_rte_vf_hdr_handler\n-\t},\n \t[RTE_FLOW_ITEM_TYPE_PHY_PORT] = {\n \t.hdr_type = BNXT_ULP_HDR_TYPE_SUPPORTED,\n \t.proto_hdr_func = ulp_rte_phy_port_hdr_handler\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\nindex 6a1d235f77..38799840dd 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.c\n@@ -507,40 +507,6 @@ ulp_rte_parser_implicit_act_port_process(struct ulp_rte_parser_params *params)\n \treturn BNXT_TF_RC_SUCCESS;\n }\n \n-/* Function to handle the parsing of RTE Flow item VF Header. */\n-int32_t\n-ulp_rte_vf_hdr_handler(const struct rte_flow_item *item,\n-\t\t struct ulp_rte_parser_params *params)\n-{\n-\tconst struct rte_flow_item_vf *vf_spec = item->spec;\n-\tconst struct rte_flow_item_vf *vf_mask = item->mask;\n-\tuint16_t mask = 0;\n-\tuint32_t ifindex;\n-\tint32_t rc = BNXT_TF_RC_PARSE_ERR;\n-\n-\t/* Get VF rte_flow_item for Port details */\n-\tif (!vf_spec) {\n-\t\tBNXT_TF_DBG(ERR, \"ParseErr:VF id is not valid\\n\");\n-\t\treturn rc;\n-\t}\n-\tif (!vf_mask) {\n-\t\tBNXT_TF_DBG(ERR, \"ParseErr:VF mask is not valid\\n\");\n-\t\treturn rc;\n-\t}\n-\tmask = vf_mask->id;\n-\n-\t/* perform the conversion from VF Func id to bnxt ifindex */\n-\tif (ulp_port_db_dev_func_id_to_ulp_index(params->ulp_ctx,\n-\t\t\t\t\t\t vf_spec->id,\n-\t\t\t\t\t\t &ifindex)) {\n-\t\tBNXT_TF_DBG(ERR, \"ParseErr:Portid is not valid\\n\");\n-\t\treturn rc;\n-\t}\n-\t/* Update the SVIF details */\n-\treturn ulp_rte_parser_svif_set(params, ifindex, mask,\n-\t\t\t\t BNXT_ULP_DIR_INVALID);\n-}\n-\n /* Parse items PORT_ID, PORT_REPRESENTOR and REPRESENTED_PORT. */\n int32_t\n ulp_rte_port_hdr_handler(const struct rte_flow_item *item,\ndiff --git a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\nindex 94918f6b4a..0e246abbd8 100644\n--- a/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\n+++ b/drivers/net/bnxt/tf_ulp/ulp_rte_parser.h\n@@ -80,11 +80,6 @@ bnxt_ulp_rte_parser_act_parse(const struct rte_flow_action actions[],\n void\n bnxt_ulp_rte_parser_post_process(struct ulp_rte_parser_params *params);\n \n-/* Function to handle the parsing of RTE Flow item VF Header. */\n-int32_t\n-ulp_rte_vf_hdr_handler(const struct rte_flow_item *item,\n-\t\t struct ulp_rte_parser_params *params);\n-\n /* Parse items PORT_ID, PORT_REPRESENTOR and REPRESENTED_PORT. */\n int32_t\n ulp_rte_port_hdr_handler(const struct rte_flow_item *item,\ndiff --git a/drivers/net/cxgbe/cxgbe_flow.c b/drivers/net/cxgbe/cxgbe_flow.c\nindex e4f9c152b5..8b4efc697b 100644\n--- a/drivers/net/cxgbe/cxgbe_flow.c\n+++ b/drivers/net/cxgbe/cxgbe_flow.c\n@@ -288,35 +288,6 @@ ch_rte_parsetype_vlan(const void *dmask, const struct rte_flow_item *item,\n \treturn 0;\n }\n \n-static int\n-ch_rte_parsetype_vf(const void *dmask, const struct rte_flow_item *item,\n-\t\t struct ch_filter_specification *fs,\n-\t\t struct rte_flow_error *e)\n-{\n-\tconst struct rte_flow_item_vf *umask = item->mask;\n-\tconst struct rte_flow_item_vf *val = item->spec;\n-\tconst struct rte_flow_item_vf *mask;\n-\n-\t/* If user has not given any mask, then use chelsio supported mask. */\n-\tmask = umask ? umask : (const struct rte_flow_item_vf *)dmask;\n-\n-\tCXGBE_FILL_FS(1, 1, pfvf_vld);\n-\n-\tif (!val)\n-\t\treturn 0; /* Wildcard, match all Vf */\n-\n-\tif (val->id > UCHAR_MAX)\n-\t\treturn rte_flow_error_set(e, EINVAL,\n-\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t item,\n-\t\t\t\t\t \"VF ID > MAX(255)\");\n-\n-\tif (val->id || (umask && umask->id))\n-\t\tCXGBE_FILL_FS(val->id, mask->id, vf);\n-\n-\treturn 0;\n-}\n-\n static int\n ch_rte_parsetype_udp(const void *dmask, const struct rte_flow_item *item,\n \t\t struct ch_filter_specification *fs,\n@@ -1005,13 +976,6 @@ static struct chrte_fparse parseitem[] = {\n \t\t.fptr = ch_rte_parsetype_tcp,\n \t\t.dmask = &rte_flow_item_tcp_mask,\n \t},\n-\n-\t[RTE_FLOW_ITEM_TYPE_VF] = {\n-\t\t.fptr = ch_rte_parsetype_vf,\n-\t\t.dmask = &(const struct rte_flow_item_vf){\n-\t\t\t.id = 0xffffffff,\n-\t\t}\n-\t},\n };\n \n static int\ndiff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c\nindex 4f3808cb5f..65a826d51c 100644\n--- a/drivers/net/i40e/i40e_flow.c\n+++ b/drivers/net/i40e/i40e_flow.c\n@@ -62,7 +62,6 @@ static int i40e_flow_parse_ethertype_action(struct rte_eth_dev *dev,\n \t\t\t\t struct rte_flow_error *error,\n \t\t\t\t struct rte_eth_ethertype_filter *filter);\n static int i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n-\t\t\t\t\tconst struct rte_flow_attr *attr,\n \t\t\t\t\tconst struct rte_flow_item *pattern,\n \t\t\t\t\tstruct rte_flow_error *error,\n \t\t\t\t\tstruct i40e_fdir_filter_conf *filter);\n@@ -148,1171 +147,508 @@ const struct rte_flow_ops i40e_flow_ops = {\n \n static union i40e_filter_t cons_filter;\n static enum rte_filter_type cons_filter_type = RTE_ETH_FILTER_NONE;\n-/* internal pattern w/o VOID items */\n-struct rte_flow_item g_items[32];\n-\n-/* Pattern matched ethertype filter */\n-static enum rte_flow_item_type pattern_ethertype[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-/* Pattern matched flow director filter */\n-static enum rte_flow_item_type pattern_fdir_ipv4[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_udp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_gtpc[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPC,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_gtpu[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPU,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_gtpu_ipv4[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPU,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_gtpu_ipv6[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPU,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_udp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_gtpc[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPC,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_gtpu[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPU,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_gtpu_ipv4[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPU,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_gtpu_ipv6[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_GTPU,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n+/* internal pattern w/o VOID items */\n+struct rte_flow_item g_items[32];\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_3[] = {\n+/* Pattern matched ethertype filter */\n+static enum rte_flow_item_type pattern_ethertype[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_1[] = {\n+/* Pattern matched flow director filter */\n+static enum rte_flow_item_type pattern_fdir_ipv4[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_2[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_udp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_3[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_tcp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_1[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_sctp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_2[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_gtpc[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPC,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_3[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_gtpu[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_2[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_3[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_2[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_gtpu_ipv4[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_3[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_gtpu_ipv6[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_IPV6,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_1[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_2[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_3[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_udp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_1[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_tcp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n+\tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_2[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_sctp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_3[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_gtpc[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_vf[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_vf[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_vf[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_vf[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n-\tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n+\tRTE_FLOW_ITEM_TYPE_GTPC,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_gtpu[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_gtpu_ipv4[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n+\tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_gtpu_ipv6[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n-\tRTE_FLOW_ITEM_TYPE_END,\n-};\n-\n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_vf[] = {\n-\tRTE_FLOW_ITEM_TYPE_ETH,\n+\tRTE_FLOW_ITEM_TYPE_UDP,\n+\tRTE_FLOW_ITEM_TYPE_GTPU,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_udp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_tcp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv4_sctp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_udp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_tcp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ipv6_sctp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_vlan[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_ethertype_vlan_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n@@ -1320,32 +656,29 @@ static enum rte_flow_item_type pattern_fdir_vlan_ipv4_udp_raw_3_vf[] = {\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n@@ -1353,32 +686,29 @@ static enum rte_flow_item_type pattern_fdir_vlan_ipv4_tcp_raw_3_vf[] = {\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV4,\n@@ -1386,62 +716,56 @@ static enum rte_flow_item_type pattern_fdir_vlan_ipv4_sctp_raw_3_vf[] = {\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_UDP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n@@ -1449,32 +773,29 @@ static enum rte_flow_item_type pattern_fdir_vlan_ipv6_udp_raw_3_vf[] = {\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_TCP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n@@ -1482,32 +803,29 @@ static enum rte_flow_item_type pattern_fdir_vlan_ipv6_tcp_raw_3_vf[] = {\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_1_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_1[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_2_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_2[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n \tRTE_FLOW_ITEM_TYPE_SCTP,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n-static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_3_vf[] = {\n+static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_3[] = {\n \tRTE_FLOW_ITEM_TYPE_ETH,\n \tRTE_FLOW_ITEM_TYPE_VLAN,\n \tRTE_FLOW_ITEM_TYPE_IPV6,\n@@ -1515,7 +833,6 @@ static enum rte_flow_item_type pattern_fdir_vlan_ipv6_sctp_raw_3_vf[] = {\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n \tRTE_FLOW_ITEM_TYPE_RAW,\n-\tRTE_FLOW_ITEM_TYPE_VF,\n \tRTE_FLOW_ITEM_TYPE_END,\n };\n \n@@ -1765,78 +1082,6 @@ static struct i40e_valid_pattern i40e_supported_patterns[] = {\n \t{ pattern_fdir_vlan_ipv6_sctp_raw_1, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_vlan_ipv6_sctp_raw_2, i40e_flow_parse_fdir_filter },\n \t{ pattern_fdir_vlan_ipv6_sctp_raw_3, i40e_flow_parse_fdir_filter },\n-\t/* FDIR - support VF item */\n-\t{ pattern_fdir_ipv4_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_udp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_tcp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_sctp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_udp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_tcp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_sctp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_udp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_udp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_udp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_tcp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_tcp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_tcp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_sctp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_sctp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv4_sctp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_udp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_udp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_udp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_tcp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_tcp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_tcp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_sctp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_sctp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ipv6_sctp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_vlan_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_udp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_tcp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_sctp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_udp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_tcp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_sctp_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_vlan_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_vlan_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_ethertype_vlan_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_udp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_udp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_udp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_tcp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_tcp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_tcp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_sctp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_sctp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv4_sctp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_udp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_udp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_udp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_tcp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_tcp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_tcp_raw_3_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_sctp_raw_1_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_sctp_raw_2_vf, i40e_flow_parse_fdir_filter },\n-\t{ pattern_fdir_vlan_ipv6_sctp_raw_3_vf, i40e_flow_parse_fdir_filter },\n \t/* VXLAN */\n \t{ pattern_vxlan_1, i40e_flow_parse_vxlan_filter },\n \t{ pattern_vxlan_2, i40e_flow_parse_vxlan_filter },\n@@ -2348,7 +1593,6 @@ i40e_flow_set_filter_spi(struct i40e_fdir_filter_conf *filter,\n */\n static int\n i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n-\t\t\t const struct rte_flow_attr *attr,\n \t\t\t const struct rte_flow_item *pattern,\n \t\t\t struct rte_flow_error *error,\n \t\t\t struct i40e_fdir_filter_conf *filter)\n@@ -2365,7 +1609,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \tconst struct rte_flow_item_gtp *gtp_spec, *gtp_mask;\n \tconst struct rte_flow_item_esp *esp_spec, *esp_mask;\n \tconst struct rte_flow_item_raw *raw_spec, *raw_mask;\n-\tconst struct rte_flow_item_vf *vf_spec;\n \tconst struct rte_flow_item_l2tpv3oip *l2tpv3oip_spec, *l2tpv3oip_mask;\n \n \tuint8_t pctype = 0;\n@@ -3067,29 +2310,6 @@ i40e_flow_parse_fdir_pattern(struct rte_eth_dev *dev,\n \t\t\tfilter->input.flow_ext.raw_id = raw_id;\n \t\t\tfilter->input.flow_ext.is_flex_flow = true;\n \t\t\tbreak;\n-\t\tcase RTE_FLOW_ITEM_TYPE_VF:\n-\t\t\tvf_spec = item->spec;\n-\t\t\tif (!attr->transfer) {\n-\t\t\t\trte_flow_error_set(error, ENOTSUP,\n-\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t item,\n-\t\t\t\t\t\t \"Matching VF traffic\"\n-\t\t\t\t\t\t \" without affecting it\"\n-\t\t\t\t\t\t \" (transfer attribute)\"\n-\t\t\t\t\t\t \" is unsupported\");\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\t\t\tfilter->input.flow_ext.is_vf = 1;\n-\t\t\tfilter->input.flow_ext.dst_id = vf_spec->id;\n-\t\t\tif (filter->input.flow_ext.is_vf &&\n-\t\t\t filter->input.flow_ext.dst_id >= pf->vf_num) {\n-\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\t RTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t item,\n-\t\t\t\t\t\t \"Invalid VF ID for FDIR.\");\n-\t\t\t\treturn -rte_errno;\n-\t\t\t}\n-\t\t\tbreak;\n \t\tcase RTE_FLOW_ITEM_TYPE_L2TPV3OIP:\n \t\t\tl2tpv3oip_spec = item->spec;\n \t\t\tl2tpv3oip_mask = item->mask;\n@@ -3277,8 +2497,7 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,\n \t\t&filter->fdir_filter;\n \tint ret;\n \n-\tret = i40e_flow_parse_fdir_pattern(dev, attr, pattern, error,\n-\t\t\t\t\t fdir_filter);\n+\tret = i40e_flow_parse_fdir_pattern(dev, pattern, error, fdir_filter);\n \tif (ret)\n \t\treturn ret;\n \ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex e8da2d2a0d..06de659ee2 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -1685,71 +1685,6 @@ sfc_mae_rule_parse_item_phy_port(const struct rte_flow_item *item,\n \treturn 0;\n }\n \n-static int\n-sfc_mae_rule_parse_item_vf(const struct rte_flow_item *item,\n-\t\t\t struct sfc_flow_parse_ctx *ctx,\n-\t\t\t struct rte_flow_error *error)\n-{\n-\tstruct sfc_mae_parse_ctx *ctx_mae = ctx->mae;\n-\tconst efx_nic_cfg_t *encp = efx_nic_cfg_get(ctx_mae->sa->nic);\n-\tconst struct rte_flow_item_vf supp_mask = {\n-\t\t.id = 0xffffffff,\n-\t};\n-\tconst void *def_mask = &rte_flow_item_vf_mask;\n-\tconst struct rte_flow_item_vf *spec = NULL;\n-\tconst struct rte_flow_item_vf *mask = NULL;\n-\tefx_mport_sel_t mport_v;\n-\tint rc;\n-\n-\tif (ctx_mae->match_mport_set) {\n-\t\treturn rte_flow_error_set(error, ENOTSUP,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n-\t\t\t\t\"Can't handle multiple traffic source items\");\n-\t}\n-\n-\trc = sfc_flow_parse_init(item,\n-\t\t\t\t (const void **)&spec, (const void **)&mask,\n-\t\t\t\t (const void *)&supp_mask, def_mask,\n-\t\t\t\t sizeof(struct rte_flow_item_vf), error);\n-\tif (rc != 0)\n-\t\treturn rc;\n-\n-\tif (mask->id != supp_mask.id) {\n-\t\treturn rte_flow_error_set(error, EINVAL,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n-\t\t\t\t\"Bad mask in the VF pattern item\");\n-\t}\n-\n-\t/*\n-\t * If \"spec\" is not set, the item requests any VF related to the\n-\t * PF of the current DPDK port (but not the PF itself).\n-\t * Reject this match criterion as unsupported.\n-\t */\n-\tif (spec == NULL) {\n-\t\treturn rte_flow_error_set(error, EINVAL,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n-\t\t\t\t\"Bad spec in the VF pattern item\");\n-\t}\n-\n-\trc = efx_mae_mport_by_pcie_function(encp->enc_pf, spec->id, &mport_v);\n-\tif (rc != 0) {\n-\t\treturn rte_flow_error_set(error, rc,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n-\t\t\t\t\"Failed to convert the PF + VF IDs\");\n-\t}\n-\n-\trc = efx_mae_match_spec_mport_set(ctx_mae->match_spec, &mport_v, NULL);\n-\tif (rc != 0) {\n-\t\treturn rte_flow_error_set(error, rc,\n-\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n-\t\t\t\t\"Failed to set MPORT for the PF + VF\");\n-\t}\n-\n-\tctx_mae->match_mport_set = B_TRUE;\n-\n-\treturn 0;\n-}\n-\n /*\n * Having this field ID in a field locator means that this\n * locator cannot be used to actually set the field at the\n@@ -2555,18 +2490,6 @@ static const struct sfc_flow_item sfc_flow_items[] = {\n \t\t.ctx_type = SFC_FLOW_PARSE_CTX_MAE,\n \t\t.parse = sfc_mae_rule_parse_item_phy_port,\n \t},\n-\t{\n-\t\t.type = RTE_FLOW_ITEM_TYPE_VF,\n-\t\t.name = \"VF\",\n-\t\t/*\n-\t\t * In terms of RTE flow, this item is a META one,\n-\t\t * and its position in the pattern is don't care.\n-\t\t */\n-\t\t.prev_layer = SFC_FLOW_ITEM_ANY_LAYER,\n-\t\t.layer = SFC_FLOW_ITEM_ANY_LAYER,\n-\t\t.ctx_type = SFC_FLOW_PARSE_CTX_MAE,\n-\t\t.parse = sfc_mae_rule_parse_item_vf,\n-\t},\n \t{\n \t\t.type = RTE_FLOW_ITEM_TYPE_ETH,\n \t\t.name = \"ETH\",\ndiff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c\nindex 6ece72bf36..65c74687e3 100644\n--- a/lib/ethdev/rte_flow.c\n+++ b/lib/ethdev/rte_flow.c\n@@ -97,7 +97,6 @@ static const struct rte_flow_desc_data rte_flow_desc_item[] = {\n \tMK_FLOW_ITEM(VOID, 0),\n \tMK_FLOW_ITEM(INVERT, 0),\n \tMK_FLOW_ITEM(ANY, sizeof(struct rte_flow_item_any)),\n-\tMK_FLOW_ITEM(VF, sizeof(struct rte_flow_item_vf)),\n \tMK_FLOW_ITEM(PHY_PORT, sizeof(struct rte_flow_item_phy_port)),\n \tMK_FLOW_ITEM(PORT_ID, sizeof(struct rte_flow_item_port_id)),\n \tMK_FLOW_ITEM(RAW, sizeof(struct rte_flow_item_raw)),\ndiff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h\nindex 97de98e232..0a98db9c1c 100644\n--- a/lib/ethdev/rte_flow.h\n+++ b/lib/ethdev/rte_flow.h\n@@ -188,20 +188,6 @@ enum rte_flow_item_type {\n \t */\n \tRTE_FLOW_ITEM_TYPE_ANY,\n \n-\t/**\n-\t * @deprecated\n-\t * @see RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR\n-\t * @see RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT\n-\t *\n-\t * [META]\n-\t *\n-\t * Matches traffic originating from (ingress) or going to (egress) a\n-\t * given virtual function of the current device.\n-\t *\n-\t * See struct rte_flow_item_vf.\n-\t */\n-\tRTE_FLOW_ITEM_TYPE_VF,\n-\n \t/**\n \t * @deprecated\n \t * @see RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR\n@@ -700,38 +686,6 @@ static const struct rte_flow_item_any rte_flow_item_any_mask = {\n };\n #endif\n \n-/**\n- * @deprecated\n- * @see RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR\n- * @see RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT\n- *\n- * RTE_FLOW_ITEM_TYPE_VF\n- *\n- * Matches traffic originating from (ingress) or going to (egress) a given\n- * virtual function of the current device.\n- *\n- * If supported, should work even if the virtual function is not managed by\n- * the application and thus not associated with a DPDK port ID.\n- *\n- * Note this pattern item does not match VF representors traffic which, as\n- * separate entities, should be addressed through their own DPDK port IDs.\n- *\n- * - Can be specified multiple times to match traffic addressed to several\n- * VF IDs.\n- *\n- * A zeroed mask can be used to match any VF ID.\n- */\n-struct rte_flow_item_vf {\n-\tuint32_t id; /**< VF ID. */\n-};\n-\n-/** Default mask for RTE_FLOW_ITEM_TYPE_VF. */\n-#ifndef __cplusplus\n-static const struct rte_flow_item_vf rte_flow_item_vf_mask = {\n-\t.id = 0x00000000,\n-};\n-#endif\n-\n /**\n * @deprecated\n * @see RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR\n", "prefixes": [ "11/13" ] }