From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>,
qemu-block@nongnu.org, "Max Reitz" <mreitz@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 14/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq()
Date: Tue, 20 Oct 2020 19:24:26 +0200 [thread overview]
Message-ID: <20201020172428.2220726-15-philmd@redhat.com> (raw)
In-Reply-To: <20201020172428.2220726-1-philmd@redhat.com>
Introduce qemu_vfio_pci_msix_set_irq() to set the event
notifier of a specific MSIX IRQ. All other registered IRQs
are left unmodified.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
include/qemu/vfio-helpers.h | 2 ++
util/vfio-helpers.c | 35 +++++++++++++++++++++++++++++++++++
util/trace-events | 1 +
3 files changed, 38 insertions(+)
diff --git a/include/qemu/vfio-helpers.h b/include/qemu/vfio-helpers.h
index 492072cba2f..4c06694e03a 100644
--- a/include/qemu/vfio-helpers.h
+++ b/include/qemu/vfio-helpers.h
@@ -33,5 +33,7 @@ int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
int irq_type, Error **errp);
int qemu_vfio_pci_msix_init_irqs(QEMUVFIOState *s,
unsigned *irq_count, Error **errp);
+int qemu_vfio_pci_msix_set_irq(QEMUVFIOState *s, unsigned irq_index,
+ EventNotifier *notifier, Error **errp);
#endif
diff --git a/util/vfio-helpers.c b/util/vfio-helpers.c
index d88e2c7dc1f..18142e6be86 100644
--- a/util/vfio-helpers.c
+++ b/util/vfio-helpers.c
@@ -232,6 +232,41 @@ int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
return 0;
}
+/**
+ * Initialize a MSIX IRQ and register its event notifier.
+ * @irq_index: MSIX IRQ index
+ * @notifier: notifier for the MSIX IRQ
+ */
+int qemu_vfio_pci_msix_set_irq(QEMUVFIOState *s, unsigned irq_index,
+ EventNotifier *notifier, Error **errp)
+{
+ int r;
+ int fd = event_notifier_get_fd(notifier);
+ size_t irq_set_size;
+ struct vfio_irq_set *irq_set;
+
+ trace_qemu_vfio_pci_msix_set_irq(irq_index, fd);
+ irq_set_size = sizeof(*irq_set) + sizeof(int32_t);
+ irq_set = g_malloc0(irq_set_size);
+ /* Get to a known IRQ state */
+ *irq_set = (struct vfio_irq_set) {
+ .argsz = irq_set_size,
+ .flags = VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER,
+ .index = VFIO_PCI_MSIX_IRQ_INDEX,
+ .start = irq_index,
+ .count = 1,
+ };
+ ((int32_t *)&irq_set->data)[0] = fd;
+ r = ioctl(s->device, VFIO_DEVICE_SET_IRQS, irq_set);
+ g_free(irq_set);
+ if (r) {
+ error_setg_errno(errp, errno, "Failed to setup device interrupt #%u",
+ irq_index);
+ return -errno;
+ }
+ return 0;
+}
+
/**
* Initialize device MSIX IRQs and register event notifiers.
* @irq_count: pointer to number of MSIX IRQs to initialize
diff --git a/util/trace-events b/util/trace-events
index ec93578b125..3a56c542a94 100644
--- a/util/trace-events
+++ b/util/trace-events
@@ -88,6 +88,7 @@ qemu_vfio_dma_map(void *s, void *host, size_t size, bool temporary, uint64_t *io
qemu_vfio_dma_mapped(void *s, void *host, uint64_t iova, size_t size) "s %p host %p <-> iova 0x%"PRIx64" size 0x%zx"
qemu_vfio_dma_unmap(void *s, void *host) "s %p host %p"
qemu_vfio_msix_info_irqs(uint32_t count, unsigned asked) "msix irqs %"PRIu32" (asked: %u)"
+qemu_vfio_pci_msix_set_irq(unsigned irq_index, int fd) "msix irq %u notifier_fd %d"
qemu_vfio_iommu_iova_pgsizes(uint64_t iova_pgsizes) "iommu page size bitmask: 0x%08"PRIx64
qemu_vfio_pci_read_config(void *buf, int ofs, int size, uint64_t region_ofs, uint64_t region_size) "read cfg ptr %p ofs 0x%x size %d (region ofs 0x%"PRIx64" size %"PRId64")"
qemu_vfio_pci_write_config(void *buf, int ofs, int size, uint64_t region_ofs, uint64_t region_size) "write cfg ptr %p ofs 0x%x size %d (region ofs 0x%"PRIx64" size %"PRId64")"
--
2.26.2
next prev parent reply other threads:[~2020-10-20 17:44 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-20 17:24 [PATCH 00/16] util/vfio-helpers: Allow using multiple MSIX IRQs Philippe Mathieu-Daudé
2020-10-20 17:24 ` [PATCH 01/16] block/nvme: Correct minimum device page size Philippe Mathieu-Daudé
2020-10-22 13:52 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 02/16] util/vfio-helpers: Improve reporting unsupported IOMMU type Philippe Mathieu-Daudé
2020-10-22 13:53 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 03/16] util/vfio-helpers: Pass minimum page size to qemu_vfio_open_pci() Philippe Mathieu-Daudé
2020-10-22 14:00 ` Stefan Hajnoczi
2020-10-24 19:52 ` Philippe Mathieu-Daudé
2020-10-20 17:24 ` [PATCH 04/16] util/vfio-helpers: Report error when IOMMU page size is not supported Philippe Mathieu-Daudé
2020-10-22 15:21 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 05/16] util/vfio-helpers: Trace PCI I/O config accesses Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 06/16] util/vfio-helpers: Trace PCI BAR region info Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 07/16] util/vfio-helpers: Trace where BARs are mapped Philippe Mathieu-Daudé
2020-10-22 14:13 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 08/16] util/vfio-helpers: Improve DMA trace events Philippe Mathieu-Daudé
2020-10-22 14:17 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 09/16] util/vfio-helpers: Convert vfio_dump_mapping to " Philippe Mathieu-Daudé
2020-10-22 14:20 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 10/16] util/vfio-helpers: Let qemu_vfio_dma_map() propagate Error Philippe Mathieu-Daudé
2020-10-22 14:23 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 11/16] util/vfio-helpers: Let qemu_vfio_do_mapping() " Philippe Mathieu-Daudé
2020-10-22 14:24 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 12/16] util/vfio-helpers: Let qemu_vfio_verify_mappings() use error_report() Philippe Mathieu-Daudé
2020-10-22 14:25 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 13/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_init_irqs() Philippe Mathieu-Daudé
2020-10-22 14:34 ` Stefan Hajnoczi
2020-10-20 17:24 ` Philippe Mathieu-Daudé [this message]
2020-10-22 14:47 ` [PATCH 14/16] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq() Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 15/16] block/nvme: Switch to using the MSIX API Philippe Mathieu-Daudé
2020-10-22 14:49 ` Stefan Hajnoczi
2020-10-20 17:24 ` [PATCH 16/16] util/vfio-helpers: Remove now unused qemu_vfio_pci_init_irq() Philippe Mathieu-Daudé
2020-10-22 14:50 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201020172428.2220726-15-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=fam@euphon.net \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).