Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85689/?format=api
{ "id": 85689, "url": "https://patches.dpdk.org/api/patches/85689/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201223123044.55942-1-xuan.ding@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": "<20201223123044.55942-1-xuan.ding@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201223123044.55942-1-xuan.ding@intel.com", "date": "2020-12-23T12:30:44", "name": "[v2] net/iavf: improve default RSS", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "19fc34b0a19728390b2f3065ea42b23f62619cc4", "submitter": { "id": 1401, "url": "https://patches.dpdk.org/api/people/1401/?format=api", "name": "Ding, Xuan", "email": "xuan.ding@intel.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201223123044.55942-1-xuan.ding@intel.com/mbox/", "series": [ { "id": 14441, "url": "https://patches.dpdk.org/api/series/14441/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14441", "date": "2020-12-23T12:30:44", "name": "[v2] net/iavf: improve default RSS", "version": 2, "mbox": "https://patches.dpdk.org/series/14441/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/85689/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/85689/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 ADB3FA052A;\n\tWed, 23 Dec 2020 13:32:28 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 461EDC9E4;\n\tWed, 23 Dec 2020 13:32:26 +0100 (CET)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n by dpdk.org (Postfix) with ESMTP id BA887C9E2\n for <dev@dpdk.org>; Wed, 23 Dec 2020 13:32:23 +0100 (CET)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 23 Dec 2020 04:32:22 -0800", "from dpdk-xuanding-dev2.sh.intel.com ([10.67.119.124])\n by orsmga001.jf.intel.com with ESMTP; 23 Dec 2020 04:32:20 -0800" ], "IronPort-SDR": [ "\n XZUsq+oFWHEb1UGsM3KbXyZdE2aP0mjbOpfdmrixDy+v+Fjp3PWwoA7dJZoniUJde+sYCsa4ev\n P4803V0EiwtA==", "\n lljbUcvyhNkzhk56ej6wBdTV8BrA52qJTbpfmVP+wdWVOuRR6pm5SSrzIEzTAWx3etl5zQLVX4\n 6IBZlwKvgeMw==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6000,8403,9843\"; a=\"163729629\"", "E=Sophos;i=\"5.78,441,1599548400\"; d=\"scan'208\";a=\"163729629\"", "E=Sophos;i=\"5.78,441,1599548400\"; d=\"scan'208\";a=\"417198196\"" ], "X-ExtLoop1": "1", "From": "Xuan Ding <xuan.ding@intel.com>", "To": "qi.z.zhang@intel.com,\n\tjingjing.wu@intel.com,\n\tbeilei.xing@intel.com", "Cc": "dev@dpdk.org,\n\tXuan Ding <xuan.ding@intel.com>", "Date": "Wed, 23 Dec 2020 12:30:44 +0000", "Message-Id": "<20201223123044.55942-1-xuan.ding@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20201203032618.70919-1-xuan.ding@intel.com>", "References": "<20201203032618.70919-1-xuan.ding@intel.com>", "Subject": "[dpdk-dev] [PATCH v2] net/iavf: improve default RSS", "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": "This patch adds support to actively configure RSS through port config.\nAny kernel PF enabled default RSS will be disabled during initialization.\nBesides, default RSS will be configured based on rte_eth_rss_conf->rss_hf.\nCurrently supported default rss_type: ipv4[6], ipv4[6]_udp, ipv4[6]_tcp,\nipv4[6]_sctp.\n\nSigned-off-by: Xuan Ding <xuan.ding@intel.com>\n---\n\nv2:\n* Revised the commit log.\n* Fixed a bug to cause memory leak.\n* Optimized the code to avoid duplication.\n---\n drivers/net/iavf/iavf.h | 12 ++++-\n drivers/net/iavf/iavf_ethdev.c | 76 ++++++++++++++++++++++++-------\n drivers/net/iavf/iavf_hash.c | 81 ++++++++++++++++++++++------------\n drivers/net/iavf/iavf_vchnl.c | 23 ++++++++++\n 4 files changed, 146 insertions(+), 46 deletions(-)", "diff": "diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h\nindex 6d5912d8c..9754273b2 100644\n--- a/drivers/net/iavf/iavf.h\n+++ b/drivers/net/iavf/iavf.h\n@@ -46,11 +46,18 @@\n \tVIRTCHNL_VF_OFFLOAD_RX_POLLING)\n \n #define IAVF_RSS_OFFLOAD_ALL ( \\\n+\tETH_RSS_IPV4 | \\\n \tETH_RSS_FRAG_IPV4 | \\\n \tETH_RSS_NONFRAG_IPV4_TCP | \\\n \tETH_RSS_NONFRAG_IPV4_UDP | \\\n \tETH_RSS_NONFRAG_IPV4_SCTP | \\\n-\tETH_RSS_NONFRAG_IPV4_OTHER)\n+\tETH_RSS_NONFRAG_IPV4_OTHER | \\\n+\tETH_RSS_IPV6 | \\\n+\tETH_RSS_FRAG_IPV6 | \\\n+\tETH_RSS_NONFRAG_IPV6_TCP | \\\n+\tETH_RSS_NONFRAG_IPV6_UDP | \\\n+\tETH_RSS_NONFRAG_IPV6_SCTP | \\\n+\tETH_RSS_NONFRAG_IPV6_OTHER)\n \n #define IAVF_MISC_VEC_ID RTE_INTR_VEC_ZERO_OFFSET\n #define IAVF_RX_VEC_START RTE_INTR_VEC_RXTX_OFFSET\n@@ -153,6 +160,7 @@ struct iavf_info {\n \n \tuint8_t *rss_lut;\n \tuint8_t *rss_key;\n+\tuint64_t rss_hf;\n \tuint16_t nb_msix; /* number of MSI-X interrupts on Rx */\n \tuint16_t msix_base; /* msix vector base from */\n \tuint16_t max_rss_qregion; /* max RSS queue region supported by PF */\n@@ -321,6 +329,8 @@ 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_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,\n \t\t\tstruct rte_ether_addr *mc_addrs,\n \t\t\tuint32_t mc_addrs_num, bool add);\ndiff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c\nindex 7e3c26a94..d2fa16825 100644\n--- a/drivers/net/iavf/iavf_ethdev.c\n+++ b/drivers/net/iavf/iavf_ethdev.c\n@@ -267,10 +267,6 @@ iavf_init_rss(struct iavf_adapter *adapter)\n \t\treturn ret;\n \t}\n \n-\t/* In IAVF, RSS enablement is set by PF driver. It is not supported\n-\t * to set based on rss_conf->rss_hf.\n-\t */\n-\n \t/* configure RSS key */\n \tif (!rss_conf->rss_key) {\n \t\t/* Calculate the default hash key */\n@@ -295,6 +291,13 @@ iavf_init_rss(struct iavf_adapter *adapter)\n \tif (ret)\n \t\treturn ret;\n \n+\t/* Set RSS hash configuration based on rss_conf->rss_hf. */\n+\tret = iavf_rss_hash_set(adapter, rss_conf->rss_hf, true);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"fail to set default RSS\");\n+\t\treturn ret;\n+\t}\n+\n \treturn 0;\n }\n \n@@ -1102,33 +1105,66 @@ iavf_dev_rss_reta_query(struct rte_eth_dev *dev,\n }\n \n static int\n-iavf_dev_rss_hash_update(struct rte_eth_dev *dev,\n-\t\t\tstruct rte_eth_rss_conf *rss_conf)\n+iavf_set_rss_key(struct iavf_adapter *adapter, uint8_t *key, uint8_t key_len)\n {\n-\tstruct iavf_adapter *adapter =\n-\t\tIAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n \tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n \n-\tif (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF))\n-\t\treturn -ENOTSUP;\n-\n \t/* HENA setting, it is enabled by default, no change */\n-\tif (!rss_conf->rss_key || rss_conf->rss_key_len == 0) {\n+\tif (!key || key_len == 0) {\n \t\tPMD_DRV_LOG(DEBUG, \"No key to be configured\");\n \t\treturn 0;\n-\t} else if (rss_conf->rss_key_len != vf->vf_res->rss_key_size) {\n+\t} else if (key_len != vf->vf_res->rss_key_size) {\n \t\tPMD_DRV_LOG(ERR, \"The size of hash key configured \"\n \t\t\t\"(%d) doesn't match the size of hardware can \"\n-\t\t\t\"support (%d)\", rss_conf->rss_key_len,\n+\t\t\t\"support (%d)\", key_len,\n \t\t\tvf->vf_res->rss_key_size);\n \t\treturn -EINVAL;\n \t}\n \n-\trte_memcpy(vf->rss_key, rss_conf->rss_key, rss_conf->rss_key_len);\n+\trte_memcpy(vf->rss_key, key, key_len);\n \n \treturn iavf_configure_rss_key(adapter);\n }\n \n+static int\n+iavf_dev_rss_hash_update(struct rte_eth_dev *dev,\n+\t\t\tstruct rte_eth_rss_conf *rss_conf)\n+{\n+\tstruct iavf_adapter *adapter =\n+\t\tIAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);\n+\tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);\n+\tint ret;\n+\n+\tadapter->eth_dev->data->dev_conf.rx_adv_conf.rss_conf = *rss_conf;\n+\n+\tif (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF))\n+\t\treturn -ENOTSUP;\n+\n+\t/* Set hash key. */\n+\tret = iavf_set_rss_key(adapter, rss_conf->rss_key,\n+\t\t\t rss_conf->rss_key_len);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\tif (rss_conf->rss_hf == 0)\n+\t\treturn 0;\n+\n+\t/* Overwritten default RSS. */\n+\tret = iavf_set_hena(adapter, 0);\n+\tif (ret)\n+\t\tPMD_DRV_LOG(ERR, \"%s Remove rss vsi fail %d\",\n+\t\t\t __func__, ret);\n+\n+\t/* Set new RSS configuration. */\n+\tret = iavf_rss_hash_set(adapter, rss_conf->rss_hf, true);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"fail to set new RSS\");\n+\t\treturn ret;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int\n iavf_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n \t\t\t struct rte_eth_rss_conf *rss_conf)\n@@ -1140,8 +1176,7 @@ iavf_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n \tif (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF))\n \t\treturn -ENOTSUP;\n \n-\t /* Just set it to default value now. */\n-\trss_conf->rss_hf = IAVF_RSS_OFFLOAD_ALL;\n+\trss_conf->rss_hf = vf->rss_hf;\n \n \tif (!rss_conf->rss_key)\n \t\treturn 0;\n@@ -2029,6 +2064,13 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)\n \t\treturn ret;\n \t}\n \n+\t/* Set hena = 0 to ask PF to cleanup all existing RSS. */\n+\tret = iavf_set_hena(adapter, 0);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"fail to disable default PF RSS\");\n+\t\treturn ret;\n+\t}\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c\nindex c4c73e664..8fda6d0cb 100644\n--- a/drivers/net/iavf/iavf_hash.c\n+++ b/drivers/net/iavf/iavf_hash.c\n@@ -429,17 +429,6 @@ static struct iavf_pattern_match_item iavf_hash_pattern_list[] = {\n \t{iavf_pattern_eth_ipv6_gtpc,\t\t\tETH_RSS_IPV6,\t\t\t&ipv6_udp_gtpc_tmplt},\n };\n \n-struct virtchnl_proto_hdrs *iavf_hash_default_hdrs[] = {\n-\t&inner_ipv4_tmplt,\n-\t&inner_ipv4_udp_tmplt,\n-\t&inner_ipv4_tcp_tmplt,\n-\t&inner_ipv4_sctp_tmplt,\n-\t&inner_ipv6_tmplt,\n-\t&inner_ipv6_udp_tmplt,\n-\t&inner_ipv6_tcp_tmplt,\n-\t&inner_ipv6_sctp_tmplt,\n-};\n-\n static struct iavf_flow_engine iavf_hash_engine = {\n \t.init = iavf_hash_init,\n \t.create = iavf_hash_create,\n@@ -458,24 +447,64 @@ static struct iavf_flow_parser iavf_hash_parser = {\n \t.stage = IAVF_FLOW_STAGE_RSS,\n };\n \n-static int\n-iavf_hash_default_set(struct iavf_adapter *ad, bool add)\n+int\n+iavf_rss_hash_set(struct iavf_adapter *ad, uint64_t rss_hf, bool add)\n {\n+\tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);\n \tstruct virtchnl_rss_cfg *rss_cfg;\n-\tuint16_t i;\n \n-\trss_cfg = rte_zmalloc(\"iavf rss rule\",\n-\t\t\t sizeof(struct virtchnl_rss_cfg), 0);\n-\tif (!rss_cfg)\n-\t\treturn -ENOMEM;\n+#define IAVF_RSS_HF_ALL ( \\\n+\tETH_RSS_IPV4 | \\\n+\tETH_RSS_IPV6 | \\\n+\tETH_RSS_NONFRAG_IPV4_UDP | \\\n+\tETH_RSS_NONFRAG_IPV6_UDP | \\\n+\tETH_RSS_NONFRAG_IPV4_TCP | \\\n+\tETH_RSS_NONFRAG_IPV6_TCP | \\\n+\tETH_RSS_NONFRAG_IPV4_SCTP | \\\n+\tETH_RSS_NONFRAG_IPV6_SCTP)\n+\n+\trss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;\n+\tif (rss_hf & ETH_RSS_IPV4) {\n+\t\trss_cfg->proto_hdrs = inner_ipv4_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n+\n+\tif (rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) {\n+\t\trss_cfg->proto_hdrs = inner_ipv4_udp_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n+\n+\tif (rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) {\n+\t\trss_cfg->proto_hdrs = inner_ipv4_tcp_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n \n-\tfor (i = 0; i < RTE_DIM(iavf_hash_default_hdrs); i++) {\n-\t\trss_cfg->proto_hdrs = *iavf_hash_default_hdrs[i];\n-\t\trss_cfg->rss_algorithm = VIRTCHNL_RSS_ALG_TOEPLITZ_ASYMMETRIC;\n+\tif (rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) {\n+\t\trss_cfg->proto_hdrs = inner_ipv4_sctp_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n+\n+\tif (rss_hf & ETH_RSS_IPV6) {\n+\t\trss_cfg->proto_hdrs = inner_ipv6_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n+\n+\tif (rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) {\n+\t\trss_cfg->proto_hdrs = inner_ipv6_udp_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n+\n+\tif (rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) {\n+\t\trss_cfg->proto_hdrs = inner_ipv6_tcp_tmplt;\n+\t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n+\t}\n \n+\tif (rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) {\n+\t\trss_cfg->proto_hdrs = inner_ipv6_sctp_tmplt;\n \t\tiavf_add_del_rss_cfg(ad, rss_cfg, add);\n \t}\n \n+\tvf->rss_hf = rss_hf & IAVF_RSS_HF_ALL;\n \treturn 0;\n }\n \n@@ -510,12 +539,6 @@ iavf_hash_init(struct iavf_adapter *ad)\n \t\treturn ret;\n \t}\n \n-\tret = iavf_hash_default_set(ad, true);\n-\tif (ret) {\n-\t\tPMD_DRV_LOG(ERR, \"fail to set default RSS\");\n-\t\tiavf_unregister_parser(parser, ad);\n-\t}\n-\n \treturn ret;\n }\n \n@@ -1089,6 +1112,7 @@ static void\n iavf_hash_uninit(struct iavf_adapter *ad)\n {\n \tstruct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(ad);\n+\tstruct rte_eth_rss_conf *rss_conf;\n \n \tif (vf->vf_reset)\n \t\treturn;\n@@ -1099,7 +1123,8 @@ iavf_hash_uninit(struct iavf_adapter *ad)\n \tif (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF))\n \t\treturn;\n \n-\tif (iavf_hash_default_set(ad, false))\n+\trss_conf = &ad->eth_dev->data->dev_conf.rx_adv_conf.rss_conf;\n+\tif (iavf_rss_hash_set(ad, rss_conf->rss_hf, false))\n \t\tPMD_DRV_LOG(ERR, \"fail to delete default RSS\");\n \n \tiavf_unregister_parser(&iavf_hash_parser, ad);\ndiff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c\nindex 33d03af65..c718a75c4 100644\n--- a/drivers/net/iavf/iavf_vchnl.c\n+++ b/drivers/net/iavf/iavf_vchnl.c\n@@ -1341,6 +1341,29 @@ iavf_add_del_rss_cfg(struct iavf_adapter *adapter,\n \treturn err;\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+\tstruct virtchnl_rss_hena vrh;\n+\tstruct iavf_cmd_info args;\n+\tint err;\n+\n+\tvrh.hena = hena;\n+\targs.ops = VIRTCHNL_OP_SET_RSS_HENA;\n+\targs.in_args = (u8 *)&vrh;\n+\targs.in_args_size = sizeof(vrh);\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_SET_RSS_HENA\");\n+\n+\treturn err;\n+}\n+\n int\n iavf_add_del_mc_addr_list(struct iavf_adapter *adapter,\n \t\t\tstruct rte_ether_addr *mc_addrs,\n", "prefixes": [ "v2" ] }