Patch Detail

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

{
    "id": 138770,
    "url": "http://patchwork.dpdk.org/api/patches/138770/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20240325170141.10192-1-ian.stokes@intel.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.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": "<20240325170141.10192-1-ian.stokes@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20240325170141.10192-1-ian.stokes@intel.com",
    "date": "2024-03-25T17:01:41",
    "name": "[RFC,v3] net/iavf: support rte flow with mask for FDIR",
    "commit_ref": null,
    "pull_url": null,
    "state": "not-applicable",
    "archived": true,
    "hash": "f638b3407eb35f937f61398893c160b366ac9507",
    "submitter": {
        "id": 306,
        "url": "http://patchwork.dpdk.org/api/people/306/?format=api",
        "name": "Ian Stokes",
        "email": "ian.stokes@intel.com"
    },
    "delegate": {
        "id": 319,
        "url": "http://patchwork.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20240325170141.10192-1-ian.stokes@intel.com/mbox/",
    "series": [
        {
            "id": 31615,
            "url": "http://patchwork.dpdk.org/api/series/31615/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31615",
            "date": "2024-03-25T17:01:41",
            "name": "[RFC,v3] net/iavf: support rte flow with mask for FDIR",
            "version": 3,
            "mbox": "http://patchwork.dpdk.org/series/31615/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/138770/comments/",
    "check": "warning",
    "checks": "http://patchwork.dpdk.org/api/patches/138770/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 6678343D48;\n\tMon, 25 Mar 2024 18:01:52 +0100 (CET)",
            "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0247840695;\n\tMon, 25 Mar 2024 18:01:52 +0100 (CET)",
            "from mgamail.intel.com (mgamail.intel.com [198.175.65.15])\n by mails.dpdk.org (Postfix) with ESMTP id 1C05E40298\n for <dev@dpdk.org>; Mon, 25 Mar 2024 18:01:49 +0100 (CET)",
            "from fmviesa003.fm.intel.com ([10.60.135.143])\n by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 25 Mar 2024 10:01:48 -0700",
            "from sivswdev19.ir.intel.com ([10.237.217.69])\n by fmviesa003.fm.intel.com with ESMTP; 25 Mar 2024 10:01:46 -0700"
        ],
        "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1711386110; x=1742922110;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=9WRDIamX5Z+lryGMshr1H6PuPRlDL2aCkRBaLZC5BIE=;\n b=g1hDkqiFu591+7FNslnnLd1I4YsC6hmp4HJlgkMm27UTpWNe0VVGNr+C\n 31W/DKrJ0E2crkM9IdzEXwRGGJlgJYIt1xgublOTznr5Sr9Zf68NtFIXW\n tyrh+7Su3f1nA5KzK9RX+tAlFbrOZz0AVKsN/vKv/MQSFrGRCnO7iTZ82\n iz8tYFrZ3qV88srxP68uG7ILU9Vius95S3Q3a3Up/Ae65VW0nMFd8smBh\n bXYZUU2Rs13NfraArKtJIgx2nTI4Auo18S9d4FNOQKz5iI3orS1FsQWqS\n u0ovDi4u/SEylS15cL/em5Lc6vxvoFFkDElHdbYxVTPIRf8ZMrOHQ5QWV A==;",
        "X-IronPort-AV": [
            "E=McAfee;i=\"6600,9927,11024\"; a=\"10196522\"",
            "E=Sophos;i=\"6.07,153,1708416000\"; d=\"scan'208\";a=\"10196522\"",
            "E=Sophos;i=\"6.07,153,1708416000\"; d=\"scan'208\";a=\"20232745\""
        ],
        "X-ExtLoop1": "1",
        "From": "Ian Stokes <ian.stokes@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "Ananth S <ananth.s@intel.com>,\n\tZhichao Zeng <zhichaox.zeng@intel.com>",
        "Subject": "[RFC PATCH v3] net/iavf: support rte flow with mask for FDIR",
        "Date": "Mon, 25 Mar 2024 17:01:41 +0000",
        "Message-Id": "<20240325170141.10192-1-ian.stokes@intel.com>",
        "X-Mailer": "git-send-email 2.35.3",
        "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": "From: Ananth S <ananth.s@intel.com>\n\nThis 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\nThis patch additionally contains the fixes for the issues\nidentified in the patch [21.11.5 v2].\n\nThis patch is based on DPDK v21.11.5 LTS\n[4e50ad4469f7c037e32de5aa3535d1cd25de0741], for customer cherry-pick.\n\nSigned-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>\nSigned-off-by: Ananth S <ananth.s@intel.com>\n---\n drivers/common/iavf/virtchnl.h |  40 ++++-\n drivers/net/iavf/iavf_ethdev.c |  26 +++\n drivers/net/iavf/iavf_fdir.c   | 305 ++++++++++++++++++---------------\n drivers/net/iavf/iavf_hash.c   | 112 ++++++------\n drivers/net/ice/ice_ethdev.c   |  26 +++\n lib/ethdev/rte_ethdev.h        |   3 +\n 6 files changed, 320 insertions(+), 192 deletions(-)",
    "diff": "diff --git a/drivers/common/iavf/virtchnl.h b/drivers/common/iavf/virtchnl.h\nindex 80e754a1b2..bc8f355db1 100644\n--- a/drivers/common/iavf/virtchnl.h\n+++ b/drivers/common/iavf/virtchnl.h\n@@ -1482,6 +1482,8 @@ enum virtchnl_vfr_states {\n };\n \n #define VIRTCHNL_MAX_NUM_PROTO_HDRS\t32\n+#define VIRTCHNL_MAX_NUM_PROTO_HDRS_W_MSK 16\n+#define VIRTCHNL_MAX_SIZE_RAW_PACKET 1024\n #define PROTO_HDR_SHIFT\t\t\t5\n #define PROTO_HDR_FIELD_START(proto_hdr_type) \\\n \t\t\t\t\t(proto_hdr_type << PROTO_HDR_SHIFT)\n@@ -1669,6 +1671,22 @@ struct virtchnl_proto_hdr {\n \n VIRTCHNL_CHECK_STRUCT_LEN(72, virtchnl_proto_hdr);\n \n+struct virtchnl_proto_hdr_w_msk {\n+\t/* see enum virtchnl_proto_hdr_type */\n+\ts32 type;\n+\tu32 pad;\n+\t/**\n+\t * binary buffer in network order for specific header type.\n+\t * For example, if type = VIRTCHNL_PROTO_HDR_IPV4, a IPv4\n+\t * header is expected to be copied into the buffer.\n+\t */\n+\tu8 buffer_spec[64];\n+\t/* binary buffer for bit-mask applied to specific header type */\n+\tu8 buffer_mask[64];\n+};\n+\n+VIRTCHNL_CHECK_STRUCT_LEN(136, virtchnl_proto_hdr_w_msk);\n+\n struct virtchnl_proto_hdrs {\n \tu8 tunnel_level;\n \t/**\n@@ -1678,8 +1696,26 @@ struct virtchnl_proto_hdrs {\n \t * 2 - from the second inner layer\n \t * ....\n \t **/\n-\tint count; /* the proto layers must < VIRTCHNL_MAX_NUM_PROTO_HDRS */\n-\tstruct virtchnl_proto_hdr proto_hdr[VIRTCHNL_MAX_NUM_PROTO_HDRS];\n+\tint count;\n+\t/**\n+\t * count must <=\n+\t * VIRTCHNL_MAX_NUM_PROTO_HDRS + VIRTCHNL_MAX_NUM_PROTO_HDRS_W_MSK\n+\t * count = 0 :\t\t\t\t\tselect raw\n+\t * 1 < count <= VIRTCHNL_MAX_NUM_PROTO_HDRS :\tselect proto_hdr\n+\t * count > VIRTCHNL_MAX_NUM_PROTO_HDRS :\tselect proto_hdr_w_msk\n+\t * last valid index = count - VIRTCHNL_MAX_NUM_PROTO_HDRS\n+\t */\n+\tunion {\n+\t\tstruct virtchnl_proto_hdr\n+\t\t\tproto_hdr[VIRTCHNL_MAX_NUM_PROTO_HDRS];\n+\t\tstruct virtchnl_proto_hdr_w_msk\n+\t\t\tproto_hdr_w_msk[VIRTCHNL_MAX_NUM_PROTO_HDRS_W_MSK];\n+\t\tstruct {\n+\t\t\tu16 pkt_len;\n+\t\t\tu8 spec[VIRTCHNL_MAX_SIZE_RAW_PACKET];\n+\t\t\tu8 mask[VIRTCHNL_MAX_SIZE_RAW_PACKET];\n+\t\t} raw;\n+\t};\n };\n \n VIRTCHNL_CHECK_STRUCT_LEN(2312, virtchnl_proto_hdrs);\ndiff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c\nindex e40af1316d..93d4d03eb9 100644\n--- a/drivers/net/iavf/iavf_ethdev.c\n+++ b/drivers/net/iavf/iavf_ethdev.c\n@@ -500,6 +500,11 @@ iavf_init_rss(struct iavf_adapter *adapter)\n \tuint16_t i, j, nb_q;\n \tint ret;\n \n+#ifdef RTE_ETHDEV_EXCL_Q\n+\tuint16_t q_index = 0;\n+\tuint16_t excl_q = RSS_RETA_EXCL_Q_ID;\n+#endif /* RTE_ETHDEV_EXCL_Q */\n+\n \trss_conf = &adapter->dev_data->dev_conf.rx_adv_conf.rss_conf;\n \tnb_q = RTE_MIN(adapter->dev_data->nb_rx_queues,\n \t\t       vf->max_rss_qregion);\n@@ -525,6 +530,27 @@ iavf_init_rss(struct iavf_adapter *adapter)\n \t\t\tj = 0;\n \t\tvf->rss_lut[i] = j;\n \t}\n+\n+#ifdef RTE_ETHDEV_EXCL_Q\n+\tif (nb_q > 1) {\n+\t\tif (excl_q > nb_q) {\n+\t\t\t/* if excl_q index is higher than the max_queue, assign default\n+\t\t\t * RSS LUT\n+\t\t\t */\n+\t\t\tfor (i = 0; i < vf->vf_res->rss_lut_size; i++)\n+\t\t\t\tvf->rss_lut[i] = i % nb_q;\n+\n+\t\t} else {\n+\t\t\tfor (i = 0, q_index = 0; i < vf->vf_res->rss_lut_size; i++, q_index++) {\n+\t\t\t\t/* Increment q_index to skip excl_q */\n+\t\t\t\tif (q_index % nb_q == excl_q)\n+\t\t\t\t\tq_index++;\n+\n+\t\t\t\tvf->rss_lut[i] = q_index % (nb_q);\n+\t\t\t}\n+\t\t}\n+\t}\n+#endif /* RTE_ETHDEV_EXCL_Q */\n \t/* send virtchnl ops to configure RSS */\n \tret = iavf_configure_rss_lut(adapter);\n \tif (ret)\ndiff --git a/drivers/net/iavf/iavf_fdir.c b/drivers/net/iavf/iavf_fdir.c\nindex c30853dd94..be7c9da053 100644\n--- a/drivers/net/iavf/iavf_fdir.c\n+++ b/drivers/net/iavf/iavf_fdir.c\n@@ -695,6 +695,7 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \tconst struct rte_flow_item_ecpri *ecpri_spec, *ecpri_mask;\n \tconst struct rte_flow_item_gre *gre_spec, *gre_mask;\n \tconst struct rte_flow_item *item = pattern;\n+\tstruct virtchnl_proto_hdr_w_msk *hdr_w_msk, *hdr1_w_msk = NULL;\n \tstruct virtchnl_proto_hdr *hdr, *hdr1 = NULL;\n \tstruct rte_ecpri_common_hdr ecpri_common;\n \tuint64_t input_set = IAVF_INSET_NONE;\n@@ -702,8 +703,12 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \tenum rte_flow_item_type next_type;\n \tuint8_t tun_inner = 0;\n \tuint16_t ether_type;\n+\tint with_mask = 0;\n \tint layer = 0;\n-\n+\tuint8_t  ipv6_zero_mask[16] = {\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\n+\t\t0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00\n+\t};\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@@ -727,8 +732,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@@ -739,39 +746,59 @@ 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->src) ||\n-\t\t\t\t    !rte_is_zero_ether_addr(&eth_mask->dst)) {\n-\t\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM, item,\n-\t\t\t\t\t\t\"Invalid MAC_addr mask.\");\n-\t\t\t\t\treturn -rte_errno;\n-\t\t\t\t}\n-\t\t\t}\n-\n-\t\t\tif (eth_spec && eth_mask && eth_mask->type) {\n-\t\t\t\tif (eth_mask->type != RTE_BE16(0xffff)) {\n-\t\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\titem, \"Invalid type mask.\");\n-\t\t\t\t\treturn -rte_errno;\n-\t\t\t\t}\n-\n-\t\t\t\tether_type = rte_be_to_cpu_16(eth_spec->type);\n-\t\t\t\tif (ether_type == RTE_ETHER_TYPE_IPV4 ||\n-\t\t\t\t\tether_type == RTE_ETHER_TYPE_IPV6) {\n-\t\t\t\t\trte_flow_error_set(error, EINVAL,\n-\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ITEM,\n-\t\t\t\t\t\titem,\n-\t\t\t\t\t\t\"Unsupported ether_type.\");\n-\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\tif (eth_spec && eth_mask && eth_mask->type) {\n+\t\t\t\t\t\tif (eth_mask->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->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\t ETHERTYPE);\n+\t\t\t\t\t}\n+\t\t\t\t\trte_memcpy(hdr1->buffer, eth_spec,\n+\t\t\t\t\t\tsizeof(struct rte_ether_hdr));\n \t\t\t\t}\n-\n-\t\t\t\tinput_set |= IAVF_INSET_ETHERTYPE;\n-\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr1, ETH,\n-\t\t\t\t\t\t\t\t ETHERTYPE);\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@@ -785,8 +812,10 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\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@@ -817,43 +846,54 @@ 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+\t\t\tif (!with_mask && ipv4_mask->hdr.src_addr == UINT32_MAX) {\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\tSRC);\n+\t\t\t} else if (ipv4_mask->hdr.src_addr) {\n+\t\t\t\tinput_set |= IAVF_INSET_IPV4_SRC;\n+\t\t\t\twith_mask = 1;\n+\t\t\t}\n+\n+\t\t\tif (!with_mask && ipv4_mask->hdr.dst_addr == UINT32_MAX) {\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\tDST);\n+\t\t\t} else if (ipv4_mask->hdr.dst_addr) {\n+\t\t\t\tinput_set |= IAVF_INSET_IPV4_DST;\n+\t\t\t\twith_mask = 1;\n+\t\t\t}\n \n \t\t\tif (ipv4_mask->hdr.type_of_service ==\n \t\t\t    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\tif (!with_mask)\n+\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n+\t\t\t\t\t\t\tDSCP);\n \t\t\t}\n \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\tif (!with_mask)\n+\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n+\t\t\t\t\t\t\tPROT);\n \t\t\t}\n \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\tif (!with_mask)\n+\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV4,\n+\t\t\t\t\t\t\tTTL);\n \t\t\t}\n \n-\t\t\tif (ipv4_mask->hdr.src_addr == UINT32_MAX) {\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\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\tif (with_mask) {\n+\t\t\t\trte_memcpy(hdr_w_msk->buffer_spec, &ipv4_spec->hdr,\n+\t\t\t\t\t\tsizeof(ipv4_spec->hdr));\n+\t\t\t\trte_memcpy(hdr_w_msk->buffer_mask, &ipv4_mask->hdr,\n+\t\t\t\t\t\tsizeof(ipv4_mask->hdr));\n+\t\t\t} else {\n+\t\t\t\trte_memcpy(hdr->buffer, &ipv4_spec->hdr,\n+\t\t\t\t\t\tsizeof(ipv4_spec->hdr));\n \t\t\t}\n \n \t\t\tif (tun_inner) {\n@@ -861,9 +901,6 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\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@@ -898,8 +935,10 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\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@@ -913,37 +952,59 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\n \t\t\t\treturn -rte_errno;\n \t\t\t}\n \n+\n+\t\t\tif (!with_mask && !memcmp(ipv6_mask->hdr.src_addr, ipv6_addr_mask,\n+\t\t\t\t    RTE_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} else if (memcmp(ipv6_mask->hdr.src_addr, ipv6_zero_mask,\n+\t\t\t\t\t\tRTE_DIM(ipv6_mask->hdr.src_addr))) {\n+\t\t\t\tinput_set |= IAVF_INSET_IPV6_SRC;\n+\t\t\t\twith_mask = 1;\n+\t\t\t}\n+\n+\t\t\tif (!with_mask && !memcmp(ipv6_mask->hdr.dst_addr, ipv6_addr_mask,\n+\t\t\t\t    RTE_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} else if (memcmp(ipv6_mask->hdr.dst_addr, ipv6_zero_mask,\n+\t\t\t\t\t\tRTE_DIM(ipv6_mask->hdr.dst_addr))) {\n+\t\t\t\tinput_set |= IAVF_INSET_IPV6_DST;\n+\t\t\t\twith_mask = 1;\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\tif (!with_mask)\n+\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n+\t\t\t\t\t\t\tTC);\n \t\t\t}\n \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\tif (!with_mask)\n+\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n+\t\t\t\t\t\t\tPROT);\n \t\t\t}\n \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\tif (!with_mask)\n+\t\t\t\t\tVIRTCHNL_ADD_PROTO_HDR_FIELD_BIT(hdr, IPV6,\n+\t\t\t\t\t\t\tHOP_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\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\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\tif (with_mask) {\n+\t\t\t\trte_memcpy(hdr_w_msk->buffer_spec, &ipv6_spec->hdr,\n+\t\t\t\t\t\tsizeof(ipv6_spec->hdr));\n+\t\t\t\trte_memcpy(hdr_w_msk->buffer_mask, &ipv6_mask->hdr,\n+\t\t\t\t\t\tsizeof(ipv6_mask->hdr));\n+\t\t\t} else {\n+\t\t\t\trte_memcpy(hdr->buffer, &ipv6_spec->hdr,\n+\t\t\t\t\t\tsizeof(ipv6_spec->hdr));\n \t\t\t}\n \n \t\t\tif (tun_inner) {\n@@ -951,9 +1012,6 @@ iavf_fdir_parse_pattern(__rte_unused struct iavf_adapter *ad,\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@@ -1002,9 +1060,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@@ -1015,36 +1073,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\tsizeof(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@@ -1054,9 +1100,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@@ -1072,36 +1118,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@@ -1376,6 +1410,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,\ndiff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex 5e0888ea68..e43ed412bf 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -178,218 +178,218 @@ iavf_hash_parse_pattern_action(struct iavf_adapter *ad,\n /* proto_hdrs template */\n struct virtchnl_proto_hdrs outer_ipv4_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 4,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4}\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv4_udp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n \t proto_hdr_ipv4_with_prot,\n-\t proto_hdr_udp}\n+\t proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv4_tcp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n \t proto_hdr_ipv4_with_prot,\n-\t proto_hdr_tcp}\n+\t proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv4_sctp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4,\n-\t proto_hdr_sctp}\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv4,\n+\t proto_hdr_sctp}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv6_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 4,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6}\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv6_frag_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n-\t proto_hdr_ipv6, proto_hdr_ipv6_frag}\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n+\t proto_hdr_ipv6, proto_hdr_ipv6_frag}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv6_udp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n \t proto_hdr_ipv6_with_prot,\n-\t proto_hdr_udp}\n+\t proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv6_tcp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan,\n \t proto_hdr_ipv6_with_prot,\n-\t proto_hdr_tcp}\n+\t proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs outer_ipv6_sctp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 5,\n-\t{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6,\n-\t proto_hdr_sctp}\n+\t{{proto_hdr_eth, proto_hdr_svlan, proto_hdr_cvlan, proto_hdr_ipv6,\n+\t proto_hdr_sctp}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv4_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 1, {proto_hdr_ipv4}\n+\tTUNNEL_LEVEL_INNER, 1, {{proto_hdr_ipv4}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv4_udp_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv4_with_prot, proto_hdr_udp}\n+\tTUNNEL_LEVEL_INNER, 2, {{proto_hdr_ipv4_with_prot, proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv4_tcp_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv4_with_prot, proto_hdr_tcp}\n+\tTUNNEL_LEVEL_INNER, 2, {{proto_hdr_ipv4_with_prot, proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs second_inner_ipv4_tmplt = {\n-\t2, 1, {proto_hdr_ipv4}\n+\t2, 1, {{proto_hdr_ipv4}}\n };\n \n struct virtchnl_proto_hdrs second_inner_ipv4_udp_tmplt = {\n-\t2, 2, {proto_hdr_ipv4_with_prot, proto_hdr_udp}\n+\t2, 2, {{proto_hdr_ipv4_with_prot, proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs second_inner_ipv4_tcp_tmplt = {\n-\t2, 2, {proto_hdr_ipv4_with_prot, proto_hdr_tcp}\n+\t2, 2, {{proto_hdr_ipv4_with_prot, proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs second_inner_ipv6_tmplt = {\n-\t2, 1, {proto_hdr_ipv6}\n+\t2, 1, {{proto_hdr_ipv6}}\n };\n \n struct virtchnl_proto_hdrs second_inner_ipv6_udp_tmplt = {\n-\t2, 2, {proto_hdr_ipv6_with_prot, proto_hdr_udp}\n+\t2, 2, {{proto_hdr_ipv6_with_prot, proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs second_inner_ipv6_tcp_tmplt = {\n-\t2, 2, {proto_hdr_ipv6_with_prot, proto_hdr_tcp}\n+\t2, 2, {{proto_hdr_ipv6_with_prot, proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv4_sctp_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv4, proto_hdr_sctp}\n+\tTUNNEL_LEVEL_INNER, 2, {{proto_hdr_ipv4, proto_hdr_sctp}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv6_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 1, {proto_hdr_ipv6}\n+\tTUNNEL_LEVEL_INNER, 1, {{proto_hdr_ipv6}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv6_udp_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6_with_prot, proto_hdr_udp}\n+\tTUNNEL_LEVEL_INNER, 2, {{proto_hdr_ipv6_with_prot, proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv6_tcp_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6_with_prot, proto_hdr_tcp}\n+\tTUNNEL_LEVEL_INNER, 2, {{proto_hdr_ipv6_with_prot, proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs inner_ipv6_sctp_tmplt = {\n-\tTUNNEL_LEVEL_INNER, 2, {proto_hdr_ipv6, proto_hdr_sctp}\n+\tTUNNEL_LEVEL_INNER, 2, {{proto_hdr_ipv6, proto_hdr_sctp}}\n };\n \n struct virtchnl_proto_hdrs ipv4_esp_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv4, proto_hdr_esp}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv4, proto_hdr_esp}}\n };\n \n struct virtchnl_proto_hdrs ipv4_udp_esp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 3,\n-\t{proto_hdr_ipv4, proto_hdr_udp, proto_hdr_esp}\n+\t{{proto_hdr_ipv4, proto_hdr_udp, proto_hdr_esp}}\n };\n \n struct virtchnl_proto_hdrs ipv4_ah_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv4, proto_hdr_ah}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv4, proto_hdr_ah}}\n };\n \n struct virtchnl_proto_hdrs ipv6_esp_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_esp}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv6, proto_hdr_esp}}\n };\n \n struct virtchnl_proto_hdrs ipv6_udp_esp_tmplt = {\n \tTUNNEL_LEVEL_OUTER, 3,\n-\t{proto_hdr_ipv6, proto_hdr_udp, proto_hdr_esp}\n+\t{{proto_hdr_ipv6, proto_hdr_udp, proto_hdr_esp}}\n };\n \n struct virtchnl_proto_hdrs ipv6_ah_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_ah}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv6, proto_hdr_ah}}\n };\n \n struct virtchnl_proto_hdrs ipv4_l2tpv3_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv4, proto_hdr_l2tpv3}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv4, proto_hdr_l2tpv3}}\n };\n \n struct virtchnl_proto_hdrs ipv6_l2tpv3_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_l2tpv3}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv6, proto_hdr_l2tpv3}}\n };\n \n struct virtchnl_proto_hdrs ipv4_pfcp_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv4, proto_hdr_pfcp}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv4, proto_hdr_pfcp}}\n };\n \n struct virtchnl_proto_hdrs ipv6_pfcp_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_ipv6, proto_hdr_pfcp}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_ipv6, proto_hdr_pfcp}}\n };\n \n struct virtchnl_proto_hdrs ipv4_udp_gtpc_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}\n+\tTUNNEL_LEVEL_OUTER, 3, {{proto_hdr_ipv4, proto_hdr_udp, proto_hdr_gtpc}}\n };\n \n struct virtchnl_proto_hdrs ipv6_udp_gtpc_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}\n+\tTUNNEL_LEVEL_OUTER, 3, {{proto_hdr_ipv6, proto_hdr_udp, proto_hdr_gtpc}}\n };\n \n struct virtchnl_proto_hdrs eth_ecpri_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 2, {proto_hdr_eth, proto_hdr_ecpri}\n+\tTUNNEL_LEVEL_OUTER, 2, {{proto_hdr_eth, proto_hdr_ecpri}}\n };\n \n struct virtchnl_proto_hdrs ipv4_ecpri_tmplt = {\n-\tTUNNEL_LEVEL_OUTER, 3, {proto_hdr_ipv4, proto_hdr_udp, proto_hdr_ecpri}\n+\tTUNNEL_LEVEL_OUTER, 3, {{proto_hdr_ipv4, proto_hdr_udp, proto_hdr_ecpri}}\n };\n \n struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv4_tmplt = {\n \tTUNNEL_LEVEL_INNER, 3,\n-\t{proto_hdr_l2tpv2,\n+\t{{proto_hdr_l2tpv2,\n \t proto_hdr_ppp,\n-\t proto_hdr_ipv4}\n+\t proto_hdr_ipv4}}\n };\n \n struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv6_tmplt = {\n \tTUNNEL_LEVEL_INNER, 3,\n-\t{proto_hdr_l2tpv2,\n+\t{{proto_hdr_l2tpv2,\n \t proto_hdr_ppp,\n-\t proto_hdr_ipv6}\n+\t proto_hdr_ipv6}}\n };\n \n struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv4_udp_tmplt = {\n \tTUNNEL_LEVEL_INNER, 4,\n-\t{proto_hdr_l2tpv2,\n+\t{{proto_hdr_l2tpv2,\n \t proto_hdr_ppp,\n \t proto_hdr_ipv4_with_prot,\n-\t proto_hdr_udp}\n+\t proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv4_tcp_tmplt = {\n \tTUNNEL_LEVEL_INNER, 4,\n-\t{proto_hdr_l2tpv2,\n+\t{{proto_hdr_l2tpv2,\n \t proto_hdr_ppp,\n \t proto_hdr_ipv4_with_prot,\n-\t proto_hdr_tcp}\n+\t proto_hdr_tcp}}\n };\n \n struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv6_udp_tmplt = {\n \tTUNNEL_LEVEL_INNER, 4,\n-\t{proto_hdr_l2tpv2,\n+\t{{proto_hdr_l2tpv2,\n \t proto_hdr_ppp,\n \t proto_hdr_ipv6_with_prot,\n-\t proto_hdr_udp}\n+\t proto_hdr_udp}}\n };\n \n struct virtchnl_proto_hdrs udp_l2tpv2_ppp_ipv6_tcp_tmplt = {\n \tTUNNEL_LEVEL_INNER, 4,\n-\t{proto_hdr_l2tpv2,\n+\t{{proto_hdr_l2tpv2,\n \t proto_hdr_ppp,\n \t proto_hdr_ipv6_with_prot,\n-\t proto_hdr_tcp}\n+\t proto_hdr_tcp}}\n };\n \n /* rss type super set */\ndiff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c\nindex cefbccd3e4..e0066e1dac 100644\n--- a/drivers/net/ice/ice_ethdev.c\n+++ b/drivers/net/ice/ice_ethdev.c\n@@ -3197,6 +3197,11 @@ static int ice_init_rss(struct ice_pf *pf)\n \tbool is_safe_mode = pf->adapter->is_safe_mode;\n \tuint32_t reg;\n \n+#ifdef RTE_ETHDEV_EXCL_Q\n+\tuint16_t q_index = 0;\n+\tuint16_t excl_q = RSS_RETA_EXCL_Q_ID;\n+#endif /* RTE_ETHDEV_EXCL_Q */\n+\n \trss_conf = &dev_data->dev_conf.rx_adv_conf.rss_conf;\n \tnb_q = dev_data->nb_rx_queues;\n \tvsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE +\n@@ -3253,6 +3258,27 @@ static int ice_init_rss(struct ice_pf *pf)\n \tfor (i = 0; i < vsi->rss_lut_size; i++)\n \t\tvsi->rss_lut[i] = i % nb_q;\n \n+#ifdef RTE_ETHDEV_EXCL_Q\n+\tif (nb_q > 1) {\n+\t\tif (excl_q > nb_q) {\n+\t\t\t/* if excl_q index is higher than the max_queue, assign default\n+\t\t\t * RSS LUT\n+\t\t\t */\n+\t\t\tfor (i = 0; i < vsi->rss_lut_size; i++)\n+\t\t\t\tvsi->rss_lut[i] = i % nb_q;\n+\n+\t\t} else {\n+\t\t\tfor (i = 0, q_index = 0; i < vsi->rss_lut_size; i++, q_index++) {\n+\t\t\t\t/* Increment q_index to skip excl_q */\n+\t\t\t\tif (q_index % nb_q == excl_q)\n+\t\t\t\t\tq_index++;\n+\n+\t\t\t\tvsi->rss_lut[i] = q_index % (nb_q);\n+\t\t\t}\n+\t\t}\n+\t}\n+#endif /* RTE_ETHDEV_EXCL_Q */\n+\n \tlut_params.vsi_handle = vsi->idx;\n \tlut_params.lut_size = vsi->rss_lut_size;\n \tlut_params.lut_type = ICE_AQC_GSET_RSS_LUT_TABLE_TYPE_PF;\ndiff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h\nindex 4da4baf2a1..4ae8db3936 100644\n--- a/lib/ethdev/rte_ethdev.h\n+++ b/lib/ethdev/rte_ethdev.h\n@@ -160,6 +160,9 @@ extern \"C\" {\n #define RTE_ETHDEV_DEBUG_TX\n #endif\n \n+#define RTE_ETHDEV_EXCL_Q\n+#define RSS_RETA_EXCL_Q_ID 1\n+\n #include <rte_compat.h>\n #include <rte_log.h>\n #include <rte_interrupts.h>\n",
    "prefixes": [
        "RFC",
        "v3"
    ]
}