Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131353/?format=api
{ "id": 131353, "url": "http://patches.dpdk.org/api/patches/131353/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230912162640.1439383-6-beilei.xing@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": "<20230912162640.1439383-6-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230912162640.1439383-6-beilei.xing@intel.com", "date": "2023-09-12T16:26:35", "name": "[v5,05/10] net/cpfl: enable vport mapping", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "819b465dfbaa7be8c5c4bdc28bee73469bbce993", "submitter": { "id": 410, "url": "http://patches.dpdk.org/api/people/410/?format=api", "name": "Xing, Beilei", "email": "beilei.xing@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/20230912162640.1439383-6-beilei.xing@intel.com/mbox/", "series": [ { "id": 29484, "url": "http://patches.dpdk.org/api/series/29484/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29484", "date": "2023-09-12T16:26:30", "name": "net/cpfl: support port representor", "version": 5, "mbox": "http://patches.dpdk.org/series/29484/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131353/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131353/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 200C84257B;\n\tTue, 12 Sep 2023 10:08:41 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 240B0402F1;\n\tTue, 12 Sep 2023 10:08:16 +0200 (CEST)", "from mgamail.intel.com (mgamail.intel.com [192.55.52.93])\n by mails.dpdk.org (Postfix) with ESMTP id AA7A84067E\n for <dev@dpdk.org>; Tue, 12 Sep 2023 10:08:12 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 12 Sep 2023 01:08:12 -0700", "from dpdk-beileix-icelake.sh.intel.com ([10.67.116.248])\n by fmsmga002.fm.intel.com with ESMTP; 12 Sep 2023 01:08:10 -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=1694506092; x=1726042092;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=fku0Odt8rIXRqThBWMru9DZoE4mMDac2rDFyHqwMyJQ=;\n b=FoG7T5rxyMV7KIUg+jnln4DdAsBzphDOXeQJ4/K82JRmsXmOVKYAJjNy\n q26+9brUE3DFUUtpHpFPoKRc4MsAjUsstMElnvuhjUPLoodEU/51qGFb2\n 9o9ls/ZUeDfmoVDjbP4Q56J6M1NcjPQH9+mSqCHfcft4vXx36MDR9v+/U\n V26kOGLKuPZTm5sntDnSbBIkG5Vov2c1wX5FRgHr9XsCJDm/uwhlTg4Z5\n 9vx5AMXgY2Jc/fe9//wFp6ZMSuQIAOQx7vqUWjUexNTXKYsrkxmVPGiUf\n Aut9MBBcmgksLH1P1ywIQmD83BQ2DDY0+rB3sS7dsQawQe0x8aIqpetPX A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10830\"; a=\"375639565\"", "E=Sophos;i=\"6.02,245,1688454000\"; d=\"scan'208\";a=\"375639565\"", "E=McAfee;i=\"6600,9927,10830\"; a=\"858702573\"", "E=Sophos;i=\"6.02,245,1688454000\"; d=\"scan'208\";a=\"858702573\"" ], "X-ExtLoop1": "1", "From": "beilei.xing@intel.com", "To": "jingjing.wu@intel.com", "Cc": "dev@dpdk.org, mingxia.liu@intel.com, Beilei Xing <beilei.xing@intel.com>,\n Qi Zhang <qi.z.zhang@intel.com>", "Subject": "[PATCH v5 05/10] net/cpfl: enable vport mapping", "Date": "Tue, 12 Sep 2023 16:26:35 +0000", "Message-Id": "<20230912162640.1439383-6-beilei.xing@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230912162640.1439383-1-beilei.xing@intel.com>", "References": "<20230908111701.1022724-1-beilei.xing@intel.com>\n <20230912162640.1439383-1-beilei.xing@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": "From: Beilei Xing <beilei.xing@intel.com>\n\n1. Handle cpchnl event for vport create/destroy\n2. Use hash table to store vport_id to vport_info mapping\n3. Use spinlock for thread safe.\n\nSigned-off-by: Qi Zhang <qi.z.zhang@intel.com>\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\n---\n drivers/net/cpfl/cpfl_ethdev.c | 157 +++++++++++++++++++++++++++++++++\n drivers/net/cpfl/cpfl_ethdev.h | 21 ++++-\n drivers/net/cpfl/meson.build | 2 +-\n 3 files changed, 177 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c\nindex 31a5822d2c..ad21f901bb 100644\n--- a/drivers/net/cpfl/cpfl_ethdev.c\n+++ b/drivers/net/cpfl/cpfl_ethdev.c\n@@ -10,6 +10,7 @@\n #include <rte_dev.h>\n #include <errno.h>\n #include <rte_alarm.h>\n+#include <rte_hash_crc.h>\n \n #include \"cpfl_ethdev.h\"\n #include \"cpfl_rxtx.h\"\n@@ -1504,6 +1505,108 @@ cpfl_handle_vchnl_event_msg(struct cpfl_adapter_ext *adapter, uint8_t *msg, uint\n \t}\n }\n \n+static int\n+cpfl_vport_info_create(struct cpfl_adapter_ext *adapter,\n+\t\t struct cpfl_vport_id *vport_identity,\n+\t\t struct cpchnl2_vport_info *vport_info)\n+{\n+\tstruct cpfl_vport_info *info = NULL;\n+\tint ret;\n+\n+\trte_spinlock_lock(&adapter->vport_map_lock);\n+\tret = rte_hash_lookup_data(adapter->vport_map_hash, vport_identity, (void **)&info);\n+\tif (ret >= 0) {\n+\t\tPMD_DRV_LOG(WARNING, \"vport already exist, overwrite info anyway\");\n+\t\t/* overwrite info */\n+\t\tif (info)\n+\t\t\tinfo->vport_info = *vport_info;\n+\t\tgoto fini;\n+\t}\n+\n+\tinfo = rte_zmalloc(NULL, sizeof(*info), 0);\n+\tif (info == NULL) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to alloc memory for vport map info\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err;\n+\t}\n+\n+\tinfo->vport_info = *vport_info;\n+\n+\tret = rte_hash_add_key_data(adapter->vport_map_hash, vport_identity, info);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to add vport map into hash\");\n+\t\trte_free(info);\n+\t\tgoto err;\n+\t}\n+\n+fini:\n+\trte_spinlock_unlock(&adapter->vport_map_lock);\n+\treturn 0;\n+err:\n+\trte_spinlock_unlock(&adapter->vport_map_lock);\n+\treturn ret;\n+}\n+\n+static int\n+cpfl_vport_info_destroy(struct cpfl_adapter_ext *adapter, struct cpfl_vport_id *vport_identity)\n+{\n+\tstruct cpfl_vport_info *info;\n+\tint ret;\n+\n+\trte_spinlock_lock(&adapter->vport_map_lock);\n+\tret = rte_hash_lookup_data(adapter->vport_map_hash, vport_identity, (void **)&info);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"vport id not exist\");\n+\t\tgoto err;\n+\t}\n+\n+\trte_hash_del_key(adapter->vport_map_hash, vport_identity);\n+\trte_spinlock_unlock(&adapter->vport_map_lock);\n+\trte_free(info);\n+\n+\treturn 0;\n+\n+err:\n+\trte_spinlock_unlock(&adapter->vport_map_lock);\n+\treturn ret;\n+}\n+\n+static void\n+cpfl_handle_cpchnl_event_msg(struct cpfl_adapter_ext *adapter, uint8_t *msg, uint16_t msglen)\n+{\n+\tstruct cpchnl2_event_info *cpchnl2_event = (struct cpchnl2_event_info *)msg;\n+\tstruct cpchnl2_vport_info *info;\n+\tstruct cpfl_vport_id vport_identity = { 0 };\n+\n+\tif (msglen < sizeof(struct cpchnl2_event_info)) {\n+\t\tPMD_DRV_LOG(ERR, \"Error event\");\n+\t\treturn;\n+\t}\n+\n+\tswitch (cpchnl2_event->header.type) {\n+\tcase CPCHNL2_EVENT_VPORT_CREATED:\n+\t\tvport_identity.vport_id = cpchnl2_event->data.vport_created.vport.vport_id;\n+\t\tinfo = &cpchnl2_event->data.vport_created.info;\n+\t\tvport_identity.func_type = info->func_type;\n+\t\tvport_identity.pf_id = info->pf_id;\n+\t\tvport_identity.vf_id = info->vf_id;\n+\t\tif (cpfl_vport_info_create(adapter, &vport_identity, info))\n+\t\t\tPMD_DRV_LOG(WARNING, \"Failed to handle CPCHNL2_EVENT_VPORT_CREATED\");\n+\t\tbreak;\n+\tcase CPCHNL2_EVENT_VPORT_DESTROYED:\n+\t\tvport_identity.vport_id = cpchnl2_event->data.vport_destroyed.vport.vport_id;\n+\t\tvport_identity.func_type = cpchnl2_event->data.vport_destroyed.func.func_type;\n+\t\tvport_identity.pf_id = cpchnl2_event->data.vport_destroyed.func.pf_id;\n+\t\tvport_identity.vf_id = cpchnl2_event->data.vport_destroyed.func.vf_id;\n+\t\tif (cpfl_vport_info_destroy(adapter, &vport_identity))\n+\t\t\tPMD_DRV_LOG(WARNING, \"Failed to handle CPCHNL2_EVENT_VPORT_DESTROY\");\n+\t\tbreak;\n+\tdefault:\n+\t\tPMD_DRV_LOG(ERR, \" unknown event received %u\", cpchnl2_event->header.type);\n+\t\tbreak;\n+\t}\n+}\n+\n static void\n cpfl_handle_virtchnl_msg(struct cpfl_adapter_ext *adapter)\n {\n@@ -1535,6 +1638,9 @@ cpfl_handle_virtchnl_msg(struct cpfl_adapter_ext *adapter)\n \t\t\tif (vc_op == VIRTCHNL2_OP_EVENT) {\n \t\t\t\tcpfl_handle_vchnl_event_msg(adapter, adapter->base.mbx_resp,\n \t\t\t\t\t\t\t ctlq_msg.data_len);\n+\t\t\t} else if (vc_op == CPCHNL2_OP_EVENT) {\n+\t\t\t\tcpfl_handle_cpchnl_event_msg(adapter, adapter->base.mbx_resp,\n+\t\t\t\t\t\t\t ctlq_msg.data_len);\n \t\t\t} else {\n \t\t\t\tif (vc_op == base->pend_cmd)\n \t\t\t\t\tnotify_cmd(base, base->cmd_retval);\n@@ -1610,6 +1716,48 @@ static struct virtchnl2_get_capabilities req_caps = {\n \t.other_caps = VIRTCHNL2_CAP_WB_ON_ITR\n };\n \n+static int\n+cpfl_vport_map_init(struct cpfl_adapter_ext *adapter)\n+{\n+\tchar hname[32];\n+\n+\tsnprintf(hname, 32, \"%s-vport\", adapter->name);\n+\n+\trte_spinlock_init(&adapter->vport_map_lock);\n+\n+#define CPFL_VPORT_MAP_HASH_ENTRY_NUM 2048\n+\n+\tstruct rte_hash_parameters params = {\n+\t\t.name = adapter->name,\n+\t\t.entries = CPFL_VPORT_MAP_HASH_ENTRY_NUM,\n+\t\t.key_len = sizeof(struct cpfl_vport_id),\n+\t\t.hash_func = rte_hash_crc,\n+\t\t.socket_id = SOCKET_ID_ANY,\n+\t};\n+\n+\tadapter->vport_map_hash = rte_hash_create(¶ms);\n+\n+\tif (adapter->vport_map_hash == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to create vport map hash\");\n+\t\treturn -EINVAL;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static void\n+cpfl_vport_map_uninit(struct cpfl_adapter_ext *adapter)\n+{\n+\tconst void *key = NULL;\n+\tstruct cpfl_vport_map_info *info;\n+\tuint32_t iter = 0;\n+\n+\twhile (rte_hash_iterate(adapter->vport_map_hash, &key, (void **)&info, &iter) >= 0)\n+\t\trte_free(info);\n+\n+\trte_hash_free(adapter->vport_map_hash);\n+}\n+\n static int\n cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter)\n {\n@@ -1634,6 +1782,12 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *a\n \t\tgoto err_adapter_init;\n \t}\n \n+\tret = cpfl_vport_map_init(adapter);\n+\tif (ret) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to init vport map\");\n+\t\tgoto err_vport_map_init;\n+\t}\n+\n \trte_eal_alarm_set(CPFL_ALARM_INTERVAL, cpfl_dev_alarm_handler, adapter);\n \n \tadapter->max_vport_nb = adapter->base.caps.max_vports > CPFL_MAX_VPORT_NUM ?\n@@ -1658,6 +1812,8 @@ cpfl_adapter_ext_init(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *a\n \n err_vports_alloc:\n \trte_eal_alarm_cancel(cpfl_dev_alarm_handler, adapter);\n+\tcpfl_vport_map_uninit(adapter);\n+err_vport_map_init:\n \tidpf_adapter_deinit(base);\n err_adapter_init:\n \treturn ret;\n@@ -1887,6 +2043,7 @@ static void\n cpfl_adapter_ext_deinit(struct cpfl_adapter_ext *adapter)\n {\n \trte_eal_alarm_cancel(cpfl_dev_alarm_handler, adapter);\n+\tcpfl_vport_map_uninit(adapter);\n \tidpf_adapter_deinit(&adapter->base);\n \n \trte_free(adapter->vports);\ndiff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h\nindex feb1edc4b8..de86c49016 100644\n--- a/drivers/net/cpfl/cpfl_ethdev.h\n+++ b/drivers/net/cpfl/cpfl_ethdev.h\n@@ -10,16 +10,18 @@\n #include <rte_spinlock.h>\n #include <rte_ethdev.h>\n #include <rte_kvargs.h>\n+#include <rte_hash.h>\n #include <ethdev_driver.h>\n #include <ethdev_pci.h>\n \n-#include \"cpfl_logs.h\"\n-\n #include <idpf_common_device.h>\n #include <idpf_common_virtchnl.h>\n #include <base/idpf_prototype.h>\n #include <base/virtchnl2.h>\n \n+#include \"cpfl_logs.h\"\n+#include \"cpfl_cpchnl.h\"\n+\n /* Currently, backend supports up to 8 vports */\n #define CPFL_MAX_VPORT_NUM\t8\n \n@@ -86,6 +88,18 @@ struct p2p_queue_chunks_info {\n \tuint32_t rx_buf_qtail_spacing;\n };\n \n+struct cpfl_vport_id {\n+\tuint32_t vport_id;\n+\tuint8_t func_type;\n+\tuint8_t pf_id;\n+\tuint16_t vf_id;\n+};\n+\n+struct cpfl_vport_info {\n+\tstruct cpchnl2_vport_info vport_info;\n+\tbool enabled;\n+};\n+\n enum cpfl_itf_type {\n \tCPFL_ITF_TYPE_VPORT,\n };\n@@ -127,6 +141,9 @@ struct cpfl_adapter_ext {\n \n \tuint16_t used_vecs_num;\n \tstruct cpfl_devargs devargs;\n+\n+\trte_spinlock_t vport_map_lock;\n+\tstruct rte_hash *vport_map_hash;\n };\n \n TAILQ_HEAD(cpfl_adapter_list, cpfl_adapter_ext);\ndiff --git a/drivers/net/cpfl/meson.build b/drivers/net/cpfl/meson.build\nindex 8d62ebfd77..28167bb81d 100644\n--- a/drivers/net/cpfl/meson.build\n+++ b/drivers/net/cpfl/meson.build\n@@ -11,7 +11,7 @@ if dpdk_conf.get('RTE_IOVA_IN_MBUF') == 0\n subdir_done()\n endif\n \n-deps += ['common_idpf']\n+deps += ['hash', 'common_idpf']\n \n sources = files(\n 'cpfl_ethdev.c',\n", "prefixes": [ "v5", "05/10" ] }