Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/91994/?format=api
{ "id": 91994, "url": "http://patches.dpdk.org/api/patches/91994/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210422050809.33164-1-alvinx.zhang@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": "<20210422050809.33164-1-alvinx.zhang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210422050809.33164-1-alvinx.zhang@intel.com", "date": "2021-04-22T05:08:09", "name": "[v5] net/iavf: fix hash configuration on i40e VF", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "db3ec4e85d685f2669f6ac13355285e551201dba", "submitter": { "id": 1398, "url": "http://patches.dpdk.org/api/people/1398/?format=api", "name": "Alvin Zhang", "email": "alvinx.zhang@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/20210422050809.33164-1-alvinx.zhang@intel.com/mbox/", "series": [ { "id": 16589, "url": "http://patches.dpdk.org/api/series/16589/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=16589", "date": "2021-04-22T05:08:09", "name": "[v5] net/iavf: fix hash configuration on i40e VF", "version": 5, "mbox": "http://patches.dpdk.org/series/16589/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/91994/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/91994/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 2F5BFA0548;\n\tThu, 22 Apr 2021 07:08:30 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id B653C413FA;\n\tThu, 22 Apr 2021 07:08:29 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n by mails.dpdk.org (Postfix) with ESMTP id EDC9B413E6;\n Thu, 22 Apr 2021 07:08:27 +0200 (CEST)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Apr 2021 22:08:16 -0700", "from shwdenpg235.ccr.corp.intel.com ([10.240.182.60])\n by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 21 Apr 2021 22:08:14 -0700" ], "IronPort-SDR": [ "\n m8tjRWXZ9D8uljZ3h6SPCOC48vzJiRtCBK3ClwISOHm2hXPQDXzFjFAWUteGAAtnq0hPUC36qh\n lCW7vVpKvKDQ==", "\n PHSWrR4AQgnZmN4Fqn9CThLmaV5ZcmKkI8EfqwHCrSWEYnRCJbCdICho1NVg2JRArBBXtxJjZD\n QfuhGWgrgdLA==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,9961\"; a=\"195855521\"", "E=Sophos;i=\"5.82,241,1613462400\"; d=\"scan'208\";a=\"195855521\"", "E=Sophos;i=\"5.82,241,1613462400\"; d=\"scan'208\";a=\"446153483\"" ], "From": "Alvin Zhang <alvinx.zhang@intel.com>", "To": "jingjing.wu@intel.com,\n\tbeilei.xing@intel.com", "Cc": "dev@dpdk.org,\n\tAlvin Zhang <alvinx.zhang@intel.com>,\n\tstable@dpdk.org", "Date": "Thu, 22 Apr 2021 13:08:09 +0800", "Message-Id": "<20210422050809.33164-1-alvinx.zhang@intel.com>", "X-Mailer": "git-send-email 2.21.0.windows.1", "In-Reply-To": "<20210422031500.32256-1-alvinx.zhang@intel.com>", "References": "<20210422031500.32256-1-alvinx.zhang@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v5] net/iavf: fix hash configuration on i40e VF", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "In i40evf PMD, the VF directly accesses the hash enable registers to\nenable or disable hashing on ingress packets. When binding i40e VF\nto iavf, because the PF doesn't support VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF\ncapability. Therefore, the VF hashing cannot be enabled.\n\nThis patch adds support of hash configuration for i40e VF by sending\nVIRTCHNL_OP_SET_RSS_HENA message to the PF after checking that the PF\ndoes not support VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF capability.\n\nFixes: c678299594a8 (\"net/iavf: fix default RSS configuration\")\nCc: stable@dpdk.org\n\nSigned-off-by: Alvin Zhang <alvinx.zhang@intel.com>\n---\n\nv2: Update commit log.\nv3: Increase compatibility with old drivers.\nv4: Fix compile issues.\nv5: Rebase to 1b593b9c832e9b284cc59665fe662242a3fc1daf.\n---\n drivers/net/iavf/iavf.h | 1 +\n drivers/net/iavf/iavf_ethdev.c | 111 ++++++++++++++++++++++++++++++++++++++++-\n drivers/net/iavf/iavf_vchnl.c | 45 ++++++++++++++---\n 3 files changed, 150 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h\nindex d1ae5a3..1e73f01 100644\n--- a/drivers/net/iavf/iavf.h\n+++ b/drivers/net/iavf/iavf.h\n@@ -336,6 +336,7 @@ int iavf_fdir_check(struct iavf_adapter *adapter,\n \t\tstruct iavf_fdir_conf *filter);\n int iavf_add_del_rss_cfg(struct iavf_adapter *adapter,\n \t\t\t struct virtchnl_rss_cfg *rss_cfg, bool add);\n+int iavf_get_hena_caps(struct iavf_adapter *adapter, uint64_t *caps);\n int iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena);\n int iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t rss_hf, bool add);\n int iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,\ndiff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c\nindex d523a06..97a2dc7 100644\n--- a/drivers/net/iavf/iavf_ethdev.c\n+++ b/drivers/net/iavf/iavf_ethdev.c\n@@ -246,6 +246,107 @@ struct rte_iavf_xstats_name_off {\n }\n \n static int\n+iavf_config_rss_hf(struct iavf_adapter *adapter, uint64_t rss_hf)\n+{\n+\tstatic const uint64_t map_hena_rss[] = {\n+\t\t/* IPv4 */\n+\t\t[IAVF_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV4_UDP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_UDP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV4_TCP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_TCP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV4_SCTP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_SCTP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV4_OTHER] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV4_OTHER,\n+\t\t[IAVF_FILTER_PCTYPE_FRAG_IPV4] = ETH_RSS_FRAG_IPV4,\n+\n+\t\t/* IPv6 */\n+\t\t[IAVF_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV6_UDP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_UDP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV6_TCP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_TCP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV6_SCTP] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_SCTP,\n+\t\t[IAVF_FILTER_PCTYPE_NONF_IPV6_OTHER] =\n+\t\t\t\tETH_RSS_NONFRAG_IPV6_OTHER,\n+\t\t[IAVF_FILTER_PCTYPE_FRAG_IPV6] = ETH_RSS_FRAG_IPV6,\n+\n+\t\t/* L2 Payload */\n+\t\t[IAVF_FILTER_PCTYPE_L2_PAYLOAD] = ETH_RSS_L2_PAYLOAD\n+\t};\n+\n+\tconst uint64_t ipv4_rss = ETH_RSS_NONFRAG_IPV4_UDP |\n+\t\t\t\t ETH_RSS_NONFRAG_IPV4_TCP |\n+\t\t\t\t ETH_RSS_NONFRAG_IPV4_SCTP |\n+\t\t\t\t ETH_RSS_NONFRAG_IPV4_OTHER |\n+\t\t\t\t ETH_RSS_FRAG_IPV4;\n+\n+\tconst uint64_t ipv6_rss = ETH_RSS_NONFRAG_IPV6_UDP |\n+\t\t\t\t ETH_RSS_NONFRAG_IPV6_TCP |\n+\t\t\t\t ETH_RSS_NONFRAG_IPV6_SCTP |\n+\t\t\t\t ETH_RSS_NONFRAG_IPV6_OTHER |\n+\t\t\t\t ETH_RSS_FRAG_IPV6;\n+\n+\tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n+\tuint64_t caps = 0, hena = 0, valid_rss_hf = 0;\n+\tuint32_t i;\n+\tint ret;\n+\n+\tret = iavf_get_hena_caps(adapter, &caps);\n+\tif (ret)\n+\t\treturn ret;\n+\t/**\n+\t * ETH_RSS_IPV4 and 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 & ETH_RSS_IPV4)\n+\t\trss_hf |= ipv4_rss;\n+\n+\tif (rss_hf & ETH_RSS_IPV6)\n+\t\trss_hf |= ipv6_rss;\n+\n+\tRTE_BUILD_BUG_ON(RTE_DIM(map_hena_rss) > sizeof(uint64_t) * CHAR_BIT);\n+\n+\tfor (i = 0; i < RTE_DIM(map_hena_rss); i++) {\n+\t\tuint64_t bit = BIT_ULL(i);\n+\n+\t\tif ((caps & bit) && (map_hena_rss[i] & rss_hf)) {\n+\t\t\tvalid_rss_hf |= map_hena_rss[i];\n+\t\t\thena |= bit;\n+\t\t}\n+\t}\n+\n+\tret = iavf_set_hena(adapter, hena);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (valid_rss_hf & ipv4_rss)\n+\t\tvalid_rss_hf |= rss_hf & ETH_RSS_IPV4;\n+\n+\tif (valid_rss_hf & ipv6_rss)\n+\t\tvalid_rss_hf |= rss_hf & 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+\n+\tvf->rss_hf = valid_rss_hf;\n+\treturn 0;\n+}\n+\n+static int\n iavf_init_rss(struct iavf_adapter *adapter)\n {\n \tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n@@ -301,6 +402,10 @@ struct rte_iavf_xstats_name_off {\n \t\t\tPMD_DRV_LOG(ERR, \"fail to set default RSS\");\n \t\t\treturn ret;\n \t\t}\n+\t} else {\n+\t\tret = iavf_config_rss_hf(adapter, rss_conf->rss_hf);\n+\t\tif (ret != -ENOTSUP)\n+\t\t\treturn ret;\n \t}\n \n \treturn 0;\n@@ -1282,6 +1387,10 @@ static int iavf_config_rx_queues_irqs(struct rte_eth_dev *dev,\n \t\t\tPMD_DRV_LOG(ERR, \"fail to set new RSS\");\n \t\t\treturn ret;\n \t\t}\n+\t} else {\n+\t\tret = iavf_config_rss_hf(adapter, rss_conf->rss_hf);\n+\t\tif (ret != -ENOTSUP)\n+\t\t\treturn ret;\n \t}\n \n \treturn 0;\n@@ -2096,7 +2205,7 @@ static int iavf_parse_devargs(struct rte_eth_dev *dev)\n \tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n \tint ret = 0;\n \n-\tif (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF) {\n+\tif (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF) {\n \t\t/* Set hena = 0 to ask PF to cleanup all existing RSS. */\n \t\tret = iavf_set_hena(adapter, 0);\n \t\tif (ret)\ndiff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c\nindex 45096cb..8f2df0a 100644\n--- a/drivers/net/iavf/iavf_vchnl.c\n+++ b/drivers/net/iavf/iavf_vchnl.c\n@@ -9,6 +9,7 @@\n #include <unistd.h>\n #include <stdarg.h>\n #include <inttypes.h>\n+#include <assert.h>\n #include <rte_byteorder.h>\n #include <rte_common.h>\n \n@@ -228,13 +229,19 @@\n \t\t\trte_delay_ms(ASQ_DELAY_MS);\n \t\t\t/* If don't read msg or read sys event, continue */\n \t\t} while (i++ < MAX_TRY_TIMES);\n-\t\t/* If there's no response is received, clear command */\n-\t\tif (i >= MAX_TRY_TIMES ||\n-\t\t vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {\n-\t\t\terr = -1;\n-\t\t\tPMD_DRV_LOG(ERR, \"No response or return failure (%d)\"\n-\t\t\t\t \" for cmd %d\", vf->cmd_retval, args->ops);\n+\n+\t\tif (i >= MAX_TRY_TIMES) {\n+\t\t\tPMD_DRV_LOG(ERR, \"No response for cmd %d\", args->ops);\n \t\t\t_clear_cmd(vf);\n+\t\t\terr = -EIO;\n+\t\t} else if (vf->cmd_retval ==\n+\t\t\t (uint32_t)VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Cmd %d not supported\", args->ops);\n+\t\t\terr = -ENOTSUP;\n+\t\t} else if (vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {\n+\t\t\tPMD_DRV_LOG(ERR, \"Return failure %d for cmd %d\",\n+\t\t\t\t vf->cmd_retval, args->ops);\n+\t\t\terr = -EINVAL;\n \t\t}\n \t\tbreak;\n \t}\n@@ -1496,6 +1503,32 @@\n }\n \n int\n+iavf_get_hena_caps(struct iavf_adapter *adapter, uint64_t *caps)\n+{\n+\tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n+\tstruct iavf_cmd_info args;\n+\tint err;\n+\n+\tassert(caps);\n+\n+\targs.ops = VIRTCHNL_OP_GET_RSS_HENA_CAPS;\n+\targs.in_args = NULL;\n+\targs.in_args_size = 0;\n+\targs.out_buffer = vf->aq_resp;\n+\targs.out_size = IAVF_AQ_BUF_SZ;\n+\n+\terr = iavf_execute_vf_cmd(adapter, &args);\n+\tif (err) {\n+\t\tPMD_DRV_LOG(ERR,\n+\t\t\t \"Failed to execute command of OP_GET_RSS_HENA_CAPS\");\n+\t\treturn err;\n+\t}\n+\n+\t*caps = ((struct virtchnl_rss_hena *)args.out_buffer)->hena;\n+\treturn 0;\n+}\n+\n+int\n iavf_set_hena(struct iavf_adapter *adapter, uint64_t hena)\n {\n \tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n", "prefixes": [ "v5" ] }