| Message ID | 1c2ab7cdd9f18f98ee86c73b182f4ee0697f7495.1389103215.git.agordeev@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Tue, Jan 07, 2014 at 11:34:13AM -0700, Alex Williamson wrote: > On Tue, 2014-01-07 at 19:05 +0100, Alexander Gordeev wrote: > > This update also fixes a bug when deprecated pci_enable_msix() > > and pci_enable_msi_block() functions return a positive return > > value which indicats the number of interrupts that could have > > been allocated rather than a successful allocation. The driver > > misinterpreted this value and assumed MSI-X/MSIs are enabled, > > although in fact it were not. > > No, the driver interpreted it correctly, which is why anything other > than zero is handled as an error. This patch looks incorrect if the new > interfaces follow the same return convention. Thanks, The new interfaces differ wrt the return value - it is eigher a negative error code or a positive number of successfuly allocated vectors. If the user level makes use of a number of vectors that could have been allocated then it should cease doing it, since only 0 or a negative error code is returned after this update. The changelog is incorrect as the driver indeed bailes out on positive return values. I will send a updated version. > Alex
diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index 641bc87..66d1746 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -482,15 +482,15 @@ static int vfio_msi_enable(struct vfio_pci_device *vdev, int nvec, bool msix) for (i = 0; i < nvec; i++) vdev->msix[i].entry = i; - ret = pci_enable_msix(pdev, vdev->msix, nvec); - if (ret) { + ret = pci_enable_msix_range(pdev, vdev->msix, nvec, nvec); + if (ret < 0) { kfree(vdev->msix); kfree(vdev->ctx); return ret; } } else { - ret = pci_enable_msi_block(pdev, nvec); - if (ret) { + ret = pci_enable_msi_range(pdev, nvec, nvec); + if (ret < 0) { kfree(vdev->ctx); return ret; }
This update also fixes a bug when deprecated pci_enable_msix() and pci_enable_msi_block() functions return a positive return value which indicats the number of interrupts that could have been allocated rather than a successful allocation. The driver misinterpreted this value and assumed MSI-X/MSIs are enabled, although in fact it were not. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> --- drivers/vfio/pci/vfio_pci_intrs.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)