Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/122026/?format=api
{ "id": 122026, "url": "http://patches.dpdk.org/api/patches/122026/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230113081931.221576-20-mingxia.liu@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": "<20230113081931.221576-20-mingxia.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230113081931.221576-20-mingxia.liu@intel.com", "date": "2023-01-13T08:19:29", "name": "[v2,19/21] net/cpfl: add RSS set/get ops", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3a818b015696d019a6c289391c7958d9cc4526b1", "submitter": { "id": 2514, "url": "http://patches.dpdk.org/api/people/2514/?format=api", "name": "Liu, Mingxia", "email": "mingxia.liu@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/20230113081931.221576-20-mingxia.liu@intel.com/mbox/", "series": [ { "id": 26532, "url": "http://patches.dpdk.org/api/series/26532/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26532", "date": "2023-01-13T08:19:10", "name": "add support for cpfl PMD in DPDK", "version": 2, "mbox": "http://patches.dpdk.org/series/26532/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/122026/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/122026/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 96623423C1;\n\tFri, 13 Jan 2023 10:17:17 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C97B242E2B;\n\tFri, 13 Jan 2023 10:15:37 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by mails.dpdk.org (Postfix) with ESMTP id 8CDAA42E06\n for <dev@dpdk.org>; Fri, 13 Jan 2023 10:15:29 +0100 (CET)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 13 Jan 2023 01:15:29 -0800", "from dpdk-mingxial-01.sh.intel.com ([10.67.119.167])\n by fmsmga006.fm.intel.com with ESMTP; 13 Jan 2023 01:15:27 -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=1673601329; x=1705137329;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=KMunp+I7hQ2DeaRev8aG0YPqlcsgp6IYqtpeaFejSSo=;\n b=MgWGlWOeYFq3Lg2adHpm3RdTiZRTKxx3hth1JjbjrfNMu7eOVKUDASbr\n fQkOUHp1xq1Qe6ohEkchuG9+29kFXW7Fld1PFeRGc0U+1ITZn1xRkr1zK\n TPqjIDFbasDV506y96+NyR+mP1gJHu0WoTAEEqnS29tH0+g8aYDQOz4m1\n D+k7qYy0eNq+2bWMhV4SxVTHvy0ewFo09J7C6JvgSLwDM2LiFltX6hfzA\n ajuYWyOmNcHVGi+FDXsrZ+k87rXwntOoIe4YlX3X+Zl1WLn05lNgl1olE\n 1+LUK6Yc4ATo9/lHIrar1rbqIRqLyKEPVNt7vyDkdDVI1CRkSQWymzaIU A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10588\"; a=\"304332586\"", "E=Sophos;i=\"5.97,213,1669104000\"; d=\"scan'208\";a=\"304332586\"", "E=McAfee;i=\"6500,9779,10588\"; a=\"903522799\"", "E=Sophos;i=\"5.97,213,1669104000\"; d=\"scan'208\";a=\"903522799\"" ], "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": "wenjun1.wu@intel.com,\n\tMingxia Liu <mingxia.liu@intel.com>", "Subject": "[PATCH v2 19/21] net/cpfl: add RSS set/get ops", "Date": "Fri, 13 Jan 2023 08:19:29 +0000", "Message-Id": "<20230113081931.221576-20-mingxia.liu@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20230113081931.221576-1-mingxia.liu@intel.com>", "References": "<20221223015558.3143279-1-mingxia.liu@intel.com>\n <20230113081931.221576-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/net/cpfl/cpfl_ethdev.c | 303 +++++++++++++++++++++++++++++++++\n 1 file changed, 303 insertions(+)", "diff": "diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c\nindex 9ae653b99a..b35224e1ec 100644\n--- a/drivers/net/cpfl/cpfl_ethdev.c\n+++ b/drivers/net/cpfl/cpfl_ethdev.c\n@@ -30,6 +30,56 @@ static const char * const cpfl_valid_args[] = {\n \tNULL\n };\n \n+static const uint64_t cpfl_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 cpfl_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 cpfl_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 cpfl_dev_link_update(struct rte_eth_dev *dev,\n \t\t __rte_unused int wait_to_complete)\n@@ -97,6 +147,9 @@ cpfl_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 = CPFL_RSS_OFFLOAD_ALL;\n \n \tdev_info->rx_offload_capa =\n@@ -259,6 +312,54 @@ cpfl_dev_stats_reset(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n+static int cpfl_config_rss_hf(struct idpf_vport *vport, uint64_t rss_hf)\n+{\n+\tuint64_t hena = 0, valid_rss_hf = 0;\n+\tint ret = 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 |= cpfl_ipv4_rss;\n+\n+\tif (rss_hf & RTE_ETH_RSS_IPV6)\n+\t\trss_hf |= cpfl_ipv6_rss;\n+\n+\tfor (i = 0; i < RTE_DIM(cpfl_map_hena_rss); i++) {\n+\t\tuint64_t bit = BIT_ULL(i);\n+\n+\t\tif (cpfl_map_hena_rss[i] & rss_hf) {\n+\t\t\tvalid_rss_hf |= cpfl_map_hena_rss[i];\n+\t\t\thena |= bit;\n+\t\t}\n+\t}\n+\n+\tvport->rss_hf = hena;\n+\n+\tret = idpf_vc_set_rss_hash(vport);\n+\tif (ret != 0) {\n+\t\tPMD_DRV_LOG(WARNING,\n+\t\t\t \"fail to set RSS offload types, ret: %d\", ret);\n+\t\treturn ret;\n+\t}\n+\n+\tif (valid_rss_hf & cpfl_ipv4_rss)\n+\t\tvalid_rss_hf |= rss_hf & RTE_ETH_RSS_IPV4;\n+\n+\tif (valid_rss_hf & cpfl_ipv6_rss)\n+\t\tvalid_rss_hf |= rss_hf & RTE_ETH_RSS_IPV6;\n+\n+\tif (rss_hf & ~valid_rss_hf)\n+\t\tPMD_DRV_LOG(WARNING, \"Unsupported rss_hf 0x%\" PRIx64,\n+\t\t\t rss_hf & ~valid_rss_hf);\n+\tvport->last_general_rss_hf = valid_rss_hf;\n+\n+\treturn ret;\n+}\n+\n static int\n cpfl_init_rss(struct idpf_vport *vport)\n {\n@@ -295,6 +396,204 @@ cpfl_init_rss(struct idpf_vport *vport)\n \treturn ret;\n }\n \n+static int\n+cpfl_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+\tuint32_t *lut;\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+\t/* It MUST use the current LUT size to get the RSS lookup table,\n+\t * otherwise if will fail with -100 error code.\n+\t */\n+\tlut = rte_zmalloc(NULL, reta_size * sizeof(uint32_t), 0);\n+\tif (!lut) {\n+\t\tPMD_DRV_LOG(ERR, \"No memory can be allocated\");\n+\t\treturn -ENOMEM;\n+\t}\n+\t/* store the old lut table temporarily */\n+\trte_memcpy(lut, vport->rss_lut, reta_size * sizeof(uint32_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\tlut[i] = reta_conf[idx].reta[shift];\n+\t}\n+\n+\trte_memcpy(vport->rss_lut, lut, reta_size * sizeof(uint32_t));\n+\t/* send virtchnl ops to configure RSS */\n+\tret = idpf_vc_set_rss_lut(vport);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS lut\");\n+\t\tgoto out;\n+\t}\n+out:\n+\trte_free(lut);\n+\n+\treturn ret;\n+}\n+\n+static int\n+cpfl_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_get_rss_lut(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+cpfl_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_set_rss_key(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 = cpfl_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+cpfl_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(cpfl_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 |= cpfl_map_hena_rss[i];\n+\t}\n+\n+\tif (valid_rss_hf & cpfl_ipv4_rss)\n+\t\tvalid_rss_hf |= last_general_rss_hf & RTE_ETH_RSS_IPV4;\n+\n+\tif (valid_rss_hf & cpfl_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+cpfl_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_get_rss_hash(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 = cpfl_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_get_rss_key(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 cpfl_dev_configure(struct rte_eth_dev *dev)\n {\n@@ -854,6 +1153,10 @@ static const struct eth_dev_ops cpfl_eth_dev_ops = {\n \t.dev_supported_ptypes_get\t= cpfl_dev_supported_ptypes_get,\n \t.stats_get\t\t\t= cpfl_dev_stats_get,\n \t.stats_reset\t\t\t= cpfl_dev_stats_reset,\n+\t.reta_update\t\t\t= cpfl_rss_reta_update,\n+\t.reta_query\t\t\t= cpfl_rss_reta_query,\n+\t.rss_hash_update\t\t= cpfl_rss_hash_update,\n+\t.rss_hash_conf_get\t\t= cpfl_rss_hash_conf_get,\n };\n \n static uint16_t\n", "prefixes": [ "v2", "19/21" ] }