From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 14A734CB3 for ; Tue, 27 Mar 2018 01:19:19 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id s18so20503454wrg.9 for ; Mon, 26 Mar 2018 16:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=MAl926b+OKbmoDEnHq7feuNxOEtGpRfSFOsJ8yXpaUU=; b=nicUkdzVLgFFYOPUa/74o8yt1U6+hEe0VcQPL7O1X4Rrl88t46TSRWjK51O5abF8f1 siyGRr75IbTKoqW33nk60kgs/1FqMGEz7qs6Q9y6LBG8ItaAIO+mhd3wWziSk1kqJpWB Qb+R+1WyeLeevCLbi1sOM1putZ43UginhtS5lYP2xZOLJMCoDn+JaD9ei4cdVwcFStU8 cmPJgg+aC/VXE0EH+i/k/NzJ3JmmzOpEkA19JAi17ASwwvWKHRRpNe61R92J7Lv9CxMT 1zRG2W867/CJqsv4tThHQY0GiAB7RKzceprsLwqE5BTJoOffkDGpAsLZNrXI8fS48ezY Bl5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=MAl926b+OKbmoDEnHq7feuNxOEtGpRfSFOsJ8yXpaUU=; b=XmBtd/y+cmxcPVN7q/9202OQPUfKEwDJ0UjdW5oS/T2PeYCxwWkA4aAaOOYeXh/IPH A6npbysuuRUys6SG3Fkl1Y7MhyFPeiHx16FoQwXMnW1ReW0BPGkrCEovajYvdAOU+EQz 2pcxEO1R5k1f29TjWU9q0x9QgGqRXgspXPMMCEY7EUbEV0tQJbeEWGDufZRKmU61Eiv1 qnOdFfrMafvYYeESQsqxSbGYY63s3tTo6ptGzvNR9nk3K4dp/nM86oIYVBDNzqWqQzuZ rJQnFkJyO8vQC8MqIFrfADUTB4cS0P+HvGiAS95ZJFdMF+oAW9q/HJcsW1HrY/evxdQC rboQ== X-Gm-Message-State: AElRT7GXVF7YNAZPmz+hOSJaCOFJfdJm9F6yJHbj2jwVi2jjwXfawzVa 96b29020UtAkIt3tarDaJDiYlqkG X-Google-Smtp-Source: AG47ELvhDWpp9VgyUBZgQ6HrgoZKGYoFidgwZPauaX0yaqOuRmqZxB/Wk/ZtLhha+tklP9FFS+72gg== X-Received: by 10.223.177.213 with SMTP id r21mr27966111wra.89.1522106358191; Mon, 26 Mar 2018 16:19:18 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id 67sm343712wra.9.2018.03.26.16.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 16:19:17 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Tue, 27 Mar 2018 01:18:35 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 11/20] eal/dev: implement device iteration X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2018 23:19:21 -0000 Use the iteration hooks in the abstraction layers to perform the requested filtering on the internal device lists. Signed-off-by: Gaetan Rivet --- lib/librte_eal/common/eal_common_dev.c | 170 ++++++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_dev.h | 25 +++++ lib/librte_eal/rte_eal_version.map | 1 + 3 files changed, 196 insertions(+) diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index 1f6df2351..604e01940 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -20,6 +20,28 @@ #include "eal_private.h" +struct dev_next_ctx { + struct rte_dev_iterator *it; + const char *busstr; + const char *clsstr; +}; + +#define CTX(it, busstr, clsstr) \ + (&(const struct dev_next_ctx){ \ + .it = it, \ + .busstr = busstr, \ + .clsstr = clsstr, \ + }) + +#define ITCTX(ptr) \ + (((struct dev_next_ctx *)(intptr_t)ptr)->it) + +#define BUSCTX(ptr) \ + (((struct dev_next_ctx *)(intptr_t)ptr)->busstr) + +#define CLSCTX(ptr) \ + (((struct dev_next_ctx *)(intptr_t)ptr)->clsstr) + static int cmp_detached_dev_name(const struct rte_device *dev, const void *_name) { @@ -354,3 +376,151 @@ rte_dev_iterator_init(struct rte_dev_iterator *it, } return -rte_errno; } + +/* '\0' forbidden in sym */ +static const char * +strfirstof(const char *str, + const char *sym) +{ + const char *s; + + for (s = str; s[0] != '\0'; s++) { + const char *c; + + for (c = sym; c[0] != '\0'; c++) { + if (c[0] == s[0]) + return s; + } + } + return NULL; +} + +static char * +dev_str_sane_cpy(const char *str) +{ + const char *end; + char *copy; + + end = strfirstof(str, ",/"); + if (end != NULL && + end[0] == ',') { + copy = strdup(end + 1); + } else { + /* '/' or '\0' */ + copy = strdup(""); + } + if (copy == NULL) + rte_errno = ENOMEM; + return copy; +} + +static int +class_next_dev_cmp(const struct rte_class *cls, + const void *ctx) +{ + struct rte_dev_iterator *it; + const char *clsstr = NULL; + void *dev; + + if (cls->dev_iterate == NULL) + return 1; + it = ITCTX(ctx); + clsstr = CLSCTX(ctx); + dev = it->class_device; + /* it->clsstr != NULL means a class + * was specified in the devstr. + */ + if (it->clsstr != NULL && cls != it->cls) + return 1; + dev = cls->dev_iterate(dev, clsstr, it); + it->class_device = dev; + return dev == NULL; +} + +static int +bus_next_dev_cmp(const struct rte_bus *bus, + const void *ctx) +{ + struct rte_device *dev = NULL; + struct rte_class *cls = NULL; + struct rte_dev_iterator *it; + const char *busstr = NULL; + + if (bus->dev_iterate == NULL) + return 1; + it = ITCTX(ctx); + busstr = BUSCTX(ctx); + dev = it->device; + /* it->busstr != NULL means a bus + * was specified in the devstr. + */ + if (it->busstr != NULL && bus != it->bus) + return 1; + if (it->clsstr == NULL) { + dev = bus->dev_iterate(dev, busstr, it); + goto end; + } + /* clsstr != NULL */ + if (dev == NULL) { +next_dev_on_bus: + dev = bus->dev_iterate(dev, busstr, it); + it->device = dev; + } + if (dev == NULL) + return 1; + if (it->cls != NULL) + cls = TAILQ_PREV(it->cls, rte_class_list, next); + cls = rte_class_find(cls, class_next_dev_cmp, ctx); + if (cls != NULL) { + it->cls = cls; + goto end; + } + goto next_dev_on_bus; +end: + it->device = dev; + return dev == NULL; +} +__rte_experimental +struct rte_device * +rte_dev_iterator_next(struct rte_dev_iterator *it) +{ + struct rte_bus *bus = NULL; + int old_errno = rte_errno; + char *busstr = NULL; + char *clsstr = NULL; + + rte_errno = 0; + if (it->busstr == NULL && it->clsstr == NULL) { + /* Invalid iterator. */ + rte_errno = EINVAL; + return NULL; + } + if (it->bus != NULL) + bus = TAILQ_PREV(it->bus, rte_bus_list, next); + if (it->busstr != NULL) { + busstr = dev_str_sane_cpy(it->busstr); + if (busstr == NULL) + goto out; + } + if (it->clsstr != NULL) { + clsstr = dev_str_sane_cpy(it->clsstr); + if (clsstr == NULL) + goto out; + } + while ((bus = rte_bus_find(bus, bus_next_dev_cmp, + CTX(it, busstr, clsstr)))) { + if (it->device != NULL) { + it->bus = bus; + goto out; + } + if (it->busstr != NULL || + rte_errno != 0) + break; + } + if (rte_errno == 0) + rte_errno = old_errno; +out: + free(busstr); + free(clsstr); + return it->device; +} diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 7ce13e068..dfb5d696f 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -333,6 +333,31 @@ typedef void *(*rte_dev_iterate_t)(const void *start, int __rte_experimental rte_dev_iterator_init(struct rte_dev_iterator *it, const char *str); +/** + * Iterates on a device iterator. + * + * Generates a new rte_device handle corresponding to the next element + * in the list described in comprehension by the iterator. + * + * The next object is returned, and the iterator is updated. + * + * @param it + * Device iterator handle. + * + * @return + * An rte_device handle if found. + * NULL if an error occurred (rte_errno is set). + * NULL if no device could be found (rte_errno is not set). + */ +struct rte_device * __rte_experimental +rte_dev_iterator_next(struct rte_dev_iterator *it); + +#define RTE_DEV_FOREACH(dev, devstr, it) \ + for (rte_dev_iterator_init(it, devstr), \ + dev = rte_dev_iterator_next(it); \ + dev != NULL; \ + dev = rte_dev_iterator_next(it)) + #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index 921da3075..925efcb6d 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -229,6 +229,7 @@ EXPERIMENTAL { rte_mp_request; rte_mp_reply; rte_dev_iterator_init; + rte_dev_iterator_next; rte_service_attr_get; rte_service_attr_reset_all; rte_service_component_register; -- 2.11.0