Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/41593/?format=api
http://patchwork.dpdk.org/api/patches/41593/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/0ce131421cf2386dec4393d848a15a365c9698d4.1530031921.git.gaetan.rivet@6wind.com/", "project": { "id": 1, "url": "http://patchwork.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": "<0ce131421cf2386dec4393d848a15a365c9698d4.1530031921.git.gaetan.rivet@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/0ce131421cf2386dec4393d848a15a365c9698d4.1530031921.git.gaetan.rivet@6wind.com", "date": "2018-06-26T16:56:10", "name": "[v8,07/21] devargs: add function to parse device layers", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "25ec99044fe990e3a5d9029a5efa9f7906a9c118", "submitter": { "id": 269, "url": "http://patchwork.dpdk.org/api/people/269/?format=api", "name": "Gaëtan Rivet", "email": "gaetan.rivet@6wind.com" }, "delegate": { "id": 1, "url": "http://patchwork.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/0ce131421cf2386dec4393d848a15a365c9698d4.1530031921.git.gaetan.rivet@6wind.com/mbox/", "series": [ { "id": 249, "url": "http://patchwork.dpdk.org/api/series/249/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=249", "date": "2018-06-26T16:56:03", "name": "Device querying", "version": 8, "mbox": "http://patchwork.dpdk.org/series/249/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/41593/comments/", "check": "fail", "checks": "http://patchwork.dpdk.org/api/patches/41593/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 A3CBE1BE1D;\n\tTue, 26 Jun 2018 18:57:03 +0200 (CEST)", "from mail-wm0-f66.google.com (mail-wm0-f66.google.com\n\t[74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 1B3891BE06\n\tfor <dev@dpdk.org>; Tue, 26 Jun 2018 18:56:57 +0200 (CEST)", "by mail-wm0-f66.google.com with SMTP id e16-v6so2752065wmd.0\n\tfor <dev@dpdk.org>; Tue, 26 Jun 2018 09:56:57 -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\tp5-v6sm2680880wre.83.2018.06.26.09.56.54\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 26 Jun 2018 09:56:55 -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=JiGoqkJjNRKoNIo30pwQ3qEnkhOjDh/K3fTAwhD+xtQ=;\n\tb=DwGYK9Rng9uj/QPObjvpp8kt86m2lrUkaFB96bCH1r/yv+/S1pshJSDOHBavTFWiJC\n\txaMewRsWTwcHENmXALs2wEa2L117tx2cruL55jZ9gvPXEqa6AwAXvtEfOsUK9fJpQrTv\n\tWojcoh9Jx/XKAJDN1zawYdsD+OujcXaCb8hi9M49If3SUg/T/rJo7ex/DAiwe2tbM898\n\t8ZxxvlaXPqjgBZ58aKj9bvcWQCBGMb+DRDCQBFcaEXMAYvODthAU4cTe5pmgEfeAWehR\n\ta22/AXb5AF9i4+hs8pdfN5Hkoy3oxF1tDRKN8ei+I2yxFgnFYQTRaJL50gkEy3zUfzu2\n\t1lVA==", "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=JiGoqkJjNRKoNIo30pwQ3qEnkhOjDh/K3fTAwhD+xtQ=;\n\tb=m9mjNQ8qJ/cicGljgBzFZHcB5Vvbm52JF3TJGnvx+10V8XGQEPG2mOrWqNlXG5Y+s2\n\t9sOST3qXFod604VnpC5pV4BpOhxpvH6jHhAUEPBjGArXR0fSbnzldkhW2o2GJ45B5QEp\n\tEXDkJjoILnm4D/MLLRUrE7XmOXMaaHIooEybel0Tht7j2P+HivaF5P2SUpfszvXMsUZC\n\tvz4UYckuDGJQW7Xcitd4AgZE+JSRRmPUJCafzSkNa3JjjgFwOWElUCWj44vbkgbvb98Z\n\tqkFLKlretiBeZvUkFs4bg7C2MaxCfOwJDd4mp5MGnToGIpgEH2r1hbAB2rhv/gJiQaqx\n\tTj0Q==", "X-Gm-Message-State": "APt69E12DpXhNTrz2ZfCd37CU08FKrgJEK4EQjkRI08WxoPvpKPUNhm6\n\tTgxO8v0Jg8LtOmO9/RUl7NVCIw2e", "X-Google-Smtp-Source": "AAOMgpd7pqogDp+2R6NlKKQhrYrvjkoZNBDTYCoMLQK7T/gWmqYWvYUO7shWrLKDpTbXdyWXiXLbJw==", "X-Received": "by 2002:a1c:2489:: with SMTP id\n\tk131-v6mr2396501wmk.114.1530032216215; \n\tTue, 26 Jun 2018 09:56:56 -0700 (PDT)", "From": "Gaetan Rivet <gaetan.rivet@6wind.com>", "To": "dev@dpdk.org", "Cc": "Gaetan Rivet <gaetan.rivet@6wind.com>", "Date": "Tue, 26 Jun 2018 18:56:10 +0200", "Message-Id": "<0ce131421cf2386dec4393d848a15a365c9698d4.1530031921.git.gaetan.rivet@6wind.com>", "X-Mailer": "git-send-email 2.11.0", "In-Reply-To": [ "<cover.1530031921.git.gaetan.rivet@6wind.com>", "<cover.1530031921.git.gaetan.rivet@6wind.com>" ], "References": [ "<cover.1521124599.git.gaetan.rivet@6wind.com>\n\t<cover.1530031921.git.gaetan.rivet@6wind.com>", "<cover.1530031921.git.gaetan.rivet@6wind.com>" ], "Subject": "[dpdk-dev] [PATCH v8 07/21] devargs: add function to parse device\n\tlayers", "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://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This function is private to the EAL.\nIt is used to parse each layers in a device description string,\nand store the result in an rte_devargs structure.\n\nSigned-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\n---\n lib/librte_eal/common/eal_common_devargs.c | 144 ++++++++++++++++++++++++++++\n lib/librte_eal/common/eal_private.h | 27 ++++++\n lib/librte_eal/common/include/rte_devargs.h | 13 ++-\n 3 files changed, 181 insertions(+), 3 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c\nindex 0a83beb94..9fee2153f 100644\n--- a/lib/librte_eal/common/eal_common_devargs.c\n+++ b/lib/librte_eal/common/eal_common_devargs.c\n@@ -13,9 +13,13 @@\n #include <string.h>\n #include <stdarg.h>\n \n+#include <rte_bus.h>\n+#include <rte_class.h>\n #include <rte_compat.h>\n #include <rte_dev.h>\n #include <rte_devargs.h>\n+#include <rte_kvargs.h>\n+#include <rte_errno.h>\n #include <rte_tailq.h>\n #include \"eal_private.h\"\n \n@@ -56,6 +60,146 @@ rte_eal_parse_devargs_str(const char *devargs_str,\n \treturn 0;\n }\n \n+static size_t\n+devargs_layer_count(const char *s)\n+{\n+\tsize_t i = s ? 1 : 0;\n+\n+\twhile (s != NULL && s[0] != '\\0') {\n+\t\ti += s[0] == '/';\n+\t\ts++;\n+\t}\n+\treturn i;\n+}\n+\n+int\n+rte_devargs_layers_parse(struct rte_devargs *da,\n+\t\t\t const char *devstr)\n+{\n+\tstruct {\n+\t\tconst char *key;\n+\t\tconst char *str;\n+\t\tstruct rte_kvargs *kvlist;\n+\t} layers[] = {\n+\t\t{ \"bus=\", NULL, NULL, },\n+\t\t{ \"class=\", NULL, NULL, },\n+\t\t{ \"driver=\", NULL, NULL, },\n+\t};\n+\tstruct rte_kvargs_pair *kv = NULL;\n+\tstruct rte_class *cls = NULL;\n+\tstruct rte_bus *bus = NULL;\n+\tconst char *s = devstr;\n+\tsize_t nblayer;\n+\tsize_t i = 0;\n+\tint ret = 0;\n+\n+\t/* Split each sub-lists. */\n+\tnblayer = devargs_layer_count(devstr);\n+\tif (nblayer > RTE_DIM(layers)) {\n+\t\tRTE_LOG(ERR, EAL, \"Invalid format: too many layers (%zu)\\n\",\n+\t\t\tnblayer);\n+\t\tret = -E2BIG;\n+\t\tgoto get_out;\n+\t}\n+\n+\t/* If the devargs points the devstr\n+\t * as source data, then it should not allocate\n+\t * anything and keep referring only to it.\n+\t */\n+\tif (da->data != devstr) {\n+\t\tda->data = strdup(devstr);\n+\t\tif (da->data == NULL) {\n+\t\t\tRTE_LOG(ERR, EAL, \"OOM\\n\");\n+\t\t\tret = -ENOMEM;\n+\t\t\tgoto get_out;\n+\t\t}\n+\t\ts = da->data;\n+\t}\n+\n+\twhile (s != NULL) {\n+\t\tif (strncmp(layers[i].key, s,\n+\t\t\t strlen(layers[i].key)) &&\n+\t\t /* The last layer is free-form.\n+\t\t * The \"driver\" key is not required (but accepted).\n+\t\t */\n+\t\t i != RTE_DIM(layers) - 1)\n+\t\t\tgoto next_layer;\n+\t\tlayers[i].str = s;\n+\t\tlayers[i].kvlist = rte_kvargs_parse2(s, NULL, \"/\");\n+\t\tif (layers[i].kvlist == NULL) {\n+\t\t\tRTE_LOG(ERR, EAL, \"Could not parse %s\\n\", s);\n+\t\t\tret = -EINVAL;\n+\t\t\tgoto get_out;\n+\t\t}\n+\t\ts = strchr(s, '/');\n+\t\tif (s != NULL)\n+\t\t\ts++;\n+next_layer:\n+\t\tif (i >= RTE_DIM(layers)) {\n+\t\t\tRTE_LOG(ERR, EAL, \"Unrecognized layer %s\\n\", s);\n+\t\t\tret = -EINVAL;\n+\t\t\tgoto get_out;\n+\t\t}\n+\t\ti++;\n+\t}\n+\n+\t/* Parse each sub-list. */\n+\tfor (i = 0; i < RTE_DIM(layers); i++) {\n+\t\tif (layers[i].kvlist == NULL)\n+\t\t\tcontinue;\n+\t\tkv = &layers[i].kvlist->pairs[0];\n+\t\tif (strcmp(kv->key, \"bus\") == 0) {\n+\t\t\tbus = rte_bus_find_by_name(kv->value);\n+\t\t\tif (bus == NULL) {\n+\t\t\t\tRTE_LOG(ERR, EAL, \"Could not find bus \\\"%s\\\"\\n\",\n+\t\t\t\t\tkv->value);\n+\t\t\t\tret = -EFAULT;\n+\t\t\t\tgoto get_out;\n+\t\t\t}\n+\t\t} else if (strcmp(kv->key, \"class\") == 0) {\n+\t\t\tcls = rte_class_find_by_name(kv->value);\n+\t\t\tif (cls == NULL) {\n+\t\t\t\tRTE_LOG(ERR, EAL, \"Could not find class \\\"%s\\\"\\n\",\n+\t\t\t\t\tkv->value);\n+\t\t\t\tret = -EFAULT;\n+\t\t\t\tgoto get_out;\n+\t\t\t}\n+\t\t} else if (strcmp(kv->key, \"driver\") == 0) {\n+\t\t\t/* Ignore */\n+\t\t\tcontinue;\n+\t\t}\n+\t}\n+\n+\t/* Fill devargs fields. */\n+\tda->busstr = layers[0].str;\n+\tda->clsstr = layers[1].str;\n+\tda->drvstr = layers[2].str;\n+\tda->bus = bus;\n+\tda->cls = cls;\n+\n+\t/* If we own the data, clean up a bit\n+\t * the several layers string, to ease\n+\t * their parsing afterward.\n+\t */\n+\tif (da->data != devstr) {\n+\t\tchar *s = (void*)(intptr_t)(da->data);\n+\n+\t\twhile ((s = strchr(s, '/'))) {\n+\t\t\t*s = '\\0';\n+\t\t\ts++;\n+\t\t}\n+\t}\n+\n+get_out:\n+\tfor (i = 0; i < RTE_DIM(layers); i++) {\n+\t\tif (layers[i].kvlist)\n+\t\t\trte_kvargs_free(layers[i].kvlist);\n+\t}\n+\tif (ret != 0)\n+\t\trte_errno = -ret;\n+\treturn ret;\n+}\n+\n static int\n bus_name_cmp(const struct rte_bus *bus, const void *name)\n {\ndiff --git a/lib/librte_eal/common/eal_private.h b/lib/librte_eal/common/eal_private.h\nindex bdadc4d50..c4c9283c8 100644\n--- a/lib/librte_eal/common/eal_private.h\n+++ b/lib/librte_eal/common/eal_private.h\n@@ -258,4 +258,31 @@ int rte_mp_channel_init(void);\n */\n void dev_callback_process(char *device_name, enum rte_dev_event_type event);\n \n+/**\n+ * @internal\n+ * Parse a device string and store its information in an\n+ * rte_devargs structure.\n+ *\n+ * Note: if the \"data\" field of da points to devstr,\n+ * then no dynamic allocation is performed and the rte_devargs\n+ * can be safely discarded.\n+ *\n+ * Otherwise ``data`` will hold a workable copy of devstr, that will be\n+ * used by layers descriptors within rte_devargs. In this case,\n+ * any rte_devargs should be cleaned-up before being freed.\n+ *\n+ * @param da\n+ * rte_devargs structure to fill.\n+ *\n+ * @param devstr\n+ * Device string.\n+ *\n+ * @return\n+ * 0 on success.\n+ * Negative errno values on error (rte_errno is set).\n+ */\n+int\n+rte_devargs_layers_parse(struct rte_devargs *da,\n+\t\t\t const char *devstr);\n+\n #endif /* _EAL_PRIVATE_H_ */\ndiff --git a/lib/librte_eal/common/include/rte_devargs.h b/lib/librte_eal/common/include/rte_devargs.h\nindex 6c3b6326b..148600258 100644\n--- a/lib/librte_eal/common/include/rte_devargs.h\n+++ b/lib/librte_eal/common/include/rte_devargs.h\n@@ -51,12 +51,19 @@ struct rte_devargs {\n \tenum rte_devtype type;\n \t/** Device policy. */\n \tenum rte_dev_policy policy;\n-\t/** Bus handle for the device. */\n-\tstruct rte_bus *bus;\n \t/** Name of the device. */\n \tchar name[RTE_DEV_NAME_MAX_LEN];\n+\tRTE_STD_C11\n+\tunion {\n \t/** Arguments string as given by user or \"\" for no argument. */\n-\tchar *args;\n+\t\tchar *args;\n+\t\tconst char *drvstr;\n+\t};\n+\tstruct rte_bus *bus; /**< bus handle. */\n+\tstruct rte_class *cls; /**< class handle. */\n+\tconst char *busstr; /**< bus-related part of device string. */\n+\tconst char *clsstr; /**< bus-related part of device string. */\n+\tconst char *data; /**< Device string storage. */\n };\n \n /**\n", "prefixes": [ "v8", "07/21" ] }{ "id": 41593, "url": "