| Message ID | a01c7bb01ac4b1930a428fa8a8cae89bb1c4327a.1632305919.git.leonro@nvidia.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [mlx5-next,1/7] PCI/IOV: Provide internal VF index | expand |
On 9/22/2021 1:38 PM, Leon Romanovsky wrote: > From: Yishai Hadas <yishaih@nvidia.com> > > Make the region->release() function optional as in some cases there is > nothing to do by driver as part of it. > > This is needed for coming patch from this series once we add > mlx5_vfio_cpi driver to support live migration but we don't need a mlx5_vfio_pci *typo > migration release function. > > Signed-off-by: Yishai Hadas <yishaih@nvidia.com> > Signed-off-by: Leon Romanovsky <leonro@nvidia.com> > --- > drivers/vfio/pci/vfio_pci_core.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c > index 68198e0f2a63..3ddc3adb24de 100644 > --- a/drivers/vfio/pci/vfio_pci_core.c > +++ b/drivers/vfio/pci/vfio_pci_core.c > @@ -341,7 +341,8 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev) > vdev->virq_disabled = false; > > for (i = 0; i < vdev->num_regions; i++) > - vdev->region[i].ops->release(vdev, &vdev->region[i]); > + if (vdev->region[i].ops->release) > + vdev->region[i].ops->release(vdev, &vdev->region[i]); > > vdev->num_regions = 0; > kfree(vdev->region); Looks good, Reviewed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index 68198e0f2a63..3ddc3adb24de 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -341,7 +341,8 @@ void vfio_pci_core_disable(struct vfio_pci_core_device *vdev) vdev->virq_disabled = false; for (i = 0; i < vdev->num_regions; i++) - vdev->region[i].ops->release(vdev, &vdev->region[i]); + if (vdev->region[i].ops->release) + vdev->region[i].ops->release(vdev, &vdev->region[i]); vdev->num_regions = 0; kfree(vdev->region);