Patch Detail

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

{
    "id": 67711,
    "url": "http://patches.dpdk.org/api/patches/67711/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200403024353.24681-4-wei.zhao1@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": "<20200403024353.24681-4-wei.zhao1@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200403024353.24681-4-wei.zhao1@intel.com",
    "date": "2020-04-03T02:43:43",
    "name": "[v3,03/13] net/ice: change swicth parser to support flexible mask",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "caa629fdebecf17229755b3456c8754357b04009",
    "submitter": {
        "id": 495,
        "url": "http://patches.dpdk.org/api/people/495/?format=api",
        "name": "Zhao1, Wei",
        "email": "wei.zhao1@intel.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200403024353.24681-4-wei.zhao1@intel.com/mbox/",
    "series": [
        {
            "id": 9180,
            "url": "http://patches.dpdk.org/api/series/9180/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9180",
            "date": "2020-04-03T02:43:40",
            "name": "add switch filter support for intel DCF",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/9180/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/67711/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/67711/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 5BD52A0562;\n\tFri,  3 Apr 2020 05:05:29 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BDFCE1C0B3;\n\tFri,  3 Apr 2020 05:05:12 +0200 (CEST)",
            "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id E0D101C07D\n for <dev@dpdk.org>; Fri,  3 Apr 2020 05:05:09 +0200 (CEST)",
            "from orsmga003.jf.intel.com ([10.7.209.27])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 02 Apr 2020 20:05:09 -0700",
            "from unknown (HELO localhost.localdomain.bj.intel.com)\n ([172.16.182.123])\n by orsmga003.jf.intel.com with ESMTP; 02 Apr 2020 20:05:07 -0700"
        ],
        "IronPort-SDR": [
            "\n MF0EX/R0P3qT1y7IJV0/QpHQcptRhkDYj5OLolmef8qzEsXKYw+N8LOuWBHPfOb5fZeV56eDVp\n geNlirAZJ/Jw==",
            "\n 4ggtmNLmFM/N1nb6KHr8QhJt20A+B02DS3J/2R4N9Hkn7kb58VTkzwyGhtTTrfYdDhrATKAJtI\n WFTOTdPXjvrQ=="
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.72,337,1580803200\"; d=\"scan'208\";a=\"250034435\"",
        "From": "Wei Zhao <wei.zhao1@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "qi.z.zhang@intel.com, nannan.lu@intel.com, qi.fu@intel.com,\n yuan.peng@intel.com, Wei Zhao <wei.zhao1@intel.com>",
        "Date": "Fri,  3 Apr 2020 10:43:43 +0800",
        "Message-Id": "<20200403024353.24681-4-wei.zhao1@intel.com>",
        "X-Mailer": "git-send-email 2.19.1",
        "In-Reply-To": "<20200403024353.24681-1-wei.zhao1@intel.com>",
        "References": "<20200402064620.47668-1-wei.zhao1@intel.com>\n <20200403024353.24681-1-wei.zhao1@intel.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v3 03/13] net/ice: change swicth parser to\n\tsupport flexible mask",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "DCF need to make configuration of flexible mask, that is to say\nsome iput set mask may be not 0xFFFF type all one bit. In order\nto direct L2/IP multicast packets, the mask for source IP maybe\n0xF0000000, this patch enable switch filter parser for it.\n\nSigned-off-by: Wei Zhao <wei.zhao1@intel.com>\n---\n drivers/net/ice/ice_switch_filter.c | 318 ++++++++++++----------------\n 1 file changed, 140 insertions(+), 178 deletions(-)",
    "diff": "diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c\nindex add66e683..4edaea3f5 100644\n--- a/drivers/net/ice/ice_switch_filter.c\n+++ b/drivers/net/ice/ice_switch_filter.c\n@@ -326,9 +326,6 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \tconst struct rte_flow_item_pppoe *pppoe_spec, *pppoe_mask;\n \tconst struct rte_flow_item_pppoe_proto_id *pppoe_proto_spec,\n \t\t\t\t*pppoe_proto_mask;\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 \tuint64_t input_set = ICE_INSET_NONE;\n \tuint16_t j, t = 0;\n \tuint16_t tunnel_valid = 0;\n@@ -351,19 +348,31 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\teth_spec = item->spec;\n \t\t\teth_mask = item->mask;\n \t\t\tif (eth_spec && eth_mask) {\n-\t\t\t\tif (tunnel_valid &&\n-\t\t\t\t    rte_is_broadcast_ether_addr(&eth_mask->src))\n-\t\t\t\t\tinput_set |= ICE_INSET_TUN_SMAC;\n-\t\t\t\telse if (\n-\t\t\t\trte_is_broadcast_ether_addr(&eth_mask->src))\n-\t\t\t\t\tinput_set |= ICE_INSET_SMAC;\n-\t\t\t\tif (tunnel_valid &&\n-\t\t\t\t    rte_is_broadcast_ether_addr(&eth_mask->dst))\n-\t\t\t\t\tinput_set |= ICE_INSET_TUN_DMAC;\n-\t\t\t\telse if (\n-\t\t\t\trte_is_broadcast_ether_addr(&eth_mask->dst))\n-\t\t\t\t\tinput_set |= ICE_INSET_DMAC;\n-\t\t\t\tif (eth_mask->type == RTE_BE16(0xffff))\n+\t\t\t\tconst uint8_t *a = eth_mask->src.addr_bytes;\n+\t\t\t\tconst uint8_t *b = eth_mask->dst.addr_bytes;\n+\t\t\t\tfor (j = 0; j < RTE_ETHER_ADDR_LEN; j++) {\n+\t\t\t\t\tif (a[j] && tunnel_valid) {\n+\t\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\t\tICE_INSET_TUN_SMAC;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t} else if (a[j]) {\n+\t\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\t\tICE_INSET_SMAC;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tfor (j = 0; j < RTE_ETHER_ADDR_LEN; j++) {\n+\t\t\t\t\tif (b[j] && tunnel_valid) {\n+\t\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\t\tICE_INSET_TUN_DMAC;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t} else if (b[j]) {\n+\t\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\t\tICE_INSET_DMAC;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tif (eth_mask->type)\n \t\t\t\t\tinput_set |= ICE_INSET_ETHERTYPE;\n \t\t\t\tlist[t].type = (tunnel_valid  == 0) ?\n \t\t\t\t\tICE_MAC_OFOS : ICE_MAC_IL;\n@@ -373,16 +382,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\th = &list[t].h_u.eth_hdr;\n \t\t\t\tm = &list[t].m_u.eth_hdr;\n \t\t\t\tfor (j = 0; j < RTE_ETHER_ADDR_LEN; j++) {\n-\t\t\t\t\tif (eth_mask->src.addr_bytes[j] ==\n-\t\t\t\t\t\t\t\tUINT8_MAX) {\n+\t\t\t\t\tif (eth_mask->src.addr_bytes[j]) {\n \t\t\t\t\t\th->src_addr[j] =\n \t\t\t\t\t\teth_spec->src.addr_bytes[j];\n \t\t\t\t\t\tm->src_addr[j] =\n \t\t\t\t\t\teth_mask->src.addr_bytes[j];\n \t\t\t\t\t\ti = 1;\n \t\t\t\t\t}\n-\t\t\t\t\tif (eth_mask->dst.addr_bytes[j] ==\n-\t\t\t\t\t\t\t\tUINT8_MAX) {\n+\t\t\t\t\tif (eth_mask->dst.addr_bytes[j]) {\n \t\t\t\t\t\th->dst_addr[j] =\n \t\t\t\t\t\teth_spec->dst.addr_bytes[j];\n \t\t\t\t\t\tm->dst_addr[j] =\n@@ -392,17 +399,14 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t}\n \t\t\t\tif (i)\n \t\t\t\t\tt++;\n-\t\t\t\tif (eth_mask->type == UINT16_MAX) {\n+\t\t\t\tif (eth_mask->type) {\n \t\t\t\t\tlist[t].type = ICE_ETYPE_OL;\n \t\t\t\t\tlist[t].h_u.ethertype.ethtype_id =\n \t\t\t\t\t\teth_spec->type;\n \t\t\t\t\tlist[t].m_u.ethertype.ethtype_id =\n-\t\t\t\t\t\tUINT16_MAX;\n+\t\t\t\t\t\teth_mask->type;\n \t\t\t\t\tt++;\n \t\t\t\t}\n-\t\t\t} else if (!eth_spec && !eth_mask) {\n-\t\t\t\tlist[t].type = (tun_type == ICE_NON_TUN) ?\n-\t\t\t\t\tICE_MAC_OFOS : ICE_MAC_IL;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -423,81 +427,68 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t}\n \n \t\t\t\tif (tunnel_valid) {\n-\t\t\t\t\tif (ipv4_mask->hdr.type_of_service ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.type_of_service)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\t\tICE_INSET_TUN_IPV4_TOS;\n-\t\t\t\t\tif (ipv4_mask->hdr.src_addr ==\n-\t\t\t\t\t\t\tUINT32_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.src_addr)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\t\tICE_INSET_TUN_IPV4_SRC;\n-\t\t\t\t\tif (ipv4_mask->hdr.dst_addr ==\n-\t\t\t\t\t\t\tUINT32_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.dst_addr)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\t\tICE_INSET_TUN_IPV4_DST;\n-\t\t\t\t\tif (ipv4_mask->hdr.time_to_live ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.time_to_live)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\t\tICE_INSET_TUN_IPV4_TTL;\n-\t\t\t\t\tif (ipv4_mask->hdr.next_proto_id ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.next_proto_id)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_IPV4_PROTO;\n \t\t\t\t} else {\n-\t\t\t\t\tif (ipv4_mask->hdr.src_addr ==\n-\t\t\t\t\t\t\tUINT32_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.src_addr)\n \t\t\t\t\t\tinput_set |= ICE_INSET_IPV4_SRC;\n-\t\t\t\t\tif (ipv4_mask->hdr.dst_addr ==\n-\t\t\t\t\t\t\tUINT32_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.dst_addr)\n \t\t\t\t\t\tinput_set |= ICE_INSET_IPV4_DST;\n-\t\t\t\t\tif (ipv4_mask->hdr.time_to_live ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.time_to_live)\n \t\t\t\t\t\tinput_set |= ICE_INSET_IPV4_TTL;\n-\t\t\t\t\tif (ipv4_mask->hdr.next_proto_id ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.next_proto_id)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_IPV4_PROTO;\n-\t\t\t\t\tif (ipv4_mask->hdr.type_of_service ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n+\t\t\t\t\tif (ipv4_mask->hdr.type_of_service)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\t\tICE_INSET_IPV4_TOS;\n \t\t\t\t}\n \t\t\t\tlist[t].type = (tunnel_valid  == 0) ?\n \t\t\t\t\tICE_IPV4_OFOS : ICE_IPV4_IL;\n-\t\t\t\tif (ipv4_mask->hdr.src_addr == UINT32_MAX) {\n+\t\t\t\tif (ipv4_mask->hdr.src_addr) {\n \t\t\t\t\tlist[t].h_u.ipv4_hdr.src_addr =\n \t\t\t\t\t\tipv4_spec->hdr.src_addr;\n \t\t\t\t\tlist[t].m_u.ipv4_hdr.src_addr =\n-\t\t\t\t\t\tUINT32_MAX;\n+\t\t\t\t\t\tipv4_mask->hdr.src_addr;\n \t\t\t\t}\n-\t\t\t\tif (ipv4_mask->hdr.dst_addr == UINT32_MAX) {\n+\t\t\t\tif (ipv4_mask->hdr.dst_addr) {\n \t\t\t\t\tlist[t].h_u.ipv4_hdr.dst_addr =\n \t\t\t\t\t\tipv4_spec->hdr.dst_addr;\n \t\t\t\t\tlist[t].m_u.ipv4_hdr.dst_addr =\n-\t\t\t\t\t\tUINT32_MAX;\n+\t\t\t\t\t\tipv4_mask->hdr.dst_addr;\n \t\t\t\t}\n-\t\t\t\tif (ipv4_mask->hdr.time_to_live == UINT8_MAX) {\n+\t\t\t\tif (ipv4_mask->hdr.time_to_live) {\n \t\t\t\t\tlist[t].h_u.ipv4_hdr.time_to_live =\n \t\t\t\t\t\tipv4_spec->hdr.time_to_live;\n \t\t\t\t\tlist[t].m_u.ipv4_hdr.time_to_live =\n-\t\t\t\t\t\tUINT8_MAX;\n+\t\t\t\t\t\tipv4_mask->hdr.time_to_live;\n \t\t\t\t}\n-\t\t\t\tif (ipv4_mask->hdr.next_proto_id == UINT8_MAX) {\n+\t\t\t\tif (ipv4_mask->hdr.next_proto_id) {\n \t\t\t\t\tlist[t].h_u.ipv4_hdr.protocol =\n \t\t\t\t\t\tipv4_spec->hdr.next_proto_id;\n \t\t\t\t\tlist[t].m_u.ipv4_hdr.protocol =\n-\t\t\t\t\t\tUINT8_MAX;\n+\t\t\t\t\t\tipv4_mask->hdr.next_proto_id;\n \t\t\t\t}\n-\t\t\t\tif (ipv4_mask->hdr.type_of_service ==\n-\t\t\t\t\t\tUINT8_MAX) {\n+\t\t\t\tif (ipv4_mask->hdr.type_of_service) {\n \t\t\t\t\tlist[t].h_u.ipv4_hdr.tos =\n \t\t\t\t\t\tipv4_spec->hdr.type_of_service;\n-\t\t\t\t\tlist[t].m_u.ipv4_hdr.tos = UINT8_MAX;\n+\t\t\t\t\tlist[t].m_u.ipv4_hdr.tos =\n+\t\t\t\t\t\tipv4_mask->hdr.type_of_service;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!ipv4_spec && !ipv4_mask) {\n-\t\t\t\tlist[t].type = (tunnel_valid  == 0) ?\n-\t\t\t\t\tICE_IPV4_OFOS : ICE_IPV4_IL;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -513,54 +504,53 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\treturn 0;\n \t\t\t\t}\n \n-\t\t\t\tif (tunnel_valid) {\n-\t\t\t\t\tif (!memcmp(ipv6_mask->hdr.src_addr,\n-\t\t\t\t\t\tipv6_addr_mask,\n-\t\t\t\t\t    RTE_DIM(ipv6_mask->hdr.src_addr)))\n-\t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV6_SRC;\n-\t\t\t\t\tif (!memcmp(ipv6_mask->hdr.dst_addr,\n-\t\t\t\t\t\tipv6_addr_mask,\n-\t\t\t\t\t    RTE_DIM(ipv6_mask->hdr.dst_addr)))\n+\t\t\t\tfor (j = 0; j < ICE_IPV6_ADDR_LENGTH; j++) {\n+\t\t\t\t\tif (ipv6_mask->hdr.src_addr[j] &&\n+\t\t\t\t\t\ttunnel_valid) {\n \t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\t\tICE_INSET_TUN_IPV6_DST;\n-\t\t\t\t\tif (ipv6_mask->hdr.proto == UINT8_MAX)\n+\t\t\t\t\t\tICE_INSET_TUN_IPV6_SRC;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t} else if (ipv6_mask->hdr.src_addr[j]) {\n+\t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_SRC;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tfor (j = 0; j < ICE_IPV6_ADDR_LENGTH; j++) {\n+\t\t\t\t\tif (ipv6_mask->hdr.dst_addr[j] &&\n+\t\t\t\t\t\ttunnel_valid) {\n \t\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\tICE_INSET_TUN_IPV6_DST;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t} else if (ipv6_mask->hdr.dst_addr[j]) {\n+\t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_DST;\n+\t\t\t\t\t\tbreak;\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\tif (ipv6_mask->hdr.proto &&\n+\t\t\t\t\ttunnel_valid)\n+\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_IPV6_NEXT_HDR;\n-\t\t\t\t\tif (ipv6_mask->hdr.hop_limits ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n-\t\t\t\t\t\tinput_set |=\n+\t\t\t\telse if (ipv6_mask->hdr.proto)\n+\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\tICE_INSET_IPV6_NEXT_HDR;\n+\t\t\t\tif (ipv6_mask->hdr.hop_limits &&\n+\t\t\t\t\ttunnel_valid)\n+\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_IPV6_HOP_LIMIT;\n-\t\t\t\t\tif ((ipv6_mask->hdr.vtc_flow &\n+\t\t\t\telse if (ipv6_mask->hdr.hop_limits)\n+\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\tICE_INSET_IPV6_HOP_LIMIT;\n+\t\t\t\tif ((ipv6_mask->hdr.vtc_flow &\n \t\t\t\t\t\trte_cpu_to_be_32\n-\t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK))\n-\t\t\t\t\t\t\t== rte_cpu_to_be_32\n-\t\t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK))\n-\t\t\t\t\t\tinput_set |=\n+\t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK)) &&\n+\t\t\t\t\ttunnel_valid)\n+\t\t\t\t\tinput_set |=\n \t\t\t\t\t\t\tICE_INSET_TUN_IPV6_TC;\n-\t\t\t\t} else {\n-\t\t\t\t\tif (!memcmp(ipv6_mask->hdr.src_addr,\n-\t\t\t\t\t\tipv6_addr_mask,\n-\t\t\t\t\t    RTE_DIM(ipv6_mask->hdr.src_addr)))\n-\t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_SRC;\n-\t\t\t\t\tif (!memcmp(ipv6_mask->hdr.dst_addr,\n-\t\t\t\t\t\tipv6_addr_mask,\n-\t\t\t\t\t    RTE_DIM(ipv6_mask->hdr.dst_addr)))\n-\t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_DST;\n-\t\t\t\t\tif (ipv6_mask->hdr.proto == UINT8_MAX)\n-\t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_IPV6_NEXT_HDR;\n-\t\t\t\t\tif (ipv6_mask->hdr.hop_limits ==\n-\t\t\t\t\t\t\tUINT8_MAX)\n-\t\t\t\t\t\tinput_set |=\n-\t\t\t\t\t\tICE_INSET_IPV6_HOP_LIMIT;\n-\t\t\t\t\tif ((ipv6_mask->hdr.vtc_flow &\n+\t\t\t\telse if (ipv6_mask->hdr.vtc_flow &\n \t\t\t\t\t\trte_cpu_to_be_32\n \t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK))\n-\t\t\t\t\t\t\t== rte_cpu_to_be_32\n-\t\t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK))\n-\t\t\t\t\t\tinput_set |= ICE_INSET_IPV6_TC;\n-\t\t\t\t}\n+\t\t\t\t\tinput_set |= ICE_INSET_IPV6_TC;\n+\n \t\t\t\tlist[t].type = (tunnel_valid  == 0) ?\n \t\t\t\t\tICE_IPV6_OFOS : ICE_IPV6_IL;\n \t\t\t\tstruct ice_ipv6_hdr *f;\n@@ -568,35 +558,33 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tf = &list[t].h_u.ipv6_hdr;\n \t\t\t\ts = &list[t].m_u.ipv6_hdr;\n \t\t\t\tfor (j = 0; j < ICE_IPV6_ADDR_LENGTH; j++) {\n-\t\t\t\t\tif (ipv6_mask->hdr.src_addr[j] ==\n-\t\t\t\t\t\tUINT8_MAX) {\n+\t\t\t\t\tif (ipv6_mask->hdr.src_addr[j]) {\n \t\t\t\t\t\tf->src_addr[j] =\n \t\t\t\t\t\tipv6_spec->hdr.src_addr[j];\n \t\t\t\t\t\ts->src_addr[j] =\n \t\t\t\t\t\tipv6_mask->hdr.src_addr[j];\n \t\t\t\t\t}\n-\t\t\t\t\tif (ipv6_mask->hdr.dst_addr[j] ==\n-\t\t\t\t\t\t\t\tUINT8_MAX) {\n+\t\t\t\t\tif (ipv6_mask->hdr.dst_addr[j]) {\n \t\t\t\t\t\tf->dst_addr[j] =\n \t\t\t\t\t\tipv6_spec->hdr.dst_addr[j];\n \t\t\t\t\t\ts->dst_addr[j] =\n \t\t\t\t\t\tipv6_mask->hdr.dst_addr[j];\n \t\t\t\t\t}\n \t\t\t\t}\n-\t\t\t\tif (ipv6_mask->hdr.proto == UINT8_MAX) {\n+\t\t\t\tif (ipv6_mask->hdr.proto) {\n \t\t\t\t\tf->next_hdr =\n \t\t\t\t\t\tipv6_spec->hdr.proto;\n-\t\t\t\t\ts->next_hdr = UINT8_MAX;\n+\t\t\t\t\ts->next_hdr =\n+\t\t\t\t\t\tipv6_mask->hdr.proto;\n \t\t\t\t}\n-\t\t\t\tif (ipv6_mask->hdr.hop_limits == UINT8_MAX) {\n+\t\t\t\tif (ipv6_mask->hdr.hop_limits) {\n \t\t\t\t\tf->hop_limit =\n \t\t\t\t\t\tipv6_spec->hdr.hop_limits;\n-\t\t\t\t\ts->hop_limit = UINT8_MAX;\n+\t\t\t\t\ts->hop_limit =\n+\t\t\t\t\t\tipv6_mask->hdr.hop_limits;\n \t\t\t\t}\n-\t\t\t\tif ((ipv6_mask->hdr.vtc_flow &\n+\t\t\t\tif (ipv6_mask->hdr.vtc_flow &\n \t\t\t\t\t\trte_cpu_to_be_32\n-\t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK))\n-\t\t\t\t\t\t== rte_cpu_to_be_32\n \t\t\t\t\t\t(RTE_IPV6_HDR_TC_MASK)) {\n \t\t\t\t\tstruct ice_le_ver_tc_flow vtf;\n \t\t\t\t\tvtf.u.fld.version = 0;\n@@ -606,13 +594,13 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\t\t\tRTE_IPV6_HDR_TC_MASK) >>\n \t\t\t\t\t\t\tRTE_IPV6_HDR_TC_SHIFT;\n \t\t\t\t\tf->be_ver_tc_flow = CPU_TO_BE32(vtf.u.val);\n-\t\t\t\t\tvtf.u.fld.tc = UINT8_MAX;\n+\t\t\t\t\tvtf.u.fld.tc = (rte_be_to_cpu_32\n+\t\t\t\t\t\t(ipv6_mask->hdr.vtc_flow) &\n+\t\t\t\t\t\t\tRTE_IPV6_HDR_TC_MASK) >>\n+\t\t\t\t\t\t\tRTE_IPV6_HDR_TC_SHIFT;\n \t\t\t\t\ts->be_ver_tc_flow = CPU_TO_BE32(vtf.u.val);\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!ipv6_spec && !ipv6_mask) {\n-\t\t\t\tlist[t].type = (tun_type == ICE_NON_TUN) ?\n-\t\t\t\t\tICE_IPV4_OFOS : ICE_IPV4_IL;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -631,21 +619,17 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t}\n \n \t\t\t\tif (tunnel_valid) {\n-\t\t\t\t\tif (udp_mask->hdr.src_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (udp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_UDP_SRC_PORT;\n-\t\t\t\t\tif (udp_mask->hdr.dst_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (udp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_UDP_DST_PORT;\n \t\t\t\t} else {\n-\t\t\t\t\tif (udp_mask->hdr.src_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (udp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_UDP_SRC_PORT;\n-\t\t\t\t\tif (udp_mask->hdr.dst_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (udp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_UDP_DST_PORT;\n \t\t\t\t}\n@@ -654,21 +638,19 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\tlist[t].type = ICE_UDP_OF;\n \t\t\t\telse\n \t\t\t\t\tlist[t].type = ICE_UDP_ILOS;\n-\t\t\t\tif (udp_mask->hdr.src_port == UINT16_MAX) {\n+\t\t\t\tif (udp_mask->hdr.src_port) {\n \t\t\t\t\tlist[t].h_u.l4_hdr.src_port =\n \t\t\t\t\t\tudp_spec->hdr.src_port;\n \t\t\t\t\tlist[t].m_u.l4_hdr.src_port =\n \t\t\t\t\t\tudp_mask->hdr.src_port;\n \t\t\t\t}\n-\t\t\t\tif (udp_mask->hdr.dst_port == UINT16_MAX) {\n+\t\t\t\tif (udp_mask->hdr.dst_port) {\n \t\t\t\t\tlist[t].h_u.l4_hdr.dst_port =\n \t\t\t\t\t\tudp_spec->hdr.dst_port;\n \t\t\t\t\tlist[t].m_u.l4_hdr.dst_port =\n \t\t\t\t\t\tudp_mask->hdr.dst_port;\n \t\t\t\t}\n \t\t\t\t\t\tt++;\n-\t\t\t} else if (!udp_spec && !udp_mask) {\n-\t\t\t\tlist[t].type = ICE_UDP_ILOS;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -692,40 +674,34 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t}\n \n \t\t\t\tif (tunnel_valid) {\n-\t\t\t\t\tif (tcp_mask->hdr.src_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (tcp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_TCP_SRC_PORT;\n-\t\t\t\t\tif (tcp_mask->hdr.dst_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (tcp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_TCP_DST_PORT;\n \t\t\t\t} else {\n-\t\t\t\t\tif (tcp_mask->hdr.src_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (tcp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TCP_SRC_PORT;\n-\t\t\t\t\tif (tcp_mask->hdr.dst_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (tcp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TCP_DST_PORT;\n \t\t\t\t}\n \t\t\t\tlist[t].type = ICE_TCP_IL;\n-\t\t\t\tif (tcp_mask->hdr.src_port == UINT16_MAX) {\n+\t\t\t\tif (tcp_mask->hdr.src_port) {\n \t\t\t\t\tlist[t].h_u.l4_hdr.src_port =\n \t\t\t\t\t\ttcp_spec->hdr.src_port;\n \t\t\t\t\tlist[t].m_u.l4_hdr.src_port =\n \t\t\t\t\t\ttcp_mask->hdr.src_port;\n \t\t\t\t}\n-\t\t\t\tif (tcp_mask->hdr.dst_port == UINT16_MAX) {\n+\t\t\t\tif (tcp_mask->hdr.dst_port) {\n \t\t\t\t\tlist[t].h_u.l4_hdr.dst_port =\n \t\t\t\t\t\ttcp_spec->hdr.dst_port;\n \t\t\t\t\tlist[t].m_u.l4_hdr.dst_port =\n \t\t\t\t\t\ttcp_mask->hdr.dst_port;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!tcp_spec && !tcp_mask) {\n-\t\t\t\tlist[t].type = ICE_TCP_IL;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -743,40 +719,34 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t}\n \n \t\t\t\tif (tunnel_valid) {\n-\t\t\t\t\tif (sctp_mask->hdr.src_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (sctp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_SCTP_SRC_PORT;\n-\t\t\t\t\tif (sctp_mask->hdr.dst_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (sctp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_SCTP_DST_PORT;\n \t\t\t\t} else {\n-\t\t\t\t\tif (sctp_mask->hdr.src_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (sctp_mask->hdr.src_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_SCTP_SRC_PORT;\n-\t\t\t\t\tif (sctp_mask->hdr.dst_port ==\n-\t\t\t\t\t\t\tUINT16_MAX)\n+\t\t\t\t\tif (sctp_mask->hdr.dst_port)\n \t\t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_SCTP_DST_PORT;\n \t\t\t\t}\n \t\t\t\tlist[t].type = ICE_SCTP_IL;\n-\t\t\t\tif (sctp_mask->hdr.src_port == UINT16_MAX) {\n+\t\t\t\tif (sctp_mask->hdr.src_port) {\n \t\t\t\t\tlist[t].h_u.sctp_hdr.src_port =\n \t\t\t\t\t\tsctp_spec->hdr.src_port;\n \t\t\t\t\tlist[t].m_u.sctp_hdr.src_port =\n \t\t\t\t\t\tsctp_mask->hdr.src_port;\n \t\t\t\t}\n-\t\t\t\tif (sctp_mask->hdr.dst_port == UINT16_MAX) {\n+\t\t\t\tif (sctp_mask->hdr.dst_port) {\n \t\t\t\t\tlist[t].h_u.sctp_hdr.dst_port =\n \t\t\t\t\t\tsctp_spec->hdr.dst_port;\n \t\t\t\t\tlist[t].m_u.sctp_hdr.dst_port =\n \t\t\t\t\t\tsctp_mask->hdr.dst_port;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!sctp_spec && !sctp_mask) {\n-\t\t\t\tlist[t].type = ICE_SCTP_IL;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -799,21 +769,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\ttunnel_valid = 1;\n \t\t\tif (vxlan_spec && vxlan_mask) {\n \t\t\t\tlist[t].type = ICE_VXLAN;\n-\t\t\t\tif (vxlan_mask->vni[0] == UINT8_MAX &&\n-\t\t\t\t\tvxlan_mask->vni[1] == UINT8_MAX &&\n-\t\t\t\t\tvxlan_mask->vni[2] == UINT8_MAX) {\n+\t\t\t\tif (vxlan_mask->vni[0] ||\n+\t\t\t\t\tvxlan_mask->vni[1] ||\n+\t\t\t\t\tvxlan_mask->vni[2]) {\n \t\t\t\t\tlist[t].h_u.tnl_hdr.vni =\n \t\t\t\t\t\t(vxlan_spec->vni[2] << 16) |\n \t\t\t\t\t\t(vxlan_spec->vni[1] << 8) |\n \t\t\t\t\t\tvxlan_spec->vni[0];\n \t\t\t\t\tlist[t].m_u.tnl_hdr.vni =\n-\t\t\t\t\t\tUINT32_MAX;\n+\t\t\t\t\t\t(vxlan_mask->vni[2] << 16) |\n+\t\t\t\t\t\t(vxlan_mask->vni[1] << 8) |\n+\t\t\t\t\t\tvxlan_mask->vni[0];\n \t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_VXLAN_VNI;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!vxlan_spec && !vxlan_mask) {\n-\t\t\t\tlist[t].type = ICE_VXLAN;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -835,21 +805,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\ttunnel_valid = 1;\n \t\t\tif (nvgre_spec && nvgre_mask) {\n \t\t\t\tlist[t].type = ICE_NVGRE;\n-\t\t\t\tif (nvgre_mask->tni[0] == UINT8_MAX &&\n-\t\t\t\t\tnvgre_mask->tni[1] == UINT8_MAX &&\n-\t\t\t\t\tnvgre_mask->tni[2] == UINT8_MAX) {\n+\t\t\t\tif (nvgre_mask->tni[0] ||\n+\t\t\t\t\tnvgre_mask->tni[1] ||\n+\t\t\t\t\tnvgre_mask->tni[2]) {\n \t\t\t\t\tlist[t].h_u.nvgre_hdr.tni_flow =\n \t\t\t\t\t\t(nvgre_spec->tni[2] << 16) |\n \t\t\t\t\t\t(nvgre_spec->tni[1] << 8) |\n \t\t\t\t\t\tnvgre_spec->tni[0];\n \t\t\t\t\tlist[t].m_u.nvgre_hdr.tni_flow =\n-\t\t\t\t\t\tUINT32_MAX;\n+\t\t\t\t\t\t(nvgre_mask->tni[2] << 16) |\n+\t\t\t\t\t\t(nvgre_mask->tni[1] << 8) |\n+\t\t\t\t\t\tnvgre_mask->tni[0];\n \t\t\t\t\tinput_set |=\n \t\t\t\t\t\tICE_INSET_TUN_NVGRE_TNI;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!nvgre_spec && !nvgre_mask) {\n-\t\t\t\tlist[t].type = ICE_NVGRE;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -870,23 +840,21 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t}\n \t\t\tif (vlan_spec && vlan_mask) {\n \t\t\t\tlist[t].type = ICE_VLAN_OFOS;\n-\t\t\t\tif (vlan_mask->tci == UINT16_MAX) {\n+\t\t\t\tif (vlan_mask->tci) {\n \t\t\t\t\tlist[t].h_u.vlan_hdr.vlan =\n \t\t\t\t\t\tvlan_spec->tci;\n \t\t\t\t\tlist[t].m_u.vlan_hdr.vlan =\n-\t\t\t\t\t\tUINT16_MAX;\n+\t\t\t\t\t\tvlan_mask->tci;\n \t\t\t\t\tinput_set |= ICE_INSET_VLAN_OUTER;\n \t\t\t\t}\n-\t\t\t\tif (vlan_mask->inner_type == UINT16_MAX) {\n+\t\t\t\tif (vlan_mask->inner_type) {\n \t\t\t\t\tlist[t].h_u.vlan_hdr.type =\n \t\t\t\t\t\tvlan_spec->inner_type;\n \t\t\t\t\tlist[t].m_u.vlan_hdr.type =\n-\t\t\t\t\t\tUINT16_MAX;\n+\t\t\t\t\t\tvlan_mask->inner_type;\n \t\t\t\t\tinput_set |= ICE_INSET_VLAN_OUTER;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!vlan_spec && !vlan_mask) {\n-\t\t\t\tlist[t].type = ICE_VLAN_OFOS;\n \t\t\t}\n \t\t\tbreak;\n \n@@ -918,19 +886,16 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\t\treturn 0;\n \t\t\t\t}\n \t\t\t\tlist[t].type = ICE_PPPOE;\n-\t\t\t\tif (pppoe_mask->session_id == UINT16_MAX) {\n+\t\t\t\tif (pppoe_mask->session_id) {\n \t\t\t\t\tlist[t].h_u.pppoe_hdr.session_id =\n \t\t\t\t\t\tpppoe_spec->session_id;\n \t\t\t\t\tlist[t].m_u.pppoe_hdr.session_id =\n-\t\t\t\t\t\tUINT16_MAX;\n+\t\t\t\t\t\tpppoe_mask->session_id;\n \t\t\t\t\tinput_set |= ICE_INSET_PPPOE_SESSION;\n \t\t\t\t}\n \t\t\t\tt++;\n \t\t\t\tpppoe_valid = 1;\n-\t\t\t} else if (!pppoe_spec && !pppoe_mask) {\n-\t\t\t\tlist[t].type = ICE_PPPOE;\n \t\t\t}\n-\n \t\t\tbreak;\n \n \t\tcase RTE_FLOW_ITEM_TYPE_PPPOE_PROTO_ID:\n@@ -953,18 +918,15 @@ ice_switch_inset_get(const struct rte_flow_item pattern[],\n \t\t\t\tif (pppoe_valid)\n \t\t\t\t\tt--;\n \t\t\t\tlist[t].type = ICE_PPPOE;\n-\t\t\t\tif (pppoe_proto_mask->proto_id == UINT16_MAX) {\n+\t\t\t\tif (pppoe_proto_mask->proto_id) {\n \t\t\t\t\tlist[t].h_u.pppoe_hdr.ppp_prot_id =\n \t\t\t\t\t\tpppoe_proto_spec->proto_id;\n \t\t\t\t\tlist[t].m_u.pppoe_hdr.ppp_prot_id =\n-\t\t\t\t\t\tUINT16_MAX;\n+\t\t\t\t\t\tpppoe_proto_mask->proto_id;\n \t\t\t\t\tinput_set |= ICE_INSET_PPPOE_PROTO;\n \t\t\t\t}\n \t\t\t\tt++;\n-\t\t\t} else if (!pppoe_proto_spec && !pppoe_proto_mask) {\n-\t\t\t\tlist[t].type = ICE_PPPOE;\n \t\t\t}\n-\n \t\t\tbreak;\n \n \t\tcase RTE_FLOW_ITEM_TYPE_VOID:\n",
    "prefixes": [
        "v3",
        "03/13"
    ]
}