Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 135219,
    "url": "http://patches.dpdk.org/api/patches/135219/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20231215032841.2455798-1-zhichaox.zeng@intel.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<20231215032841.2455798-1-zhichaox.zeng@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20231215032841.2455798-1-zhichaox.zeng@intel.com",
    "date": "2023-12-15T03:28:41",
    "name": "[v3] net/iavf: support rte flow with mask for FDIR",
    "commit_ref": null,
    "pull_url": null,
    "state": "new",
    "archived": false,
    "hash": "43281fce754b769d3398c96c4df0a6dd25c15d22",
    "submitter": {
        "id": 2644,
        "url": "http://patches.dpdk.org/api/people/2644/?format=api",
        "name": "Zhichao Zeng",
        "email": "zhichaox.zeng@intel.com"
    },
    "delegate": {
        "id": 1540,
        "url": "http://patches.dpdk.org/api/users/1540/?format=api",
        "username": "qzhan15",
        "first_name": "Qi",
        "last_name": "Zhang",
        "email": "qi.z.zhang@intel.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20231215032841.2455798-1-zhichaox.zeng@intel.com/mbox/",
    "series": [
        {
            "id": 30571,
            "url": "http://patches.dpdk.org/api/series/30571/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=30571",
            "date": "2023-12-15T03:28:41",
            "name": "[v3] net/iavf: support rte flow with mask for FDIR",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/30571/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/135219/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/135219/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 4AAB9436F7;\n\tFri, 15 Dec 2023 04:19:21 +0100 (CET)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0527940266;\n\tFri, 15 Dec 2023 04:19:21 +0100 (CET)",
            "from mgamail.intel.com (mgamail.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id D1E8440263\n for <dev@dpdk.org>; Fri, 15 Dec 2023 04:19:18 +0100 (CET)",
            "from orsmga005.jf.intel.com ([10.7.209.41])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 14 Dec 2023 19:19:16 -0800",
            "from unknown (HELO zhichao-dpdk..) ([10.239.252.103])\n by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 14 Dec 2023 19:19:15 -0800"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1702610357; x=1734146357;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=4YCK7NQxtoFHcqVLNuAk/PFECnXqobKEMJPnYuPW7zA=;\n b=FzDdurp37mJVnD45Y/rqu6CPZf/3Pm70IlZzOdeCVwDdvLhbRNsXSMMJ\n O1PTDVAvEW7nPLpXnGEKpiqyXWZ1eegTecbcQ6PixJ9p/Od4s/6C/Gl/h\n a+qi1b97BT36x33O2UaZ2yM7Q+x7Llh/jY76wvHRxSr+1JW1rgxPrKbue\n UCntLXOMlUddeZDrkz9qGliKO0NOlNo2p/2w1gHQJWuXdQ5pKw7IJoK50\n sDM0O1MR1VqUAUO/GmUWUuKvHUZCUa+TWCd/Vq3pNDGqGq/srDLbY+Xp4\n ADO97uOdBq85/1Klmzu4e/w/K8WK7lehXvbfwY++BNiL1mXZp5tsePk0v g==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6600,9927,10924\"; a=\"385643433\"",
            "E=Sophos;i=\"6.04,277,1695711600\"; d=\"scan'208\";a=\"385643433\"",
            "E=McAfee;i=\"6600,9927,10924\"; a=\"947811991\"",
            "E=Sophos;i=\"6.04,277,1695711600\"; d=\"scan'208\";a=\"947811991\""
        ],
        "X-ExtLoop1": "1",
        "From": "Zhichao Zeng <zhichaox.zeng@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "qi.z.zhang@intel.com, Zhichao Zeng <zhichaox.zeng@intel.com>,\n Jingjing Wu <jingjing.wu@intel.com>, Beilei Xing <beilei.xing@intel.com>",
        "Subject": "[PATCH v3] net/iavf: support rte flow with mask for FDIR",
        "Date": "Fri, 15 Dec 2023 11:28:41 +0800",
        "Message-Id": "<20231215032841.2455798-1-zhichaox.zeng@intel.com>",
        "X-Mailer": "git-send-email 2.34.1",
        "In-Reply-To": "<20231214060819.2121735-1-zhichaox.zeng@intel.com>",
        "References": "<20231214060819.2121735-1-zhichaox.zeng@intel.com>",
        "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": "This patch supports rte flow with mask for FDIR, including\neth/ipv4/ipv6/tcp/udp flow items, where src/dst for ipv4/ipv6\nand sport/dport for tcp/udp are realized by switch filter.\n\nSigned-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>\n\n---\nv3: fix judgment on ipv6 addresses\nv2: implemented by switch filter\n---\n drivers/net/iavf/iavf_fdir.c | 264 +++++++++++++++--------------------\n 1 file changed, 114 insertions(+), 150 deletions(-)",
    "diff": "diff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c\nindex 811a10287b..6fdf9faa3b 100644\n--- a/drivers/net/iavf/iavf_fdir.c\n+++ b/drivers/net/iavf/iavf_fdir.c\n@@ -742,6 +742,7 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \tconst struct rte_flow_item_ppp *ppp_spec, *ppp_mask;\n \tconst struct rte_flow_item *item = pattern;\n \tstruct virtchnl_proto_hdr *hdr, *hdr1 = NULL;\n+\tstruct virtchnl_proto_hdr_w_msk *hdr_w_msk, *hdr1_w_msk = NULL;\n \tstruct rte_ecpri_common_hdr ecpri_common;\n \tuint64_t input_set = IAVF_INSET_NONE;\n \tenum rte_flow_item_type item_type;\n@@ -749,12 +750,10 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \tuint8_t tun_inner = 0;\n \tuint16_t ether_type, flags_version;\n \tuint8_t item_num = 0;\n+\tint with_mask = 0;\n \tint layer = 0;\n \n-\tuint8_t  ipv6_addr_mask[16] = {\n-\t\t0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,\n-\t\t0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF\n-\t};\n+\tuint8_t ipv6_zero_addr[16] = {0};\n \n \tfor (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {\n \t\titem_type = item->type;\n@@ -838,8 +837,10 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\tnext_type = (item + 1)->type;\n \n \t\t\thdr1 = &hdrs->proto_hdr[layer];\n+\t\t\thdr1_w_msk = &hdrs->proto_hdr_w_msk[layer];\n \n \t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1, ETH);\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr1_w_msk, ETH);\n \n \t\t\tif (next_type == RTE_FLOW_ITEM_TYPE_END &&\n \t\t\t    (!eth_spec || !eth_mask)) {\n@@ -850,43 +851,60 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\t}\n \n \t\t\tif (eth_spec && eth_mask) {\n-\t\t\t\tif (!rte_is_zero_ether_addr(&eth_mask->hdr.dst_addr)) {\n-\t\t\t\t\tinput_set |= IAVF_INSET_DMAC;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1,\n-\t\t\t\t\t\t\t\t\tETH,\n-\t\t\t\t\t\t\t\t\tDST);\n-\t\t\t\t} else if (!rte_is_zero_ether_addr(&eth_mask->hdr.src_addr)) {\n-\t\t\t\t\tinput_set |= IAVF_INSET_SMAC;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1,\n-\t\t\t\t\t\t\t\t\tETH,\n-\t\t\t\t\t\t\t\t\tSRC);\n-\t\t\t\t}\n-\n-\t\t\t\tif (eth_mask->hdr.ether_type) {\n-\t\t\t\t\tif (eth_mask->hdr.ether_type != RTE_BE16(0xffff)) {\n-\t\t\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t\titem, \"Invalid type mask.\");\n-\t\t\t\t\t\treturn -rte_errno;\n+\t\t\t\tif ((!rte_is_zero_ether_addr(&eth_mask->hdr.dst_addr) &&\n+\t\t\t\t\t!rte_is_broadcast_ether_addr(&eth_mask->hdr.dst_addr)) ||\n+\t\t\t\t\t(!rte_is_zero_ether_addr(&eth_mask->hdr.src_addr) &&\n+\t\t\t\t\t!rte_is_broadcast_ether_addr(&eth_mask->hdr.src_addr))) {\n+\t\t\t\t\tif (!rte_is_zero_ether_addr(&eth_mask->hdr.dst_addr))\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_DMAC;\n+\t\t\t\t\tif (!rte_is_zero_ether_addr(&eth_mask->hdr.src_addr))\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_SMAC;\n+\t\t\t\t\tif (eth_mask->hdr.ether_type)\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_ETHERTYPE;\n+\t\t\t\t\trte_memcpy(hdr1_w_msk->buffer_spec, eth_spec,\n+\t\t\t\t\tsizeof(struct rte_ether_hdr));\n+\t\t\t\t\trte_memcpy(hdr1_w_msk->buffer_mask, eth_mask,\n+\t\t\t\t\tsizeof(struct rte_ether_hdr));\n+\t\t\t\t\twith_mask = 1;\n+\t\t\t\t} else {\n+\t\t\t\t\tif (!rte_is_zero_ether_addr(&eth_mask->hdr.dst_addr)) {\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_DMAC;\n+\t\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1,\n+\t\t\t\t\t\t\t\t\t\tETH,\n+\t\t\t\t\t\t\t\t\t\tDST);\n+\t\t\t\t\t} else if (!rte_is_zero_ether_addr(&eth_mask->hdr.src_addr)) {\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_SMAC;\n+\t\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1,\n+\t\t\t\t\t\t\t\t\t\tETH,\n+\t\t\t\t\t\t\t\t\t\tSRC);\n \t\t\t\t\t}\n \n-\t\t\t\t\tether_type = rte_be_to_cpu_16(eth_spec->hdr.ether_type);\n-\t\t\t\t\tif (ether_type == RTE_ETHER_TYPE_IPV4 ||\n-\t\t\t\t\t\tether_type == RTE_ETHER_TYPE_IPV6) {\n-\t\t\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\t\titem,\n-\t\t\t\t\t\t\t\"Unsupported ether_type.\");\n-\t\t\t\t\t\treturn -rte_errno;\n+\t\t\t\t\tif (eth_mask->hdr.ether_type) {\n+\t\t\t\t\t\tif (eth_mask->hdr.ether_type != RTE_BE16(0xffff)) {\n+\t\t\t\t\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t\t\titem, \"Invalid type mask.\");\n+\t\t\t\t\t\t\treturn -rte_errno;\n+\t\t\t\t\t\t}\n+\n+\t\t\t\t\t\tether_type = rte_be_to_cpu_16(eth_spec->hdr.ether_type);\n+\t\t\t\t\t\tif (ether_type == RTE_ETHER_TYPE_IPV4 ||\n+\t\t\t\t\t\t\tether_type == RTE_ETHER_TYPE_IPV6) {\n+\t\t\t\t\t\t\trte_flow_error_set(error, EINVAL,\n+\t\t\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n+\t\t\t\t\t\t\t\titem,\n+\t\t\t\t\t\t\t\t\"Unsupported ether_type.\");\n+\t\t\t\t\t\t\treturn -rte_errno;\n+\t\t\t\t\t\t}\n+\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_ETHERTYPE;\n+\t\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1, ETH,\n+\t\t\t\t\t\t\t\t\t\tETHERTYPE);\n \t\t\t\t\t}\n \n-\t\t\t\t\tinput_set |= IAVF_INSET_ETHERTYPE;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1, ETH,\n-\t\t\t\t\t\t\t\t\tETHERTYPE);\n+\t\t\t\t\trte_memcpy(hdr1->buffer, eth_spec,\n+\t\t\t\t\t\t\tsizeof(struct rte_ether_hdr));\n \t\t\t\t}\n-\n-\t\t\t\trte_memcpy(hdr1->buffer, eth_spec,\n-\t\t\t\t\t   sizeof(struct rte_ether_hdr));\n \t\t\t}\n \n \t\t\thdrs->count = ++layer;\n@@ -899,9 +917,9 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\tipv4_mask = item->mask;\n \t\t\tnext_type = (item + 1)->type;\n \n-\t\t\thdr = &hdrs->proto_hdr[layer];\n+\t\t\thdr_w_msk = &hdrs->proto_hdr_w_msk[layer];\n \n-\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr, IPV4);\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr_w_msk, IPV4);\n \n \t\t\tif (!(ipv4_spec && ipv4_mask)) {\n \t\t\t\thdrs->count = ++layer;\n@@ -932,53 +950,32 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\t\treturn -rte_errno;\n \t\t\t}\n \n-\t\t\t/* Mask for IPv4 src/dst addrs not supported */\n-\t\t\tif (ipv4_mask->hdr.src_addr &&\n-\t\t\t\tipv4_mask->hdr.src_addr != UINT32_MAX)\n-\t\t\t\treturn -rte_errno;\n-\t\t\tif (ipv4_mask->hdr.dst_addr &&\n-\t\t\t\tipv4_mask->hdr.dst_addr != UINT32_MAX)\n-\t\t\t\treturn -rte_errno;\n-\n-\t\t\tif (ipv4_mask->hdr.type_of_service ==\n-\t\t\t    UINT8_MAX) {\n+\t\t\tif (ipv4_mask->hdr.type_of_service == UINT8_MAX)\n \t\t\t\tinput_set |= IAVF_INSET_IPV4_TOS;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n-\t\t\t\t\t\t\t\t DSCP);\n-\t\t\t}\n \n-\t\t\tif (ipv4_mask->hdr.next_proto_id == UINT8_MAX) {\n+\t\t\tif (ipv4_mask->hdr.next_proto_id == UINT8_MAX)\n \t\t\t\tinput_set |= IAVF_INSET_IPV4_PROTO;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n-\t\t\t\t\t\t\t\t PROT);\n-\t\t\t}\n \n-\t\t\tif (ipv4_mask->hdr.time_to_live == UINT8_MAX) {\n+\t\t\tif (ipv4_mask->hdr.time_to_live == UINT8_MAX)\n \t\t\t\tinput_set |= IAVF_INSET_IPV4_TTL;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n-\t\t\t\t\t\t\t\t TTL);\n-\t\t\t}\n \n-\t\t\tif (ipv4_mask->hdr.src_addr == UINT32_MAX) {\n+\t\t\tif (ipv4_mask->hdr.src_addr)\n \t\t\t\tinput_set |= IAVF_INSET_IPV4_SRC;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n-\t\t\t\t\t\t\t\t SRC);\n-\t\t\t}\n \n-\t\t\tif (ipv4_mask->hdr.dst_addr == UINT32_MAX) {\n+\t\t\tif (ipv4_mask->hdr.dst_addr)\n \t\t\t\tinput_set |= IAVF_INSET_IPV4_DST;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n-\t\t\t\t\t\t\t\t DST);\n-\t\t\t}\n+\n+\t\t\trte_memcpy(hdr_w_msk->buffer_spec, &ipv4_spec->hdr,\n+\t\t\t\t   sizeof(ipv4_spec->hdr));\n+\t\t\trte_memcpy(hdr_w_msk->buffer_mask, &ipv4_mask->hdr,\n+\t\t\t\t   sizeof(ipv4_mask->hdr));\n+\t\t\twith_mask = 1;\n \n \t\t\tif (tun_inner) {\n \t\t\t\tinput_set &= ~IAVF_PROT_IPV4_OUTER;\n \t\t\t\tinput_set |= IAVF_PROT_IPV4_INNER;\n \t\t\t}\n \n-\t\t\trte_memcpy(hdr->buffer, &ipv4_spec->hdr,\n-\t\t\t\t   sizeof(ipv4_spec->hdr));\n-\n \t\t\thdrs->count = ++layer;\n \n \t\t\t/* fragment Ipv4:\n@@ -1012,9 +1009,9 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\tipv6_spec = item->spec;\n \t\t\tipv6_mask = item->mask;\n \n-\t\t\thdr = &hdrs->proto_hdr[layer];\n+\t\t\thdr_w_msk = &hdrs->proto_hdr_w_msk[layer];\n \n-\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr, IPV6);\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr_w_msk, IPV6);\n \n \t\t\tif (!(ipv6_spec && ipv6_mask)) {\n \t\t\t\thdrs->count = ++layer;\n@@ -1029,46 +1026,34 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\t}\n \n \t\t\tif ((ipv6_mask->hdr.vtc_flow &\n-\t\t\t      rte_cpu_to_be_32(IAVF_IPV6_TC_MASK))\n-\t\t\t     == rte_cpu_to_be_32(IAVF_IPV6_TC_MASK)) {\n+\t\t\t\t\trte_cpu_to_be_32(IAVF_IPV6_TC_MASK))\n+\t\t\t\t\t== rte_cpu_to_be_32(IAVF_IPV6_TC_MASK))\n \t\t\t\tinput_set |= IAVF_INSET_IPV6_TC;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n-\t\t\t\t\t\t\t\t TC);\n-\t\t\t}\n \n-\t\t\tif (ipv6_mask->hdr.proto == UINT8_MAX) {\n+\t\t\tif (ipv6_mask->hdr.proto == UINT8_MAX)\n \t\t\t\tinput_set |= IAVF_INSET_IPV6_NEXT_HDR;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n-\t\t\t\t\t\t\t\t PROT);\n-\t\t\t}\n \n-\t\t\tif (ipv6_mask->hdr.hop_limits == UINT8_MAX) {\n+\t\t\tif (ipv6_mask->hdr.hop_limits == UINT8_MAX)\n \t\t\t\tinput_set |= IAVF_INSET_IPV6_HOP_LIMIT;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n-\t\t\t\t\t\t\t\t HOP_LIMIT);\n-\t\t\t}\n \n-\t\t\tif (!memcmp(ipv6_mask->hdr.src_addr, ipv6_addr_mask,\n-\t\t\t\t    RTE_DIM(ipv6_mask->hdr.src_addr))) {\n+\t\t\tif (memcmp(ipv6_mask->hdr.src_addr, ipv6_zero_addr,\n+\t\t\t\tRTE_DIM(ipv6_mask->hdr.src_addr)))\n \t\t\t\tinput_set |= IAVF_INSET_IPV6_SRC;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n-\t\t\t\t\t\t\t\t SRC);\n-\t\t\t}\n-\t\t\tif (!memcmp(ipv6_mask->hdr.dst_addr, ipv6_addr_mask,\n-\t\t\t\t    RTE_DIM(ipv6_mask->hdr.dst_addr))) {\n+\t\t\tif (memcmp(ipv6_mask->hdr.dst_addr, ipv6_zero_addr,\n+\t\t\t\tRTE_DIM(ipv6_mask->hdr.dst_addr)))\n \t\t\t\tinput_set |= IAVF_INSET_IPV6_DST;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n-\t\t\t\t\t\t\t\t DST);\n-\t\t\t}\n+\n+\t\t\trte_memcpy(hdr_w_msk->buffer_spec, &ipv6_spec->hdr,\n+\t\t\t\t\tsizeof(ipv6_spec->hdr));\n+\t\t\trte_memcpy(hdr_w_msk->buffer_mask, &ipv6_mask->hdr,\n+\t\t\t\t\tsizeof(ipv6_mask->hdr));\n+\t\t\twith_mask = 1;\n \n \t\t\tif (tun_inner) {\n \t\t\t\tinput_set &= ~IAVF_PROT_IPV6_OUTER;\n \t\t\t\tinput_set |= IAVF_PROT_IPV6_INNER;\n \t\t\t}\n \n-\t\t\trte_memcpy(hdr->buffer, &ipv6_spec->hdr,\n-\t\t\t\t   sizeof(ipv6_spec->hdr));\n-\n \t\t\thdrs->count = ++layer;\n \t\t\tbreak;\n \n@@ -1117,9 +1102,9 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\tudp_spec = item->spec;\n \t\t\tudp_mask = item->mask;\n \n-\t\t\thdr = &hdrs->proto_hdr[layer];\n+\t\t\thdr_w_msk = &hdrs->proto_hdr_w_msk[layer];\n \n-\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr, UDP);\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr_w_msk, UDP);\n \n \t\t\tif (udp_spec && udp_mask) {\n \t\t\t\tif (udp_mask->hdr.dgram_len ||\n@@ -1130,36 +1115,24 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\t\t\treturn -rte_errno;\n \t\t\t\t}\n \n-\t\t\t\t/* Mask for UDP src/dst ports not supported */\n-\t\t\t\tif (udp_mask->hdr.src_port &&\n-\t\t\t\t\tudp_mask->hdr.src_port != UINT16_MAX)\n-\t\t\t\t\treturn -rte_errno;\n-\t\t\t\tif (udp_mask->hdr.dst_port &&\n-\t\t\t\t\tudp_mask->hdr.dst_port != UINT16_MAX)\n-\t\t\t\t\treturn -rte_errno;\n-\n-\t\t\t\tif (udp_mask->hdr.src_port == UINT16_MAX) {\n-\t\t\t\t\tinput_set |= IAVF_INSET_UDP_SRC_PORT;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, UDP, SRC_PORT);\n-\t\t\t\t}\n-\t\t\t\tif (udp_mask->hdr.dst_port == UINT16_MAX) {\n-\t\t\t\t\tinput_set |= IAVF_INSET_UDP_DST_PORT;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, UDP, DST_PORT);\n+\t\t\t\tif (udp_mask->hdr.src_port || udp_mask->hdr.dst_port) {\n+\t\t\t\t\tif (udp_mask->hdr.src_port)\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_UDP_SRC_PORT;\n+\t\t\t\t\tif (udp_mask->hdr.dst_port)\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_UDP_DST_PORT;\n+\t\t\t\t\tif (l3 == RTE_FLOW_ITEM_TYPE_IPV4 ||\n+\t\t\t\t\t\tl3 == RTE_FLOW_ITEM_TYPE_IPV6)\n+\t\t\t\t\t\trte_memcpy(hdr_w_msk->buffer_spec, &udp_spec->hdr,\n+\t\t\t\t\t\t\tsizeof(udp_spec->hdr));\n+\t\t\t\t\trte_memcpy(hdr_w_msk->buffer_mask, &udp_mask->hdr,\n+\t\t\t\t\t\t   sizeof(udp_mask->hdr));\n+\t\t\t\t\twith_mask = 1;\n \t\t\t\t}\n \n \t\t\t\tif (tun_inner) {\n \t\t\t\t\tinput_set &= ~IAVF_PROT_UDP_OUTER;\n \t\t\t\t\tinput_set |= IAVF_PROT_UDP_INNER;\n \t\t\t\t}\n-\n-\t\t\t\tif (l3 == RTE_FLOW_ITEM_TYPE_IPV4)\n-\t\t\t\t\trte_memcpy(hdr->buffer,\n-\t\t\t\t\t\t&udp_spec->hdr,\n-\t\t\t\t\t\tsizeof(udp_spec->hdr));\n-\t\t\t\telse if (l3 == RTE_FLOW_ITEM_TYPE_IPV6)\n-\t\t\t\t\trte_memcpy(hdr->buffer,\n-\t\t\t\t\t\t&udp_spec->hdr,\n-\t\t\t\t\t\tsizeof(udp_spec->hdr));\n \t\t\t}\n \n \t\t\thdrs->count = ++layer;\n@@ -1169,9 +1142,9 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\ttcp_spec = item->spec;\n \t\t\ttcp_mask = item->mask;\n \n-\t\t\thdr = &hdrs->proto_hdr[layer];\n+\t\t\thdr_w_msk = &hdrs->proto_hdr_w_msk[layer];\n \n-\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr, TCP);\n+\t\t\tVIRTCHNL_SET_PROTO_HDR_TYPE(hdr_w_msk, TCP);\n \n \t\t\tif (tcp_spec && tcp_mask) {\n \t\t\t\tif (tcp_mask->hdr.sent_seq ||\n@@ -1187,36 +1160,24 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\t\t\treturn -rte_errno;\n \t\t\t\t}\n \n-\t\t\t\t/* Mask for TCP src/dst ports not supported */\n-\t\t\t\tif (tcp_mask->hdr.src_port &&\n-\t\t\t\t\ttcp_mask->hdr.src_port != UINT16_MAX)\n-\t\t\t\t\treturn -rte_errno;\n-\t\t\t\tif (tcp_mask->hdr.dst_port &&\n-\t\t\t\t\ttcp_mask->hdr.dst_port != UINT16_MAX)\n-\t\t\t\t\treturn -rte_errno;\n-\n-\t\t\t\tif (tcp_mask->hdr.src_port == UINT16_MAX) {\n-\t\t\t\t\tinput_set |= IAVF_INSET_TCP_SRC_PORT;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, TCP, SRC_PORT);\n-\t\t\t\t}\n-\t\t\t\tif (tcp_mask->hdr.dst_port == UINT16_MAX) {\n-\t\t\t\t\tinput_set |= IAVF_INSET_TCP_DST_PORT;\n-\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, TCP, DST_PORT);\n+\t\t\t\tif (tcp_mask->hdr.src_port || tcp_mask->hdr.dst_port) {\n+\t\t\t\t\tif (tcp_mask->hdr.src_port)\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_TCP_SRC_PORT;\n+\t\t\t\t\tif (tcp_mask->hdr.dst_port)\n+\t\t\t\t\t\tinput_set |= IAVF_INSET_TCP_DST_PORT;\n+\t\t\t\t\tif (l3 == RTE_FLOW_ITEM_TYPE_IPV4 ||\n+\t\t\t\t\t\tl3 == RTE_FLOW_ITEM_TYPE_IPV6)\n+\t\t\t\t\t\trte_memcpy(hdr_w_msk->buffer_spec, &tcp_spec->hdr,\n+\t\t\t\t\t\t\tsizeof(tcp_spec->hdr));\n+\t\t\t\t\trte_memcpy(hdr_w_msk->buffer_mask, &tcp_mask->hdr,\n+\t\t\t\t\t\t\tsizeof(tcp_mask->hdr));\n+\t\t\t\t\twith_mask = 1;\n \t\t\t\t}\n \n \t\t\t\tif (tun_inner) {\n \t\t\t\t\tinput_set &= ~IAVF_PROT_TCP_OUTER;\n \t\t\t\t\tinput_set |= IAVF_PROT_TCP_INNER;\n \t\t\t\t}\n-\n-\t\t\t\tif (l3 == RTE_FLOW_ITEM_TYPE_IPV4)\n-\t\t\t\t\trte_memcpy(hdr->buffer,\n-\t\t\t\t\t\t&tcp_spec->hdr,\n-\t\t\t\t\t\tsizeof(tcp_spec->hdr));\n-\t\t\t\telse if (l3 == RTE_FLOW_ITEM_TYPE_IPV6)\n-\t\t\t\t\trte_memcpy(hdr->buffer,\n-\t\t\t\t\t\t&tcp_spec->hdr,\n-\t\t\t\t\t\tsizeof(tcp_spec->hdr));\n \t\t\t}\n \n \t\t\thdrs->count = ++layer;\n@@ -1556,6 +1517,9 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t}\n \t}\n \n+\tif (with_mask)\n+\t\thdrs->count += VIRTCHNL_MAX_NUM_PROTO_HDRS;\n+\n \tif (layer > VIRTCHNL_MAX_NUM_PROTO_HDRS) {\n \t\trte_flow_error_set(error, EINVAL,\n \t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n",
    "prefixes": [
        "v3"
    ]
}