Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/53918/?format=api
{ "id": 53918, "url": "http://patches.dpdk.org/api/patches/53918/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190530174819.1160221-3-benjamin.walker@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190530174819.1160221-3-benjamin.walker@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190530174819.1160221-3-benjamin.walker@intel.com", "date": "2019-05-30T17:48:09", "name": "[02/12] eal/pci: Inline several functions into rte_pci_get_iommu_class", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b5b0991b4a163a9db8e28fbcba727ef714fa9ffc", "submitter": { "id": 487, "url": "http://patches.dpdk.org/api/people/487/?format=api", "name": "Walker, Benjamin", "email": "benjamin.walker@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190530174819.1160221-3-benjamin.walker@intel.com/mbox/", "series": [ { "id": 4830, "url": "http://patches.dpdk.org/api/series/4830/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4830", "date": "2019-05-30T17:48:13", "name": "[01/12] eal: Make rte_eal_using_phys_addrs work sooner", "version": 1, "mbox": "http://patches.dpdk.org/series/4830/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/53918/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/53918/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id C6D531B955;\n\tThu, 30 May 2019 19:48:39 +0200 (CEST)", "from mga07.intel.com (mga07.intel.com [134.134.136.100])\n\tby dpdk.org (Postfix) with ESMTP id 2920237A2\n\tfor <dev@dpdk.org>; Thu, 30 May 2019 19:48:29 +0200 (CEST)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t30 May 2019 10:48:27 -0700", "from bwalker-desk.ch.intel.com ([143.182.136.145])\n\tby fmsmga002.fm.intel.com with ESMTP; 30 May 2019 10:48:26 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,532,1549958400\"; d=\"scan'208\";a=\"180020082\"", "From": "Ben Walker <benjamin.walker@intel.com>", "To": "dev@dpdk.org", "Cc": "Ben Walker <benjamin.walker@intel.com>", "Date": "Thu, 30 May 2019 10:48:09 -0700", "Message-Id": "<20190530174819.1160221-3-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", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH 02/12] eal/pci: Inline several functions into\n\trte_pci_get_iommu_class", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This is in preparation for future simplifications. The\nfunctions are simply inlined for now.\n\nSigned-off-by: Ben Walker <benjamin.walker@intel.com>\nChange-Id: I129992c9b44f4575a28cc05b78297e15b6be4249\n---\n drivers/bus/pci/linux/pci.c | 176 +++++++++++++++---------------------\n 1 file changed, 71 insertions(+), 105 deletions(-)", "diff": "diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c\nindex c99d523f0..d3177916a 100644\n--- a/drivers/bus/pci/linux/pci.c\n+++ b/drivers/bus/pci/linux/pci.c\n@@ -497,86 +497,6 @@ rte_pci_scan(void)\n \treturn -1;\n }\n \n-/*\n- * Is pci device bound to any kdrv\n- */\n-static inline int\n-pci_one_device_is_bound(void)\n-{\n-\tstruct rte_pci_device *dev = NULL;\n-\tint ret = 0;\n-\n-\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n-\t\tif (dev->kdrv == RTE_KDRV_UNKNOWN ||\n-\t\t dev->kdrv == RTE_KDRV_NONE) {\n-\t\t\tcontinue;\n-\t\t} else {\n-\t\t\tret = 1;\n-\t\t\tbreak;\n-\t\t}\n-\t}\n-\treturn ret;\n-}\n-\n-/*\n- * Any one of the device bound to uio\n- */\n-static inline int\n-pci_one_device_bound_uio(void)\n-{\n-\tstruct rte_pci_device *dev = NULL;\n-\tstruct rte_devargs *devargs;\n-\tint need_check;\n-\n-\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n-\t\tdevargs = dev->device.devargs;\n-\n-\t\tneed_check = 0;\n-\t\tswitch (rte_pci_bus.bus.conf.scan_mode) {\n-\t\tcase RTE_BUS_SCAN_WHITELIST:\n-\t\t\tif (devargs && devargs->policy == RTE_DEV_WHITELISTED)\n-\t\t\t\tneed_check = 1;\n-\t\t\tbreak;\n-\t\tcase RTE_BUS_SCAN_UNDEFINED:\n-\t\tcase RTE_BUS_SCAN_BLACKLIST:\n-\t\t\tif (devargs == NULL ||\n-\t\t\t devargs->policy != RTE_DEV_BLACKLISTED)\n-\t\t\t\tneed_check = 1;\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\tif (!need_check)\n-\t\t\tcontinue;\n-\n-\t\tif (dev->kdrv == RTE_KDRV_IGB_UIO ||\n-\t\t dev->kdrv == RTE_KDRV_UIO_GENERIC) {\n-\t\t\treturn 1;\n-\t\t}\n-\t}\n-\treturn 0;\n-}\n-\n-/*\n- * Any one of the device has iova as va\n- */\n-static inline int\n-pci_one_device_has_iova_va(void)\n-{\n-\tstruct rte_pci_device *dev = NULL;\n-\tstruct rte_pci_driver *drv = NULL;\n-\n-\tFOREACH_DRIVER_ON_PCIBUS(drv) {\n-\t\tif (drv && drv->drv_flags & RTE_PCI_DRV_IOVA_AS_VA) {\n-\t\t\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n-\t\t\t\tif (dev->kdrv == RTE_KDRV_VFIO &&\n-\t\t\t\t rte_pci_match(drv, dev))\n-\t\t\t\t\treturn 1;\n-\t\t\t}\n-\t\t}\n-\t}\n-\treturn 0;\n-}\n-\n #if defined(RTE_ARCH_X86)\n static bool\n pci_one_device_iommu_support_va(struct rte_pci_device *dev)\n@@ -641,14 +561,76 @@ pci_one_device_iommu_support_va(__rte_unused struct rte_pci_device *dev)\n #endif\n \n /*\n- * All devices IOMMUs support VA as IOVA\n+ * Get iommu class of PCI devices on the bus.\n */\n-static bool\n-pci_devices_iommu_support_va(void)\n+enum rte_iova_mode\n+rte_pci_get_iommu_class(void)\n {\n+\tbool is_bound = false;\n+\tbool is_vfio_noiommu_enabled = true;\n+\tbool has_iova_va = false;\n+\tbool is_bound_uio = false;\n+\tbool iommu_no_va = false;\n+\tbool break_out;\n+\tbool need_check;\n \tstruct rte_pci_device *dev = NULL;\n \tstruct rte_pci_driver *drv = NULL;\n+\tstruct rte_devargs *devargs;\n+\n+\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n+\t\tif (dev->kdrv == RTE_KDRV_UNKNOWN ||\n+\t\t dev->kdrv == RTE_KDRV_NONE) {\n+\t\t\tcontinue;\n+\t\t} else {\n+\t\t\tis_bound = true;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\tif (!is_bound)\n+\t\treturn RTE_IOVA_DC;\n \n+\tFOREACH_DRIVER_ON_PCIBUS(drv) {\n+\t\tif (drv && drv->drv_flags & RTE_PCI_DRV_IOVA_AS_VA) {\n+\t\t\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n+\t\t\t\tif (dev->kdrv == RTE_KDRV_VFIO &&\n+\t\t\t\t rte_pci_match(drv, dev)) {\n+\t\t\t\t\thas_iova_va = true;\n+\t\t\t\t\tbreak;\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tif (has_iova_va)\n+\t\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n+\t\tdevargs = dev->device.devargs;\n+\n+\t\tneed_check = false;\n+\t\tswitch (rte_pci_bus.bus.conf.scan_mode) {\n+\t\tcase RTE_BUS_SCAN_WHITELIST:\n+\t\t\tif (devargs && devargs->policy == RTE_DEV_WHITELISTED)\n+\t\t\t\tneed_check = true;\n+\t\t\tbreak;\n+\t\tcase RTE_BUS_SCAN_UNDEFINED:\n+\t\tcase RTE_BUS_SCAN_BLACKLIST:\n+\t\t\tif (devargs == NULL ||\n+\t\t\t devargs->policy != RTE_DEV_BLACKLISTED)\n+\t\t\t\tneed_check = true;\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (!need_check)\n+\t\t\tcontinue;\n+\n+\t\tif (dev->kdrv == RTE_KDRV_IGB_UIO ||\n+\t\t dev->kdrv == RTE_KDRV_UIO_GENERIC) {\n+\t\t\tis_bound_uio = true;\n+\t\t}\n+\t}\n+\n+\tbreak_out = false;\n \tFOREACH_DRIVER_ON_PCIBUS(drv) {\n \t\tFOREACH_DEVICE_ON_PCIBUS(dev) {\n \t\t\tif (!rte_pci_match(drv, dev))\n@@ -657,31 +639,15 @@ pci_devices_iommu_support_va(void)\n \t\t\t * just one PCI device needs to be checked out because\n \t\t\t * the IOMMU hardware is the same for all of them.\n \t\t\t */\n-\t\t\treturn pci_one_device_iommu_support_va(dev);\n+\t\t\tiommu_no_va = !pci_one_device_iommu_support_va(dev);\n+\t\t\tbreak_out = true;\n+\t\t\tbreak;\n \t\t}\n-\t}\n-\treturn true;\n-}\n \n-/*\n- * Get iommu class of PCI devices on the bus.\n- */\n-enum rte_iova_mode\n-rte_pci_get_iommu_class(void)\n-{\n-\tbool is_bound;\n-\tbool is_vfio_noiommu_enabled = true;\n-\tbool has_iova_va;\n-\tbool is_bound_uio;\n-\tbool iommu_no_va;\n-\n-\tis_bound = pci_one_device_is_bound();\n-\tif (!is_bound)\n-\t\treturn RTE_IOVA_DC;\n+\t\tif (break_out)\n+\t\t\tbreak;\n+\t}\n \n-\thas_iova_va = pci_one_device_has_iova_va();\n-\tis_bound_uio = pci_one_device_bound_uio();\n-\tiommu_no_va = !pci_devices_iommu_support_va();\n #ifdef VFIO_PRESENT\n \tis_vfio_noiommu_enabled = rte_vfio_noiommu_is_enabled() == true ?\n \t\t\t\t\ttrue : false;\n", "prefixes": [ "02/12" ] }