From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id BD8905F2D for ; Tue, 27 Mar 2018 01:19:17 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id u11so8202997wri.12 for ; Mon, 26 Mar 2018 16:19:17 -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=nqgwOUl3BJnL5A+YuOdzREB52NCXnamXNe0EzdzRntc=; b=iLsZEZH0pYaXF/y1sI6sIUu+T8AX2j3YMsXaX4bLUYrIa1y81W/QHXCzGrxMh1bMum p3D0QIpu2FsXazd4bFrA9v/OKaMPS6tcNj1R3Lc47e5PLxZ9kt7IHiMRIO/sYh5CwEKn fusPhAzGNT5ibkcJmjFfyn4HQ3lHwcqusHgLipyP2eN8r6ivMXKya0e0/nD1qAE1wgdW YXBmnqZjDafjbPHH9722fvHBsY+LXQzG+/xoR5hq8dMmHbEtYt5eY4RvbvivCfrg79QF j03wYmC2D2MinGspxgWH/wRQS7WBIbQfI330kDbmPpd00BDNPXBf4kcyCQIftLpYbA3h vnhA== 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=nqgwOUl3BJnL5A+YuOdzREB52NCXnamXNe0EzdzRntc=; b=ogCAuGi82LePekJ0N5oI08F8wAjwNl1d3gf6gnsJGaTHZDJbtHkP1nDNHNy/c08KVN 5yW4jJgfFG2wJmn4mG28jYWZIHZK8AsorGcdjrK36+zNI2YX2laH4WG7ms1C6dRsjcVA 78f6+nHshgV8uLRxwySGYug9sSSmggUoEurDsFlfOaZcyYAcV1pl87N3FyVYgXVTr8v6 y+3V9L1AOVAXSVGzoAUahhy97vZF0YGkGb5uEOe5EAQFUxRtMuITZKY00xeepE22vsLa S2sPgXKbbuMgbo3qMNft/dhfk/wqnV6gexIWghXN7F0mYe9ZcrGxmlDRejkajPjuJ56p VYng== X-Gm-Message-State: AElRT7Ffoh9A3Hfl+JYpEIjtgT2FRWtYeXeolOI1aOBvyXkNRVlyKkQJ tWX1OllrFLnGxwiRyXUI20cWZO63 X-Google-Smtp-Source: AG47ELslWknLYCVM48CQmlv3vwdvHgFNMmR0FHw2h6RVVt7Z16bk+y5AToXWKoXS7IAp1E1FkZZ85w== X-Received: by 10.223.142.164 with SMTP id q33mr31535265wrb.72.1522106356798; Mon, 26 Mar 2018 16:19:16 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 16:19:15 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , Neil Horman , "Wiles, Keith" Date: Tue, 27 Mar 2018 01:18:34 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v3 10/20] eal/dev: implement device iteration initialization 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:17 -0000 Parse a device description. Split this description in their relevant part for each layers. No dynamic allocation is performed. Cc: Neil Horman Cc: "Wiles, Keith" Signed-off-by: Gaetan Rivet --- This version uses librte_kvargs. lib/Makefile | 1 + lib/librte_eal/bsdapp/eal/Makefile | 1 + lib/librte_eal/common/eal_common_dev.c | 147 ++++++++++++++++++++++++++++++++ lib/librte_eal/common/include/rte_dev.h | 23 +++++ lib/librte_eal/linuxapp/eal/Makefile | 1 + lib/librte_eal/rte_eal_version.map | 1 + 6 files changed, 174 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index fc7a55a37..1b17526f7 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,6 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += librte_compat DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal +DEPDIRS-librte_eal := librte_kvargs DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci DEPDIRS-librte_pci := librte_eal DIRS-$(CONFIG_RTE_LIBRTE_RING) += librte_ring diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 17ff1ac45..f6cea7fc2 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -18,6 +18,7 @@ CFLAGS += $(WERROR_FLAGS) -O3 LDLIBS += -lexecinfo LDLIBS += -lpthread LDLIBS += -lgcc_s +LDLIBS += -lrte_kvargs EXPORT_MAP := ../../rte_eal_version.map diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index cd071442f..1f6df2351 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -10,9 +10,12 @@ #include #include +#include #include #include #include +#include +#include #include #include "eal_private.h" @@ -207,3 +210,147 @@ rte_eal_hotplug_remove(const char *busname, const char *devname) rte_eal_devargs_remove(busname, devname); return ret; } + +static size_t +dev_layer_count(const char *s) +{ + size_t i = s ? 1 : 0; + + while (s != NULL && s[0] != '\0') { + i += s[0] == '/'; + s++; + } + return i; +} + +int __rte_experimental +rte_dev_iterator_init(struct rte_dev_iterator *it, + const char *devstr) +{ + struct { + const char *key; + const char *str; + struct rte_kvargs *kvlist; + } layers[] = { + { "bus=", NULL, NULL, }, + { "class=", NULL, NULL, }, + { "driver=", NULL, NULL, }, + }; + struct rte_kvargs_pair *kv = NULL; + struct rte_class *cls = NULL; + struct rte_bus *bus = NULL; + const char *s = devstr; + size_t nblayer; + size_t i = 0; + + /* Having both busstr and clsstr NULL is illegal, + * marking this iterator as invalid unless + * everything goes well. + */ + it->busstr = NULL; + it->clsstr = NULL; + /* Split each sub-lists. */ + nblayer = dev_layer_count(devstr); + if (nblayer > RTE_DIM(layers)) { + RTE_LOG(ERR, EAL, "Invalid query: too many layers (%zu)\n", + nblayer); + rte_errno = EINVAL; + goto get_out; + } + while (s != NULL) { + char *copy; + char *end; + + if (strncmp(layers[i].key, s, + strlen(layers[i].key))) + goto next_layer; + layers[i].str = s; + copy = strdup(s); + if (copy == NULL) { + RTE_LOG(ERR, EAL, "OOM\n"); + rte_errno = ENOMEM; + goto get_out; + } + end = strchr(copy, '/'); + end = end ? end : strchr(copy, '\0'); + end[0] = '\0'; + layers[i].kvlist = rte_kvargs_parse(copy, NULL); + free(copy); + if (layers[i].kvlist == NULL) { + RTE_LOG(ERR, EAL, "Could not parse %s\n", s); + rte_errno = EINVAL; + goto get_out; + } + s = strchr(s, '/'); + if (s != NULL) + s++; +next_layer: + if (i >= RTE_DIM(layers)) { + RTE_LOG(ERR, EAL, "Unrecognized layer %s\n", s); + rte_errno = EINVAL; + goto get_out; + } + i++; + } + /* Parse each sub-list. */ + for (i = 0; i < RTE_DIM(layers); i++) { + if (layers[i].kvlist == NULL) + continue; + kv = &layers[i].kvlist->pairs[0]; + if (strcmp(kv->key, "bus") == 0) { + bus = rte_bus_find_by_name(kv->value); + if (bus == NULL) { + RTE_LOG(ERR, EAL, "Could not find bus \"%s\"\n", + kv->value); + rte_errno = EFAULT; + goto get_out; + } + } else if (strcmp(kv->key, "class") == 0) { + cls = rte_class_find_by_name(kv->value); + if (cls == NULL) { + RTE_LOG(ERR, EAL, "Could not find class \"%s\"\n", + kv->value); + rte_errno = EFAULT; + goto get_out; + } + } else if (strcmp(kv->key, "driver") == 0) { + /* Ignore */ + continue; + } + } + /* The string should have at least + * one layer specified. + */ + if (bus == NULL && cls == NULL) { + RTE_LOG(ERR, EAL, + "Either bus or class must be specified.\n"); + rte_errno = EINVAL; + goto get_out; + } + if (bus != NULL && bus->dev_iterate == NULL) { + RTE_LOG(ERR, EAL, "Bus %s not supported\n", bus->name); + rte_errno = ENOTSUP; + goto get_out; + } + if (cls != NULL && cls->dev_iterate == NULL) { + RTE_LOG(ERR, EAL, "Class %s not supported\n", cls->name); + rte_errno = ENOTSUP; + goto get_out; + } + /* Fill iterator fields. */ + if (bus != NULL) + it->busstr = layers[0].str; + if (cls != NULL) + it->clsstr = layers[1].str; + it->devstr = devstr; + it->bus = bus; + it->cls = cls; + it->device = NULL; + it->class_device = NULL; +get_out: + for (i = 0; i < RTE_DIM(layers); i++) { + if (layers[i].kvlist) + rte_kvargs_free(layers[i].kvlist); + } + return -rte_errno; +} diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index 937ff6079..7ce13e068 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -310,6 +310,29 @@ typedef void *(*rte_dev_iterate_t)(const void *start, const char *devstr, const struct rte_dev_iterator *it); +/** + * Initializes a device iterator. + * + * This iterator allows accessing a list of devices matching a criteria. + * The device matching is made among all buses and classes currently registered, + * filtered by the device description given as parameter. + * + * This function will not allocate any memory. It is safe to stop the + * iteration at any moment and let the iterator go out of context. + * + * @param it + * Device iterator handle. + * + * @param str + * Device description string. + * + * @return + * 0 on successful initialization. + * <0 on error. + */ +int __rte_experimental +rte_dev_iterator_init(struct rte_dev_iterator *it, const char *str); + #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index a3edbbe76..87caa23a1 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -27,6 +27,7 @@ LDLIBS += -lrt ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) LDLIBS += -lnuma endif +LDLIBS += -lrte_kvargs # specific to linuxapp exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) := eal.c diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map index 910cb23c9..921da3075 100644 --- a/lib/librte_eal/rte_eal_version.map +++ b/lib/librte_eal/rte_eal_version.map @@ -228,6 +228,7 @@ EXPERIMENTAL { rte_mp_sendmsg; rte_mp_request; rte_mp_reply; + rte_dev_iterator_init; rte_service_attr_get; rte_service_attr_reset_all; rte_service_component_register; -- 2.11.0