From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <thomas@monjalon.net>
Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com
[66.111.4.27]) by dpdk.org (Postfix) with ESMTP id D8BB71B4D1
for <dev@dpdk.org>; Wed, 10 Oct 2018 00:33:44 +0200 (CEST)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id 834102202D;
Tue, 9 Oct 2018 18:33:44 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute1.internal (MEProxy); Tue, 09 Oct 2018 18:33:44 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=mesmtp; bh=R2NYriofV6
Niv52wfS6gDrKfwBR0GT8x+e1aiOpISOc=; b=cmYOe+sYMYf2jdTTcX7s0FbSho
9CU7EzgeBwB93L+2kWkoC/fo3ykToGWmGN81zuu1g+sbywUk394sHrnddPN67zlq
wKMe+p2D8nwaDNSk0NuXh+kaTF0lmhWw6DuOv9CXuKFBRCTpqMHhhr8y2yPkE97Y
JA6jhxMaAlh1nCPQw=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm1; bh=R2NYriofV6Niv52wfS6gDrKfwBR0GT8x+e1aiOpISOc=; b=dmKe+8ZO
1RMyzkWCKc22SW67DU3YDL48Wc/PguxU9HCVX0BMWXQShYtKHNt/jOI9l+qGQBKt
Ia9kZ/iJPtZ5WSjDCasdOpk6OiUu+lvr+X4Aks1lBXNUWtHfcpfk9oJFOJ+xUKxS
lymX0kDm5GuaAz86Vb7m2YJZ1Go3WYbcQIOd6zjpinZMdAHX1ha4KpWNUb16ijNs
E+dVgzm5zs5NIy+2OzPVgAsgJePl5rritsP9LvI2FpiWE6Y9ewM5MPLEOwDePqz1
mL700r4x9up7mf12tB39Etk/l7av7WgCx+9UVcGMa4vqJ8E0MGJKJIF4ttWONgbH
tDBtCJoM1tVqYQ==
X-ME-Sender: <xms:yCy9W0LgFuPqYR-50iqCdnEWfWSmIn_0jBw0s6Np6b9Uy1f_caUmSg>
X-ME-Proxy: <xmx:yCy9Wxzoz2kW5T9EkRcW0F3tj87Rg90-_S3P3uyq4roPC3jmrZ4otQ>
<xmx:yCy9W0VvlIc9UckeIKqlTpt8b4Ba1Wag5qBclIzXwRd9QwWwgYIIWQ>
<xmx:yCy9WzhSdcnrr5QAkN9n5MEVKeOKBeoCg_jbPxCavmbvPH74cZ5nbA>
<xmx:yCy9W3UiOGxOJLNyrxPG-WHE-w5rYiYSAqssZMRGbWAr6KQXIe4MqA>
<xmx:yCy9W3yGZ5fZ8t1Y39BdH8aWCwj2tvGmrZMbx87z5uRe51cByplpng>
<xmx:yCy9W62Hu_0ggUwv-kTPIxODyf0q5Q0vMQ7IGBune0BMqL2A4rS2Mg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 7F589102E2;
Tue, 9 Oct 2018 18:33:43 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: gaetan.rivet@6wind.com, ophirmu@mellanox.com, ferruh.yigit@intel.com,
arybchenko@solarflare.com
Date: Wed, 10 Oct 2018 00:33:35 +0200
Message-Id: <20181009223338.18307-4-thomas@monjalon.net>
X-Mailer: git-send-email 2.19.0
In-Reply-To: <20181009223338.18307-1-thomas@monjalon.net>
References: <20181007222554.4886-1-thomas@monjalon.net>
<20181009223338.18307-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v4 3/6] ethdev: allow iterating with pure class
filter
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Oct 2018 22:33:45 -0000
If no rte_device is given in the iterator,
eth_dev_match() is looking at all ports without any restriction,
except the ethdev kvargs filter.
It allows to iterate with a devargs filter referencing only
some ethdev parameters. The format (from the new devargs syntax) is:
class=eth,paramY=Y
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
lib/librte_ethdev/rte_class_eth.c | 2 +-
lib/librte_ethdev/rte_ethdev.c | 25 ++++++++++++++++++++++---
2 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c
index c04279ec6..58fed694b 100644
--- a/lib/librte_ethdev/rte_class_eth.c
+++ b/lib/librte_ethdev/rte_class_eth.c
@@ -42,7 +42,7 @@ eth_dev_match(const struct rte_eth_dev *edev,
if (edev->state == RTE_ETH_DEV_UNUSED)
return -1;
- if (edev->device != arg->device)
+ if (arg->device != NULL && arg->device != edev->device)
return -1;
if (kvlist == NULL)
/* Empty string matches everything. */
diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c
index 73919149a..f195ea917 100644
--- a/lib/librte_ethdev/rte_ethdev.c
+++ b/lib/librte_ethdev/rte_ethdev.c
@@ -199,10 +199,24 @@ rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
* The devargs string may use various syntaxes:
* - 0000:08:00.0,representor=[1-3]
* - pci:0000:06:00.0,representor=[0,5]
+ * - class=eth,mac=00:11:22:33:44:55
* A new syntax is in development (not yet supported):
* - bus=X,paramX=x/class=Y,paramY=y/driver=Z,paramZ=z
*/
+ /*
+ * Handle pure class filter (i.e. without any bus-level argument),
+ * from future new syntax.
+ * rte_devargs_parse() is not yet supporting the new syntax,
+ * that's why this simple case is temporarily parsed here.
+ */
+#define iter_anybus_str "class=eth,"
+ if (strncmp(devargs_str, iter_anybus_str,
+ strlen(iter_anybus_str)) == 0) {
+ iter->cls_str = devargs_str + strlen(iter_anybus_str);
+ goto end;
+ }
+
/* Split bus, device and parameters. */
ret = rte_devargs_parse(&devargs, devargs_str);
if (ret != 0)
@@ -256,6 +270,7 @@ rte_eth_iterator_init(struct rte_dev_iterator *iter, const char *devargs_str)
}
iter->bus_str = bus_str;
+end:
iter->cls = rte_class_find_by_name("eth");
return 0;
@@ -276,8 +291,10 @@ rte_eth_iterator_next(struct rte_dev_iterator *iter)
return RTE_MAX_ETHPORTS;
do { /* loop to try all matching rte_device */
- /* If not in middle of rte_eth_dev iteration, */
- if (iter->class_device == NULL) {
+ /* If not pure ethdev filter and */
+ if (iter->bus != NULL &&
+ /* not in middle of rte_eth_dev iteration, */
+ iter->class_device == NULL) {
/* get next rte_device to try. */
iter->device = iter->bus->dev_iterate(
iter->device, iter->bus_str, iter);
@@ -289,7 +306,7 @@ rte_eth_iterator_next(struct rte_dev_iterator *iter)
iter->class_device, iter->cls_str, iter);
if (iter->class_device != NULL)
return eth_dev_to_id(iter->class_device); /* match */
- } while (1); /* need to try next rte_device */
+ } while (iter->bus != NULL); /* need to try next rte_device */
/* No more ethdev port to iterate. */
rte_eth_iterator_cleanup(iter);
@@ -299,6 +316,8 @@ rte_eth_iterator_next(struct rte_dev_iterator *iter)
void __rte_experimental
rte_eth_iterator_cleanup(struct rte_dev_iterator *iter)
{
+ if (iter->bus_str == NULL)
+ return; /* nothing to free in pure class filter */
free(RTE_CAST_FIELD(iter, bus_str, char *)); /* workaround const */
free(RTE_CAST_FIELD(iter, cls_str, char *)); /* workaround const */
memset(iter, 0, sizeof(*iter));
--
2.19.0