Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/119000/?format=api
{ "id": 119000, "url": "http://patchwork.dpdk.org/api/patches/119000/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20221024130134.1046536-11-junfeng.guo@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": "<20221024130134.1046536-11-junfeng.guo@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221024130134.1046536-11-junfeng.guo@intel.com", "date": "2022-10-24T13:01:30", "name": "[v10,10/14] net/idpf: add support for RSS", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "5b4639720b54722148ee2ea3c3f4439b00a85a2d", "submitter": { "id": 1785, "url": "http://patchwork.dpdk.org/api/people/1785/?format=api", "name": "Junfeng Guo", "email": "junfeng.guo@intel.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20221024130134.1046536-11-junfeng.guo@intel.com/mbox/", "series": [ { "id": 25385, "url": "http://patchwork.dpdk.org/api/series/25385/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=25385", "date": "2022-10-24T13:01:20", "name": "add support for idpf PMD in DPDK", "version": 10, "mbox": "http://patchwork.dpdk.org/series/25385/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/119000/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/119000/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 A9591A034C;\n\tMon, 24 Oct 2022 15:05:05 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 0C31342BBC;\n\tMon, 24 Oct 2022 15:04:41 +0200 (CEST)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n by mails.dpdk.org (Postfix) with ESMTP id 5C18A42BAB\n for <dev@dpdk.org>; Mon, 24 Oct 2022 15:04:32 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Oct 2022 06:03:32 -0700", "from dpdk-jf-ntb-one.sh.intel.com ([10.67.111.104])\n by orsmga002.jf.intel.com with ESMTP; 24 Oct 2022 06:03:30 -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=1666616672; x=1698152672;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=r9s3/m98Fll1KOLsv2GLgZXr1wxsr6AvlN0A6lXk76Q=;\n b=DZoiUkC8MDZFaFtvfGf0W6Z+crDjlCMHOxFR/NIDH5EDq6q10QtR42QG\n uxv19tT0Mdo1THf8jRS58aOde22+lDGz0IbJ9LotmSY7jnC0Pc2YyRD7P\n 9WnSby7iehV5KJB41fG4yr+Y9+7kZH8kOtfIa8MU/M3O/tBT0AujUNMG1\n XpPrKOamPpVNayFKarUu+KWnWVw/qouWVrWIwe8AlmZvSMQn9ht9uGdVP\n V3IqRUVDdbx30w+yg+IbrJRltUp4C9Z+oM3mYe3JDQQw9p1wnX1lFNrz4\n bwvdgV//0zWr3CdkI7XMWioGQvOj80blEzFB+6Nv9OMaqkHCEJ8o+H42N w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10510\"; a=\"305018877\"", "E=Sophos;i=\"5.95,209,1661842800\"; d=\"scan'208\";a=\"305018877\"", "E=McAfee;i=\"6500,9779,10510\"; a=\"631248420\"", "E=Sophos;i=\"5.95,209,1661842800\"; d=\"scan'208\";a=\"631248420\"" ], "X-ExtLoop1": "1", "From": "Junfeng Guo <junfeng.guo@intel.com>", "To": "andrew.rybchenko@oktetlabs.ru, qi.z.zhang@intel.com,\n jingjing.wu@intel.com,\n beilei.xing@intel.com", "Cc": "dev@dpdk.org,\n\tJunfeng Guo <junfeng.guo@intel.com>", "Subject": "[PATCH v10 10/14] net/idpf: add support for RSS", "Date": "Mon, 24 Oct 2022 21:01:30 +0800", "Message-Id": "<20221024130134.1046536-11-junfeng.guo@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20221024130134.1046536-1-junfeng.guo@intel.com>", "References": "<20221021051821.2164939-2-junfeng.guo@intel.com>\n <20221024130134.1046536-1-junfeng.guo@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 RSS support.\n\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\nSigned-off-by: Junfeng Guo <junfeng.guo@intel.com>\n---\n drivers/net/idpf/idpf_ethdev.c | 116 ++++++++++++++++++++++++++++++++-\n drivers/net/idpf/idpf_ethdev.h | 26 ++++++++\n drivers/net/idpf/idpf_vchnl.c | 97 +++++++++++++++++++++++++++\n 3 files changed, 237 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c\nindex 57e4bf0d67..739cf31d65 100644\n--- a/drivers/net/idpf/idpf_ethdev.c\n+++ b/drivers/net/idpf/idpf_ethdev.c\n@@ -90,6 +90,7 @@ idpf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)\n \tdev_info->max_mtu = dev_info->max_rx_pktlen - IDPF_ETH_OVERHEAD;\n \tdev_info->min_mtu = RTE_ETHER_MIN_MTU;\n \n+\tdev_info->flow_type_rss_offloads = IDPF_RSS_OFFLOAD_ALL;\n \tdev_info->max_mac_addrs = IDPF_NUM_MACADDR_MAX;\n \tdev_info->dev_capa = RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |\n \t\tRTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;\n@@ -226,6 +227,10 @@ idpf_init_vport(struct rte_eth_dev *dev)\n \tvport->max_mtu = vport_info->max_mtu;\n \trte_memcpy(vport->default_mac_addr,\n \t\t vport_info->default_mac_addr, ETH_ALEN);\n+\tvport->rss_algorithm = vport_info->rss_algorithm;\n+\tvport->rss_key_size = RTE_MIN(IDPF_RSS_KEY_LEN,\n+\t\t\t\t vport_info->rss_key_size);\n+\tvport->rss_lut_size = vport_info->rss_lut_size;\n \tvport->sw_idx = idx;\n \n \tfor (i = 0; i < vport_info->chunks.num_chunks; i++) {\n@@ -271,13 +276,114 @@ idpf_init_vport(struct rte_eth_dev *dev)\n \n \treturn 0;\n }\n+\n+static int\n+idpf_config_rss(struct idpf_vport *vport)\n+{\n+\tint ret;\n+\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+\tret = idpf_vc_set_rss_lut(vport);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS lut\");\n+\t\treturn ret;\n+\t}\n+\n+\tret = idpf_vc_set_rss_hash(vport);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS hash\");\n+\t\treturn ret;\n+\t}\n+\n+\treturn ret;\n+}\n+\n+static int\n+idpf_init_rss(struct idpf_vport *vport)\n+{\n+\tstruct rte_eth_rss_conf *rss_conf;\n+\tuint16_t i, nb_q, lut_size;\n+\tint ret = 0;\n+\n+\trss_conf = &vport->dev_data->dev_conf.rx_adv_conf.rss_conf;\n+\tnb_q = vport->dev_data->nb_rx_queues;\n+\n+\tvport->rss_key = (uint8_t *)rte_zmalloc(\"rss_key\",\n+\t\t\t\t\t vport->rss_key_size, 0);\n+\tif (vport->rss_key == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to allocate RSS key\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err_alloc_key;\n+\t}\n+\n+\tlut_size = vport->rss_lut_size;\n+\tvport->rss_lut = (uint32_t *)rte_zmalloc(\"rss_lut\",\n+\t\t\t\t\t sizeof(uint32_t) * lut_size, 0);\n+\tif (vport->rss_lut == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to allocate RSS lut\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err_alloc_lut;\n+\t}\n+\n+\tif (rss_conf->rss_key == NULL) {\n+\t\tfor (i = 0; i < vport->rss_key_size; i++)\n+\t\t\tvport->rss_key[i] = (uint8_t)rte_rand();\n+\t} else if (rss_conf->rss_key_len != vport->rss_key_size) {\n+\t\tPMD_INIT_LOG(ERR, \"Invalid RSS key length in RSS configuration, should be %d\",\n+\t\t\t vport->rss_key_size);\n+\t\tret = -EINVAL;\n+\t\tgoto err_cfg_key;\n+\t} else {\n+\t\trte_memcpy(vport->rss_key, rss_conf->rss_key,\n+\t\t\t vport->rss_key_size);\n+\t}\n+\n+\tfor (i = 0; i < lut_size; i++)\n+\t\tvport->rss_lut[i] = i % nb_q;\n+\n+\tvport->rss_hf = IDPF_DEFAULT_RSS_HASH_EXPANDED;\n+\n+\tret = idpf_config_rss(vport);\n+\tif (ret != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to configure RSS\");\n+\t\tgoto err_cfg_key;\n+\t}\n+\n+\treturn ret;\n+\n+err_cfg_key:\n+\trte_free(vport->rss_lut);\n+\tvport->rss_lut = NULL;\n+err_alloc_lut:\n+\trte_free(vport->rss_key);\n+\tvport->rss_key = NULL;\n+err_alloc_key:\n+\treturn ret;\n+}\n+\n static int\n idpf_dev_configure(struct rte_eth_dev *dev)\n {\n-\tif ((dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0)\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\tret = idpf_init_rss(vport);\n+\t\tif (ret != 0) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Failed to init rss\");\n+\t\t\treturn ret;\n+\t\t}\n+\t} else if ((dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) != 0) {\n \t\tPMD_INIT_LOG(ERR, \"RSS is not supported.\");\n+\t}\n \n-\treturn 0;\n+\treturn ret;\n }\n \n static int\n@@ -474,6 +580,12 @@ idpf_dev_close(struct rte_eth_dev *dev)\n \n \tidpf_vc_destroy_vport(vport);\n \n+\trte_free(vport->rss_lut);\n+\tvport->rss_lut = NULL;\n+\n+\trte_free(vport->rss_key);\n+\tvport->rss_key = NULL;\n+\n \trte_free(vport->recv_vectors);\n \tvport->recv_vectors = NULL;\n \ndiff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h\nindex d89a06d239..7fe2647956 100644\n--- a/drivers/net/idpf/idpf_ethdev.h\n+++ b/drivers/net/idpf/idpf_ethdev.h\n@@ -57,6 +57,20 @@\n #define IDPF_ETH_OVERHEAD \\\n \t(RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IDPF_VLAN_TAG_SIZE * 2)\n \n+#define IDPF_RSS_OFFLOAD_ALL ( \\\n+\tRTE_ETH_RSS_IPV4\t\t| \\\n+\tRTE_ETH_RSS_FRAG_IPV4\t\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV4_TCP\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV4_UDP\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV4_SCTP\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV4_OTHER\t| \\\n+\tRTE_ETH_RSS_IPV6\t\t| \\\n+\tRTE_ETH_RSS_FRAG_IPV6\t\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV6_TCP\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV6_UDP\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV6_SCTP\t| \\\n+\tRTE_ETH_RSS_NONFRAG_IPV6_OTHER)\n+\n #ifndef ETH_ADDR_LEN\n #define ETH_ADDR_LEN\t\t6\n #endif\n@@ -103,11 +117,20 @@ struct idpf_vport {\n \tuint16_t max_mtu;\n \tuint8_t default_mac_addr[VIRTCHNL_ETH_LENGTH_OF_ADDRESS];\n \n+\tenum virtchnl_rss_algorithm rss_algorithm;\n+\tuint16_t rss_key_size;\n+\tuint16_t rss_lut_size;\n+\n \tuint16_t sw_idx; /* SW idx */\n \n \tstruct rte_eth_dev_data *dev_data; /* Pointer to the device data */\n \tuint16_t max_pkt_len; /* Maximum packet length */\n \n+\t/* RSS info */\n+\tuint32_t *rss_lut;\n+\tuint8_t *rss_key;\n+\tuint64_t rss_hf;\n+\n \t/* MSIX info*/\n \tstruct virtchnl2_queue_vector *qv_map; /* queue vector mapping */\n \tuint16_t max_vectors;\n@@ -221,6 +244,9 @@ int idpf_get_pkt_type(struct idpf_adapter *adapter);\n int idpf_vc_get_caps(struct idpf_adapter *adapter);\n int idpf_vc_create_vport(struct idpf_adapter *adapter);\n int idpf_vc_destroy_vport(struct idpf_vport *vport);\n+int idpf_vc_set_rss_key(struct idpf_vport *vport);\n+int idpf_vc_set_rss_lut(struct idpf_vport *vport);\n+int idpf_vc_set_rss_hash(struct idpf_vport *vport);\n int idpf_vc_config_rxqs(struct idpf_vport *vport);\n int idpf_vc_config_rxq(struct idpf_vport *vport, uint16_t rxq_id);\n int idpf_vc_config_txqs(struct idpf_vport *vport);\ndiff --git a/drivers/net/idpf/idpf_vchnl.c b/drivers/net/idpf/idpf_vchnl.c\nindex 34369cfc96..63605f2f64 100644\n--- a/drivers/net/idpf/idpf_vchnl.c\n+++ b/drivers/net/idpf/idpf_vchnl.c\n@@ -228,6 +228,9 @@ idpf_execute_vc_cmd(struct idpf_adapter *adapter, struct idpf_cmd_info *args)\n \tcase VIRTCHNL2_OP_GET_CAPS:\n \tcase VIRTCHNL2_OP_CREATE_VPORT:\n \tcase VIRTCHNL2_OP_DESTROY_VPORT:\n+\tcase VIRTCHNL2_OP_SET_RSS_KEY:\n+\tcase VIRTCHNL2_OP_SET_RSS_LUT:\n+\tcase VIRTCHNL2_OP_SET_RSS_HASH:\n \tcase VIRTCHNL2_OP_CONFIG_RX_QUEUES:\n \tcase VIRTCHNL2_OP_CONFIG_TX_QUEUES:\n \tcase VIRTCHNL2_OP_ENABLE_QUEUES:\n@@ -667,6 +670,100 @@ idpf_vc_destroy_vport(struct idpf_vport *vport)\n \treturn err;\n }\n \n+int\n+idpf_vc_set_rss_key(struct idpf_vport *vport)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_rss_key *rss_key;\n+\tstruct idpf_cmd_info args;\n+\tint len, err;\n+\n+\tlen = sizeof(*rss_key) + sizeof(rss_key->key[0]) *\n+\t\t(vport->rss_key_size - 1);\n+\trss_key = rte_zmalloc(\"rss_key\", len, 0);\n+\tif (rss_key == NULL)\n+\t\treturn -ENOMEM;\n+\n+\trss_key->vport_id = vport->vport_id;\n+\trss_key->key_len = vport->rss_key_size;\n+\trte_memcpy(rss_key->key, vport->rss_key,\n+\t\t sizeof(rss_key->key[0]) * vport->rss_key_size);\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_SET_RSS_KEY;\n+\targs.in_args = (uint8_t *)rss_key;\n+\targs.in_args_size = len;\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_execute_vc_cmd(adapter, &args);\n+\tif (err != 0)\n+\t\tPMD_DRV_LOG(ERR, \"Failed to execute command of VIRTCHNL2_OP_SET_RSS_KEY\");\n+\n+\trte_free(rss_key);\n+\treturn err;\n+}\n+\n+int\n+idpf_vc_set_rss_lut(struct idpf_vport *vport)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\n+\tstruct virtchnl2_rss_lut *rss_lut;\n+\tstruct idpf_cmd_info args;\n+\tint len, err;\n+\n+\tlen = sizeof(*rss_lut) + sizeof(rss_lut->lut[0]) *\n+\t\t(vport->rss_lut_size - 1);\n+\trss_lut = rte_zmalloc(\"rss_lut\", len, 0);\n+\tif (rss_lut == NULL)\n+\t\treturn -ENOMEM;\n+\n+\trss_lut->vport_id = vport->vport_id;\n+\trss_lut->lut_entries = vport->rss_lut_size;\n+\trte_memcpy(rss_lut->lut, vport->rss_lut,\n+\t\t sizeof(rss_lut->lut[0]) * vport->rss_lut_size);\n+\n+\tmemset(&args, 0, sizeof(args));\n+\targs.ops = VIRTCHNL2_OP_SET_RSS_LUT;\n+\targs.in_args = (uint8_t *)rss_lut;\n+\targs.in_args_size = len;\n+\targs.out_buffer = adapter->mbx_resp;\n+\targs.out_size = IDPF_DFLT_MBX_BUF_SIZE;\n+\n+\terr = idpf_execute_vc_cmd(adapter, &args);\n+\tif (err != 0)\n+\t\tPMD_DRV_LOG(ERR, \"Failed to execute command of VIRTCHNL2_OP_SET_RSS_LUT\");\n+\n+\trte_free(rss_lut);\n+\treturn err;\n+}\n+\n+int\n+idpf_vc_set_rss_hash(struct idpf_vport *vport)\n+{\n+\tstruct idpf_adapter *adapter = vport->adapter;\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_SET_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_execute_vc_cmd(adapter, &args);\n+\tif (err != 0)\n+\t\tPMD_DRV_LOG(ERR, \"Failed to execute command of OP_SET_RSS_HASH\");\n+\n+\treturn err;\n+}\n+\n #define IDPF_RX_BUF_STRIDE\t\t64\n int\n idpf_vc_config_rxqs(struct idpf_vport *vport)\n", "prefixes": [ "v10", "10/14" ] }