Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/38753/?format=api
{ "id": 38753, "url": "https://patches.dpdk.org/api/patches/38753/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/2e37818bc96b38ee90a9821b3f5a7fc53f0faf51.1524522516.git.gaetan.rivet@6wind.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": "<2e37818bc96b38ee90a9821b3f5a7fc53f0faf51.1524522516.git.gaetan.rivet@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/2e37818bc96b38ee90a9821b3f5a7fc53f0faf51.1524522516.git.gaetan.rivet@6wind.com", "date": "2018-04-23T22:41:10", "name": "[dpdk-dev,v4,10/10] devargs: rename legacy API", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "cc1988d5c9a7aa6cf9c069049bb04f16bcc535e8", "submitter": { "id": 269, "url": "https://patches.dpdk.org/api/people/269/?format=api", "name": "Gaëtan Rivet", "email": "gaetan.rivet@6wind.com" }, "delegate": null, "mbox": "https://patches.dpdk.org/project/dpdk/patch/2e37818bc96b38ee90a9821b3f5a7fc53f0faf51.1524522516.git.gaetan.rivet@6wind.com/mbox/", "series": [], "comments": "https://patches.dpdk.org/api/patches/38753/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/38753/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 009CD2C12;\n\tTue, 24 Apr 2018 00:42:07 +0200 (CEST)", "from mail-wr0-f196.google.com (mail-wr0-f196.google.com\n\t[209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 2FE591B19\n\tfor <dev@dpdk.org>; Tue, 24 Apr 2018 00:41:48 +0200 (CEST)", "by mail-wr0-f196.google.com with SMTP id v60-v6so45433651wrc.7\n\tfor <dev@dpdk.org>; Mon, 23 Apr 2018 15:41:48 -0700 (PDT)", "from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com.\n\t[62.23.145.78]) by smtp.gmail.com with ESMTPSA id\n\tx189sm1590705wmg.0.2018.04.23.15.41.46\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 23 Apr 2018 15:41:46 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=6wind-com.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:in-reply-to:references;\n\tbh=JBOsrqQYjiHGPbg8taxRcAw+VJxCkQgEC5OnR+0+vIc=;\n\tb=JdObKjh21yRM4ytSwl838Tp1vUAYZ2Lxge83qZT5OSGFHB35NoJRNkOz07lEf8Rc5u\n\t9Xo3Nltp9RQEkPjZ25GuEklGRn8UI9hluxbArD+lIdfyjbXfWC9JS7+tvgZFbFPYaooA\n\tPz7fQC3JYGgirVWbUv9b5s693hByBbYqswijHs7H0PUmcD9j4ubvpxCFRUmyP5dXIrx9\n\tHarSNxdWNvt7dx2nMUefCl3URQGATGbUIIzNPoBXwOE52Ie5x1g/sD5P6w5jfNoIWKSV\n\tOHnHGloYzzm+n267fRazDiYU9MSSLvPmlgKBcD75DcnizfUQ1xEl5m137mEPR5pv2dCh\n\t3U5A==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:in-reply-to:references;\n\tbh=JBOsrqQYjiHGPbg8taxRcAw+VJxCkQgEC5OnR+0+vIc=;\n\tb=hPhMe22gWanKYJDzWU09bedM7MIVxh4PtF+gTP80rEzJEL07XxGUAp3Yg8UtZM9eoB\n\tHkzrlBT8k5gv7+KIzK9W79xvaUhCgP/Go7LrC/sfykaQkKiSZg7cLSUZdHaSYvYv/o1Z\n\tsK3HXITrHSooGBjxLyy+MqBINFEb62RBAZ0xKOsMaVq+GrF5piM19BST+torZAvhXfZX\n\tDDaLxROdRmgj6s2ta8rZV0dmd277XJCmnocBO1HuUcYAYm13zuFyyFaDewGopr6ekOQu\n\tmqBwy5c78J1gFfahA8M2ZMaCTZ+Bi8W7i/WnKdReyFZ1wV0JxFnVZdFRd4pXo5f9kCKX\n\tn4IQ==", "X-Gm-Message-State": "ALQs6tAy0dqXBxIxPk0hu4rO8PGvSqqwLcba/d8jya4mIZfJaRNxMBbP\n\ts1w8JE1HYp88yrosx3KIXqCJXeWR", "X-Google-Smtp-Source": "AIpwx4/7Jy8YChj8UOyWvJNNahnx14ley3Yphb+uusQlZdBSt9QSquKQ6/M6aWeOWy91KG/+dm1bdg==", "X-Received": "by 10.28.10.83 with SMTP id 80mr11179311wmk.70.1524523307933;\n\tMon, 23 Apr 2018 15:41:47 -0700 (PDT)", "From": "Gaetan Rivet <gaetan.rivet@6wind.com>", "To": "dev@dpdk.org", "Cc": "Gaetan Rivet <gaetan.rivet@6wind.com>", "Date": "Tue, 24 Apr 2018 00:41:10 +0200", "Message-Id": "<2e37818bc96b38ee90a9821b3f5a7fc53f0faf51.1524522516.git.gaetan.rivet@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": [ "<cover.1524522514.git.gaetan.rivet@6wind.com>", "<cover.1524522514.git.gaetan.rivet@6wind.com>" ], "References": [ "<cover.1503676587.git.gaetan.rivet@6wind.com>\n\t<cover.1524522514.git.gaetan.rivet@6wind.com>", "<cover.1524522514.git.gaetan.rivet@6wind.com>" ], "Subject": "[dpdk-dev] [PATCH v4 10/10] devargs: rename legacy API", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://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": "<https://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": "This previous symbols were deprecated for two releases.\nThey are now marked as such and cannot be used anymore.\n\nThey are replaced by ones respecting the new namespace that are marked\nexperimental.\n\nAs a result, eth_dev attach and detach is slightly reworked to follow\nthe changes.\n\nSigned-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\n---\n app/test-pmd/cmdline.c | 2 +-\n drivers/net/vdev_netvsc/vdev_netvsc.c | 2 +-\n examples/bond/Makefile | 1 +\n examples/bond/main.c | 2 +-\n lib/librte_eal/common/eal_common_devargs.c | 9 +++--\n lib/librte_eal/common/eal_common_options.c | 2 +-\n lib/librte_eal/common/include/rte_devargs.h | 54 +++++++++++++++++++++++++++++\n lib/librte_eal/rte_eal_version.map | 3 ++\n lib/librte_ether/rte_ethdev.c | 44 +++++++++++------------\n test/test/commands.c | 2 +-\n 10 files changed, 89 insertions(+), 32 deletions(-)", "diff": "diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c\nindex 0b442c3a6..18470c6fc 100644\n--- a/app/test-pmd/cmdline.c\n+++ b/app/test-pmd/cmdline.c\n@@ -8754,7 +8754,7 @@ static void cmd_dump_parsed(void *parsed_result,\n \telse if (!strcmp(res->dump, \"dump_mempool\"))\n \t\trte_mempool_list_dump(stdout);\n \telse if (!strcmp(res->dump, \"dump_devargs\"))\n-\t\trte_eal_devargs_dump(stdout);\n+\t\trte_devargs_dump(stdout);\n \telse if (!strcmp(res->dump, \"dump_log_types\"))\n \t\trte_log_dump(stdout);\n }\ndiff --git a/drivers/net/vdev_netvsc/vdev_netvsc.c b/drivers/net/vdev_netvsc/vdev_netvsc.c\nindex 8b85711d4..f902dbe27 100644\n--- a/drivers/net/vdev_netvsc/vdev_netvsc.c\n+++ b/drivers/net/vdev_netvsc/vdev_netvsc.c\n@@ -803,7 +803,7 @@ vdev_netvsc_scan_callback(__rte_unused void *arg)\n \t\tvdev_netvsc_cmp_rte_device, VDEV_NETVSC_DRIVER_NAME);\n \tif (dev)\n \t\treturn;\n-\tif (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, VDEV_NETVSC_DRIVER_NAME))\n+\tif (rte_devargs_add(RTE_DEVTYPE_VIRTUAL, VDEV_NETVSC_DRIVER_NAME))\n \t\tDRV_LOG(ERR, \"unable to add netvsc devargs.\");\n }\n \ndiff --git a/examples/bond/Makefile b/examples/bond/Makefile\nindex e7afce358..6b0324a42 100644\n--- a/examples/bond/Makefile\n+++ b/examples/bond/Makefile\n@@ -62,6 +62,7 @@ endif\n \n CFLAGS += -DALLOW_EXPERIMENTAL_API\n CFLAGS += -O3\n+CFLAGS += -DALLOW_EXPERIMENTAL_API\n \n ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)\n LDLIBS += -lrte_pmd_bond\ndiff --git a/examples/bond/main.c b/examples/bond/main.c\nindex d8edc642b..65e0edd25 100644\n--- a/examples/bond/main.c\n+++ b/examples/bond/main.c\n@@ -742,7 +742,7 @@ main(int argc, char *argv[])\n \n \t/* init EAL */\n \tret = rte_eal_init(argc, argv);\n-\trte_eal_devargs_dump(stdout);\n+\trte_devargs_dump(stdout);\n \tif (ret < 0)\n \t\trte_exit(EXIT_FAILURE, \"Error with EAL initialization\\n\");\n \targc -= ret;\ndiff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c\nindex 24d0f6f44..b0434158b 100644\n--- a/lib/librte_eal/common/eal_common_devargs.c\n+++ b/lib/librte_eal/common/eal_common_devargs.c\n@@ -137,8 +137,9 @@ rte_devargs_insert(struct rte_devargs *da)\n }\n \n /* store a whitelist parameter for later parsing */\n+__rte_experimental\n int\n-rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n+rte_devargs_add(enum rte_devtype devtype, const char *devargs_str)\n {\n \tstruct rte_devargs *devargs = NULL;\n \tstruct rte_bus *bus = NULL;\n@@ -192,8 +193,9 @@ rte_devargs_remove(const char *busname, const char *devname)\n }\n \n /* count the number of devices of a specified type */\n+__rte_experimental\n unsigned int\n-rte_eal_devargs_type_count(enum rte_devtype devtype)\n+rte_devargs_type_count(enum rte_devtype devtype)\n {\n \tstruct rte_devargs *devargs;\n \tunsigned int count = 0;\n@@ -207,8 +209,9 @@ rte_eal_devargs_type_count(enum rte_devtype devtype)\n }\n \n /* dump the user devices on the console */\n+__rte_experimental\n void\n-rte_eal_devargs_dump(FILE *f)\n+rte_devargs_dump(FILE *f)\n {\n \tstruct rte_devargs *devargs;\n \ndiff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c\nindex 40c5b26f3..e1a1a3c56 100644\n--- a/lib/librte_eal/common/eal_common_options.c\n+++ b/lib/librte_eal/common/eal_common_options.c\n@@ -153,7 +153,7 @@ eal_option_device_parse(void)\n \n \tTAILQ_FOREACH_SAFE(devopt, &devopt_list, next, tmp) {\n \t\tif (ret == 0) {\n-\t\t\tret = rte_eal_devargs_add(devopt->type, devopt->arg);\n+\t\t\tret = rte_devargs_add(devopt->type, devopt->arg);\n \t\t\tif (ret)\n \t\t\t\tRTE_LOG(ERR, EAL, \"Unable to parse device '%s'\\n\",\n \t\t\t\t\tdevopt->arg);\ndiff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h\nindex 07a4701b2..3ba1f2084 100644\n--- a/lib/librte_eal/common/include/rte_devargs.h\n+++ b/lib/librte_eal/common/include/rte_devargs.h\n@@ -60,6 +60,7 @@ struct rte_devargs {\n };\n \n /**\n+ * @deprecated\n * Parse a devargs string.\n *\n * For PCI devices, the format of arguments string is \"PCI_ADDR\" or\n@@ -84,6 +85,7 @@ struct rte_devargs {\n * - 0 on success\n * - A negative value on error\n */\n+__rte_deprecated\n int rte_eal_parse_devargs_str(const char *devargs_str,\n \t\t\t\tchar **drvname, char **drvargs);\n \n@@ -146,6 +148,32 @@ rte_devargs_insert(struct rte_devargs *da);\n * - 0 on success\n * - A negative value on error\n */\n+__rte_experimental\n+int rte_devargs_add(enum rte_devtype devtype, const char *devargs_str);\n+\n+/**\n+ * @deprecated\n+ * Add a device to the user device list\n+ *\n+ * The format is\n+ *\n+ * bus:device_identifier,arg1=val1,arg2=val2\n+ *\n+ * Examples:\n+ *\n+ * pci:0000:05.00.0,arg=val\n+ * vdev:net_ring0\n+ *\n+ * @param devtype\n+ * The type of the device.\n+ * @param devargs_str\n+ * The arguments as given by the user.\n+ *\n+ * @return\n+ * - 0 on success\n+ * - A negative value on error\n+ */\n+__rte_deprecated\n int rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str);\n \n /**\n@@ -177,6 +205,21 @@ int rte_devargs_remove(const char *busname,\n * @return\n * The number of devices.\n */\n+__rte_experimental\n+unsigned int\n+rte_devargs_type_count(enum rte_devtype devtype);\n+\n+/**\n+ * @deprecated\n+ * Count the number of user devices of a specified type\n+ *\n+ * @param devtype\n+ * The type of the devices to counted.\n+ *\n+ * @return\n+ * The number of devices.\n+ */\n+__rte_deprecated\n unsigned int\n rte_eal_devargs_type_count(enum rte_devtype devtype);\n \n@@ -186,6 +229,17 @@ rte_eal_devargs_type_count(enum rte_devtype devtype);\n * @param f\n * A pointer to a file for output\n */\n+__rte_experimental\n+void rte_devargs_dump(FILE *f);\n+\n+/**\n+ * @deprecated\n+ * This function dumps the list of user device and their arguments.\n+ *\n+ * @param f\n+ * A pointer to a file for output\n+ */\n+__rte_deprecated\n void rte_eal_devargs_dump(FILE *f);\n \n /**\ndiff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map\nindex 526b0d95c..d744312ec 100644\n--- a/lib/librte_eal/rte_eal_version.map\n+++ b/lib/librte_eal/rte_eal_version.map\n@@ -217,10 +217,13 @@ EXPERIMENTAL {\n \trte_dev_event_monitor_start;\n \trte_dev_event_monitor_stop;\n \trte_eal_cleanup;\n+\trte_devargs_add;\n+\trte_devargs_dump;\n \trte_devargs_insert;\n \trte_devargs_next;\n \trte_devargs_parse;\n \trte_devargs_remove;\n+\trte_devargs_type_count;\n \trte_eal_hotplug_add;\n \trte_eal_hotplug_remove;\n \trte_eal_mbuf_user_pool_ops;\ndiff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c\nindex 7821a8883..600866de7 100644\n--- a/lib/librte_ether/rte_ethdev.c\n+++ b/lib/librte_ether/rte_ethdev.c\n@@ -618,27 +618,26 @@ eth_err(uint16_t port_id, int ret)\n int\n rte_eth_dev_attach(const char *devargs, uint16_t *port_id)\n {\n-\tint ret = -1;\n \tint current = rte_eth_dev_count_total();\n-\tchar *name = NULL;\n-\tchar *args = NULL;\n+\tstruct rte_devargs da = {0};\n+\tint ret = -1;\n \n \tif ((devargs == NULL) || (port_id == NULL)) {\n \t\tret = -EINVAL;\n \t\tgoto err;\n \t}\n \n-\t/* parse devargs, then retrieve device name and args */\n-\tif (rte_eal_parse_devargs_str(devargs, &name, &args))\n+\t/* parse devargs */\n+\tif (rte_devargs_parse(&da, \"%s\", devargs))\n \t\tgoto err;\n \n-\tret = rte_eal_dev_attach(name, args);\n+\tret = rte_eal_hotplug_add(da.bus->name, da.name, da.args);\n \tif (ret < 0)\n \t\tgoto err;\n \n \t/* no point looking at the port count if no port exists */\n \tif (!rte_eth_dev_count_total()) {\n-\t\tethdev_log(ERR, \"No port found for device (%s)\", name);\n+\t\tethdev_log(ERR, \"No port found for device (%s)\", da.name);\n \t\tret = -1;\n \t\tgoto err;\n \t}\n@@ -656,45 +655,42 @@ rte_eth_dev_attach(const char *devargs, uint16_t *port_id)\n \tret = 0;\n \n err:\n-\tfree(name);\n-\tfree(args);\n+\tfree(da.args);\n \treturn ret;\n }\n \n /* detach the device, then store the name of the device */\n int\n-rte_eth_dev_detach(uint16_t port_id, char *name)\n+rte_eth_dev_detach(uint16_t port_id, char *name __rte_unused)\n {\n+\tstruct rte_device *dev;\n+\tstruct rte_bus *bus;\n \tuint32_t dev_flags;\n \tint ret = -1;\n \n \tRTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -EINVAL);\n \n-\tif (name == NULL) {\n-\t\tret = -EINVAL;\n-\t\tgoto err;\n-\t}\n-\n \tdev_flags = rte_eth_devices[port_id].data->dev_flags;\n \tif (dev_flags & RTE_ETH_DEV_BONDED_SLAVE) {\n \t\tethdev_log(ERR,\n \t\t\t\"Port %\" PRIu16 \" is bonded, cannot detach\", port_id);\n-\t\tret = -ENOTSUP;\n-\t\tgoto err;\n+\t\treturn -ENOTSUP;\n \t}\n \n-\tsnprintf(name, sizeof(rte_eth_devices[port_id].data->name),\n-\t\t \"%s\", rte_eth_devices[port_id].data->name);\n+\tdev = rte_eth_devices[port_id].device;\n+\tif (dev == NULL)\n+\t\treturn -EINVAL;\n \n-\tret = rte_eal_dev_detach(rte_eth_devices[port_id].device);\n+\tbus = rte_bus_find_by_device(dev);\n+\tif (bus == NULL)\n+\t\treturn -ENOENT;\n+\n+\tret = rte_eal_hotplug_remove(bus->name, dev->name);\n \tif (ret < 0)\n-\t\tgoto err;\n+\t\treturn ret;\n \n \trte_eth_dev_release_port(&rte_eth_devices[port_id]);\n \treturn 0;\n-\n-err:\n-\treturn ret;\n }\n \n static int\ndiff --git a/test/test/commands.c b/test/test/commands.c\nindex 6bfdc0272..94fbc310e 100644\n--- a/test/test/commands.c\n+++ b/test/test/commands.c\n@@ -132,7 +132,7 @@ static void cmd_dump_parsed(void *parsed_result,\n \telse if (!strcmp(res->dump, \"dump_mempool\"))\n \t\trte_mempool_list_dump(stdout);\n \telse if (!strcmp(res->dump, \"dump_devargs\"))\n-\t\trte_eal_devargs_dump(stdout);\n+\t\trte_devargs_dump(stdout);\n \telse if (!strcmp(res->dump, \"dump_log_types\"))\n \t\trte_log_dump(stdout);\n \telse if (!strcmp(res->dump, \"dump_malloc_stats\"))\n", "prefixes": [ "dpdk-dev", "v4", "10/10" ] }