From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcYw0-0003El-D4 for qemu-devel@nongnu.org; Thu, 17 Sep 2015 09:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcYvu-00064N-Fw for qemu-devel@nongnu.org; Thu, 17 Sep 2015 09:09:08 -0400 From: David Gibson Date: Thu, 17 Sep 2015 23:09:09 +1000 Message-Id: <1442495357-26547-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1442495357-26547-1-git-send-email-david@gibson.dropbear.id.au> References: <1442495357-26547-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [RFC PATCH 02/10] vfio: Generalize vfio_listener_region_add failure path List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: alex.williamson@redhat.com, aik@ozlabs.ru, gwshan@linux.vnet.ibm.com Cc: lvivier@redhat.com, thuth@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, pbonzini@redhat.com, David Gibson If a DMA mapping operation fails in vfio_listener_region_add() it checks to see if we've already completed initial setup of the container. If so it reports an error so the setup code can fail gracefully, otherwise throws a hw_error(). There are other potential failure cases in vfio_listener_region_add() which could benefit from the same logic, so move it to its own fail: block. Later patches can use this to extend other failure cases to fail as gracefully as possible under the circumstances. Signed-off-by: David Gibson --- hw/vfio/common.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index e3152f6..9953b9c 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -400,19 +400,23 @@ static void vfio_listener_region_add(MemoryListener *listener, error_report("vfio_dma_map(%p, 0x%"HWADDR_PRIx", " "0x%"HWADDR_PRIx", %p) = %d (%m)", container, iova, end - iova, vaddr, ret); + goto fail; + } - /* - * On the initfn path, store the first error in the container so we - * can gracefully fail. Runtime, there's not much we can do other - * than throw a hardware error. - */ - if (!container->iommu_data.initialized) { - if (!container->iommu_data.error) { - container->iommu_data.error = ret; - } - } else { - hw_error("vfio: DMA mapping failed, unable to continue"); + return; + +fail: + /* + * On the initfn path, store the first error in the container so we + * can gracefully fail. Runtime, there's not much we can do other + * than throw a hardware error. + */ + if (!container->iommu_data.initialized) { + if (!container->iommu_data.error) { + container->iommu_data.error = ret; } + } else { + hw_error("vfio: DMA mapping failed, unable to continue"); } } -- 2.4.3