From patchwork Thu May 30 17:48:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Walker, Benjamin" X-Patchwork-Id: 53923 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 376501B99E; Thu, 30 May 2019 19:48:49 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id DC7EF1B944 for ; Thu, 30 May 2019 19:48:29 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 May 2019 10:48:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,532,1549958400"; d="scan'208";a="180020089" Received: from bwalker-desk.ch.intel.com ([143.182.136.145]) by fmsmga002.fm.intel.com with ESMTP; 30 May 2019 10:48:27 -0700 From: Ben Walker To: dev@dpdk.org Cc: Ben Walker Date: Thu, 30 May 2019 10:48:11 -0700 Message-Id: <20190530174819.1160221-5-benjamin.walker@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190530174819.1160221-1-benjamin.walker@intel.com> References: <20190530174819.1160221-1-benjamin.walker@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 04/12] eal/pci: Collapse two loops in rte_pci_get_iommu_class 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" Two of these loops easily collapse into a single loop. This sets the stage for future simplifications. Signed-off-by: Ben Walker Change-Id: I3353f2e3585808cebff3f11805f96e4a1cc7fb3a --- drivers/bus/pci/linux/pci.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c index 70815e4f0..b7a66d717 100644 --- a/drivers/bus/pci/linux/pci.c +++ b/drivers/bus/pci/linux/pci.c @@ -571,7 +571,6 @@ rte_pci_get_iommu_class(void) bool has_iova_va = false; bool is_bound_uio = false; bool iommu_no_va = false; - bool break_out; bool need_check; struct rte_pci_device *dev = NULL; struct rte_pci_driver *drv = NULL; @@ -592,8 +591,16 @@ rte_pci_get_iommu_class(void) FOREACH_DEVICE_ON_PCIBUS(dev) { if (dev->kdrv == RTE_KDRV_VFIO) { FOREACH_DRIVER_ON_PCIBUS(drv) { - if (drv->drv_flags & RTE_PCI_DRV_IOVA_AS_VA && - rte_pci_match(drv, dev)) { + if (!rte_pci_match(drv, dev)) + continue; + + /* + * just one PCI device needs to be checked out because + * the IOMMU hardware is the same for all of them. + */ + iommu_no_va = !pci_one_device_iommu_support_va(dev); + + if (drv->drv_flags & RTE_PCI_DRV_IOVA_AS_VA) { has_iova_va = true; break; } @@ -630,24 +637,6 @@ rte_pci_get_iommu_class(void) } } - break_out = false; - FOREACH_DEVICE_ON_PCIBUS(dev) { - FOREACH_DRIVER_ON_PCIBUS(drv) { - if (!rte_pci_match(drv, dev)) - continue; - /* - * just one PCI device needs to be checked out because - * the IOMMU hardware is the same for all of them. - */ - iommu_no_va = !pci_one_device_iommu_support_va(dev); - break_out = true; - break; - } - - if (break_out) - break; - } - #ifdef VFIO_PRESENT is_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ? true : false;