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 A44911B152
for <dev@dpdk.org>; Tue, 9 Oct 2018 04:19:08 +0200 (CEST)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id 4F237220DD;
Mon, 8 Oct 2018 22:19:08 -0400 (EDT)
Received: from mailfrontend2 ([10.202.2.163])
by compute1.internal (MEProxy); Mon, 08 Oct 2018 22:19:08 -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=wXgiLTE+WG
k75CO4nNxVE+7UJjr2xC9LhNgqurAB1Ko=; b=mgE27PCwSE7g6ZIcVgExmcxIp8
zJZN/7BhrTlPAKJyzn3AHIa1tMB3b6Upe4tfqHVrgsJnvIcao2gT7bLU0t6Xa3ii
UCRLu7km3uuXWrRcSpgua9ULJ+hbARK0OknQ7EchMrA3n3iT7Ap81mw8BGj7dcN1
kje77FmWgeW/JBFwA=
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=
fm3; bh=wXgiLTE+WGk75CO4nNxVE+7UJjr2xC9LhNgqurAB1Ko=; b=UcEuKUai
hN8V7eydeEexO55/LXAbSjrDUi5Yj4boocnfyjIPDKrvow4FGFUP6N0BsXsJp53/
5SIcHsuaII6MNBdkblsHHwO6Fi6OQ4+5Q6/RLIoFtjq1PyvEjlb+bDIfXV17shli
FJ6vxkoUr3K0RBSBYzw0E5gpl/laio9GmdzFebCa2d7s1x514ocC3zWLz/IVphOj
KAY2Fh5ZusvIUtvqRxqNVvtcjlzbjTxXxk/+wGv/7I1/Z1HzimtIYA3JhBbhdU2B
7740Ny2IMox+TJdj5yem1jS4WSMcFyPF6UaB4drG//sRqVgYr3WpmI3zpFHhJB6Z
ZMLWBLnGRS/Njw==
X-ME-Sender: <xms:HBC8WyW50CwBrNrh19N4ZyjVGTM0H-5jetdKpZzps3xxWCuf7N03Og>
X-ME-Proxy: <xmx:HBC8W3-LvjRg62fdCaKnWuglbjvhwiTF87Q2P_BT3T79uo9ru9lrSQ>
<xmx:HBC8W_ZV1vyXpz40XYoK2_bioVcrAJq0lxqrH_FdnNvtZ2Putn9cNA>
<xmx:HBC8W76Vt5fA7JLu9RvGtrXwf2tSAFnClofXoVP8DU24z8s02hS8rA>
<xmx:HBC8W4Q2yKYpuC729_yczRwEbTH9Hqx8rXhnJaNLTimjK7TXbLn62A>
<xmx:HBC8W8z12cSySSq4nwWvsFeQDQg5UsZmY57nzV77Zf1L9xG1p1FdSA>
<xmx:HBC8W7pqxwisP8t6jVVltZjWdfGarU-nLa7uN-0Q8Jfxn8wtNpdvKg>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 1C43E102EE;
Mon, 8 Oct 2018 22:19:07 -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, olivier.matz@6wind.com, remy.horton@intel.com
Date: Tue, 9 Oct 2018 04:18:58 +0200
Message-Id: <20181009021858.19216-5-thomas@monjalon.net>
X-Mailer: git-send-email 2.19.0
In-Reply-To: <20181009021858.19216-1-thomas@monjalon.net>
References: <20181009021858.19216-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH 4/4] ethdev: support representor id for iterating
ports
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 02:19:09 -0000
The representor id is added in rte_eth_dev_data in order to be able
to match a port with its representor id in devargs.
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
drivers/net/i40e/i40e_vf_representor.c | 1 +
drivers/net/ixgbe/ixgbe_vf_representor.c | 1 +
drivers/net/mlx5/mlx5.c | 4 ++-
lib/librte_ethdev/rte_class_eth.c | 44 ++++++++++++++++++++++++
lib/librte_ethdev/rte_ethdev_core.h | 2 ++
5 files changed, 51 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_vf_representor.c b/drivers/net/i40e/i40e_vf_representor.c
index 24751d13c..a377c1064 100644
--- a/drivers/net/i40e/i40e_vf_representor.c
+++ b/drivers/net/i40e/i40e_vf_representor.c
@@ -504,6 +504,7 @@ i40e_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params)
}
ethdev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
+ ethdev->data->representor_id = representor->vf_id;
/* Setting the number queues allocated to the VF */
ethdev->data->nb_rx_queues = vf->vsi->nb_qps;
diff --git a/drivers/net/ixgbe/ixgbe_vf_representor.c b/drivers/net/ixgbe/ixgbe_vf_representor.c
index b0fbbc49f..26e2af4f8 100644
--- a/drivers/net/ixgbe/ixgbe_vf_representor.c
+++ b/drivers/net/ixgbe/ixgbe_vf_representor.c
@@ -192,6 +192,7 @@ ixgbe_vf_representor_init(struct rte_eth_dev *ethdev, void *init_params)
return -ENODEV;
ethdev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
+ ethdev->data->representor_id = representor->vf_id;
/* Set representor device ops */
ethdev->dev_ops = &ixgbe_vf_representor_dev_ops;
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index cf258345f..de8bab342 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1075,8 +1075,10 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
err = ENOMEM;
goto error;
}
- if (priv->representor)
+ if (priv->representor) {
eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
+ eth_dev->data->representor_id = priv->representor_id;
+ }
eth_dev->data->dev_private = priv;
priv->dev_data = eth_dev->data;
eth_dev->data->mac_addrs = priv->mac;
diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c
index 58fed694b..fef431f33 100644
--- a/lib/librte_ethdev/rte_class_eth.c
+++ b/lib/librte_ethdev/rte_class_eth.c
@@ -12,13 +12,16 @@
#include "rte_ethdev.h"
#include "rte_ethdev_core.h"
+#include "rte_ethdev_driver.h"
#include "ethdev_private.h"
enum eth_params {
+ RTE_ETH_PARAM_REPRESENTOR,
RTE_ETH_PARAM_MAX,
};
static const char * const eth_params_keys[] = {
+ [RTE_ETH_PARAM_REPRESENTOR] = "representor",
[RTE_ETH_PARAM_MAX] = NULL,
};
@@ -33,10 +36,44 @@ struct eth_dev_match_arg {
.kvlist = (k), \
})
+static int
+eth_representor_cmp(const char *key __rte_unused,
+ const char *value, void *opaque)
+{
+ int ret;
+ char *values;
+ const struct rte_eth_dev_data *data = opaque;
+ struct rte_eth_devargs representors;
+ int index;
+
+ if ((data->dev_flags & RTE_ETH_DEV_REPRESENTOR) == 0)
+ return -1; /* not a representor port */
+
+ /* Parse devargs representor values. */
+ values = strdup(value);
+ if (values == NULL)
+ return -1;
+ memset(&representors, 0, sizeof(representors));
+ ret = rte_eth_devargs_parse_list(values,
+ rte_eth_devargs_parse_representor_ports,
+ &representors);
+ free(values);
+ if (ret != 0)
+ return -1; /* invalid devargs value */
+
+ /* Return 0 if representor id is matching one of the values. */
+ for (index = 0; index < representors.nb_representor_ports; index++)
+ if (data->representor_id ==
+ representors.representor_ports[index])
+ return 0;
+ return -1; /* no match */
+}
+
static int
eth_dev_match(const struct rte_eth_dev *edev,
const void *_arg)
{
+ int ret;
const struct eth_dev_match_arg *arg = _arg;
const struct rte_kvargs *kvlist = arg->kvlist;
@@ -47,6 +84,13 @@ eth_dev_match(const struct rte_eth_dev *edev,
if (kvlist == NULL)
/* Empty string matches everything. */
return 0;
+
+ ret = rte_kvargs_process(kvlist,
+ eth_params_keys[RTE_ETH_PARAM_REPRESENTOR],
+ eth_representor_cmp, edev->data);
+ if (ret != 0)
+ return -1;
+
return 0;
}
diff --git a/lib/librte_ethdev/rte_ethdev_core.h b/lib/librte_ethdev/rte_ethdev_core.h
index 33d12b3a2..ac67fde28 100644
--- a/lib/librte_ethdev/rte_ethdev_core.h
+++ b/lib/librte_ethdev/rte_ethdev_core.h
@@ -613,6 +613,8 @@ struct rte_eth_dev_data {
struct rte_vlan_filter_conf vlan_filter_conf;
/**< VLAN filter configuration. */
struct rte_eth_dev_owner owner; /**< The port owner. */
+ uint16_t representor_id;
+ /**< switch specific identifier - valid if RTE_ETH_DEV_REPRESENTOR */
} __rte_cache_aligned;
/**
--
2.19.0