Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123232/?format=api
{ "id": 123232, "url": "https://patches.dpdk.org/api/patches/123232/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230207100859.2401709-3-mingxia.liu@intel.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230207100859.2401709-3-mingxia.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230207100859.2401709-3-mingxia.liu@intel.com", "date": "2023-02-07T10:08:55", "name": "[v5,2/6] common/idpf: add RSS set/get ops", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e83d1a4afd9c17963b66a7ac312448f61b18e797", "submitter": { "id": 2514, "url": "https://patches.dpdk.org/api/people/2514/?format=api", "name": "Liu, Mingxia", "email": "mingxia.liu@intel.com" }, "delegate": { "id": 1540, "url": "https://patches.dpdk.org/api/users/1540/?format=api", "username": "qzhan15", "first_name": "Qi", "last_name": "Zhang", "email": "qi.z.zhang@intel.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230207100859.2401709-3-mingxia.liu@intel.com/mbox/", "series": [ { "id": 26846, "url": "https://patches.dpdk.org/api/series/26846/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=26846", "date": "2023-02-07T10:08:54", "name": "[v5,1/6] common/idpf: add hw statistics", "version": 5, "mbox": "https://patches.dpdk.org/series/26846/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/123232/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/123232/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 B3E4541C2D;\n\tTue, 7 Feb 2023 12:06:18 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 7AB7842D10;\n\tTue, 7 Feb 2023 12:06:08 +0100 (CET)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by mails.dpdk.org (Postfix) with ESMTP id 0911F42B71\n for <dev@dpdk.org>; Tue, 7 Feb 2023 12:06:05 +0100 (CET)", "from fmsmga007.fm.intel.com ([10.253.24.52])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 07 Feb 2023 03:06:05 -0800", "from dpdk-mingxial-01.sh.intel.com ([10.67.119.167])\n by fmsmga007.fm.intel.com with ESMTP; 07 Feb 2023 03:06:03 -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=1675767966; x=1707303966;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=wWkTMeO2nFR/BGXffz6+ckhweJKb8buAN9+QlKVXWtU=;\n b=dXSw6PAq0xvZ40CA3UvsPpUrmFzmY7WvZvAFtddnlmnThi3TGqlzhM7o\n Gh5oOTiTIJInAtcJVz0duOuPiu8DowNX+LBE6CmZyPc95mxp+VrHShx9M\n zFnR/8UFIpWFLcJ3PQC8n3jdPbGj5zh+oID71hM3kSC8enPZ61YvRfmf5\n dNGbNZVxRGrAhR5XBMRQp/j6YerBcElU91aIcmNG3sI1Vw91YAK8xNdJ+\n ua0k1eyWRDOenliCkzkM15mPVXJyRVXM57vx7JVnvQVEdqBVyI5uvBIOl\n 6WJQIte8MUPjmsO/F4qHapJA/cCFS+cwJCvI2AZPzLMV5RuPbZdnblL0I g==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10613\"; a=\"313124781\"", "E=Sophos;i=\"5.97,278,1669104000\"; d=\"scan'208\";a=\"313124781\"", "E=McAfee;i=\"6500,9779,10613\"; a=\"668750329\"", "E=Sophos;i=\"5.97,278,1669104000\"; d=\"scan'208\";a=\"668750329\"" ], "X-ExtLoop1": "1", "From": "Mingxia Liu <mingxia.liu@intel.com>", "To": "dev@dpdk.org, qi.z.zhang@intel.com, jingjing.wu@intel.com,\n beilei.xing@intel.com", "Cc": "Mingxia Liu <mingxia.liu@intel.com>", "Subject": "[PATCH v5 2/6] common/idpf: add RSS set/get ops", "Date": "Tue, 7 Feb 2023 10:08:55 +0000", "Message-Id": "<20230207100859.2401709-3-mingxia.liu@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230207100859.2401709-1-mingxia.liu@intel.com>", "References": "<20230207095701.2400179-1-mingxia.liu@intel.com>\n <20230207100859.2401709-1-mingxia.liu@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": "Add support for these device ops:\n- rss_reta_update\n- rss_reta_query\n- rss_hash_update\n- rss_hash_conf_get\n\nSigned-off-by: Mingxia Liu <mingxia.liu@intel.com>\n---\n drivers/common/idpf/idpf_common_device.h | 1 +\n drivers/common/idpf/idpf_common_virtchnl.c | 119 +++++++++\n drivers/common/idpf/idpf_common_virtchnl.h | 6 +\n drivers/common/idpf/version.map | 3 +\n drivers/net/idpf/idpf_ethdev.c | 268 +++++++++++++++++++++\n drivers/net/idpf/idpf_ethdev.h | 3 +-\n 6 files changed, 399 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h\nindex 1d8e7d405a..7abc4d2a3a 100644\n--- a/drivers/common/idpf/idpf_common_device.h\n+++ b/drivers/common/idpf/idpf_common_device.h\n@@ -98,6 +98,7 @@ struct idpf_vport {\n \tuint32_t *rss_lut;\n \tuint8_t *rss_key;\n \tuint64_t rss_hf;\n+\tuint64_t last_general_rss_hf;\n \n \t/* MSIX info*/\n \tstruct virtchnl2_queue_vector *qv_map; /* queue vector mapping */\ndiff --git a/drivers/common/idpf/idpf_common_virtchnl.c b/drivers/common/idpf/idpf_common_virtchnl.c\nindex 40cff34c09..10cfa33704 100644\n--- a/drivers/common/idpf/idpf_common_virtchnl.c\n+++ b/drivers/common/idpf/idpf_common_virtchnl.c\n@@ -218,6 +218,9 @@ idpf_vc_cmd_execute(struct idpf_adapter *adapter, struct idpf_cmd_info *args)\n \tcase VIRTCHNL2_OP_ALLOC_VECTORS:\n \tcase VIRTCHNL2_OP_DEALLOC_VECTORS:\n \tcase VIRTCHNL2_OP_GET_STATS:\n+\tcase VIRTCHNL2_OP_GET_RSS_KEY:\n+\tcase VIRTCHNL2_OP_GET_RSS_HASH:\n+\tcase VIRTCHNL2_OP_GET_RSS_LUT:\n \t\t/* for init virtchnl ops, need to poll the response */\n \t\terr = idpf_vc_one_msg_read(adapter, args->ops, args->out_size, args->out_buffer);\n \t\tclear_cmd(adapter);\n@@ -448,6 +451,48 @@ idpf_vc_rss_key_set(struct idpf_vport *vport)\n \treturn err;\n }\n \n+int idpf_vc_rss_key_get(struct idpf_vport *vport)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_rss_key *rss_key_ret;\n+\tstruct virtchnl2_rss_key rss_key;\n+\tstruct idpf_cmd_info args;\n+\tint err;\n+\n+\tmemset(&rss_key, 0, sizeof(rss_key));\n+\trss_key.vport_id = vport->vport_id;\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_GET_RSS_KEY;\n+\targs.in_args = (uint8_t *)&rss_key;\n+\targs.in_args_size = sizeof(rss_key);\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_vc_cmd_execute(adapter, &args);\n+\n+\tif (!err) {\n+\t\trss_key_ret = (struct virtchnl2_rss_key *)args.out_buffer;\n+\t\tif (rss_key_ret->key_len != vport->rss_key_size) {\n+\t\t\trte_free(vport->rss_key);\n+\t\t\tvport->rss_key = NULL;\n+\t\t\tvport->rss_key_size = RTE_MIN(IDPF_RSS_KEY_LEN,\n+\t\t\t\t\t\t rss_key_ret->key_len);\n+\t\t\tvport->rss_key = rte_zmalloc(\"rss_key\", vport->rss_key_size, 0);\n+\t\t\tif (!vport->rss_key) {\n+\t\t\t\tvport->rss_key_size = 0;\n+\t\t\t\tDRV_LOG(ERR, \"Failed to allocate RSS key\");\n+\t\t\t\treturn -ENOMEM;\n+\t\t\t}\n+\t\t}\n+\t\trte_memcpy(vport->rss_key, rss_key_ret->key, vport->rss_key_size);\n+\t} else {\n+\t\tDRV_LOG(ERR, \"Failed to execute command of VIRTCHNL2_OP_GET_RSS_KEY\");\n+\t}\n+\n+\treturn err;\n+}\n+\n int\n idpf_vc_rss_lut_set(struct idpf_vport *vport)\n {\n@@ -482,6 +527,80 @@ idpf_vc_rss_lut_set(struct idpf_vport *vport)\n \treturn err;\n }\n \n+int\n+idpf_vc_rss_lut_get(struct idpf_vport *vport)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_rss_lut *rss_lut_ret;\n+\tstruct virtchnl2_rss_lut rss_lut;\n+\tstruct idpf_cmd_info args;\n+\tint err;\n+\n+\tmemset(&rss_lut, 0, sizeof(rss_lut));\n+\trss_lut.vport_id = vport->vport_id;\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_GET_RSS_LUT;\n+\targs.in_args = (uint8_t *)&rss_lut;\n+\targs.in_args_size = sizeof(rss_lut);\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_vc_cmd_execute(adapter, &args);\n+\n+\tif (!err) {\n+\t\trss_lut_ret = (struct virtchnl2_rss_lut *)args.out_buffer;\n+\t\tif (rss_lut_ret->lut_entries != vport->rss_lut_size) {\n+\t\t\trte_free(vport->rss_lut);\n+\t\t\tvport->rss_lut = NULL;\n+\t\t\tvport->rss_lut = rte_zmalloc(\"rss_lut\",\n+\t\t\t\t sizeof(uint32_t) * rss_lut_ret->lut_entries, 0);\n+\t\t\tif (vport->rss_lut == NULL) {\n+\t\t\t\tDRV_LOG(ERR, \"Failed to allocate RSS lut\");\n+\t\t\t\treturn -ENOMEM;\n+\t\t\t}\n+\t\t}\n+\t\trte_memcpy(vport->rss_lut, rss_lut_ret->lut, rss_lut_ret->lut_entries);\n+\t\tvport->rss_lut_size = rss_lut_ret->lut_entries;\n+\t} else {\n+\t\tDRV_LOG(ERR, \"Failed to execute command of VIRTCHNL2_OP_GET_RSS_LUT\");\n+\t}\n+\n+\treturn err;\n+}\n+\n+int\n+idpf_vc_rss_hash_get(struct idpf_vport *vport)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_rss_hash *rss_hash_ret;\n+\tstruct virtchnl2_rss_hash rss_hash;\n+\tstruct idpf_cmd_info args;\n+\tint err;\n+\n+\tmemset(&rss_hash, 0, sizeof(rss_hash));\n+\trss_hash.ptype_groups = vport->rss_hf;\n+\trss_hash.vport_id = vport->vport_id;\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_GET_RSS_HASH;\n+\targs.in_args = (uint8_t *)&rss_hash;\n+\targs.in_args_size = sizeof(rss_hash);\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_vc_cmd_execute(adapter, &args);\n+\n+\tif (!err) {\n+\t\trss_hash_ret = (struct virtchnl2_rss_hash *)args.out_buffer;\n+\t\tvport->rss_hf = rss_hash_ret->ptype_groups;\n+\t} else {\n+\t\tDRV_LOG(ERR, \"Failed to execute command of OP_GET_RSS_HASH\");\n+\t}\n+\n+\treturn err;\n+}\n+\n int\n idpf_vc_rss_hash_set(struct idpf_vport *vport)\n {\ndiff --git a/drivers/common/idpf/idpf_common_virtchnl.h b/drivers/common/idpf/idpf_common_virtchnl.h\nindex 6b94fd5b8f..205d1a932d 100644\n--- a/drivers/common/idpf/idpf_common_virtchnl.h\n+++ b/drivers/common/idpf/idpf_common_virtchnl.h\n@@ -52,4 +52,10 @@ int idpf_vc_txq_config(struct idpf_vport *vport, struct idpf_tx_queue *txq);\n __rte_internal\n int idpf_vc_stats_query(struct idpf_vport *vport,\n \t\t\tstruct virtchnl2_vport_stats **pstats);\n+__rte_internal\n+int idpf_vc_rss_key_get(struct idpf_vport *vport);\n+__rte_internal\n+int idpf_vc_rss_lut_get(struct idpf_vport *vport);\n+__rte_internal\n+int idpf_vc_rss_hash_get(struct idpf_vport *vport);\n #endif /* _IDPF_COMMON_VIRTCHNL_H_ */\ndiff --git a/drivers/common/idpf/version.map b/drivers/common/idpf/version.map\nindex e6a02828ba..f6c92e7e57 100644\n--- a/drivers/common/idpf/version.map\n+++ b/drivers/common/idpf/version.map\n@@ -42,8 +42,11 @@ INTERNAL {\n \tidpf_vc_ptype_info_query;\n \tidpf_vc_queue_switch;\n \tidpf_vc_queues_ena_dis;\n+\tidpf_vc_rss_hash_get;\n \tidpf_vc_rss_hash_set;\n+\tidpf_vc_rss_key_get;\n \tidpf_vc_rss_key_set;\n+\tidpf_vc_rss_lut_get;\n \tidpf_vc_rss_lut_set;\n \tidpf_vc_rxq_config;\n \tidpf_vc_stats_query;\ndiff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c\nindex 02ddb0330a..7262109d0a 100644\n--- a/drivers/net/idpf/idpf_ethdev.c\n+++ b/drivers/net/idpf/idpf_ethdev.c\n@@ -29,6 +29,56 @@ static const char * const idpf_valid_args[] = {\n \tNULL\n };\n \n+static const uint64_t idpf_map_hena_rss[] = {\n+\t[IDPF_HASH_NONF_UNICAST_IPV4_UDP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_UDP,\n+\t[IDPF_HASH_NONF_MULTICAST_IPV4_UDP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_UDP,\n+\t[IDPF_HASH_NONF_IPV4_UDP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_UDP,\n+\t[IDPF_HASH_NONF_IPV4_TCP_SYN_NO_ACK] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_TCP,\n+\t[IDPF_HASH_NONF_IPV4_TCP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_TCP,\n+\t[IDPF_HASH_NONF_IPV4_SCTP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_SCTP,\n+\t[IDPF_HASH_NONF_IPV4_OTHER] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV4_OTHER,\n+\t[IDPF_HASH_FRAG_IPV4] = RTE_ETH_RSS_FRAG_IPV4,\n+\n+\t/* IPv6 */\n+\t[IDPF_HASH_NONF_UNICAST_IPV6_UDP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_UDP,\n+\t[IDPF_HASH_NONF_MULTICAST_IPV6_UDP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_UDP,\n+\t[IDPF_HASH_NONF_IPV6_UDP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_UDP,\n+\t[IDPF_HASH_NONF_IPV6_TCP_SYN_NO_ACK] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_TCP,\n+\t[IDPF_HASH_NONF_IPV6_TCP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_TCP,\n+\t[IDPF_HASH_NONF_IPV6_SCTP] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_SCTP,\n+\t[IDPF_HASH_NONF_IPV6_OTHER] =\n+\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_OTHER,\n+\t[IDPF_HASH_FRAG_IPV6] = RTE_ETH_RSS_FRAG_IPV6,\n+\n+\t/* L2 Payload */\n+\t[IDPF_HASH_L2_PAYLOAD] = RTE_ETH_RSS_L2_PAYLOAD\n+};\n+\n+static const uint64_t idpf_ipv4_rss = RTE_ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\t\t RTE_ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\t\t RTE_ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\t\t RTE_ETH_RSS_NONFRAG_IPV4_OTHER |\n+\t\t\t RTE_ETH_RSS_FRAG_IPV4;\n+\n+static const uint64_t idpf_ipv6_rss = RTE_ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\t\t RTE_ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\t\t RTE_ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\t\t RTE_ETH_RSS_NONFRAG_IPV6_OTHER |\n+\t\t\t RTE_ETH_RSS_FRAG_IPV6;\n+\n static int\n idpf_dev_link_update(struct rte_eth_dev *dev,\n \t\t __rte_unused int wait_to_complete)\n@@ -59,6 +109,9 @@ idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->max_mtu = vport->max_mtu;\n \tdev_info->min_mtu = RTE_ETHER_MIN_MTU;\n \n+\tdev_info->hash_key_size = vport->rss_key_size;\n+\tdev_info->reta_size = vport->rss_lut_size;\n+\n \tdev_info->flow_type_rss_offloads = IDPF_RSS_OFFLOAD_ALL;\n \n \tdev_info->rx_offload_capa =\n@@ -221,6 +274,36 @@ idpf_dev_stats_reset(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n+static int idpf_config_rss_hf(struct idpf_vport *vport, uint64_t rss_hf)\n+{\n+\tuint64_t hena = 0;\n+\tuint16_t i;\n+\n+\t/**\n+\t * RTE_ETH_RSS_IPV4 and RTE_ETH_RSS_IPV6 can be considered as 2\n+\t * generalizations of all other IPv4 and IPv6 RSS types.\n+\t */\n+\tif (rss_hf & RTE_ETH_RSS_IPV4)\n+\t\trss_hf |= idpf_ipv4_rss;\n+\n+\tif (rss_hf & RTE_ETH_RSS_IPV6)\n+\t\trss_hf |= idpf_ipv6_rss;\n+\n+\tfor (i = 0; i < RTE_DIM(idpf_map_hena_rss); i++) {\n+\t\tif (idpf_map_hena_rss[i] & rss_hf)\n+\t\t\thena |= BIT_ULL(i);\n+\t}\n+\n+\t/**\n+\t * At present, cp doesn't process the virtual channel msg of rss_hf configuration,\n+\t * tips are given below.\n+\t */\n+\tif (hena != vport->rss_hf)\n+\t\tPMD_DRV_LOG(WARNING, \"Updating RSS Hash Function is not supported at present.\");\n+\n+\treturn 0;\n+}\n+\n static int\n idpf_init_rss(struct idpf_vport *vport)\n {\n@@ -257,6 +340,187 @@ idpf_init_rss(struct idpf_vport *vport)\n \treturn ret;\n }\n \n+static int\n+idpf_rss_reta_update(struct rte_eth_dev *dev,\n+\t\t struct rte_eth_rss_reta_entry64 *reta_conf,\n+\t\t uint16_t reta_size)\n+{\n+\tstruct idpf_vport *vport = dev->data->dev_private;\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tuint16_t idx, shift;\n+\tint ret = 0;\n+\tuint16_t i;\n+\n+\tif (adapter->caps.rss_caps == 0 || dev->data->nb_rx_queues == 0) {\n+\t\tPMD_DRV_LOG(DEBUG, \"RSS is not supported\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\tif (reta_size != vport->rss_lut_size) {\n+\t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured \"\n+\t\t\t\t \"(%d) doesn't match the number of hardware can \"\n+\t\t\t\t \"support (%d)\",\n+\t\t\t reta_size, vport->rss_lut_size);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (i = 0; i < reta_size; i++) {\n+\t\tidx = i / RTE_ETH_RETA_GROUP_SIZE;\n+\t\tshift = i % RTE_ETH_RETA_GROUP_SIZE;\n+\t\tif (reta_conf[idx].mask & (1ULL << shift))\n+\t\t\tvport->rss_lut[i] = reta_conf[idx].reta[shift];\n+\t}\n+\n+\t/* send virtchnl ops to configure RSS */\n+\tret = idpf_vc_rss_lut_set(vport);\n+\tif (ret)\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS lut\");\n+\n+\treturn ret;\n+}\n+\n+static int\n+idpf_rss_reta_query(struct rte_eth_dev *dev,\n+\t\t struct rte_eth_rss_reta_entry64 *reta_conf,\n+\t\t uint16_t reta_size)\n+{\n+\tstruct idpf_vport *vport = dev->data->dev_private;\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tuint16_t idx, shift;\n+\tint ret = 0;\n+\tuint16_t i;\n+\n+\tif (adapter->caps.rss_caps == 0 || dev->data->nb_rx_queues == 0) {\n+\t\tPMD_DRV_LOG(DEBUG, \"RSS is not supported\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\tif (reta_size != vport->rss_lut_size) {\n+\t\tPMD_DRV_LOG(ERR, \"The size of hash lookup table configured \"\n+\t\t\t\"(%d) doesn't match the number of hardware can \"\n+\t\t\t\"support (%d)\", reta_size, vport->rss_lut_size);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tret = idpf_vc_rss_lut_get(vport);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get RSS LUT\");\n+\t\treturn ret;\n+\t}\n+\n+\tfor (i = 0; i < reta_size; i++) {\n+\t\tidx = i / RTE_ETH_RETA_GROUP_SIZE;\n+\t\tshift = i % RTE_ETH_RETA_GROUP_SIZE;\n+\t\tif (reta_conf[idx].mask & (1ULL << shift))\n+\t\t\treta_conf[idx].reta[shift] = vport->rss_lut[i];\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+idpf_rss_hash_update(struct rte_eth_dev *dev,\n+\t\t struct rte_eth_rss_conf *rss_conf)\n+{\n+\tstruct idpf_vport *vport = dev->data->dev_private;\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tint ret = 0;\n+\n+\tif (adapter->caps.rss_caps == 0 || dev->data->nb_rx_queues == 0) {\n+\t\tPMD_DRV_LOG(DEBUG, \"RSS is not supported\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\tif (!rss_conf->rss_key || rss_conf->rss_key_len == 0) {\n+\t\tPMD_DRV_LOG(DEBUG, \"No key to be configured\");\n+\t\tgoto skip_rss_key;\n+\t} else if (rss_conf->rss_key_len != vport->rss_key_size) {\n+\t\tPMD_DRV_LOG(ERR, \"The size of hash key configured \"\n+\t\t\t\t \"(%d) doesn't match the size of hardware can \"\n+\t\t\t\t \"support (%d)\",\n+\t\t\t rss_conf->rss_key_len,\n+\t\t\t vport->rss_key_size);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\trte_memcpy(vport->rss_key, rss_conf->rss_key,\n+\t\t vport->rss_key_size);\n+\tret = idpf_vc_rss_key_set(vport);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS key\");\n+\t\treturn ret;\n+\t}\n+\n+skip_rss_key:\n+\tret = idpf_config_rss_hf(vport, rss_conf->rss_hf);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS hash\");\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static uint64_t\n+idpf_map_general_rss_hf(uint64_t config_rss_hf, uint64_t last_general_rss_hf)\n+{\n+\tuint64_t valid_rss_hf = 0;\n+\tuint16_t i;\n+\n+\tfor (i = 0; i < RTE_DIM(idpf_map_hena_rss); i++) {\n+\t\tuint64_t bit = BIT_ULL(i);\n+\n+\t\tif (bit & config_rss_hf)\n+\t\t\tvalid_rss_hf |= idpf_map_hena_rss[i];\n+\t}\n+\n+\tif (valid_rss_hf & idpf_ipv4_rss)\n+\t\tvalid_rss_hf |= last_general_rss_hf & RTE_ETH_RSS_IPV4;\n+\n+\tif (valid_rss_hf & idpf_ipv6_rss)\n+\t\tvalid_rss_hf |= last_general_rss_hf & RTE_ETH_RSS_IPV6;\n+\n+\treturn valid_rss_hf;\n+}\n+\n+static int\n+idpf_rss_hash_conf_get(struct rte_eth_dev *dev,\n+\t\t struct rte_eth_rss_conf *rss_conf)\n+{\n+\tstruct idpf_vport *vport = dev->data->dev_private;\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tint ret = 0;\n+\n+\tif (adapter->caps.rss_caps == 0 || dev->data->nb_rx_queues == 0) {\n+\t\tPMD_DRV_LOG(DEBUG, \"RSS is not supported\");\n+\t\treturn -ENOTSUP;\n+\t}\n+\n+\tret = idpf_vc_rss_hash_get(vport);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get RSS hf\");\n+\t\treturn ret;\n+\t}\n+\n+\trss_conf->rss_hf = idpf_map_general_rss_hf(vport->rss_hf, vport->last_general_rss_hf);\n+\n+\tif (!rss_conf->rss_key)\n+\t\treturn 0;\n+\n+\tret = idpf_vc_rss_key_get(vport);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get RSS key\");\n+\t\treturn ret;\n+\t}\n+\n+\tif (rss_conf->rss_key_len > vport->rss_key_size)\n+\t\trss_conf->rss_key_len = vport->rss_key_size;\n+\n+\trte_memcpy(rss_conf->rss_key, vport->rss_key, rss_conf->rss_key_len);\n+\n+\treturn 0;\n+}\n+\n static int\n idpf_dev_configure(struct rte_eth_dev *dev)\n {\n@@ -692,6 +956,10 @@ static const struct eth_dev_ops idpf_eth_dev_ops = {\n \t.dev_supported_ptypes_get\t= idpf_dev_supported_ptypes_get,\n \t.stats_get\t\t\t= idpf_dev_stats_get,\n \t.stats_reset\t\t\t= idpf_dev_stats_reset,\n+\t.reta_update\t\t\t= idpf_rss_reta_update,\n+\t.reta_query\t\t\t= idpf_rss_reta_query,\n+\t.rss_hash_update\t\t= idpf_rss_hash_update,\n+\t.rss_hash_conf_get\t\t= idpf_rss_hash_conf_get,\n };\n \n static uint16_t\ndiff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h\nindex d791d402fb..839a2bd82c 100644\n--- a/drivers/net/idpf/idpf_ethdev.h\n+++ b/drivers/net/idpf/idpf_ethdev.h\n@@ -48,7 +48,8 @@\n \t\tRTE_ETH_RSS_NONFRAG_IPV6_TCP |\t\\\n \t\tRTE_ETH_RSS_NONFRAG_IPV6_UDP |\t\\\n \t\tRTE_ETH_RSS_NONFRAG_IPV6_SCTP |\t\\\n-\t\tRTE_ETH_RSS_NONFRAG_IPV6_OTHER)\n+\t\tRTE_ETH_RSS_NONFRAG_IPV6_OTHER |\t\\\n+\t\tRTE_ETH_RSS_L2_PAYLOAD)\n \n #define IDPF_ADAPTER_NAME_LEN\t(PCI_PRI_STR_SIZE + 1)\n \n", "prefixes": [ "v5", "2/6" ] }