The branch stable/13 has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=e8b442c74c903dfd020a83ebba7d1b3c2c281aba
commit e8b442c74c903dfd020a83ebba7d1b3c2c281aba
Author: John Baldwin <j...@freebsd.org>
AuthorDate: 2021-06-12 00:59:35 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2021-08-12 17:01:25 +0000
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
(cherry picked from commit c06676bee3d228ac18c5ed3604304e932eb84c1e)
---
usr.sbin/bhyve/virtio.h | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/usr.sbin/bhyve/virtio.h b/usr.sbin/bhyve/virtio.h
index e03fd5f710d1..5b2cf6fe2cc8 100644
--- a/usr.sbin/bhyve/virtio.h
+++ b/usr.sbin/bhyve/virtio.h
@@ -332,24 +332,35 @@ 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
-vq_interrupt(struct virtio_softc *vs, struct vqueue_info *vq)
+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, vq->vq_msix_idx);
+ pci_generate_msix(vs->vs_pi, msix_idx);
else {
VS_LOCK(vs);
- vs->vs_isr |= VIRTIO_PCI_ISR_INTR;
+ 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)
+{
+
+ vi_interrupt(vs, VIRTIO_PCI_ISR_INTR, vq->vq_msix_idx);
+}
+
static inline void
vq_kick_enable(struct vqueue_info *vq)
{
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
