Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/131360/?format=api
{ "id": 131360, "url": "http://patches.dpdk.org/api/patches/131360/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230912173039.1612287-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": "<20230912173039.1612287-2-beilei.xing@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230912173039.1612287-2-beilei.xing@intel.com", "date": "2023-09-12T17:30:30", "name": "[v6,01/10] net/cpfl: refine devargs parse and process", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "11c102044a6f23d7afed26015f1fa98851da3e68", "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/20230912173039.1612287-2-beilei.xing@intel.com/mbox/", "series": [ { "id": 29486, "url": "http://patches.dpdk.org/api/series/29486/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=29486", "date": "2023-09-12T17:30:29", "name": "net/cpfl: support port representor", "version": 6, "mbox": "http://patches.dpdk.org/series/29486/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/131360/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/131360/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 3024A4257B;\n\tTue, 12 Sep 2023 11:12:10 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 022DF40633;\n\tTue, 12 Sep 2023 11:12:06 +0200 (CEST)", "from mgamail.intel.com (mgamail.intel.com [192.55.52.93])\n by mails.dpdk.org (Postfix) with ESMTP id 2E5B640293\n for <dev@dpdk.org>; Tue, 12 Sep 2023 11:12:04 +0200 (CEST)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 12 Sep 2023 02:12:03 -0700", "from dpdk-beileix-icelake.sh.intel.com ([10.67.116.248])\n by fmsmga008.fm.intel.com with ESMTP; 12 Sep 2023 02:12:01 -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=1694509924; x=1726045924;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=cy5tZuQcX9ZESbAJTmfFDW+3ldw7/RdQOttB0i4KnzY=;\n b=i9NCoi/yzLSPGesovzR4sfTVhMHN0VXayObNTqjqWVn+OoQdjYU5+gEV\n QE4vKS0ynU0KxF7fZ9/FZ0OQtF9HLURrQPL+iicb3EiyhnBqpZOQgn6Db\n smggNSS+RkPegMTpVI/386mxPmX1pvPwx8kwq+RiWuGx0vQNIaWlVtQIt\n eMW3zSqmTmt3KaI0DLGFEvlBogiQeFuVTu5pVHrXyqHNXelLhjvlLu35I\n qkhf6x8pnPE3LWXSnapeJi0nl8J5TBIiGQf5ZY/KuCg3PlHE9HRbUNzVN\n VAagLpKImUfxaEtX7+bBgU440bszjT73wFv/lf/EEIlKlT1lLP3+Gwoac w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6600,9927,10830\"; a=\"375652045\"", "E=Sophos;i=\"6.02,245,1688454000\"; d=\"scan'208\";a=\"375652045\"", "E=McAfee;i=\"6600,9927,10830\"; a=\"809164386\"", "E=Sophos;i=\"6.02,245,1688454000\"; d=\"scan'208\";a=\"809164386\"" ], "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 v6 01/10] net/cpfl: refine devargs parse and process", "Date": "Tue, 12 Sep 2023 17:30:30 +0000", "Message-Id": "<20230912173039.1612287-2-beilei.xing@intel.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230912173039.1612287-1-beilei.xing@intel.com>", "References": "<20230912162640.1439383-1-beilei.xing@intel.com>\n <20230912173039.1612287-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. Keep devargs in adapter.\n2. Refine handling the case with no vport be specified in devargs.\n3. Separate devargs parse and devargs process\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 | 154 ++++++++++++++++++---------------\n drivers/net/cpfl/cpfl_ethdev.h | 1 +\n 2 files changed, 84 insertions(+), 71 deletions(-)", "diff": "diff --git a/drivers/net/cpfl/cpfl_ethdev.c b/drivers/net/cpfl/cpfl_ethdev.c\nindex c4ca9343c3..46b3a52e49 100644\n--- a/drivers/net/cpfl/cpfl_ethdev.c\n+++ b/drivers/net/cpfl/cpfl_ethdev.c\n@@ -1407,12 +1407,12 @@ parse_bool(const char *key, const char *value, void *args)\n }\n \n static int\n-cpfl_parse_devargs(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter,\n-\t\t struct cpfl_devargs *cpfl_args)\n+cpfl_parse_devargs(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter)\n {\n \tstruct rte_devargs *devargs = pci_dev->device.devargs;\n+\tstruct cpfl_devargs *cpfl_args = &adapter->devargs;\n \tstruct rte_kvargs *kvlist;\n-\tint i, ret;\n+\tint ret;\n \n \tcpfl_args->req_vport_nb = 0;\n \n@@ -1445,31 +1445,6 @@ cpfl_parse_devargs(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adap\n \tif (ret != 0)\n \t\tgoto fail;\n \n-\t/* check parsed devargs */\n-\tif (adapter->cur_vport_nb + cpfl_args->req_vport_nb >\n-\t adapter->max_vport_nb) {\n-\t\tPMD_INIT_LOG(ERR, \"Total vport number can't be > %d\",\n-\t\t\t adapter->max_vport_nb);\n-\t\tret = -EINVAL;\n-\t\tgoto fail;\n-\t}\n-\n-\tfor (i = 0; i < cpfl_args->req_vport_nb; i++) {\n-\t\tif (cpfl_args->req_vports[i] > adapter->max_vport_nb - 1) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Invalid vport id %d, it should be 0 ~ %d\",\n-\t\t\t\t cpfl_args->req_vports[i], adapter->max_vport_nb - 1);\n-\t\t\tret = -EINVAL;\n-\t\t\tgoto fail;\n-\t\t}\n-\n-\t\tif (adapter->cur_vports & RTE_BIT32(cpfl_args->req_vports[i])) {\n-\t\t\tPMD_INIT_LOG(ERR, \"Vport %d has been requested\",\n-\t\t\t\t cpfl_args->req_vports[i]);\n-\t\t\tret = -EINVAL;\n-\t\t\tgoto fail;\n-\t\t}\n-\t}\n-\n fail:\n \trte_kvargs_free(kvlist);\n \treturn ret;\n@@ -1915,15 +1890,79 @@ cpfl_adapter_ext_deinit(struct cpfl_adapter_ext *adapter)\n \tadapter->vports = NULL;\n }\n \n+static int\n+cpfl_vport_devargs_process(struct cpfl_adapter_ext *adapter)\n+{\n+\tstruct cpfl_devargs *devargs = &adapter->devargs;\n+\tint i;\n+\n+\t/* refine vport number, at least 1 vport */\n+\tif (devargs->req_vport_nb == 0) {\n+\t\tdevargs->req_vport_nb = 1;\n+\t\tdevargs->req_vports[0] = 0;\n+\t}\n+\n+\t/* check parsed devargs */\n+\tif (adapter->cur_vport_nb + devargs->req_vport_nb >\n+\t adapter->max_vport_nb) {\n+\t\tPMD_INIT_LOG(ERR, \"Total vport number can't be > %d\",\n+\t\t\t adapter->max_vport_nb);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tfor (i = 0; i < devargs->req_vport_nb; i++) {\n+\t\tif (devargs->req_vports[i] > adapter->max_vport_nb - 1) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Invalid vport id %d, it should be 0 ~ %d\",\n+\t\t\t\t devargs->req_vports[i], adapter->max_vport_nb - 1);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tif (adapter->cur_vports & RTE_BIT32(devargs->req_vports[i])) {\n+\t\t\tPMD_INIT_LOG(ERR, \"Vport %d has been requested\",\n+\t\t\t\t devargs->req_vports[i]);\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+cpfl_vport_create(struct rte_pci_device *pci_dev, struct cpfl_adapter_ext *adapter)\n+{\n+\tstruct cpfl_vport_param vport_param;\n+\tchar name[RTE_ETH_NAME_MAX_LEN];\n+\tint ret, i;\n+\n+\tfor (i = 0; i < adapter->devargs.req_vport_nb; i++) {\n+\t\tvport_param.adapter = adapter;\n+\t\tvport_param.devarg_id = adapter->devargs.req_vports[i];\n+\t\tvport_param.idx = cpfl_vport_idx_alloc(adapter);\n+\t\tif (vport_param.idx == CPFL_INVALID_VPORT_IDX) {\n+\t\t\tPMD_INIT_LOG(ERR, \"No space for vport %u\", vport_param.devarg_id);\n+\t\t\tbreak;\n+\t\t}\n+\t\tsnprintf(name, sizeof(name), \"net_%s_vport_%d\",\n+\t\t\t pci_dev->device.name,\n+\t\t\t adapter->devargs.req_vports[i]);\n+\t\tret = rte_eth_dev_create(&pci_dev->device, name,\n+\t\t\t\t\t sizeof(struct cpfl_vport),\n+\t\t\t\t\t NULL, NULL, cpfl_dev_vport_init,\n+\t\t\t\t\t &vport_param);\n+\t\tif (ret != 0)\n+\t\t\tPMD_DRV_LOG(ERR, \"Failed to create vport %d\",\n+\t\t\t\t vport_param.devarg_id);\n+\t}\n+\n+\treturn 0;\n+}\n+\n static int\n cpfl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t struct rte_pci_device *pci_dev)\n {\n-\tstruct cpfl_vport_param vport_param;\n \tstruct cpfl_adapter_ext *adapter;\n-\tstruct cpfl_devargs devargs;\n-\tchar name[RTE_ETH_NAME_MAX_LEN];\n-\tint i, retval;\n+\tint retval;\n \n \tif (!cpfl_adapter_list_init) {\n \t\trte_spinlock_init(&cpfl_adapter_lock);\n@@ -1938,6 +1977,12 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\treturn -ENOMEM;\n \t}\n \n+\tretval = cpfl_parse_devargs(pci_dev, adapter);\n+\tif (retval != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to parse private devargs\");\n+\t\treturn retval;\n+\t}\n+\n \tretval = cpfl_adapter_ext_init(pci_dev, adapter);\n \tif (retval != 0) {\n \t\tPMD_INIT_LOG(ERR, \"Failed to init adapter.\");\n@@ -1948,49 +1993,16 @@ cpfl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \tTAILQ_INSERT_TAIL(&cpfl_adapter_list, adapter, next);\n \trte_spinlock_unlock(&cpfl_adapter_lock);\n \n-\tretval = cpfl_parse_devargs(pci_dev, adapter, &devargs);\n+\tretval = cpfl_vport_devargs_process(adapter);\n \tif (retval != 0) {\n-\t\tPMD_INIT_LOG(ERR, \"Failed to parse private devargs\");\n+\t\tPMD_INIT_LOG(ERR, \"Failed to process vport devargs\");\n \t\tgoto err;\n \t}\n \n-\tif (devargs.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 = cpfl_vport_idx_alloc(adapter);\n-\t\tif (vport_param.idx == CPFL_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), \"cpfl_%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 cpfl_vport),\n-\t\t\t\t\t NULL, NULL, cpfl_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} else {\n-\t\tfor (i = 0; i < devargs.req_vport_nb; i++) {\n-\t\t\tvport_param.adapter = adapter;\n-\t\t\tvport_param.devarg_id = devargs.req_vports[i];\n-\t\t\tvport_param.idx = cpfl_vport_idx_alloc(adapter);\n-\t\t\tif (vport_param.idx == CPFL_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), \"cpfl_%s_vport_%d\",\n-\t\t\t\t pci_dev->device.name,\n-\t\t\t\t devargs.req_vports[i]);\n-\t\t\tretval = rte_eth_dev_create(&pci_dev->device, name,\n-\t\t\t\t\t\t sizeof(struct cpfl_vport),\n-\t\t\t\t\t\t NULL, NULL, cpfl_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 vport_param.devarg_id);\n-\t\t}\n+\tretval = cpfl_vport_create(pci_dev, adapter);\n+\tif (retval != 0) {\n+\t\tPMD_INIT_LOG(ERR, \"Failed to create vports.\");\n+\t\tgoto err;\n \t}\n \n \treturn 0;\ndiff --git a/drivers/net/cpfl/cpfl_ethdev.h b/drivers/net/cpfl/cpfl_ethdev.h\nindex 2e42354f70..b637bf2e45 100644\n--- a/drivers/net/cpfl/cpfl_ethdev.h\n+++ b/drivers/net/cpfl/cpfl_ethdev.h\n@@ -115,6 +115,7 @@ struct cpfl_adapter_ext {\n \tuint16_t cur_vport_nb;\n \n \tuint16_t used_vecs_num;\n+\tstruct cpfl_devargs devargs;\n };\n \n TAILQ_HEAD(cpfl_adapter_list, cpfl_adapter_ext);\n", "prefixes": [ "v6", "01/10" ] }