From patchwork Tue Oct 24 07:44:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Tan X-Patchwork-Id: 30755 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 6638E1B74A; Tue, 24 Oct 2017 09:43:20 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 8F81A1B748 for ; Tue, 24 Oct 2017 09:43:17 +0200 (CEST) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2017 00:43:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.43,426,1503385200"; d="scan'208";a="166805197" Received: from dpdk06.sh.intel.com ([10.67.110.196]) by fmsmga006.fm.intel.com with ESMTP; 24 Oct 2017 00:43:15 -0700 From: Jianfeng Tan To: dev@dpdk.org Cc: gaetan.rivet@6wind.com, Jianfeng Tan Date: Tue, 24 Oct 2017 07:44:53 +0000 Message-Id: <1508831093-139486-1-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1508411909-63954-1-git-send-email-jianfeng.tan@intel.com> References: <1508411909-63954-1-git-send-email-jianfeng.tan@intel.com> Subject: [dpdk-dev] [PATCH v2] pci: fix check uio bind 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" 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 Reviewed-by: Gaetan Rivet Acked-by: Santosh Shukla --- 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; 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;