diff options
| author | Jean-Philippe Brucker <jean-philippe.brucker@arm.com> | 2022-07-01 15:24:23 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-07-01 16:09:00 +0100 |
| commit | c6590f782be68e5321d3fbd90af2ebe3dbd92550 (patch) | |
| tree | 6c0495d4f25fbbfe19b08e5c1d2b5fd3b368384b | |
| parent | 8b91a1828ee9d7c137cd5c7974e67687d735d472 (diff) | |
| download | kvmtool-c6590f782be68e5321d3fbd90af2ebe3dbd92550.tar.gz | |
virtio/pci: Delete MSI routes
On exit_vq() and device reset, remove the MSI routes that were set up at
runtime.
Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com>
Link: https://lore.kernel.org/r/20220701142434.75170-2-jean-philippe.brucker@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | virtio/pci.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/virtio/pci.c b/virtio/pci.c index 1a549314..9b710852 100644 --- a/virtio/pci.c +++ b/virtio/pci.c @@ -60,6 +60,13 @@ static int virtio_pci__add_msix_route(struct virtio_pci *vpci, u32 vec) return gsi; } +static void virtio_pci__del_msix_route(struct virtio_pci *vpci, u32 gsi) +{ + struct msi_msg msg = { 0 }; + + irq__update_msix_route(vpci->kvm, gsi, &msg); +} + static void virtio_pci__ioevent_callback(struct kvm *kvm, void *param) { struct virtio_pci_ioevent_param *ioeventfd = param; @@ -128,6 +135,9 @@ static void virtio_pci_exit_vq(struct kvm *kvm, struct virtio_device *vdev, u32 mmio_addr = virtio_pci__mmio_addr(vpci); u16 port_addr = virtio_pci__port_addr(vpci); + virtio_pci__del_msix_route(vpci, vpci->gsis[vq]); + vpci->gsis[vq] = 0; + vpci->vq_vector[vq] = VIRTIO_MSI_NO_VECTOR; ioeventfd__del_event(mmio_addr + VIRTIO_PCI_QUEUE_NOTIFY, vq); ioeventfd__del_event(port_addr + VIRTIO_PCI_QUEUE_NOTIFY, vq); virtio_exit_vq(kvm, vdev, vpci->dev, vq); @@ -623,6 +633,10 @@ int virtio_pci__reset(struct kvm *kvm, struct virtio_device *vdev) unsigned int vq; struct virtio_pci *vpci = vdev->virtio; + virtio_pci__del_msix_route(vpci, vpci->config_gsi); + vpci->config_gsi = 0; + vpci->config_vector = VIRTIO_MSI_NO_VECTOR; + for (vq = 0; vq < vdev->ops->get_vq_count(kvm, vpci->dev); vq++) virtio_pci_exit_vq(kvm, vdev, vq); |