From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 789B55911 for ; Thu, 18 Apr 2019 13:50:53 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Apr 2019 04:50:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,365,1549958400"; d="scan'208";a="224607047" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.46]) ([10.237.221.46]) by orsmga001.jf.intel.com with ESMTP; 18 Apr 2019 04:50:50 -0700 To: Thomas Monjalon , Shahaf Shuler , Yongseok Koh , Andrew Rybchenko Cc: dev@dpdk.org References: <20190417225928.8962-1-thomas@monjalon.net> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 vM8= Message-ID: Date: Thu, 18 Apr 2019 12:50:50 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190417225928.8962-1-thomas@monjalon.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH 1/2] ethdev: avoid explicit check of valid port state 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: , X-List-Received-Date: Thu, 18 Apr 2019 11:50:54 -0000 On 4/17/2019 11:59 PM, Thomas Monjalon wrote: > Some port iterations are manually checking against RTE_ETH_DEV_UNUSED > instead of using the iterators based on rte_eth_find_next(). > > A new macro RTE_ETH_FOREACH_VALID_DEV() is introduced, but kept private > because there should be no need of iterating over all devices in the API. > The public iterators have additional filters for ownership, parent device > or sibling ports. > > Signed-off-by: Thomas Monjalon > --- > drivers/net/mlx5/mlx5.c | 9 ++------- > lib/librte_ethdev/rte_ethdev.c | 25 ++++++++++++------------- No strong opinion but should we separate patch for driver and the library, logically both changes RTE_ETH_DEV_UNUSED check with macros, but there is no dependency, I mean they are individual changes, driver patch will be valid on its own. > 2 files changed, 14 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index 9ff50dfbe..4deaada5c 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -1964,14 +1964,9 @@ static int > mlx5_pci_remove(struct rte_pci_device *pci_dev) > { > uint16_t port_id; > - struct rte_eth_dev *port; > > - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { > - port = &rte_eth_devices[port_id]; > - if (port->state != RTE_ETH_DEV_UNUSED && > - port->device == &pci_dev->device) > - rte_eth_dev_close(port_id); > - } > + RTE_ETH_FOREACH_DEV_OF(port_id, &pci_dev->device) > + rte_eth_dev_close(port_id); > return 0; > } > > diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c > index 243beb4dd..cca15efca 100644 > --- a/lib/librte_ethdev/rte_ethdev.c > +++ b/lib/librte_ethdev/rte_ethdev.c > @@ -339,6 +339,11 @@ rte_eth_find_next(uint16_t port_id) > return port_id; > } > > +#define RTE_ETH_FOREACH_VALID_DEV(port_id) \ > + for (port_id = rte_eth_find_next(0); \ > + port_id < RTE_MAX_ETHPORTS; \ > + port_id = rte_eth_find_next(port_id + 1)) > + What do you think adding some documentation to the new macro, specially I think documenting the difference between "RTE_ETH_FOREACH_DEV" and this one can be good otherwise it may confuse people that "RTE_ETH_FOREACH_DEV" iterates on invalid devices too? > uint16_t > rte_eth_find_next_of(uint16_t port_id, const struct rte_device *parent) > { > @@ -584,13 +589,10 @@ rte_eth_is_valid_owner_id(uint64_t owner_id) > uint64_t > rte_eth_find_next_owned_by(uint16_t port_id, const uint64_t owner_id) > { > + port_id = rte_eth_find_next(port_id); > while (port_id < RTE_MAX_ETHPORTS && > - (rte_eth_devices[port_id].state == RTE_ETH_DEV_UNUSED || > - rte_eth_devices[port_id].data->owner.id != owner_id)) > - port_id++; > - > - if (port_id >= RTE_MAX_ETHPORTS) > - return RTE_MAX_ETHPORTS; > + rte_eth_devices[port_id].data->owner.id != owner_id) > + port_id = rte_eth_find_next(port_id + 1); > > return port_id; > } > @@ -768,9 +770,8 @@ rte_eth_dev_count_total(void) > { > uint16_t port, count = 0; > > - for (port = 0; port < RTE_MAX_ETHPORTS; port++) > - if (rte_eth_devices[port].state != RTE_ETH_DEV_UNUSED) > - count++; > + RTE_ETH_FOREACH_VALID_DEV(port) > + count++; > > return count; > } > @@ -804,13 +805,11 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id) > return -EINVAL; > } > > - for (pid = 0; pid < RTE_MAX_ETHPORTS; pid++) { > - if (rte_eth_devices[pid].state != RTE_ETH_DEV_UNUSED && > - !strcmp(name, rte_eth_dev_shared_data->data[pid].name)) { > + RTE_ETH_FOREACH_VALID_DEV(pid) > + if (!strcmp(name, rte_eth_dev_shared_data->data[pid].name)) { > *port_id = pid; > return 0; > } > - } > > return -ENODEV; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id F0021A00E6 for ; Thu, 18 Apr 2019 13:50:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CEFD61B1EF; Thu, 18 Apr 2019 13:50:54 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 789B55911 for ; Thu, 18 Apr 2019 13:50:53 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Apr 2019 04:50:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,365,1549958400"; d="scan'208";a="224607047" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.46]) ([10.237.221.46]) by orsmga001.jf.intel.com with ESMTP; 18 Apr 2019 04:50:50 -0700 To: Thomas Monjalon , Shahaf Shuler , Yongseok Koh , Andrew Rybchenko Cc: dev@dpdk.org References: <20190417225928.8962-1-thomas@monjalon.net> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 vM8= Message-ID: Date: Thu, 18 Apr 2019 12:50:50 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190417225928.8962-1-thomas@monjalon.net> Content-Type: text/plain; charset="UTF-8" Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH 1/2] ethdev: avoid explicit check of valid port state 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" Message-ID: <20190418115050.MsEpawukZw5MUJSBOiXX4Gv6bTwiKEUOWKk5WHDX7Lw@z> On 4/17/2019 11:59 PM, Thomas Monjalon wrote: > Some port iterations are manually checking against RTE_ETH_DEV_UNUSED > instead of using the iterators based on rte_eth_find_next(). > > A new macro RTE_ETH_FOREACH_VALID_DEV() is introduced, but kept private > because there should be no need of iterating over all devices in the API. > The public iterators have additional filters for ownership, parent device > or sibling ports. > > Signed-off-by: Thomas Monjalon > --- > drivers/net/mlx5/mlx5.c | 9 ++------- > lib/librte_ethdev/rte_ethdev.c | 25 ++++++++++++------------- No strong opinion but should we separate patch for driver and the library, logically both changes RTE_ETH_DEV_UNUSED check with macros, but there is no dependency, I mean they are individual changes, driver patch will be valid on its own. > 2 files changed, 14 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index 9ff50dfbe..4deaada5c 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -1964,14 +1964,9 @@ static int > mlx5_pci_remove(struct rte_pci_device *pci_dev) > { > uint16_t port_id; > - struct rte_eth_dev *port; > > - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { > - port = &rte_eth_devices[port_id]; > - if (port->state != RTE_ETH_DEV_UNUSED && > - port->device == &pci_dev->device) > - rte_eth_dev_close(port_id); > - } > + RTE_ETH_FOREACH_DEV_OF(port_id, &pci_dev->device) > + rte_eth_dev_close(port_id); > return 0; > } > > diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c > index 243beb4dd..cca15efca 100644 > --- a/lib/librte_ethdev/rte_ethdev.c > +++ b/lib/librte_ethdev/rte_ethdev.c > @@ -339,6 +339,11 @@ rte_eth_find_next(uint16_t port_id) > return port_id; > } > > +#define RTE_ETH_FOREACH_VALID_DEV(port_id) \ > + for (port_id = rte_eth_find_next(0); \ > + port_id < RTE_MAX_ETHPORTS; \ > + port_id = rte_eth_find_next(port_id + 1)) > + What do you think adding some documentation to the new macro, specially I think documenting the difference between "RTE_ETH_FOREACH_DEV" and this one can be good otherwise it may confuse people that "RTE_ETH_FOREACH_DEV" iterates on invalid devices too? > uint16_t > rte_eth_find_next_of(uint16_t port_id, const struct rte_device *parent) > { > @@ -584,13 +589,10 @@ rte_eth_is_valid_owner_id(uint64_t owner_id) > uint64_t > rte_eth_find_next_owned_by(uint16_t port_id, const uint64_t owner_id) > { > + port_id = rte_eth_find_next(port_id); > while (port_id < RTE_MAX_ETHPORTS && > - (rte_eth_devices[port_id].state == RTE_ETH_DEV_UNUSED || > - rte_eth_devices[port_id].data->owner.id != owner_id)) > - port_id++; > - > - if (port_id >= RTE_MAX_ETHPORTS) > - return RTE_MAX_ETHPORTS; > + rte_eth_devices[port_id].data->owner.id != owner_id) > + port_id = rte_eth_find_next(port_id + 1); > > return port_id; > } > @@ -768,9 +770,8 @@ rte_eth_dev_count_total(void) > { > uint16_t port, count = 0; > > - for (port = 0; port < RTE_MAX_ETHPORTS; port++) > - if (rte_eth_devices[port].state != RTE_ETH_DEV_UNUSED) > - count++; > + RTE_ETH_FOREACH_VALID_DEV(port) > + count++; > > return count; > } > @@ -804,13 +805,11 @@ rte_eth_dev_get_port_by_name(const char *name, uint16_t *port_id) > return -EINVAL; > } > > - for (pid = 0; pid < RTE_MAX_ETHPORTS; pid++) { > - if (rte_eth_devices[pid].state != RTE_ETH_DEV_UNUSED && > - !strcmp(name, rte_eth_dev_shared_data->data[pid].name)) { > + RTE_ETH_FOREACH_VALID_DEV(pid) > + if (!strcmp(name, rte_eth_dev_shared_data->data[pid].name)) { > *port_id = pid; > return 0; > } > - } > > return -ENODEV; > } >