diff mbox series

ethdev: fix iterator default behaviour for representors

Message ID 20181024131321.8409-1-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers
Series ethdev: fix iterator default behaviour for representors |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Thomas Monjalon Oct. 24, 2018, 1:13 p.m. UTC 
  The iterator was matching all representors if it was not specified
in the devargs string. It was a wrong default behaviour.

If there is no representor parameter in the devargs, the iterator
should not match any representor port.

The implementation of the default behaviour would be simpler
if a "no match" handler is added to rte_kvargs_process().
As it requires an API breakage, it will be reworked later.

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 lib/librte_ethdev/rte_class_eth.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Comments

Thomas Monjalon Oct. 24, 2018, 1:19 p.m. UTC | #1 
24/10/2018 15:13, Thomas Monjalon:
> The iterator was matching all representors if it was not specified
> in the devargs string. It was a wrong default behaviour.
> 
> If there is no representor parameter in the devargs, the iterator
> should not match any representor port.
> 
> The implementation of the default behaviour would be simpler
> if a "no match" handler is added to rte_kvargs_process().
> As it requires an API breakage, it will be reworked later.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

It is fixing the commit "support representor id as iterator filter"
which is in dpdk-next-net tree.
I think we should not squash them. It is fine to have both patches
separated with a clear explanation.
When the first commit will be in mainline, we could add a Fixes: tag
to this patch.
Ferruh Yigit Oct. 25, 2018, 12:59 p.m. UTC | #2 
On 10/24/2018 2:13 PM, Thomas Monjalon wrote:
> The iterator was matching all representors if it was not specified
> in the devargs string. It was a wrong default behaviour.
> 
> If there is no representor parameter in the devargs, the iterator
> should not match any representor port.
> 
> The implementation of the default behaviour would be simpler
> if a "no match" handler is added to rte_kvargs_process().
> As it requires an API breakage, it will be reworked later.
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>

Applied to dpdk-next-net/master, thanks.
diff mbox series

Patch

diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c
index 16b47c3bc..cebbb642d 100644
--- a/lib/librte_ethdev/rte_class_eth.c
+++ b/lib/librte_ethdev/rte_class_eth.c
@@ -106,14 +106,12 @@  eth_dev_match(const struct rte_eth_dev *edev,
 	int ret;
 	const struct eth_dev_match_arg *arg = _arg;
 	const struct rte_kvargs *kvlist = arg->kvlist;
+	unsigned int pair;
 
 	if (edev->state == RTE_ETH_DEV_UNUSED)
 		return -1;
 	if (arg->device != NULL && arg->device != edev->device)
 		return -1;
-	if (kvlist == NULL)
-		/* Empty string matches everything. */
-		return 0;
 
 	ret = rte_kvargs_process(kvlist,
 			eth_params_keys[RTE_ETH_PARAM_MAC],
@@ -126,6 +124,17 @@  eth_dev_match(const struct rte_eth_dev *edev,
 			eth_representor_cmp, edev->data);
 	if (ret != 0)
 		return -1;
+	/* search for representor key */
+	for (pair = 0; pair < kvlist->count; pair++) {
+		ret = strcmp(kvlist->pairs[pair].key,
+				eth_params_keys[RTE_ETH_PARAM_REPRESENTOR]);
+		if (ret == 0)
+			break; /* there is a representor key */
+	}
+	/* if no representor key, default is to not match representor ports */
+	if (ret != 0)
+		if ((edev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0)
+			return -1; /* do not match any representor */
 
 	return 0;
 }