Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/86058/?format=api
{ "id": 86058, "url": "https://patches.dpdk.org/api/patches/86058/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1609949855-23817-2-git-send-email-xuemingl@nvidia.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": "<1609949855-23817-2-git-send-email-xuemingl@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1609949855-23817-2-git-send-email-xuemingl@nvidia.com", "date": "2021-01-06T16:17:27", "name": "[v2,1/9] ethdev: refactor representor infrastructure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f3b6fe6543f09c64997c3241b90ab73efb6c3fbf", "submitter": { "id": 1904, "url": "https://patches.dpdk.org/api/people/1904/?format=api", "name": "Xueming Li", "email": "xuemingl@nvidia.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1609949855-23817-2-git-send-email-xuemingl@nvidia.com/mbox/", "series": [ { "id": 14559, "url": "https://patches.dpdk.org/api/series/14559/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14559", "date": "2021-01-06T16:17:28", "name": "support SubFunction representor", "version": 2, "mbox": "https://patches.dpdk.org/series/14559/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/86058/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/86058/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 (xvm-189-124.dc0.ghst.net [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 97421A09FF;\n\tWed, 6 Jan 2021 17:18:19 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 00533140E0E;\n\tWed, 6 Jan 2021 17:18:09 +0100 (CET)", "from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])\n by mails.dpdk.org (Postfix) with ESMTP id 524FF140D57\n for <dev@dpdk.org>; Wed, 6 Jan 2021 17:18:05 +0100 (CET)", "from Internal Mail-Server by MTLPINE1 (envelope-from\n xuemingl@nvidia.com) with SMTP; 6 Jan 2021 18:18:00 +0200", "from nvidia.com (pegasus05.mtr.labs.mlnx [10.210.16.100])\n by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 106GI0Mg017451;\n Wed, 6 Jan 2021 18:18:00 +0200" ], "From": "Xueming Li <xuemingl@nvidia.com>", "To": "Thomas Monjalon <thomas@monjalon.net>,\n Ferruh Yigit <ferruh.yigit@intel.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Olivier Matz <olivier.matz@6wind.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Cc": "dev@dpdk.org, xuemingl@nvidia.com, Asaf Penso <asafp@nvidia.com>", "Date": "Wed, 6 Jan 2021 16:17:27 +0000", "Message-Id": "<1609949855-23817-2-git-send-email-xuemingl@nvidia.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": [ "<1609949855-23817-1-git-send-email-xuemingl@nvidia.com>", "<1608303356-13089-2-git-send-email-xuemingl@nvidia.com>" ], "References": [ "<1609949855-23817-1-git-send-email-xuemingl@nvidia.com>", "<1608303356-13089-2-git-send-email-xuemingl@nvidia.com>" ], "Subject": "[dpdk-dev] [PATCH v2 1/9] ethdev: refactor representor\n infrastructure", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "To support extended representor syntax, this patch refactor represntor\ninfrastructure:\n1. introduces representor type enum\n2. devargs representor port range extraction from partial value\n\nSigned-off-by: Xueming Li <xuemingl@nvidia.com>\n---\n drivers/net/bnxt/bnxt_ethdev.c | 12 ++++\n drivers/net/enic/enic_ethdev.c | 7 ++\n drivers/net/i40e/i40e_ethdev.c | 8 +++\n drivers/net/ixgbe/ixgbe_ethdev.c | 8 +++\n drivers/net/mlx5/linux/mlx5_os.c | 11 ++++\n lib/librte_ethdev/ethdev_private.c | 93 ++++++++++++---------------\n lib/librte_ethdev/ethdev_private.h | 3 -\n lib/librte_ethdev/rte_class_eth.c | 4 +-\n lib/librte_ethdev/rte_ethdev.c | 5 +-\n lib/librte_ethdev/rte_ethdev_driver.h | 7 ++\n 10 files changed, 98 insertions(+), 60 deletions(-)", "diff": "diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c\nindex 81c8f8d79d..844a6c3c66 100644\n--- a/drivers/net/bnxt/bnxt_ethdev.c\n+++ b/drivers/net/bnxt/bnxt_ethdev.c\n@@ -5520,6 +5520,18 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,\n \tint i, ret = 0;\n \tstruct rte_kvargs *kvlist = NULL;\n \n+\tif (eth_da->type == RTE_ETH_REPRESENTOR_NONE)\n+\t\treturn 0;\n+\tif (eth_da->type != RTE_ETH_REPRESENTOR_VF) {\n+\t\tPMD_DRV_LOG(ERR, \"unsupported representor type %d\\n\",\n+\t\t\t eth_da->type);\n+\t\treturn -ENOTSUP;\n+\t}\n+\tif (eth_da->type != RTE_ETH_REPRESENTOR_VF) {\n+\t\tPMD_DRV_LOG(ERR, \"unsupported representor type %d\\n\",\n+\t\t\t eth_da->type);\n+\t\treturn -EINVAL;\n+\t}\n \tnum_rep = eth_da->nb_representor_ports;\n \tif (num_rep > BNXT_MAX_VF_REPS) {\n \t\tPMD_DRV_LOG(ERR, \"nb_representor_ports = %d > %d MAX VF REPS\\n\",\ndiff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c\nindex d041a6bee9..dd085caa93 100644\n--- a/drivers/net/enic/enic_ethdev.c\n+++ b/drivers/net/enic/enic_ethdev.c\n@@ -1303,6 +1303,13 @@ static int eth_enic_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\tif (retval)\n \t\t\treturn retval;\n \t}\n+\tif (eth_da.type == RTE_ETH_REPRESENTOR_NONE)\n+\t\treturn 0;\n+\tif (eth_da.type != RTE_ETH_REPRESENTOR_VF) {\n+\t\tENICPMD_LOG(ERR, \"unsupported representor type: %s\\n\",\n+\t\t\t pci_dev->device.devargs->args);\n+\t\treturn -ENOTSUP;\n+\t}\n \tretval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,\n \t\tsizeof(struct enic),\n \t\teth_dev_pci_specific_init, pci_dev,\ndiff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c\nindex f54769c29d..05ed2e1079 100644\n--- a/drivers/net/i40e/i40e_ethdev.c\n+++ b/drivers/net/i40e/i40e_ethdev.c\n@@ -640,6 +640,14 @@ eth_i40e_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t\t\treturn retval;\n \t}\n \n+\tif (eth_da.type == RTE_ETH_REPRESENTOR_NONE)\n+\t\treturn 0;\n+\tif (eth_da.type != RTE_ETH_REPRESENTOR_VF) {\n+\t\tPMD_DRV_LOG(ERR, \"unsupported representor type: %s\\n\",\n+\t\t\t pci_dev->device.devargs->args);\n+\t\treturn -ENOTSUP;\n+\t}\n+\n \tretval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,\n \t\tsizeof(struct i40e_adapter),\n \t\teth_dev_pci_specific_init, pci_dev,\ndiff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c\nindex 9a47a8b262..9ea0139197 100644\n--- a/drivers/net/ixgbe/ixgbe_ethdev.c\n+++ b/drivers/net/ixgbe/ixgbe_ethdev.c\n@@ -1717,6 +1717,14 @@ eth_ixgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,\n \t} else\n \t\tmemset(ð_da, 0, sizeof(eth_da));\n \n+\tif (eth_da.type == RTE_ETH_REPRESENTOR_NONE)\n+\t\treturn 0;\n+\tif (eth_da.type != RTE_ETH_REPRESENTOR_VF) {\n+\t\tPMD_DRV_LOG(ERR, \"unsupported representor type: %s\\n\",\n+\t\t\t pci_dev->device.devargs->args);\n+\t\treturn -ENOTSUP;\n+\t}\n+\n \tretval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,\n \t\tsizeof(struct ixgbe_adapter),\n \t\teth_dev_pci_specific_init, pci_dev,\ndiff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c\nindex 6812a1f215..6981ba1f41 100644\n--- a/drivers/net/mlx5/linux/mlx5_os.c\n+++ b/drivers/net/mlx5/linux/mlx5_os.c\n@@ -706,6 +706,17 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,\n \t\t\t\tstrerror(rte_errno));\n \t\t\treturn NULL;\n \t\t}\n+\t\tif (eth_da.type != RTE_ETH_REPRESENTOR_NONE) {\n+\t\t\t/* Representor not specified. */\n+\t\t\trte_errno = EBUSY;\n+\t\t\treturn NULL;\n+\t\t}\n+\t\tif (eth_da.type != RTE_ETH_REPRESENTOR_VF) {\n+\t\t\trte_errno = ENOTSUP;\n+\t\t\tDRV_LOG(ERR, \"unsupported representor type: %s\",\n+\t\t\t\tdpdk_dev->devargs->args);\n+\t\t\treturn NULL;\n+\t\t}\n \t\tfor (i = 0; i < eth_da.nb_representor_ports; ++i)\n \t\t\tif (eth_da.representor_ports[i] ==\n \t\t\t (uint16_t)switch_info->port_name)\ndiff --git a/lib/librte_ethdev/ethdev_private.c b/lib/librte_ethdev/ethdev_private.c\nindex 162a502fe7..c219164a4a 100644\n--- a/lib/librte_ethdev/ethdev_private.c\n+++ b/lib/librte_ethdev/ethdev_private.c\n@@ -38,60 +38,13 @@ eth_find_device(const struct rte_eth_dev *start, rte_eth_cmp_t cmp,\n \treturn NULL;\n }\n \n-int\n-rte_eth_devargs_parse_list(char *str, rte_eth_devargs_callback_t callback,\n-\tvoid *data)\n-{\n-\tchar *str_start;\n-\tint state;\n-\tint result;\n-\n-\tif (*str != '[')\n-\t\t/* Single element, not a list */\n-\t\treturn callback(str, data);\n-\n-\t/* Sanity check, then strip the brackets */\n-\tstr_start = &str[strlen(str) - 1];\n-\tif (*str_start != ']') {\n-\t\tRTE_LOG(ERR, EAL, \"(%s): List does not end with ']'\\n\", str);\n-\t\treturn -EINVAL;\n-\t}\n-\tstr++;\n-\t*str_start = '\\0';\n-\n-\t/* Process list elements */\n-\tstate = 0;\n-\twhile (1) {\n-\t\tif (state == 0) {\n-\t\t\tif (*str == '\\0')\n-\t\t\t\tbreak;\n-\t\t\tif (*str != ',') {\n-\t\t\t\tstr_start = str;\n-\t\t\t\tstate = 1;\n-\t\t\t}\n-\t\t} else if (state == 1) {\n-\t\t\tif (*str == ',' || *str == '\\0') {\n-\t\t\t\tif (str > str_start) {\n-\t\t\t\t\t/* Non-empty string fragment */\n-\t\t\t\t\t*str = '\\0';\n-\t\t\t\t\tresult = callback(str_start, data);\n-\t\t\t\t\tif (result < 0)\n-\t\t\t\t\t\treturn result;\n-\t\t\t\t}\n-\t\t\t\tstate = 0;\n-\t\t\t}\n-\t\t}\n-\t\tstr++;\n-\t}\n-\treturn 0;\n-}\n-\n static int\n rte_eth_devargs_process_range(char *str, uint16_t *list, uint16_t *len_list,\n \tconst uint16_t max_list)\n {\n \tuint16_t lo, hi, val;\n \tint result;\n+\tchar *pos = str;\n \n \tresult = sscanf(str, \"%hu-%hu\", &lo, &hi);\n \tif (result == 1) {\n@@ -99,7 +52,7 @@ rte_eth_devargs_process_range(char *str, uint16_t *list, uint16_t *len_list,\n \t\t\treturn -ENOMEM;\n \t\tlist[(*len_list)++] = lo;\n \t} else if (result == 2) {\n-\t\tif (lo >= hi || lo > RTE_MAX_ETHPORTS || hi > RTE_MAX_ETHPORTS)\n+\t\tif (lo >= hi)\n \t\t\treturn -EINVAL;\n \t\tfor (val = lo; val <= hi; val++) {\n \t\t\tif (*len_list >= max_list)\n@@ -108,14 +61,52 @@ rte_eth_devargs_process_range(char *str, uint16_t *list, uint16_t *len_list,\n \t\t}\n \t} else\n \t\treturn -EINVAL;\n-\treturn 0;\n+\twhile (*pos != 0 && ((*pos >= '0' && *pos <= '9') || *pos == '-'))\n+\t\tpos++;\n+\treturn pos - str;\n }\n \n+static int\n+rte_eth_devargs_process_list(char *str, uint16_t *list, uint16_t *len_list,\n+\tconst uint16_t max_list)\n+{\n+\tchar *pos = str;\n+\tint ret;\n+\n+\tif (*pos == '[')\n+\t\tpos++;\n+\twhile (1) {\n+\t\tret = rte_eth_devargs_process_range(pos, list, len_list,\n+\t\t\t\t\t\t max_list);\n+\t\tif (ret < 0)\n+\t\t\treturn ret;\n+\t\tpos += ret;\n+\t\tif (*pos != ',') /* end of list */\n+\t\t\tbreak;\n+\t\tpos++;\n+\t}\n+\tif (*str == '[' && *pos != ']')\n+\t\treturn -EINVAL;\n+\tif (*pos == ']')\n+\t\tpos++;\n+\treturn pos - str;\n+}\n+\n+/*\n+ * representor format:\n+ * #: range or single number of VF representor - legacy\n+ */\n int\n rte_eth_devargs_parse_representor_ports(char *str, void *data)\n {\n \tstruct rte_eth_devargs *eth_da = data;\n+\tint ret;\n \n-\treturn rte_eth_devargs_process_range(str, eth_da->representor_ports,\n+\t/* Number # alone implies VF */\n+\teth_da->type = RTE_ETH_REPRESENTOR_VF;\n+\tret = rte_eth_devargs_process_list(str, eth_da->representor_ports,\n \t\tð_da->nb_representor_ports, RTE_MAX_ETHPORTS);\n+\tif (ret < 0)\n+\t\tRTE_LOG(ERR, EAL, \"wrong representor format: %s\\n\", str);\n+\treturn ret < 0 ? ret : 0;\n }\ndiff --git a/lib/librte_ethdev/ethdev_private.h b/lib/librte_ethdev/ethdev_private.h\nindex 905a45c337..220ddd4408 100644\n--- a/lib/librte_ethdev/ethdev_private.h\n+++ b/lib/librte_ethdev/ethdev_private.h\n@@ -26,9 +26,6 @@ eth_find_device(const struct rte_eth_dev *_start, rte_eth_cmp_t cmp,\n \t\tconst void *data);\n \n /* Parse devargs value for representor parameter. */\n-typedef int (*rte_eth_devargs_callback_t)(char *str, void *data);\n-int rte_eth_devargs_parse_list(char *str, rte_eth_devargs_callback_t callback,\n-\tvoid *data);\n int rte_eth_devargs_parse_representor_ports(char *str, void *data);\n \n #ifdef __cplusplus\ndiff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c\nindex 6338355e25..efe6149df5 100644\n--- a/lib/librte_ethdev/rte_class_eth.c\n+++ b/lib/librte_ethdev/rte_class_eth.c\n@@ -77,9 +77,7 @@ eth_representor_cmp(const char *key __rte_unused,\n \tif (values == NULL)\n \t\treturn -1;\n \tmemset(&representors, 0, sizeof(representors));\n-\tret = rte_eth_devargs_parse_list(values,\n-\t\t\trte_eth_devargs_parse_representor_ports,\n-\t\t\t&representors);\n+\tret = rte_eth_devargs_parse_representor_ports(values, &representors);\n \tfree(values);\n \tif (ret != 0)\n \t\treturn -1; /* invalid devargs value */\ndiff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c\nindex 17ddacc78d..2ac51ac149 100644\n--- a/lib/librte_ethdev/rte_ethdev.c\n+++ b/lib/librte_ethdev/rte_ethdev.c\n@@ -5542,9 +5542,8 @@ rte_eth_devargs_parse(const char *dargs, struct rte_eth_devargs *eth_da)\n \tfor (i = 0; i < args.count; i++) {\n \t\tpair = &args.pairs[i];\n \t\tif (strcmp(\"representor\", pair->key) == 0) {\n-\t\t\tresult = rte_eth_devargs_parse_list(pair->value,\n-\t\t\t\trte_eth_devargs_parse_representor_ports,\n-\t\t\t\teth_da);\n+\t\t\tresult = rte_eth_devargs_parse_representor_ports(\n+\t\t\t\t\tpair->value, eth_da);\n \t\t\tif (result < 0)\n \t\t\t\tgoto parse_cleanup;\n \t\t}\ndiff --git a/lib/librte_ethdev/rte_ethdev_driver.h b/lib/librte_ethdev/rte_ethdev_driver.h\nindex 0eacfd8425..b66a955b18 100644\n--- a/lib/librte_ethdev/rte_ethdev_driver.h\n+++ b/lib/librte_ethdev/rte_ethdev_driver.h\n@@ -1193,6 +1193,12 @@ __rte_internal\n int\n rte_eth_switch_domain_free(uint16_t domain_id);\n \n+/** Ethernet device representor type */\n+enum rte_eth_representor_type {\n+\tRTE_ETH_REPRESENTOR_NONE, /* not a representor */\n+\tRTE_ETH_REPRESENTOR_VF, /* representor of VF */\n+};\n+\n /** Generic Ethernet device arguments */\n struct rte_eth_devargs {\n \tuint16_t ports[RTE_MAX_ETHPORTS];\n@@ -1203,6 +1209,7 @@ struct rte_eth_devargs {\n \t/** representor port/s identifier to enable on device */\n \tuint16_t nb_representor_ports;\n \t/** number of ports in representor port field */\n+\tenum rte_eth_representor_type type; /* type of representor */\n };\n \n /**\n", "prefixes": [ "v2", "1/9" ] }