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 354975398
for <dev@dpdk.org>; Mon, 22 Oct 2018 15:15:47 +0200 (CEST)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id 9D95322105;
Mon, 22 Oct 2018 09:15:46 -0400 (EDT)
Received: from mailfrontend1 ([10.202.2.162])
by compute1.internal (MEProxy); Mon, 22 Oct 2018 09:15:46 -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=wpSh5L2Bih
5RLY+5MHAwFuW5ZDIzraAK5y6xnF0lOhI=; b=iYMio7x8pPSqTLURxXZkOpi4rZ
irS1mjWAAWb7Xc570yG9Ibh2uhFblNrOcPtOSSW+9q09Y6zNthTN61zDpfED6KFH
/52lgtPumC/xZagxNSgOvxXCldeWWplW1W7BeVMKLiPNia2iM1aXlD0p1CKcDT4q
r+ewXr5IaSiaoG+as=
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=wpSh5L2Bih5RLY+5MHAwFuW5ZDIzraAK5y6xnF0lOhI=; b=k2uvGeOU
r6uK2JGMN7QyeOBWDvPzfmyMwB/gLcMqqF+MGZTBgaf+RJU/8JbhDQVEuDQCxJjq
Tkdkraj6MwwzL9nWwoz9YlBXMMVCx3pf6u6LaponXXuLBBa2k92nK7puVeLw2ywU
tVzlv22eS/bj/kkFAro2ETSvTowG3gd5mX6NeEX4SI4tZmejf53YEk3jP6W6vPHM
XRVwxkLYENXus91ZaHDvVfN5JbXtULCa7iV7hT9Z9U5hPyZ8o/ViisO91LJ+7Jjn
fcHhRx8nEQTVBN2zMUnMf6+BcRAEUl55VDz0lHoVxKrE83JecHuS4qML9Ofngqlk
jbElqHvrcXSLYA==
X-ME-Sender: <xms:gs3NW6avrsLZ5_kpg4vCr--PuRAlC0MgVBzMufvzG-LWyruhohDccg>
X-ME-Proxy: <xmx:gs3NW-v5zOVjLnwp31uH5x4wAiSBxoEn0MkgC-IMaR3qKPMZdgaJLw>
<xmx:gs3NWzqBvGMVoGQpxA8lRrBwIhkx3jJyvMv3vl_SHFIVdeTnEvFipA>
<xmx:gs3NW7lqr2jVB1ZkUZacoIC9iXgaqOBmtTTSCVH60e9b0Rps0J24RA>
<xmx:gs3NW3wk5ebl0DTGbl_1h670J9iPbnx_9XmnDxMzlbgqLo3KXoUvCg>
<xmx:gs3NWzncP_an4vCiOrPb89i7TtJenZphFPPe-g6Rs7OFzCdVELhZhg>
<xmx:gs3NWxEQ_YdbWCDX6qxiYz_rMJTGTSDjws_jDBWopligyzTt2S3KRA>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 32A32E4899;
Mon, 22 Oct 2018 09:15:45 -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,
bruce.richardson@intel.com
Date: Mon, 22 Oct 2018 15:15:29 +0200
Message-Id: <20181022131530.6403-4-thomas@monjalon.net>
X-Mailer: git-send-email 2.19.0
In-Reply-To: <20181022131530.6403-1-thomas@monjalon.net>
References: <20181009021858.19216-1-thomas@monjalon.net>
<20181022131530.6403-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v3 3/4] ethdev: support representor id as
iterator 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: Mon, 22 Oct 2018 13:15:48 -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>
Reviewed-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
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 | 4 +++
5 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/drivers/net/i40e/i40e_vf_representor.c b/drivers/net/i40e/i40e_vf_representor.c
index 43fe00cca..a523e50da 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 eb9bbe5cb..917ee68fc 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 b2be74b51..297cbffc0 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1084,8 +1084,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..fca7fe4d4 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;
+ uint16_t 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 9a020ce3b..8f03f83f6 100644
--- a/lib/librte_ethdev/rte_ethdev_core.h
+++ b/lib/librte_ethdev/rte_ethdev_core.h
@@ -625,6 +625,10 @@ 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 in dev_flags.
+ */
} __rte_cache_aligned;
/**
--
2.19.0