Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/3725/?format=api
{ "id": 3725, "url": "https://patches.dpdk.org/api/patches/3725/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1424892749-31862-12-git-send-email-mukawa@igel.co.jp/", "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": "<1424892749-31862-12-git-send-email-mukawa@igel.co.jp>", "list_archive_url": "https://inbox.dpdk.org/dev/1424892749-31862-12-git-send-email-mukawa@igel.co.jp", "date": "2015-02-25T19:32:25", "name": "[dpdk-dev,v15,11/13] eal/pci: Add vdev driver initialization and uninitialization functions", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "428a4f8f104b5aadc7c4a259b86c2d9461368a57", "submitter": { "id": 64, "url": "https://patches.dpdk.org/api/people/64/?format=api", "name": "Tetsuya Mukawa", "email": "mukawa@igel.co.jp" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1424892749-31862-12-git-send-email-mukawa@igel.co.jp/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/3725/comments/", "check": "pending", "checks": "https://patches.dpdk.org/api/patches/3725/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 70D367F1C;\n\tWed, 25 Feb 2015 20:33:56 +0100 (CET)", "from mail-pd0-f173.google.com (mail-pd0-f173.google.com\n\t[209.85.192.173]) by dpdk.org (Postfix) with ESMTP id 091E45A9C\n\tfor <dev@dpdk.org>; Wed, 25 Feb 2015 20:33:10 +0100 (CET)", "by pdbfl12 with SMTP id fl12so7102399pdb.2\n\tfor <dev@dpdk.org>; Wed, 25 Feb 2015 11:33:09 -0800 (PST)", "from localhost.localdomain (napt.igel.co.jp. [219.106.231.132])\n\tby mx.google.com with ESMTPSA id\n\tux7sm39997444pab.19.2015.02.25.11.33.07\n\t(version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 25 Feb 2015 11:33:08 -0800 (PST)" ], "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=RqSITtOtkNJLTeMIiTq7/npqIjLSvhZs6Ym/e06QWN4=;\n\tb=NT3VLJBxUnHrwmNuLstA9pj814v9btC0c9Nrdn7u4+GzYmGDTO/KBs1F/eCD9ANE+q\n\tks7ttHkO823PUgXGeCfFeZLHMqNBSagrv8pWhn5fVKPRihewkm2Km53c1tve3we2KVAi\n\tmifa/Ubl6R95HRjkwj93F8n1SNmL+90bTEndIowB1VOt0JA70p+Q/eciIfzJYjJIXKt8\n\tY3DzDm44nkItjnbHxaI2MWqnM3BZvSqUytiSTSoYx0G1uBS6jwxu9/f7qDS75+Jcx0oo\n\tA+Z5dGvh3FRLfKfbtNSSXnuNGDx1qSwxYDmB7uWEtOJFTtTKqBr7IbrSa8gYysBsX0yY\n\t/efw==", "X-Gm-Message-State": "ALoCoQltCtUs7QXCDO0TWi0clZT38Nd1AF+39SsUybInILB7cUzdYbTizpPpI080WEShVuIdhWvM", "X-Received": "by 10.68.217.103 with SMTP id ox7mr8463808pbc.56.1424892789466; \n\tWed, 25 Feb 2015 11:33:09 -0800 (PST)", "From": "Tetsuya Mukawa <mukawa@igel.co.jp>", "To": "dev@dpdk.org", "Date": "Thu, 26 Feb 2015 04:32:25 +0900", "Message-Id": "<1424892749-31862-12-git-send-email-mukawa@igel.co.jp>", "X-Mailer": "git-send-email 1.9.1", "In-Reply-To": "<1424892749-31862-1-git-send-email-mukawa@igel.co.jp>", "References": "<1424837093-5661-13-git-send-email-mukawa@igel.co.jp>\n\t<1424892749-31862-1-git-send-email-mukawa@igel.co.jp>", "Subject": "[dpdk-dev] [PATCH v15 11/13] eal/pci: Add vdev driver\n\tinitialization and uninitialization functions", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The patch adds following functions.\n- rte_eal_vdev_init();\n- rte_eal_vdev_uninit();\n- rte_eal_parse_devargs_str().\nThese functions are used for driver initialization and finalization.\n\nv15:\n- Add this patch to hotplug series.\n\nSigned-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>\n---\n lib/librte_eal/common/eal_common_dev.c | 77 ++++++++++++++++++++-----\n lib/librte_eal/common/eal_common_devargs.c | 54 +++++++++++------\n lib/librte_eal/common/include/rte_dev.h | 28 +++++++++\n lib/librte_eal/common/include/rte_devargs.h | 28 +++++++++\n lib/librte_eal/linuxapp/eal/rte_eal_version.map | 3 +\n 5 files changed, 155 insertions(+), 35 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c\nindex eae5656..92a5a94 100644\n--- a/lib/librte_eal/common/eal_common_dev.c\n+++ b/lib/librte_eal/common/eal_common_dev.c\n@@ -32,6 +32,7 @@\n * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n \n+#include <stdio.h>\n #include <string.h>\n #include <inttypes.h>\n #include <sys/queue.h>\n@@ -40,6 +41,7 @@\n #include <rte_devargs.h>\n #include <rte_debug.h>\n #include <rte_devargs.h>\n+#include <rte_log.h>\n \n #include \"eal_private.h\"\n \n@@ -62,6 +64,32 @@ rte_eal_driver_unregister(struct rte_driver *driver)\n }\n \n int\n+rte_eal_vdev_init(const char *name, const char *args)\n+{\n+\tstruct rte_driver *driver;\n+\n+\tif (name == NULL)\n+\t\treturn -EINVAL;\n+\n+\tTAILQ_FOREACH(driver, &dev_driver_list, next) {\n+\t\tif (driver->type != PMD_VDEV)\n+\t\t\tcontinue;\n+\n+\t\t/*\n+\t\t * search a driver prefix in virtual device name.\n+\t\t * For example, if the driver is pcap PMD, driver->name\n+\t\t * will be \"eth_pcap\", but \"name\" will be \"eth_pcapN\".\n+\t\t * So use strncmp to compare.\n+\t\t */\n+\t\tif (!strncmp(driver->name, name, strlen(driver->name)))\n+\t\t\treturn driver->init(name, args);\n+\t}\n+\n+\tRTE_LOG(ERR, EAL, \"no driver found for %s\\n\", name);\n+\treturn -EINVAL;\n+}\n+\n+int\n rte_eal_dev_init(void)\n {\n \tstruct rte_devargs *devargs;\n@@ -79,22 +107,11 @@ rte_eal_dev_init(void)\n \t\tif (devargs->type != RTE_DEVTYPE_VIRTUAL)\n \t\t\tcontinue;\n \n-\t\tTAILQ_FOREACH(driver, &dev_driver_list, next) {\n-\t\t\tif (driver->type != PMD_VDEV)\n-\t\t\t\tcontinue;\n-\n-\t\t\t/* search a driver prefix in virtual device name */\n-\t\t\tif (!strncmp(driver->name, devargs->virtual.drv_name,\n-\t\t\t\t\tstrlen(driver->name))) {\n-\t\t\t\tdriver->init(devargs->virtual.drv_name,\n-\t\t\t\t\tdevargs->args);\n-\t\t\t\tbreak;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif (driver == NULL) {\n-\t\t\trte_panic(\"no driver found for %s\\n\",\n-\t\t\t\t devargs->virtual.drv_name);\n+\t\tif (rte_eal_vdev_init(devargs->virtual.drv_name,\n+\t\t\t\t\tdevargs->args)) {\n+\t\t\tRTE_LOG(ERR, EAL, \"failed to initialize %s device\\n\",\n+\t\t\t\t\tdevargs->virtual.drv_name);\n+\t\t\treturn -1;\n \t\t}\n \t}\n \n@@ -107,3 +124,31 @@ rte_eal_dev_init(void)\n \t}\n \treturn 0;\n }\n+\n+#ifdef RTE_LIBRTE_EAL_HOTPLUG\n+int\n+rte_eal_vdev_uninit(const char *name)\n+{\n+\tstruct rte_driver *driver;\n+\n+\tif (name == NULL)\n+\t\treturn -EINVAL;\n+\n+\tTAILQ_FOREACH(driver, &dev_driver_list, next) {\n+\t\tif (driver->type != PMD_VDEV)\n+\t\t\tcontinue;\n+\n+\t\t/*\n+\t\t * search a driver prefix in virtual device name.\n+\t\t * For example, if the driver is pcap PMD, driver->name\n+\t\t * will be \"eth_pcap\", but \"name\" will be \"eth_pcapN\".\n+\t\t * So use strncmp to compare.\n+\t\t */\n+\t\tif (!strncmp(driver->name, name, strlen(driver->name)))\n+\t\t\treturn driver->uninit(name);\n+\t}\n+\n+\tRTE_LOG(ERR, EAL, \"no driver found for %s\\n\", name);\n+\treturn -EINVAL;\n+}\n+#endif /* RTE_LIBRTE_EAL_HOTPLUG */\ndiff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c\nindex eadd719..9b110f7 100644\n--- a/lib/librte_eal/common/eal_common_devargs.c\n+++ b/lib/librte_eal/common/eal_common_devargs.c\n@@ -44,13 +44,46 @@\n struct rte_devargs_list devargs_list =\n \tTAILQ_HEAD_INITIALIZER(devargs_list);\n \n+int\n+rte_eal_parse_devargs_str(const char *devargs_str,\n+\t\t\tchar **drvname, char **drvargs)\n+{\n+\tchar *sep;\n+\n+\tif ((devargs_str) == NULL || (drvname) == NULL || (drvargs == NULL))\n+\t\treturn -1;\n+\n+\t*drvname = strdup(devargs_str);\n+\tif (drvname == NULL) {\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"cannot allocate temp memory for driver name\\n\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* set the first ',' to '\\0' to split name and arguments */\n+\tsep = strchr(*drvname, ',');\n+\tif (sep != NULL) {\n+\t\tsep[0] = '\\0';\n+\t\t*drvargs = strdup(sep + 1);\n+\t} else {\n+\t\t*drvargs = strdup(\"\");\n+\t}\n+\n+\tif (*drvargs == NULL) {\n+\t\tRTE_LOG(ERR, EAL,\n+\t\t\t\"cannot allocate temp memory for driver arguments\\n\");\n+\t\tfree(*drvname);\n+\t\treturn -1;\n+\t}\n+\treturn 0;\n+}\n+\n /* store a whitelist parameter for later parsing */\n int\n rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n {\n \tstruct rte_devargs *devargs = NULL;\n \tchar *buf = NULL;\n-\tchar *sep;\n \tint ret;\n \n \t/* use malloc instead of rte_malloc as it's called early at init */\n@@ -62,25 +95,8 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n \tmemset(devargs, 0, sizeof(*devargs));\n \tdevargs->type = devtype;\n \n-\tbuf = strdup(devargs_str);\n-\tif (buf == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"cannot allocate temp memory for devargs\\n\");\n-\t\tgoto fail;\n-\t}\n-\n-\t/* set the first ',' to '\\0' to split name and arguments */\n-\tsep = strchr(buf, ',');\n-\tif (sep != NULL) {\n-\t\tsep[0] = '\\0';\n-\t\tdevargs->args = strdup(sep + 1);\n-\t} else {\n-\t\tdevargs->args = strdup(\"\");\n-\t}\n-\n-\tif (devargs->args == NULL) {\n-\t\tRTE_LOG(ERR, EAL, \"cannot allocate for devargs args\\n\");\n+\tif (rte_eal_parse_devargs_str(devargs_str, &buf, &devargs->args))\n \t\tgoto fail;\n-\t}\n \n \tswitch (devargs->type) {\n \tcase RTE_DEVTYPE_WHITELISTED_PCI:\ndiff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h\nindex f7e3a10..f601d21 100644\n--- a/lib/librte_eal/common/include/rte_dev.h\n+++ b/lib/librte_eal/common/include/rte_dev.h\n@@ -57,6 +57,11 @@ TAILQ_HEAD(rte_driver_list, rte_driver);\n typedef int (rte_dev_init_t)(const char *name, const char *args);\n \n /**\n+ * Uninitilization function called for each device driver once.\n+ */\n+typedef int (rte_dev_uninit_t)(const char *name);\n+\n+/**\n * Driver type enumeration\n */\n enum pmd_type {\n@@ -72,6 +77,7 @@ struct rte_driver {\n \tenum pmd_type type;\t\t /**< PMD Driver type */\n \tconst char *name; /**< Driver name. */\n \trte_dev_init_t *init; /**< Device init. function. */\n+\trte_dev_uninit_t *uninit; /**< Device uninit. function. */\n };\n \n /**\n@@ -97,6 +103,28 @@ void rte_eal_driver_unregister(struct rte_driver *driver);\n */\n int rte_eal_dev_init(void);\n \n+/**\n+ * Initialize a driver specified by name.\n+ *\n+ * @param name\n+ * The pointer to a driver name to be initialized.\n+ * @param args\n+ * The pointer to arguments used by driver initialization.\n+ * @return\n+ * 0 on success, negative on error\n+ */\n+int rte_eal_vdev_init(const char *name, const char *args);\n+\n+/**\n+ * Uninitalize a driver specified by name.\n+ *\n+ * @param name\n+ * The pointer to a driver name to be initialized.\n+ * @return\n+ * 0 on success, negative on error\n+ */\n+int rte_eal_vdev_uninit(const char *name);\n+\n #define PMD_REGISTER_DRIVER(d)\\\n void devinitfn_ ##d(void);\\\n void __attribute__((constructor, used)) devinitfn_ ##d(void)\\\ndiff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h\nindex 6834333..039f728 100644\n--- a/lib/librte_eal/common/include/rte_devargs.h\n+++ b/lib/librte_eal/common/include/rte_devargs.h\n@@ -99,6 +99,34 @@ TAILQ_HEAD(rte_devargs_list, rte_devargs);\n extern struct rte_devargs_list devargs_list;\n \n /**\n+ * Parse a devargs string.\n+ *\n+ * For PCI devices, the format of arguments string is \"PCI_ADDR\" or\n+ * \"PCI_ADDR,key=val,key2=val2,...\". Examples: \"08:00.1\", \"0000:5:00.0\",\n+ * \"04:00.0,arg=val\".\n+ *\n+ * For virtual devices, the format of arguments string is \"DRIVER_NAME*\"\n+ * or \"DRIVER_NAME*,key=val,key2=val2,...\". Examples: \"eth_ring\",\n+ * \"eth_ring0\", \"eth_pmdAnything,arg=0:arg2=1\".\n+ *\n+ * The function parses the arguments string to get driver name and driver\n+ * arguments.\n+ *\n+ * @param devargs_str\n+ * The arguments as given by the user.\n+ * @param drvname\n+ * The pointer to the string to store parsed driver name.\n+ * @param drvargs\n+ * The pointer to the string to store parsed driver arguments.\n+ *\n+ * @return\n+ * - 0 on success\n+ * - A negative value on error\n+ */\n+int rte_eal_parse_devargs_str(const char *devargs_str,\n+\t\t\t\tchar **drvname, char **drvargs);\n+\n+/**\n * Add a device to the user device list\n *\n * For PCI devices, the format of arguments string is \"PCI_ADDR\" or\ndiff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map\nindex 5478492..214643d 100644\n--- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map\n+++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map\n@@ -38,6 +38,7 @@ DPDK_2.0 {\n \trte_eal_lcore_role;\n \trte_eal_mp_remote_launch;\n \trte_eal_mp_wait_lcore;\n+\trte_eal_parse_devargs_str;\n \trte_eal_pci_close_one;\n \trte_eal_pci_dump;\n \trte_eal_pci_probe;\n@@ -50,6 +51,8 @@ DPDK_2.0 {\n \trte_eal_tailq_lookup_by_idx;\n \trte_eal_tailq_reserve;\n \trte_eal_tailq_reserve_by_idx;\n+\trte_eal_vdev_init;\n+\trte_eal_vdev_uninit;\n \trte_eal_wait_lcore;\n \trte_exit;\n \trte_get_hpet_cycles;\n", "prefixes": [ "dpdk-dev", "v15", "11/13" ] }