From patchwork Wed Oct 24 13:13:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 47331 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C446D4F91; Wed, 24 Oct 2018 15:15:28 +0200 (CEST) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id 45BB24F90 for ; Wed, 24 Oct 2018 15:15:27 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id CF1CD20A4D; Wed, 24 Oct 2018 09:15:26 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 24 Oct 2018 09:15:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=hR/22OB0YwaP50VjdswJ3rZ tbkEPhBTooLau+TVcvv0=; b=ahXtN8dY9YHwsxoI55AvFoToFDsEMDn/wk7RLWi MzgmL0m6rSYA+Wu2xgF5Z2MrkjAtQk6xJCDyRIgEG6iSujAixTaoNSX8pE48vRP0 gQ4/wwnm7o1My5w6HDw0/8ufEAGm3TJRSuAezXDIJwz+TMDPgZx91uvxidBK+dav GNSo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=hR/22OB0YwaP50Vjd swJ3rZtbkEPhBTooLau+TVcvv0=; b=HMIomxoTIGVCNTEUPupISrwfhWdD0P4cR r9rILwDPhdsJl2PR6W4WqSL660yBFl3p+0v/8oNrcfrC2lx655NCedNX6wABZxNj 6SIUgKtc4BQKwdhZ1jSFVjJpR4IGZcbXjQdNROyHA7kSBJoE/ZzrUCte+OxvIHUK wJ59JX3GxJrHINrFMBdWr+G3mOxHyIQ5FhiFPxpt8Nef3Lnkx+k2uDCiU1RhEXri VgnRfrH0XLotDi7jEKUad5+0EElhTHRk14URoEWpWqbCX4mpxCOTF0R2wTvRFn63 LQDzx7uJYkqxnSXDCBsLMyYg65x2lykXgMnNtI3YbyR4A1FcaUbDw== X-ME-Sender: X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id E8608E455C; Wed, 24 Oct 2018 09:15:24 -0400 (EDT) From: Thomas Monjalon To: Ferruh Yigit , Andrew Rybchenko Cc: dev@dpdk.org, ophirmu@mellanox.com Date: Wed, 24 Oct 2018 15:13:21 +0200 Message-Id: <20181024131321.8409-1-thomas@monjalon.net> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] ethdev: fix iterator default behaviour for representors X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Reviewed-by: Ferruh Yigit --- lib/librte_ethdev/rte_class_eth.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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; }