Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42904/?format=api
{ "id": 42904, "url": "http://patches.dpdk.org/api/patches/42904/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/d5ea19aaec29793e7e9570c5458475df1f60eab3.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": "<d5ea19aaec29793e7e9570c5458475df1f60eab3.1531345404.git.gaetan.rivet@6wind.com>", "list_archive_url": "https://inbox.dpdk.org/dev/d5ea19aaec29793e7e9570c5458475df1f60eab3.1531345404.git.gaetan.rivet@6wind.com", "date": "2018-07-11T21:45:01", "name": "[v11,11/25] eal/dev: implement device iteration", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "02fc9d863c006c23e7d261564068c0fe23908762", "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/d5ea19aaec29793e7e9570c5458475df1f60eab3.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/42904/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/42904/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 156681B5C3;\n\tWed, 11 Jul 2018 23:46:03 +0200 (CEST)", "from mail-wm0-f54.google.com (mail-wm0-f54.google.com\n\t[74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 3E50D1B46A\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 23:45:52 +0200 (CEST)", "by mail-wm0-f54.google.com with SMTP id h20-v6so3931320wmb.4\n\tfor <dev@dpdk.org>; Wed, 11 Jul 2018 14:45:52 -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.50\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tWed, 11 Jul 2018 14:45:50 -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=pHdH5CMwam+4k9OqYdwo+Y6hZ7ItDWf7ml+tkO03Vgo=;\n\tb=rIZUoDme8DEElU6ha/ELmrytteJC5S8lQbRpvGWr9Sn5N4gwp3pjzyd790fi6BDA3a\n\tRDfgMXucLWJLNtGq+RVv9gFev3kV8snIoZRWMQkSXBAml1fZbZPoOC4/6dOVYTXY2Q0S\n\tas0mErgzP1lQtLEKIVdltRn+g+c0O9XObwMp8YClT8nyyfgRuVjSU9ZHE6mRhqMJQ8iP\n\tvY5xW2NBQNNeyA6JdCtu23hzXJGLWyLoFmDoxgJKF7L0jzOu8p0uC54fAH9zN2as1akZ\n\t2sIMuF8JGTWdBYPm0sbJYIK/EKUYalmwQ5WAhh/0FYMQipMf8/7Eih2klxxuY4lfNvfg\n\tiCkw==", "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=pHdH5CMwam+4k9OqYdwo+Y6hZ7ItDWf7ml+tkO03Vgo=;\n\tb=Rhb+2AWyP/y/bWWZFySHe51y7CShasE5N/ccVxr/UVc6ISJ7c3DOww+/i0orrIDrmT\n\to9/B8Wx9xj72XXqLqGg3Wp4Pudbsi1a4XaBixutApSNiOstLnHv7SxXQPX2aAYRSIl0v\n\tA4W7F2Pkzk0mRpSrm9i2KT8HJuWAWpK0FLoLMqEClggW7Q4+Xeo90JxOkDEK3qBxLF+N\n\tDGEBgSK93tj9tZDVpR89qZohN6DV1ojv+x2jZkZ+Cl4kpzxyHPW7kbJHAIAD+ymCtRmY\n\tkzgTPGxst+j2ZuX/ldIvAgciurC1RczKFEV7tBAuq44LrXFElcbeydnQghuxqXa62byr\n\ttQKA==", "X-Gm-Message-State": "AOUpUlHtKnDL6L5m6lEmt1zF4ntoPllCJa0SlKDfj9Mt/RgAyIuqS7ro\n\tqJRcFYZxDCfegLePSfnDvnw6rXab", "X-Google-Smtp-Source": "AAOMgpfflB3F2fAH7QwVrIcJrspPuHqNbSRXitLkaUrQfDYP4KNVX6RNDfrhE6WQwL4BP6GwB8J/GQ==", "X-Received": "by 2002:a1c:e304:: with SMTP id a4-v6mr147466wmh.0.1531345551490;\n\tWed, 11 Jul 2018 14:45:51 -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:45:01 +0200", "Message-Id": "<d5ea19aaec29793e7e9570c5458475df1f60eab3.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 11/25] eal/dev: implement device iteration", "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": "Use the iteration hooks in the abstraction layers to perform the\nrequested filtering on the internal device lists.\n\nSigned-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>\n---\n lib/librte_eal/common/eal_common_dev.c | 168 ++++++++++++++++++++++++\n lib/librte_eal/common/include/rte_dev.h | 26 ++++\n lib/librte_eal/rte_eal_version.map | 1 +\n 3 files changed, 195 insertions(+)", "diff": "diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c\nindex 63e329bd8..b78845f02 100644\n--- a/lib/librte_eal/common/eal_common_dev.c\n+++ b/lib/librte_eal/common/eal_common_dev.c\n@@ -45,6 +45,28 @@ static struct dev_event_cb_list dev_event_cbs;\n /* spinlock for device callbacks */\n static rte_spinlock_t dev_event_lock = RTE_SPINLOCK_INITIALIZER;\n \n+struct dev_next_ctx {\n+\tstruct rte_dev_iterator *it;\n+\tconst char *bus_str;\n+\tconst char *cls_str;\n+};\n+\n+#define CTX(it, bus_str, cls_str) \\\n+\t(&(const struct dev_next_ctx){ \\\n+\t\t.it = it, \\\n+\t\t.bus_str = bus_str, \\\n+\t\t.cls_str = cls_str, \\\n+\t})\n+\n+#define ITCTX(ptr) \\\n+\t(((struct dev_next_ctx *)(intptr_t)ptr)->it)\n+\n+#define BUSCTX(ptr) \\\n+\t(((struct dev_next_ctx *)(intptr_t)ptr)->bus_str)\n+\n+#define CLSCTX(ptr) \\\n+\t(((struct dev_next_ctx *)(intptr_t)ptr)->cls_str)\n+\n static int cmp_detached_dev_name(const struct rte_device *dev,\n \tconst void *_name)\n {\n@@ -398,3 +420,149 @@ rte_dev_iterator_init(struct rte_dev_iterator *it,\n get_out:\n \treturn -rte_errno;\n }\n+\n+static char *\n+dev_str_sane_copy(const char *str)\n+{\n+\tsize_t end;\n+\tchar *copy;\n+\n+\tend = strcspn(str, \",/\");\n+\tif (str[end] == ',') {\n+\t\tcopy = strdup(&str[end + 1]);\n+\t} else {\n+\t\t/* '/' or '\\0' */\n+\t\tcopy = strdup(\"\");\n+\t}\n+\tif (copy == NULL) {\n+\t\trte_errno = ENOMEM;\n+\t} else {\n+\t\tchar *slash;\n+\n+\t\tslash = strchr(copy, '/');\n+\t\tif (slash != NULL)\n+\t\t\tslash[0] = '\\0';\n+\t}\n+\treturn copy;\n+}\n+\n+static int\n+class_next_dev_cmp(const struct rte_class *cls,\n+\t\t const void *ctx)\n+{\n+\tstruct rte_dev_iterator *it;\n+\tconst char *cls_str = NULL;\n+\tvoid *dev;\n+\n+\tif (cls->dev_iterate == NULL)\n+\t\treturn 1;\n+\tit = ITCTX(ctx);\n+\tcls_str = CLSCTX(ctx);\n+\tdev = it->class_device;\n+\t/* it->cls_str != NULL means a class\n+\t * was specified in the devstr.\n+\t */\n+\tif (it->cls_str != NULL && cls != it->cls)\n+\t\treturn 1;\n+\t/* If an error occurred previously,\n+\t * no need to test further.\n+\t */\n+\tif (rte_errno != 0)\n+\t\treturn -1;\n+\tdev = cls->dev_iterate(dev, cls_str, it);\n+\tit->class_device = dev;\n+\treturn dev == NULL;\n+}\n+\n+static int\n+bus_next_dev_cmp(const struct rte_bus *bus,\n+\t\t const void *ctx)\n+{\n+\tstruct rte_device *dev = NULL;\n+\tstruct rte_class *cls = NULL;\n+\tstruct rte_dev_iterator *it;\n+\tconst char *bus_str = NULL;\n+\n+\tif (bus->dev_iterate == NULL)\n+\t\treturn 1;\n+\tit = ITCTX(ctx);\n+\tbus_str = BUSCTX(ctx);\n+\tdev = it->device;\n+\t/* it->bus_str != NULL means a bus\n+\t * was specified in the devstr.\n+\t */\n+\tif (it->bus_str != NULL && bus != it->bus)\n+\t\treturn 1;\n+\t/* If an error occurred previously,\n+\t * no need to test further.\n+\t */\n+\tif (rte_errno != 0)\n+\t\treturn -1;\n+\tif (it->cls_str == NULL) {\n+\t\tdev = bus->dev_iterate(dev, bus_str, it);\n+\t\tgoto end;\n+\t}\n+\t/* cls_str != NULL */\n+\tif (dev == NULL) {\n+next_dev_on_bus:\n+\t\tdev = bus->dev_iterate(dev, bus_str, it);\n+\t\tit->device = dev;\n+\t}\n+\tif (dev == NULL)\n+\t\treturn 1;\n+\tif (it->cls != NULL)\n+\t\tcls = TAILQ_PREV(it->cls, rte_class_list, next);\n+\tcls = rte_class_find(cls, class_next_dev_cmp, ctx);\n+\tif (cls != NULL) {\n+\t\tit->cls = cls;\n+\t\tgoto end;\n+\t}\n+\tgoto next_dev_on_bus;\n+end:\n+\tit->device = dev;\n+\treturn dev == NULL;\n+}\n+__rte_experimental\n+struct rte_device *\n+rte_dev_iterator_next(struct rte_dev_iterator *it)\n+{\n+\tstruct rte_bus *bus = NULL;\n+\tint old_errno = rte_errno;\n+\tchar *bus_str = NULL;\n+\tchar *cls_str = NULL;\n+\n+\trte_errno = 0;\n+\tif (it->bus_str == NULL && it->cls_str == NULL) {\n+\t\t/* Invalid iterator. */\n+\t\trte_errno = EINVAL;\n+\t\treturn NULL;\n+\t}\n+\tif (it->bus != NULL)\n+\t\tbus = TAILQ_PREV(it->bus, rte_bus_list, next);\n+\tif (it->bus_str != NULL) {\n+\t\tbus_str = dev_str_sane_copy(it->bus_str);\n+\t\tif (bus_str == NULL)\n+\t\t\tgoto out;\n+\t}\n+\tif (it->cls_str != NULL) {\n+\t\tcls_str = dev_str_sane_copy(it->cls_str);\n+\t\tif (cls_str == NULL)\n+\t\t\tgoto out;\n+\t}\n+\twhile ((bus = rte_bus_find(bus, bus_next_dev_cmp,\n+\t\t\t\t CTX(it, bus_str, cls_str)))) {\n+\t\tif (it->device != NULL) {\n+\t\t\tit->bus = bus;\n+\t\t\tgoto out;\n+\t\t}\n+\t\tif (it->bus_str != NULL ||\n+\t\t rte_errno != 0)\n+\t\t\tbreak;\n+\t}\n+\tif (rte_errno == 0)\n+\t\trte_errno = old_errno;\n+out:\n+\tfree(bus_str);\n+\tfree(cls_str);\n+\treturn it->device;\n+}\ndiff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h\nindex fdc812ff8..8638a2bbd 100644\n--- a/lib/librte_eal/common/include/rte_dev.h\n+++ b/lib/librte_eal/common/include/rte_dev.h\n@@ -355,6 +355,32 @@ __rte_experimental\n int\n rte_dev_iterator_init(struct rte_dev_iterator *it, const char *str);\n \n+/**\n+ * Iterates on a device iterator.\n+ *\n+ * Generates a new rte_device handle corresponding to the next element\n+ * in the list described in comprehension by the iterator.\n+ *\n+ * The next object is returned, and the iterator is updated.\n+ *\n+ * @param it\n+ * Device iterator handle.\n+ *\n+ * @return\n+ * An rte_device handle if found.\n+ * NULL if an error occurred (rte_errno is set).\n+ * NULL if no device could be found (rte_errno is not set).\n+ */\n+__rte_experimental\n+struct rte_device *\n+rte_dev_iterator_next(struct rte_dev_iterator *it);\n+\n+#define RTE_DEV_FOREACH(dev, devstr, it) \\\n+\tfor (rte_dev_iterator_init(it, devstr), \\\n+\t dev = rte_dev_iterator_next(it); \\\n+\t dev != NULL; \\\n+\t dev = rte_dev_iterator_next(it))\n+\n #ifdef __cplusplus\n }\n #endif\ndiff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map\nindex ac04120d6..4cd5ab3df 100644\n--- a/lib/librte_eal/rte_eal_version.map\n+++ b/lib/librte_eal/rte_eal_version.map\n@@ -252,6 +252,7 @@ EXPERIMENTAL {\n \trte_dev_event_monitor_start;\n \trte_dev_event_monitor_stop;\n \trte_dev_iterator_init;\n+\trte_dev_iterator_next;\n \trte_devargs_add;\n \trte_devargs_dump;\n \trte_devargs_insert;\n", "prefixes": [ "v11", "11/25" ] }