Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/120552/?format=api
{ "id": 120552, "url": "http://patches.dpdk.org/api/patches/120552/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20221208072725.32434-2-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": "<20221208072725.32434-2-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221208072725.32434-2-beilei.xing@intel.com", "date": "2022-12-08T07:27:23", "name": "[1/3] net/idpf: remove vport req and recv info from adapter", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "dae8bc65533fc64f2d2962974fc5e869946e433e", "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/20221208072725.32434-2-beilei.xing@intel.com/mbox/", "series": [ { "id": 26040, "url": "http://patches.dpdk.org/api/series/26040/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26040", "date": "2022-12-08T07:27:22", "name": "net/idpf: code refine", "version": 1, "mbox": "http://patches.dpdk.org/series/26040/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/120552/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/120552/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 DDADFA00C2;\n\tThu, 8 Dec 2022 08:27:48 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 69F6342D24;\n\tThu, 8 Dec 2022 08:27:46 +0100 (CET)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n by mails.dpdk.org (Postfix) with ESMTP id 99C9940DDC\n for <dev@dpdk.org>; Thu, 8 Dec 2022 08:27:43 +0100 (CET)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 07 Dec 2022 23:27:43 -0800", "from dpdk-beileix-3.sh.intel.com ([10.67.110.253])\n by orsmga001.jf.intel.com with ESMTP; 07 Dec 2022 23:27:40 -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=1670484464; x=1702020464;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=gOByyArdEDxT/gs5aHJDc9H+ezIriLqr265JHCwHKD0=;\n b=IvZq/Rp9xpHqVdwCzFB015DBan1SYMkT/YAPyR+gdmkwZoFiTqFGNHo5\n kaKUjpgQ2xnP6wUp/EdOvmdb9HFDOokPCvhMNdSiokq8I+h3TuIw3XJBa\n /gdDHXgphnY4Kt5vEQMLpOrS8ekWxa1mIt0NVSIJHmsUZhm2CvZ3n5C1a\n r3At2dPcVmo/H2f2HJ2wa+Wl7sVGR35aXlcxVM5MIEQFeqAZoBZvLP5gL\n z9hcgFQNivAWajN4q+zUT/aTtl5M0jw6zyGabbBsGatbS51Z1rNNwwLrP\n PrHMr2oFj60AwrV8kJRrUUyagXfPGa0QPDU3Ra3s0SOSlM0voFEAEeKyJ A==;", "X-IronPort-AV": [ "E=McAfee;i=\"6500,9779,10554\"; a=\"297455944\"", "E=Sophos;i=\"5.96,227,1665471600\"; d=\"scan'208\";a=\"297455944\"", "E=McAfee;i=\"6500,9779,10554\"; a=\"679428374\"", "E=Sophos;i=\"5.96,227,1665471600\"; d=\"scan'208\";a=\"679428374\"" ], "X-ExtLoop1": "1", "From": "beilei.xing@intel.com", "To": "jingjing.wu@intel.com,\n\tqi.z.zhang@intel.com", "Cc": "dev@dpdk.org,\n\tBeilei Xing <beilei.xing@intel.com>", "Subject": "[PATCH 1/3] net/idpf: remove vport req and recv info from adapter", "Date": "Thu, 8 Dec 2022 07:27:23 +0000", "Message-Id": "<20221208072725.32434-2-beilei.xing@intel.com>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20221208072725.32434-1-beilei.xing@intel.com>", "References": "<20221208072725.32434-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: Jingjing Wu <jingjing.wu@intel.com>\n\nThis patch refines idpf_adapter structure by removing vport request\nand receive info.\n\nSigned-off-by: Jingjing Wu <jingjing.wu@intel.com>\nSigned-off-by: Beilei Xing <beilei.xing@intel.com>\n---\n drivers/net/idpf/idpf_ethdev.c | 185 +++++++++++----------------------\n drivers/net/idpf/idpf_ethdev.h | 19 ++--\n drivers/net/idpf/idpf_vchnl.c | 18 +---\n 3 files changed, 74 insertions(+), 148 deletions(-)", "diff": "diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c\nindex 8b347631ce..d8b7b069cf 100644\n--- a/drivers/net/idpf/idpf_ethdev.c\n+++ b/drivers/net/idpf/idpf_ethdev.c\n@@ -134,29 +134,11 @@ idpf_dev_supported_ptypes_get(struct rte_eth_dev *dev __rte_unused)\n }\n \n static int\n-idpf_init_vport_req_info(struct rte_eth_dev *dev)\n+idpf_init_vport_req_info(struct rte_eth_dev *dev,\n+\t\t\t struct virtchnl2_create_vport *vport_info)\n {\n \tstruct idpf_vport *vport = dev->data->dev_private;\n \tstruct idpf_adapter *adapter = vport->adapter;\n-\tstruct virtchnl2_create_vport *vport_info;\n-\tuint16_t idx = adapter->cur_vport_idx;\n-\n-\tif (idx == IDPF_INVALID_VPORT_IDX) {\n-\t\tPMD_INIT_LOG(ERR, \"Invalid vport index.\");\n-\t\treturn -EINVAL;\n-\t}\n-\n-\tif (adapter->vport_req_info[idx] == NULL) {\n-\t\tadapter->vport_req_info[idx] = rte_zmalloc(NULL,\n-\t\t\t\tsizeof(struct virtchnl2_create_vport), 0);\n-\t\tif (adapter->vport_req_info[idx] == NULL) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Failed to allocate vport_req_info\");\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\t}\n-\n-\tvport_info =\n-\t\t(struct virtchnl2_create_vport *)adapter->vport_req_info[idx];\n \n \tvport_info->vport_type = rte_cpu_to_le_16(VIRTCHNL2_VPORT_TYPE_DEFAULT);\n \tif (adapter->txq_model == 0) {\n@@ -187,35 +169,13 @@ idpf_init_vport_req_info(struct rte_eth_dev *dev)\n \treturn 0;\n }\n \n-static int\n-idpf_parse_devarg_id(char *name)\n-{\n-\tuint16_t val;\n-\tchar *p;\n-\n-\tp = strstr(name, \"vport_\");\n-\n-\tif (p == NULL)\n-\t\treturn -EINVAL;\n-\n-\tp += sizeof(\"vport_\") - 1;\n-\n-\tval = strtoul(p, NULL, 10);\n-\n-\treturn val;\n-}\n-\n #define IDPF_RSS_KEY_LEN 52\n \n static int\n-idpf_init_vport(struct rte_eth_dev *dev)\n+idpf_init_vport(struct idpf_vport *vport)\n {\n-\tstruct idpf_vport *vport = dev->data->dev_private;\n-\tstruct idpf_adapter *adapter = vport->adapter;\n-\tuint16_t idx = adapter->cur_vport_idx;\n-\tstruct virtchnl2_create_vport *vport_info =\n-\t\t(struct virtchnl2_create_vport *)adapter->vport_recv_info[idx];\n-\tint i, type, ret;\n+\tstruct virtchnl2_create_vport *vport_info = vport->vport_info;\n+\tint i, type;\n \n \tvport->vport_id = vport_info->vport_id;\n \tvport->txq_model = vport_info->txq_model;\n@@ -231,7 +191,6 @@ idpf_init_vport(struct rte_eth_dev *dev)\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 \t\ttype = vport_info->chunks.chunks[i].type;\n@@ -274,17 +233,6 @@ idpf_init_vport(struct rte_eth_dev *dev)\n \t\t}\n \t}\n \n-\tret = idpf_parse_devarg_id(dev->data->name);\n-\tif (ret < 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to parse devarg id.\");\n-\t\treturn -EINVAL;\n-\t}\n-\tvport->devarg_id = ret;\n-\n-\tvport->dev_data = dev->data;\n-\n-\tadapter->vports[idx] = vport;\n-\n \treturn 0;\n }\n \n@@ -662,9 +610,10 @@ idpf_dev_close(struct rte_eth_dev *dev)\n \tvport->qv_map = NULL;\n \n \tadapter->cur_vports &= ~RTE_BIT32(vport->devarg_id);\n-\n-\trte_free(vport);\n+\tadapter->cur_vport_nb--;\n \tdev->data->dev_private = NULL;\n+\tadapter->vports[vport->sw_idx] = NULL;\n+\trte_free(vport);\n \n \treturn 0;\n }\n@@ -757,10 +706,7 @@ parse_vport(const char *key, const char *value, void *args)\n \t}\n \n \tfor (i = 0; i < adapter->req_vport_nb; i++) {\n-\t\tif ((adapter->cur_vports & RTE_BIT32(adapter->req_vports[i])) == 0) {\n-\t\t\tadapter->cur_vports |= RTE_BIT32(adapter->req_vports[i]);\n-\t\t\tadapter->cur_vport_nb++;\n-\t\t} else {\n+\t\tif (adapter->cur_vports & RTE_BIT32(adapter->req_vports[i])) {\n \t\t\tPMD_INIT_LOG(ERR, \"Vport %d has been created\",\n \t\t\t\t adapter->req_vports[i]);\n \t\t\treturn -EINVAL;\n@@ -798,6 +744,8 @@ idpf_parse_devargs(struct rte_pci_device *pci_dev, struct idpf_adapter *adapter)\n \tstruct rte_kvargs *kvlist;\n \tint ret;\n \n+\tadapter->req_vport_nb = 0;\n+\n \tif (devargs == NULL)\n \t\treturn 0;\n \n@@ -981,26 +929,6 @@ idpf_adapter_init(struct rte_pci_device *pci_dev, struct idpf_adapter *adapter)\n \n \tadapter->max_vport_nb = adapter->caps->max_vports;\n \n-\tadapter->vport_req_info = rte_zmalloc(\"vport_req_info\",\n-\t\t\t\t\t adapter->max_vport_nb *\n-\t\t\t\t\t sizeof(*adapter->vport_req_info),\n-\t\t\t\t\t 0);\n-\tif (adapter->vport_req_info == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate vport_req_info memory\");\n-\t\tret = -ENOMEM;\n-\t\tgoto err_caps;\n-\t}\n-\n-\tadapter->vport_recv_info = rte_zmalloc(\"vport_recv_info\",\n-\t\t\t\t\t adapter->max_vport_nb *\n-\t\t\t\t\t sizeof(*adapter->vport_recv_info),\n-\t\t\t\t\t 0);\n-\tif (adapter->vport_recv_info == NULL) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to allocate vport_recv_info memory\");\n-\t\tret = -ENOMEM;\n-\t\tgoto err_vport_recv_info;\n-\t}\n-\n \tadapter->vports = rte_zmalloc(\"vports\",\n \t\t\t\t adapter->max_vport_nb *\n \t\t\t\t sizeof(*adapter->vports),\n@@ -1026,11 +954,6 @@ idpf_adapter_init(struct rte_pci_device *pci_dev, struct idpf_adapter *adapter)\n \treturn ret;\n \n err_vports:\n-\trte_free(adapter->vport_recv_info);\n-\tadapter->vport_recv_info = NULL;\n-err_vport_recv_info:\n-\trte_free(adapter->vport_req_info);\n-\tadapter->vport_req_info = NULL;\n err_caps:\n \trte_free(adapter->caps);\n \tadapter->caps = NULL;\n@@ -1063,17 +986,17 @@ static const struct eth_dev_ops idpf_eth_dev_ops = {\n };\n \n static uint16_t\n-idpf_get_vport_idx(struct idpf_vport **vports, uint16_t max_vport_nb)\n+idpf_vport_idx_alloc(struct idpf_adapter *ad)\n {\n \tuint16_t vport_idx;\n \tuint16_t i;\n \n-\tfor (i = 0; i < max_vport_nb; i++) {\n-\t\tif (vports[i] == NULL)\n+\tfor (i = 0; i < ad->max_vport_nb; i++) {\n+\t\tif (ad->vports[i] == NULL)\n \t\t\tbreak;\n \t}\n \n-\tif (i == max_vport_nb)\n+\tif (i == ad->max_vport_nb)\n \t\tvport_idx = IDPF_INVALID_VPORT_IDX;\n \telse\n \t\tvport_idx = i;\n@@ -1082,35 +1005,50 @@ idpf_get_vport_idx(struct idpf_vport **vports, uint16_t max_vport_nb)\n }\n \n static int\n-idpf_dev_init(struct rte_eth_dev *dev, void *init_params)\n+idpf_dev_vport_init(struct rte_eth_dev *dev, void *init_params)\n {\n \tstruct idpf_vport *vport = dev->data->dev_private;\n-\tstruct idpf_adapter *adapter = init_params;\n+\tstruct idpf_vport_param *param = init_params;\n+\tstruct idpf_adapter *adapter = param->adapter;\n+\t/* for sending create vport virtchnl msg prepare */\n+\tstruct virtchnl2_create_vport vport_req_info;\n \tint ret = 0;\n \n \tdev->dev_ops = &idpf_eth_dev_ops;\n \tvport->adapter = adapter;\n+\tvport->sw_idx = param->idx;\n+\tvport->devarg_id = param->devarg_id;\n+\n+\tvport->vport_info = rte_zmalloc(NULL, IDPF_DFLT_MBX_BUF_SIZE, 0);\n+\tif (vport->vport_info == NULL) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to allocate vport_info\");\n+\t\tret = -ENOMEM;\n+\t\tgoto err;\n+\t}\n \n-\tret = idpf_init_vport_req_info(dev);\n+\tmemset(&vport_req_info, 0, sizeof(vport_req_info));\n+\tret = idpf_init_vport_req_info(dev, &vport_req_info);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to init vport req_info.\");\n \t\tgoto err;\n \t}\n \n-\tret = idpf_vc_create_vport(adapter);\n+\tret = idpf_vc_create_vport(vport, &vport_req_info);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to create vport.\");\n \t\tgoto err_create_vport;\n \t}\n \n-\tret = idpf_init_vport(dev);\n+\tret = idpf_init_vport(vport);\n \tif (ret != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to init vports.\");\n \t\tgoto err_init_vport;\n \t}\n \n-\tadapter->cur_vport_idx = idpf_get_vport_idx(adapter->vports,\n-\t\t\t\t\t\t adapter->max_vport_nb);\n+\tvport->dev_data = dev->data;\n+\tadapter->vports[param->idx] = vport;\n+\tadapter->cur_vports |= RTE_BIT32(param->devarg_id);\n+\tadapter->cur_vport_nb++;\n \n \tdev->data->mac_addrs = rte_zmalloc(NULL, RTE_ETHER_ADDR_LEN, 0);\n \tif (dev->data->mac_addrs == NULL) {\n@@ -1125,9 +1063,10 @@ idpf_dev_init(struct rte_eth_dev *dev, void *init_params)\n \treturn 0;\n \n err_init_vport:\n+\tadapter->vports[param->idx] = NULL; /* reset */\n \tidpf_vc_destroy_vport(vport);\n err_create_vport:\n-\trte_free(vport->adapter->vport_req_info[vport->adapter->cur_vport_idx]);\n+\trte_free(vport->vport_info);\n err:\n \treturn ret;\n }\n@@ -1165,7 +1104,6 @@ static void\n idpf_adapter_rel(struct idpf_adapter *adapter)\n {\n \tstruct idpf_hw *hw = &adapter->hw;\n-\tint i;\n \n \tidpf_ctlq_deinit(hw);\n \n@@ -1175,24 +1113,6 @@ idpf_adapter_rel(struct idpf_adapter *adapter)\n \trte_free(adapter->mbx_resp);\n \tadapter->mbx_resp = NULL;\n \n-\tif (adapter->vport_req_info != NULL) {\n-\t\tfor (i = 0; i < adapter->max_vport_nb; i++) {\n-\t\t\trte_free(adapter->vport_req_info[i]);\n-\t\t\tadapter->vport_req_info[i] = NULL;\n-\t\t}\n-\t\trte_free(adapter->vport_req_info);\n-\t\tadapter->vport_req_info = NULL;\n-\t}\n-\n-\tif (adapter->vport_recv_info != NULL) {\n-\t\tfor (i = 0; i < adapter->max_vport_nb; i++) {\n-\t\t\trte_free(adapter->vport_recv_info[i]);\n-\t\t\tadapter->vport_recv_info[i] = NULL;\n-\t\t}\n-\t\trte_free(adapter->vport_recv_info);\n-\t\tadapter->vport_recv_info = NULL;\n-\t}\n-\n \trte_free(adapter->vports);\n \tadapter->vports = NULL;\n }\n@@ -1201,6 +1121,7 @@ static int\n idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t struct rte_pci_device *pci_dev)\n {\n+\tstruct idpf_vport_param vport_param;\n \tstruct idpf_adapter *adapter;\n \tchar name[RTE_ETH_NAME_MAX_LEN];\n \tint i, retval;\n@@ -1241,28 +1162,40 @@ idpf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \n \tif (adapter->req_vport_nb == 0) {\n \t\t/* If no vport devarg, create vport 0 by default. */\n+\t\tvport_param.adapter = adapter;\n+\t\tvport_param.devarg_id = 0;\n+\t\tvport_param.idx = idpf_vport_idx_alloc(adapter);\n+\t\tif (vport_param.idx == IDPF_INVALID_VPORT_IDX) {\n+\t\t\tPMD_INIT_LOG(ERR, \"No space for vport %u\", vport_param.devarg_id);\n+\t\t\treturn 0;\n+\t\t}\n \t\tsnprintf(name, sizeof(name), \"idpf_%s_vport_0\",\n \t\t\t pci_dev->device.name);\n \t\tretval = rte_eth_dev_create(&pci_dev->device, name,\n \t\t\t\t\t sizeof(struct idpf_vport),\n-\t\t\t\t\t NULL, NULL, idpf_dev_init,\n-\t\t\t\t\t adapter);\n+\t\t\t\t\t NULL, NULL, idpf_dev_vport_init,\n+\t\t\t\t\t &vport_param);\n \t\tif (retval != 0)\n \t\t\tPMD_DRV_LOG(ERR, \"Failed to create default vport 0\");\n-\t\tadapter->cur_vports |= RTE_BIT32(0);\n-\t\tadapter->cur_vport_nb++;\n \t} else {\n \t\tfor (i = 0; i < adapter->req_vport_nb; i++) {\n+\t\t\tvport_param.adapter = adapter;\n+\t\t\tvport_param.devarg_id = adapter->req_vports[i];\n+\t\t\tvport_param.idx = idpf_vport_idx_alloc(adapter);\n+\t\t\tif (vport_param.idx == IDPF_INVALID_VPORT_IDX) {\n+\t\t\t\tPMD_INIT_LOG(ERR, \"No space for vport %u\", vport_param.devarg_id);\n+\t\t\t\tbreak;\n+\t\t\t}\n \t\t\tsnprintf(name, sizeof(name), \"idpf_%s_vport_%d\",\n \t\t\t\t pci_dev->device.name,\n \t\t\t\t adapter->req_vports[i]);\n \t\t\tretval = rte_eth_dev_create(&pci_dev->device, name,\n \t\t\t\t\t\t sizeof(struct idpf_vport),\n-\t\t\t\t\t\t NULL, NULL, idpf_dev_init,\n-\t\t\t\t\t\t adapter);\n+\t\t\t\t\t\t NULL, NULL, idpf_dev_vport_init,\n+\t\t\t\t\t\t &vport_param);\n \t\t\tif (retval != 0)\n \t\t\t\tPMD_DRV_LOG(ERR, \"Failed to create vport %d\",\n-\t\t\t\t\t adapter->req_vports[i]);\n+\t\t\t\t\t vport_param.devarg_id);\n \t\t}\n \t}\n \ndiff --git a/drivers/net/idpf/idpf_ethdev.h b/drivers/net/idpf/idpf_ethdev.h\nindex 991677c3bc..c236cc8f16 100644\n--- a/drivers/net/idpf/idpf_ethdev.h\n+++ b/drivers/net/idpf/idpf_ethdev.h\n@@ -89,8 +89,16 @@ struct idpf_chunks_info {\n \tuint32_t rx_buf_qtail_spacing;\n };\n \n+struct idpf_vport_param {\n+\tstruct idpf_adapter *adapter;\n+\tuint16_t devarg_id; /* arg id from user */\n+\tuint16_t idx; /* index in adapter->vports[]*/\n+};\n+\n struct idpf_vport {\n \tstruct idpf_adapter *adapter; /* Backreference to associated adapter */\n+\tstruct virtchnl2_create_vport *vport_info; /* virtchnl response info handling */\n+\tuint16_t sw_idx; /* SW index in adapter->vports[]*/\n \tuint16_t vport_id;\n \tuint32_t txq_model;\n \tuint32_t rxq_model;\n@@ -108,8 +116,6 @@ struct idpf_vport {\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@@ -146,16 +152,12 @@ struct idpf_adapter {\n \tuint32_t txq_model; /* 0 - split queue model, non-0 - single queue model */\n \tuint32_t rxq_model; /* 0 - split queue model, non-0 - single queue model */\n \n-\t/* Vport info */\n-\tuint8_t **vport_req_info;\n-\tuint8_t **vport_recv_info;\n \tstruct idpf_vport **vports;\n \tuint16_t max_vport_nb;\n \tuint16_t req_vports[IDPF_MAX_VPORT_NUM];\n \tuint16_t req_vport_nb;\n-\tuint16_t cur_vports;\n+\tuint16_t cur_vports; /* bit mask of created vport */\n \tuint16_t cur_vport_nb;\n-\tuint16_t cur_vport_idx;\n \n \tuint16_t used_vecs_num;\n \n@@ -231,7 +233,8 @@ void idpf_handle_virtchnl_msg(struct rte_eth_dev *dev);\n int idpf_vc_check_api_version(struct idpf_adapter *adapter);\n 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_create_vport(struct idpf_vport *vport,\n+\t\t\t struct virtchnl2_create_vport *vport_info);\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);\ndiff --git a/drivers/net/idpf/idpf_vchnl.c b/drivers/net/idpf/idpf_vchnl.c\nindex ac6486d4ef..14b34619af 100644\n--- a/drivers/net/idpf/idpf_vchnl.c\n+++ b/drivers/net/idpf/idpf_vchnl.c\n@@ -583,11 +583,10 @@ idpf_vc_get_caps(struct idpf_adapter *adapter)\n }\n \n int\n-idpf_vc_create_vport(struct idpf_adapter *adapter)\n+idpf_vc_create_vport(struct idpf_vport *vport,\n+\t\t struct virtchnl2_create_vport *vport_req_info)\n {\n-\tuint16_t idx = adapter->cur_vport_idx;\n-\tstruct virtchnl2_create_vport *vport_req_info =\n-\t\t(struct virtchnl2_create_vport *)adapter->vport_req_info[idx];\n+\tstruct idpf_adapter *adapter = vport->adapter;\n \tstruct virtchnl2_create_vport vport_msg;\n \tstruct idpf_cmd_info args;\n \tint err = -1;\n@@ -615,16 +614,7 @@ idpf_vc_create_vport(struct idpf_adapter *adapter)\n \t\treturn err;\n \t}\n \n-\tif (adapter->vport_recv_info[idx] == NULL) {\n-\t\tadapter->vport_recv_info[idx] = rte_zmalloc(NULL,\n-\t\t\t\t\t\t IDPF_DFLT_MBX_BUF_SIZE, 0);\n-\t\tif (adapter->vport_recv_info[idx] == NULL) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Failed to alloc vport_recv_info.\");\n-\t\t\treturn -ENOMEM;\n-\t\t}\n-\t}\n-\trte_memcpy(adapter->vport_recv_info[idx], args.out_buffer,\n-\t\t IDPF_DFLT_MBX_BUF_SIZE);\n+\trte_memcpy(vport->vport_info, args.out_buffer, IDPF_DFLT_MBX_BUF_SIZE);\n \treturn 0;\n }\n \n", "prefixes": [ "1/3" ] }