diff options
| author | Leo Yan <leo.yan@linaro.org> | 2019-04-08 09:27:17 +0800 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-04-26 14:49:11 +0100 |
| commit | a1ff6f87aa420da3afaec475f9bd405228e04189 (patch) | |
| tree | 0de07e9ed679545163c5ed28c32834dff9572e2b | |
| parent | c57e001a3efba729a2d0c424bb7bb570c852f851 (diff) | |
| download | kvmtool-a1ff6f87aa420da3afaec475f9bd405228e04189.tar.gz | |
vfio-pci: Release INTx's unmask eventfd properly
The PCI device INTx uses event fd 'unmask_fd' to signal the deassertion
of the line from guest to host; but this eventfd isn't released properly
when disable INTx.
This patch firstly adds field 'unmask_fd' in struct vfio_pci_device for
storing unmask eventfd and close it when disable INTx.
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Reviewed-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | include/kvm/vfio.h | 1 | ||||
| -rw-r--r-- | vfio/pci.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/kvm/vfio.h b/include/kvm/vfio.h index 60e6c54d..28223cf2 100644 --- a/include/kvm/vfio.h +++ b/include/kvm/vfio.h @@ -74,6 +74,7 @@ struct vfio_pci_device { unsigned long irq_modes; int intx_fd; + int unmask_fd; unsigned int intx_gsi; struct vfio_pci_msi_common msi; struct vfio_pci_msi_common msix; @@ -1008,6 +1008,7 @@ static void vfio_pci_disable_intx(struct kvm *kvm, struct vfio_device *vdev) irq__del_irqfd(kvm, gsi, pdev->intx_fd); close(pdev->intx_fd); + close(pdev->unmask_fd); } static int vfio_pci_enable_intx(struct kvm *kvm, struct vfio_device *vdev) @@ -1095,6 +1096,7 @@ static int vfio_pci_enable_intx(struct kvm *kvm, struct vfio_device *vdev) } pdev->intx_fd = trigger_fd; + pdev->unmask_fd = unmask_fd; /* Guest is going to ovewrite our irq_line... */ pdev->intx_gsi = gsi; |