From c06676bee3d228ac18c5ed3604304e932eb84c1e Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 11 Jun 2021 17:59:35 -0700 Subject: [PATCH] bhyve: Split out a lower-level helper for VirtIO interrupts. This allows device models to assert VirtIO interrupts for reasons other than publishing changes to a VirtIO ring such as configuration changes. Reviewed by: grehan, markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D30505 --- usr.sbin/bhyve/virtio.h | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h index 4c7b9de8312..5731baa0dd0 100644 --- a/usr.sbin/bhyve/virtio.h +++ b/usr.sbin/bhyve/virtio.h @@ -348,22 +348,33 @@ vq_has_descs(struct vqueue_info *vq) } /* - * Deliver an interrupt to guest on the given virtual queue - * (if possible, or a generic MSI interrupt if not using MSI-X). + * Deliver an interrupt to the guest for a specific MSI-X queue or + * event. + */ +static inline void +vi_interrupt(struct virtio_softc *vs, uint8_t isr, uint16_t msix_idx) +{ + + if (pci_msix_enabled(vs->vs_pi)) + pci_generate_msix(vs->vs_pi, msix_idx); + else { + VS_LOCK(vs); + vs->vs_isr |= isr; + pci_generate_msi(vs->vs_pi, 0); + pci_lintr_assert(vs->vs_pi); + VS_UNLOCK(vs); + } +} + +/* + * Deliver an interrupt to the guest on the given virtual queue (if + * possible, or a generic MSI interrupt if not using MSI-X). */ static inline void vq_interrupt(struct virtio_softc *vs, struct vqueue_info *vq) { - if (pci_msix_enabled(vs->vs_pi)) - pci_generate_msix(vs->vs_pi, vq->vq_msix_idx); - else { - VS_LOCK(vs); - vs->vs_isr |= VIRTIO_PCI_ISR_INTR; - pci_generate_msi(vs->vs_pi, 0); - pci_lintr_assert(vs->vs_pi); - VS_UNLOCK(vs); - } + vi_interrupt(vs, VIRTIO_PCI_ISR_INTR, vq->vq_msix_idx); } static inline void