vfio: platform: check reset call return code during open
authorSinan Kaya <okaya@codeaurora.org>
Tue, 19 Jul 2016 13:01:48 +0000 (09:01 -0400)
committerAlex Williamson <alex.williamson@redhat.com>
Tue, 19 Jul 2016 16:54:45 +0000 (10:54 -0600)
Open call is ignoring the return code from reset call and can
potentially continue even though reset call failed.

If reset_required module parameter is set, this patch is going
to validate the return code and will abort open if reset fails.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Reviewed-by: Baptiste Reynal <b.reynal@virtualopensystems.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
drivers/vfio/platform/vfio_platform_common.c

index d8755d2..389d651 100644 (file)
@@ -251,6 +251,8 @@ static int vfio_platform_open(void *device_data)
        mutex_lock(&driver_lock);
 
        if (!vdev->refcnt) {
+               const char *extra_dbg = NULL;
+
                ret = vfio_platform_regions_init(vdev);
                if (ret)
                        goto err_reg;
@@ -259,7 +261,12 @@ static int vfio_platform_open(void *device_data)
                if (ret)
                        goto err_irq;
 
-               vfio_platform_call_reset(vdev, NULL);
+               ret = vfio_platform_call_reset(vdev, &extra_dbg);
+               if (ret && vdev->reset_required) {
+                       dev_warn(vdev->device, "reset driver is required and reset call failed in open (%d) %s\n",
+                                ret, extra_dbg ? extra_dbg : "");
+                       goto err_rst;
+               }
        }
 
        vdev->refcnt++;
@@ -267,6 +274,8 @@ static int vfio_platform_open(void *device_data)
        mutex_unlock(&driver_lock);
        return 0;
 
+err_rst:
+       vfio_platform_irq_cleanup(vdev);
 err_irq:
        vfio_platform_regions_cleanup(vdev);
 err_reg: