Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 42901,
    "url": "http://patches.dpdk.org/api/patches/42901/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/31ece7bda6ce4809dd5a6941a4f47176996b7321.1531345404.git.gaetan.rivet@6wind.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": "<31ece7bda6ce4809dd5a6941a4f47176996b7321.1531345404.git.gaetan.rivet@6wind.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/31ece7bda6ce4809dd5a6941a4f47176996b7321.1531345404.git.gaetan.rivet@6wind.com",
    "date": "2018-07-11T21:44:58",
    "name": "[v11,08/25] devargs: add function to parse device layers",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "b25d1535570fc0e324cd9b4c4688734ba237304a",
    "submitter": {
        "id": 269,
        "url": "http://patches.dpdk.org/api/people/269/?format=api",
        "name": "Gaëtan Rivet",
        "email": "gaetan.rivet@6wind.com"
    },
    "delegate": null,
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/31ece7bda6ce4809dd5a6941a4f47176996b7321.1531345404.git.gaetan.rivet@6wind.com/mbox/",
    "series": [
        {
            "id": 533,
            "url": "http://patches.dpdk.org/api/series/533/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=533",
            "date": "2018-07-11T21:44:50",
            "name": "Device querying",
            "version": 11,
            "mbox": "http://patches.dpdk.org/series/533/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/42901/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/42901/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 3D2591B5A5;\n\tWed, 11 Jul 2018 23:45:56 +0200 (CEST)",
            "from mail-wr1-f65.google.com (mail-wr1-f65.google.com\n\t[209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 86FAA1B56A\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 23:45:48 +0200 (CEST)",
            "by mail-wr1-f65.google.com with SMTP id g6-v6so10691606wrp.0\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 14:45: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\th5-v6sm10550936wrr.19.2018.07.11.14.45.46\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 11 Jul 2018 14:45: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\tbh=5lquyKyb4fQAQodLIsSlzwJeEaVORDxXaCUXdXbGS6g=;\n\tb=GFkctAr+aDgtIdEtp7VMjxK5cQUQX+wG7wd4QrwY+cynDpVwgR3I0E8ZhMOs9aUKdU\n\tEme/GhmJKLhaSYeyGfId6r+joEP5MtjsN0rWC72cLk1UrNU3ZpJ3F4rPclBbJHCu6GSM\n\tW229RieEfm0hl+H62fTUW+OoJq1L/CB1xG3FjdNt668VYV1ML9vu+JA9V1Jm09MzlTjA\n\t82pIBirBuXh0U5tcrVd69oZIjKygLLbUUL0uuaJ9xve+9i5FfuF2anaZ/mMW2H7GF/3l\n\twXDCOx3A9W7507zXdGMk2voCF/sgmuixtwyRlfC13GP0ogD1tuUqPSgahFHycZzY+jU2\n\ty8GA==",
        "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;\n\tbh=5lquyKyb4fQAQodLIsSlzwJeEaVORDxXaCUXdXbGS6g=;\n\tb=OwutrqGH1L2K+ZUGLhyPU7nqN0UUxRR72vmevPzQL08qV3ofIm5m9g+/5lEr1NlmIJ\n\t1uzltWZlppzK9mAt2P0JRYBP7fmVCFsddLAcQUn7Vp0rs60KE+9j2mUhhKJkr3RS7nOr\n\tAtNC+MWwMtyaRCFd4uv6TdeVBtBG29Pb0r3yGF5hVXOPaRjb1PrtXxvZSw8x7znlIakf\n\ta294jBcqoTH84v25HVrVTZd3S51IR4kjoySfqItZcwk8SQNMykIN5ei5iwIraAIkqYku\n\tGnNYfgye4KpWG1lx75zK82je6YVbebpcUlpuOs/gSBQoh31b/gpkzsXfjZfW5dZxNbNb\n\txqnQ==",
        "X-Gm-Message-State": "AOUpUlFPoBOeoq9GSErvJcxF+94WGyhfWHhiYzShB5m5uyG9Id+IRUIy\n\tXtgA2NCQZE4YvD7n7iknRtjEAlWU",
        "X-Google-Smtp-Source": "AAOMgpcV8d7F0QCIxocolnoNKT4XHyX5buNUBYLy2ZdykbSvQp0IhwRr8IrptGyXz+f+Eu5lRIQMYQ==",
        "X-Received": "by 2002:adf:f850:: with SMTP id\n\td16-v6mr209105wrq.172.1531345547668; \n\tWed, 11 Jul 2018 14:45:47 -0700 (PDT)",
        "From": "Gaetan Rivet <gaetan.rivet@6wind.com>",
        "To": "dev@dpdk.org",
        "Cc": "Gaetan Rivet <gaetan.rivet@6wind.com>",
        "Date": "Wed, 11 Jul 2018 23:44:58 +0200",
        "Message-Id": "<31ece7bda6ce4809dd5a6941a4f47176996b7321.1531345404.git.gaetan.rivet@6wind.com>",
        "X-Mailer": "git-send-email 2.18.0",
        "In-Reply-To": "<cover.1531345404.git.gaetan.rivet@6wind.com>",
        "References": "<cover.1531345404.git.gaetan.rivet@6wind.com>",
        "Subject": "[dpdk-dev] [PATCH v11 08/25] 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         |  34 +++++\n lib/librte_eal/common/include/rte_devargs.h |  13 +-\n 3 files changed, 188 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 f84f3d2cf..a22a2002e 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_errno.h>\n+#include <rte_kvargs.h>\n #include <rte_log.h>\n #include <rte_tailq.h>\n #include \"eal_private.h\"\n@@ -57,6 +61,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 *devargs,\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 (devargs->data != devstr) {\n+\t\tdevargs->data = strdup(devstr);\n+\t\tif (devargs->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 = devargs->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_parse_delim(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+\tdevargs->bus_str = layers[0].str;\n+\tdevargs->cls_str = layers[1].str;\n+\tdevargs->drv_str = layers[2].str;\n+\tdevargs->bus = bus;\n+\tdevargs->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 (devargs->data != devstr) {\n+\t\tchar *s = (void *)(intptr_t)(devargs->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..722957428 100644\n--- a/lib/librte_eal/common/eal_private.h\n+++ b/lib/librte_eal/common/eal_private.h\n@@ -258,4 +258,38 @@ 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+ * A device description is split by layers of abstraction of the device:\n+ * bus, class and driver. Each layer will offer a set of properties that\n+ * can be applied either to configure or recognize a device.\n+ *\n+ * This function will parse those properties and prepare the rte_devargs\n+ * to be given to each layers for processing.\n+ *\n+ * Note: if the \"data\" field of the devargs 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 *devargs,\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..097a4ce7b 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 *drv_str;\n+\t};\n+\tstruct rte_bus *bus; /**< bus handle. */\n+\tstruct rte_class *cls; /**< class handle. */\n+\tconst char *bus_str; /**< bus-related part of device string. */\n+\tconst char *cls_str; /**< class-related part of device string. */\n+\tconst char *data; /**< Device string storage. */\n };\n \n /**\n",
    "prefixes": [
        "v11",
        "08/25"
    ]
}