On Tue, Oct 24, 2017 at 07:44:53AM +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, or
> not-blacklisted devices depending on the bus scan mode.
>
> Fixes: 815c7deaed2d ("pci: get IOMMU class on Linux")
>
> Signed-off-by: Jianfeng Tan <jianfeng....@intel.com>
Small nit below, but otherwise:
Reviewed-by: Gaetan Rivet <gaetan.ri...@6wind.com>
> ---
> v2:
> - Accept two suggestions from Gaetan.
>
> lib/librte_eal/linuxapp/eal/eal_pci.c | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c
> b/lib/librte_eal/linuxapp/eal/eal_pci.c
> index b4dbf95..4d1de07 100644
> --- a/lib/librte_eal/linuxapp/eal/eal_pci.c
> +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c
> @@ -516,8 +516,29 @@ static inline int
> pci_one_device_bound_uio(void)
> {
> struct rte_pci_device *dev = NULL;
> + struct rte_devargs *devargs;
> + int need_check;
Both could have been declared within the loop instead, but this is
really a detail and isn't worth a v3 IMO, so do as you please.
>
> FOREACH_DEVICE_ON_PCIBUS(dev) {
> + devargs = dev->device.devargs;
> +
> + need_check = 0;
> + switch (rte_pci_bus.bus.conf.scan_mode) {
> + case RTE_BUS_SCAN_WHITELIST:
> + if (devargs && devargs->policy == RTE_DEV_WHITELISTED)
> + need_check = 1;
> + break;
> + case RTE_BUS_SCAN_UNDEFINED:
> + case RTE_BUS_SCAN_BLACKLIST:
> + if (devargs == NULL ||
> + devargs->policy != RTE_DEV_BLACKLISTED)
> + need_check = 1;
> + break;
> + }
> +
> + 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
