From: Thomas Monjalon Date: Wed, 24 Oct 2018 13:13:21 +0000 (+0200) Subject: ethdev: fix iterator default behaviour for representors X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=8fae42404cab6c9ad7e7683a1bebf891ba1192ac;p=dpdk.git ethdev: fix iterator default behaviour for representors 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. Fixes: a7d3c6271d55 ("ethdev: support representor id as iterator filter") Signed-off-by: Thomas Monjalon Reviewed-by: Ferruh Yigit --- diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c index 16b47c3bc7..cebbb642d5 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; }