lkml.org 
[lkml]   [2020]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v2 7/7] vfio/pci: Cleanup .probe() exit paths
    From
    Date
    The cleanup is getting a tad long.

    Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
    ---
    drivers/vfio/pci/vfio_pci.c | 54 ++++++++++++++++++++-----------------------
    1 file changed, 25 insertions(+), 29 deletions(-)

    diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
    index 497ecadef2ba..7d410224343a 100644
    --- a/drivers/vfio/pci/vfio_pci.c
    +++ b/drivers/vfio/pci/vfio_pci.c
    @@ -1591,8 +1591,8 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

    vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
    if (!vdev) {
    - vfio_iommu_group_put(group, &pdev->dev);
    - return -ENOMEM;
    + ret = -ENOMEM;
    + goto out_group_put;
    }

    vdev->pdev = pdev;
    @@ -1603,43 +1603,27 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    INIT_LIST_HEAD(&vdev->ioeventfds_list);

    ret = vfio_add_group_dev(&pdev->dev, &vfio_pci_ops, vdev);
    - if (ret) {
    - vfio_iommu_group_put(group, &pdev->dev);
    - kfree(vdev);
    - return ret;
    - }
    + if (ret)
    + goto out_free;

    ret = vfio_pci_reflck_attach(vdev);
    - if (ret) {
    - vfio_del_group_dev(&pdev->dev);
    - vfio_iommu_group_put(group, &pdev->dev);
    - kfree(vdev);
    - return ret;
    - }
    + if (ret)
    + goto out_del_group_dev;

    if (pdev->is_physfn) {
    vdev->vf_token = kzalloc(sizeof(*vdev->vf_token), GFP_KERNEL);
    if (!vdev->vf_token) {
    - vfio_pci_reflck_put(vdev->reflck);
    - vfio_del_group_dev(&pdev->dev);
    - vfio_iommu_group_put(group, &pdev->dev);
    - kfree(vdev);
    - return -ENOMEM;
    - }
    -
    - vdev->nb.notifier_call = vfio_pci_bus_notifier;
    - ret = bus_register_notifier(&pci_bus_type, &vdev->nb);
    - if (ret) {
    - kfree(vdev->vf_token);
    - vfio_pci_reflck_put(vdev->reflck);
    - vfio_del_group_dev(&pdev->dev);
    - vfio_iommu_group_put(group, &pdev->dev);
    - kfree(vdev);
    - return ret;
    + ret = -ENOMEM;
    + goto out_reflck;
    }

    mutex_init(&vdev->vf_token->lock);
    uuid_gen(&vdev->vf_token->uuid);
    +
    + vdev->nb.notifier_call = vfio_pci_bus_notifier;
    + ret = bus_register_notifier(&pci_bus_type, &vdev->nb);
    + if (ret)
    + goto out_vf_token;
    }

    if (vfio_pci_is_vga(pdev)) {
    @@ -1665,6 +1649,18 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
    }

    return ret;
    +
    +out_vf_token:
    + kfree(vdev->vf_token);
    +out_reflck:
    + vfio_pci_reflck_put(vdev->reflck);
    +out_del_group_dev:
    + vfio_del_group_dev(&pdev->dev);
    +out_free:
    + kfree(vdev);
    +out_group_put:
    + vfio_iommu_group_put(group, &pdev->dev);
    + return ret;
    }

    static void vfio_pci_remove(struct pci_dev *pdev)
    \
     
     \ /
      Last update: 2020-02-19 19:55    [W:7.576 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site