[dpdk-dev] [PATCH] pci: fix check uio bind

[Gaëtan Rivet]

Hi Jianfeng,

On Thu, Oct 19, 2017 at 11:18:29AM +0000, Jianfeng Tan wrote:
> When checking if any devices bound to uio, we did not exclud
> those which are blacklisted (or in the case that a whitelist
> is specified).
> 
> This patch fixes it by only checking whitelisted devices.
> 
> Fixes: 815c7deaed2d ("pci: get IOMMU class on Linux")
> 
> Signed-off-by: Jianfeng Tan <jianfeng.tan at intel.com>
> ---
>  lib/librte_eal/linuxapp/eal/eal_pci.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c
> index b4dbf95..2b23d67 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_pci.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
> @@ -516,8 +516,26 @@ static inline int
>  pci_one_device_bound_uio(void)
>  {
>  	struct rte_pci_device *dev = NULL;
> +	struct rte_devargs *devargs;
> +	int check_all = 1;
> +	int need_check;
> +
> +	if (rte_pci_bus.bus.conf.scan_mode == RTE_BUS_SCAN_WHITELIST)
> +		check_all = 0;
>  
>  	FOREACH_DEVICE_ON_PCIBUS(dev) {
> +		devargs = dev->device.devargs;
> +
> +		need_check = 0;
> +		if (check_all)

Unless I'm mistaken, you will check blacklisted devices as well here.
The condition should be something like:

if (check_all && devargs == NULL)

Which means that both ifs can be refactored as

if ((check_all ^ (devargs != NULL)) == 0)
        continue;

Removing need_check. But it can be hard to read.

> +			need_check = 1;
> +		else if (devargs != NULL &&
> +			 devargs->policy == RTE_DEV_WHITELISTED)
> +			need_check = 1;
> +
> +		if (!need_check)
> +			continue;
> +
>  		if (dev->kdrv == RTE_KDRV_IGB_UIO ||
>  		   dev->kdrv == RTE_KDRV_UIO_GENERIC) {
>  			return 1;
> -- 
> 2.7.4
> 

-- 
Gaëtan Rivet
6WIND