From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bruce Richardson <bruce.richardson@intel.com>
Subject: Re: [PATCH v5 12/12] eal: make virtual driver probe and
 remove take rte_vdev_device
Date: Tue, 27 Jun 2017 14:58:55 +0100
Message-ID: <20170627135855.GI104744@bricha3-MOBL3.ger.corp.intel.com>
References: <cover.1498436062.git.gaetan.rivet@6wind.com>
 <ee3ecc972735daec6964d71ebe2c5ce7d56f999f.1498436062.git.gaetan.rivet@6wind.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: dev@dpdk.org, Jan Blunck <jblunck@infradead.org>
To: Gaetan Rivet <gaetan.rivet@6wind.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mga03.intel.com (mga03.intel.com [134.134.136.65])
 by dpdk.org (Postfix) with ESMTP id 777CA2C8
 for <dev@dpdk.org>; Tue, 27 Jun 2017 15:58:59 +0200 (CEST)
Content-Disposition: inline
In-Reply-To: <ee3ecc972735daec6964d71ebe2c5ce7d56f999f.1498436062.git.gaetan.rivet@6wind.com>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

On Mon, Jun 26, 2017 at 02:22:10AM +0200, Gaetan Rivet wrote:
> From: Jan Blunck <jblunck@infradead.org>
> 
> This is a preparation to embed the generic rte_device into the rte_eth_dev
> also for virtual devices.
> 
> Signed-off-by: Jan Blunck <jblunck@infradead.org>
> Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
> ---
>  lib/librte_eal/common/eal_common_dev.c | 93 ++++++++++++++++++++++++++--------
>  1 file changed, 71 insertions(+), 22 deletions(-)
> 
> diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c
> index a400ddd..d83ae41 100644
> --- a/lib/librte_eal/common/eal_common_dev.c
> +++ b/lib/librte_eal/common/eal_common_dev.c
> @@ -37,6 +37,7 @@
>  #include <inttypes.h>
>  #include <sys/queue.h>
>  
> +#include <rte_bus.h>
>  #include <rte_dev.h>
>  #include <rte_devargs.h>
>  #include <rte_debug.h>
> @@ -45,50 +46,98 @@
>  
>  #include "eal_private.h"
>  
> +static int cmp_detached_dev_name(const struct rte_device *dev,
> +	const void *_name)
> +{
> +	const char *name = _name;
> +
> +	/* skip attached devices */
> +	if (dev->driver)
> +		return 0;
> +

Does returning 0 from this function not mean that all already-attached
devices with match? Is that really what we want, as it doesn't seem to
match the logic in the function below. Please explain if I'm wrong here.

> +	return strcmp(dev->name, name);
> +}
> +
>  int rte_eal_dev_attach(const char *name, const char *devargs)
>  {
> -	struct rte_pci_addr addr;
> +	struct rte_device *dev;
> +	int ret;
>  
>  	if (name == NULL || devargs == NULL) {
>  		RTE_LOG(ERR, EAL, "Invalid device or arguments provided\n");
>  		return -EINVAL;
>  	}
>  
> -	if (eal_parse_pci_DomBDF(name, &addr) == 0) {
> -		if (rte_pci_probe_one(&addr) < 0)
> -			goto err;
> +	dev = rte_bus_find_device(cmp_detached_dev_name, name, NULL);
> +	if (dev) {
> +		struct rte_bus *bus;
> +
> +		bus = rte_bus_find_by_device(dev);
> +		if (!bus) {
> +			RTE_LOG(ERR, EAL, "Cannot find bus for device (%s)\n",
> +				name);
> +			return -EINVAL;
> +		}
>  
> -	} else {
> -		if (rte_vdev_init(name, devargs))
> -			goto err;
> +		if (!bus->plug) {
> +			RTE_LOG(ERR, EAL, "Bus function not supported\n");
> +			return -ENOTSUP;
> +		}
> +
> +		ret = (bus->plug(dev->devargs) == NULL);
> +		goto out;
>  	}
>  
> -	return 0;
> +	/*
> +	 * If we haven't found a bus device the user meant to "hotplug" a
> +	 * virtual device instead.
> +	 */
> +	ret = rte_vdev_init(name, devargs);
> +out:
> +	if (ret)
> +		RTE_LOG(ERR, EAL, "Driver cannot attach the device (%s)\n",
> +			name);
> +	return ret;
> +}
> +
<snip>

Regards,
/Bruce