From: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-devel@nongnu.org Cc: bjsdjshi@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, agraf@suse.com, alex.williamson@redhat.com, eric.auger@redhat.com Subject: [PATCH v7 09/13] vfio/ccw: get irqs info and set the eventfd fd Date: Fri, 5 May 2017 04:03:48 +0200 [thread overview] Message-ID: <20170505020352.8984-10-bjsdjshi@linux.vnet.ibm.com> (raw) In-Reply-To: <20170505020352.8984-1-bjsdjshi@linux.vnet.ibm.com> vfio-ccw resorts to the eventfd mechanism to communicate with userspace. We fetch the irqs info via the ioctl VFIO_DEVICE_GET_IRQ_INFO, register a event notifier to get the eventfd fd which is sent to kernel via the ioctl VFIO_DEVICE_SET_IRQS, then we can implement read operation once kernel sends the signal. Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> --- hw/vfio/ccw.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 7ddcfd7..6760cee 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -22,6 +22,7 @@ #include "hw/vfio/vfio-common.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/ccw-device.h" +#include "qemu/error-report.h" #define TYPE_VFIO_CCW "vfio-ccw" typedef struct VFIOCCWDevice { @@ -30,6 +31,7 @@ typedef struct VFIOCCWDevice { uint64_t io_region_size; uint64_t io_region_offset; struct ccw_io_region *io_region; + EventNotifier io_notifier; } VFIOCCWDevice; static void vfio_ccw_compute_needs_reset(VFIODevice *vdev) @@ -54,6 +56,99 @@ static void vfio_ccw_reset(DeviceState *dev) ioctl(vcdev->vdev.fd, VFIO_DEVICE_RESET); } +static void vfio_ccw_io_notifier_handler(void *opaque) +{ + VFIOCCWDevice *vcdev = opaque; + + if (!event_notifier_test_and_clear(&vcdev->io_notifier)) { + return; + } +} + +static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) +{ + VFIODevice *vdev = &vcdev->vdev; + struct vfio_irq_info *irq_info; + struct vfio_irq_set *irq_set; + size_t argsz; + int32_t *pfd; + + if (vdev->num_irqs < VFIO_CCW_IO_IRQ_INDEX + 1) { + error_setg(errp, "vfio: unexpected number of io irqs %u", + vdev->num_irqs); + return; + } + + argsz = sizeof(*irq_set); + irq_info = g_malloc0(argsz); + irq_info->index = VFIO_CCW_IO_IRQ_INDEX; + irq_info->argsz = argsz; + if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, + irq_info) < 0 || irq_info->count < 1) { + error_setg_errno(errp, errno, "vfio: Error getting irq info"); + goto get_error; + } + + if (event_notifier_init(&vcdev->io_notifier, 0)) { + error_setg_errno(errp, errno, + "vfio: Unable to init event notifier for IO"); + goto get_error; + } + + argsz = sizeof(*irq_set) + sizeof(*pfd); + irq_set = g_malloc0(argsz); + irq_set->argsz = argsz; + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | + VFIO_IRQ_SET_ACTION_TRIGGER; + irq_set->index = VFIO_CCW_IO_IRQ_INDEX; + irq_set->start = 0; + irq_set->count = 1; + pfd = (int32_t *) &irq_set->data; + + *pfd = event_notifier_get_fd(&vcdev->io_notifier); + qemu_set_fd_handler(*pfd, vfio_ccw_io_notifier_handler, NULL, vcdev); + if (ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) { + error_setg(errp, "vfio: Failed to set up io notification"); + qemu_set_fd_handler(*pfd, NULL, NULL, vcdev); + event_notifier_cleanup(&vcdev->io_notifier); + goto set_error; + } + +set_error: + g_free(irq_set); + +get_error: + g_free(irq_info); +} + +static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev) +{ + struct vfio_irq_set *irq_set; + size_t argsz; + int32_t *pfd; + + argsz = sizeof(*irq_set) + sizeof(*pfd); + irq_set = g_malloc0(argsz); + irq_set->argsz = argsz; + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | + VFIO_IRQ_SET_ACTION_TRIGGER; + irq_set->index = VFIO_CCW_IO_IRQ_INDEX; + irq_set->start = 0; + irq_set->count = 1; + pfd = (int32_t *) &irq_set->data; + *pfd = -1; + + if (ioctl(vcdev->vdev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) { + error_report("vfio: Failed to de-assign device io fd: %m"); + } + + qemu_set_fd_handler(event_notifier_get_fd(&vcdev->io_notifier), + NULL, NULL, vcdev); + event_notifier_cleanup(&vcdev->io_notifier); + + g_free(irq_set); +} + static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) { VFIODevice *vdev = &vcdev->vdev; @@ -173,8 +268,15 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) goto out_region_err; } + vfio_ccw_register_io_notifier(vcdev, &err); + if (err) { + goto out_notifier_err; + } + return; +out_notifier_err: + vfio_ccw_put_region(vcdev); out_region_err: vfio_put_device(vcdev); out_device_err: @@ -195,6 +297,7 @@ static void vfio_ccw_unrealize(DeviceState *dev, Error **errp) S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev); VFIOGroup *group = vcdev->vdev.group; + vfio_ccw_unregister_io_notifier(vcdev); vfio_ccw_put_region(vcdev); vfio_put_device(vcdev); vfio_put_group(group); -- 2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-devel@nongnu.org Cc: bjsdjshi@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, borntraeger@de.ibm.com, agraf@suse.com, alex.williamson@redhat.com, eric.auger@redhat.com Subject: [Qemu-devel] [PATCH v7 09/13] vfio/ccw: get irqs info and set the eventfd fd Date: Fri, 5 May 2017 04:03:48 +0200 [thread overview] Message-ID: <20170505020352.8984-10-bjsdjshi@linux.vnet.ibm.com> (raw) In-Reply-To: <20170505020352.8984-1-bjsdjshi@linux.vnet.ibm.com> vfio-ccw resorts to the eventfd mechanism to communicate with userspace. We fetch the irqs info via the ioctl VFIO_DEVICE_GET_IRQ_INFO, register a event notifier to get the eventfd fd which is sent to kernel via the ioctl VFIO_DEVICE_SET_IRQS, then we can implement read operation once kernel sends the signal. Signed-off-by: Dong Jia Shi <bjsdjshi@linux.vnet.ibm.com> --- hw/vfio/ccw.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/hw/vfio/ccw.c b/hw/vfio/ccw.c index 7ddcfd7..6760cee 100644 --- a/hw/vfio/ccw.c +++ b/hw/vfio/ccw.c @@ -22,6 +22,7 @@ #include "hw/vfio/vfio-common.h" #include "hw/s390x/s390-ccw.h" #include "hw/s390x/ccw-device.h" +#include "qemu/error-report.h" #define TYPE_VFIO_CCW "vfio-ccw" typedef struct VFIOCCWDevice { @@ -30,6 +31,7 @@ typedef struct VFIOCCWDevice { uint64_t io_region_size; uint64_t io_region_offset; struct ccw_io_region *io_region; + EventNotifier io_notifier; } VFIOCCWDevice; static void vfio_ccw_compute_needs_reset(VFIODevice *vdev) @@ -54,6 +56,99 @@ static void vfio_ccw_reset(DeviceState *dev) ioctl(vcdev->vdev.fd, VFIO_DEVICE_RESET); } +static void vfio_ccw_io_notifier_handler(void *opaque) +{ + VFIOCCWDevice *vcdev = opaque; + + if (!event_notifier_test_and_clear(&vcdev->io_notifier)) { + return; + } +} + +static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) +{ + VFIODevice *vdev = &vcdev->vdev; + struct vfio_irq_info *irq_info; + struct vfio_irq_set *irq_set; + size_t argsz; + int32_t *pfd; + + if (vdev->num_irqs < VFIO_CCW_IO_IRQ_INDEX + 1) { + error_setg(errp, "vfio: unexpected number of io irqs %u", + vdev->num_irqs); + return; + } + + argsz = sizeof(*irq_set); + irq_info = g_malloc0(argsz); + irq_info->index = VFIO_CCW_IO_IRQ_INDEX; + irq_info->argsz = argsz; + if (ioctl(vdev->fd, VFIO_DEVICE_GET_IRQ_INFO, + irq_info) < 0 || irq_info->count < 1) { + error_setg_errno(errp, errno, "vfio: Error getting irq info"); + goto get_error; + } + + if (event_notifier_init(&vcdev->io_notifier, 0)) { + error_setg_errno(errp, errno, + "vfio: Unable to init event notifier for IO"); + goto get_error; + } + + argsz = sizeof(*irq_set) + sizeof(*pfd); + irq_set = g_malloc0(argsz); + irq_set->argsz = argsz; + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | + VFIO_IRQ_SET_ACTION_TRIGGER; + irq_set->index = VFIO_CCW_IO_IRQ_INDEX; + irq_set->start = 0; + irq_set->count = 1; + pfd = (int32_t *) &irq_set->data; + + *pfd = event_notifier_get_fd(&vcdev->io_notifier); + qemu_set_fd_handler(*pfd, vfio_ccw_io_notifier_handler, NULL, vcdev); + if (ioctl(vdev->fd, VFIO_DEVICE_SET_IRQS, irq_set)) { + error_setg(errp, "vfio: Failed to set up io notification"); + qemu_set_fd_handler(*pfd, NULL, NULL, vcdev); + event_notifier_cleanup(&vcdev->io_notifier); + goto set_error; + } + +set_error: + g_free(irq_set); + +get_error: + g_free(irq_info); +} + +static void vfio_ccw_unregister_io_notifier(VFIOCCWDevice *vcdev) +{ + struct vfio_irq_set *irq_set; + size_t argsz; + int32_t *pfd; + + argsz = sizeof(*irq_set) + sizeof(*pfd); + irq_set = g_malloc0(argsz); + irq_set->argsz = argsz; + irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD | + VFIO_IRQ_SET_ACTION_TRIGGER; + irq_set->index = VFIO_CCW_IO_IRQ_INDEX; + irq_set->start = 0; + irq_set->count = 1; + pfd = (int32_t *) &irq_set->data; + *pfd = -1; + + if (ioctl(vcdev->vdev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) { + error_report("vfio: Failed to de-assign device io fd: %m"); + } + + qemu_set_fd_handler(event_notifier_get_fd(&vcdev->io_notifier), + NULL, NULL, vcdev); + event_notifier_cleanup(&vcdev->io_notifier); + + g_free(irq_set); +} + static void vfio_ccw_get_region(VFIOCCWDevice *vcdev, Error **errp) { VFIODevice *vdev = &vcdev->vdev; @@ -173,8 +268,15 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) goto out_region_err; } + vfio_ccw_register_io_notifier(vcdev, &err); + if (err) { + goto out_notifier_err; + } + return; +out_notifier_err: + vfio_ccw_put_region(vcdev); out_region_err: vfio_put_device(vcdev); out_device_err: @@ -195,6 +297,7 @@ static void vfio_ccw_unrealize(DeviceState *dev, Error **errp) S390CCWDeviceClass *cdc = S390_CCW_DEVICE_GET_CLASS(cdev); VFIOGroup *group = vcdev->vdev.group; + vfio_ccw_unregister_io_notifier(vcdev); vfio_ccw_put_region(vcdev); vfio_put_device(vcdev); vfio_put_group(group); -- 2.10.2
next prev parent reply other threads:[~2017-05-05 2:03 UTC|newest] Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-05 2:03 [PATCH v7 00/13] basic channel IO passthrough infrastructure based on vfio Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 01/13] update-linux-headers: update for vfio-ccw Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 02/13] vfio: linux-headers " Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 03/13] s390x/css: add s390-squash-mcss machine option Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 04/13] s390x/css: realize css_sch_build_schib Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 12:04 ` Cornelia Huck 2017-05-05 12:04 ` [Qemu-devel] " Cornelia Huck 2017-05-08 3:07 ` Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 05/13] s390x/css: realize css_create_sch Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 12:11 ` Cornelia Huck 2017-05-05 12:11 ` [Qemu-devel] " Cornelia Huck 2017-05-08 5:18 ` Dong Jia Shi 2017-05-08 10:50 ` Cornelia Huck 2017-05-08 10:50 ` [Qemu-devel] " Cornelia Huck 2017-05-09 1:38 ` Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 06/13] s390x/css: device support for s390-ccw passthrough Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-09 8:18 ` Auger Eric 2017-05-11 21:13 ` Alex Williamson 2017-05-11 21:13 ` [Qemu-devel] " Alex Williamson 2017-05-15 2:22 ` Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 07/13] vfio/ccw: vfio based subchannel passthrough driver Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-09 8:19 ` Auger Eric 2017-05-09 8:19 ` [Qemu-devel] " Auger Eric 2017-05-11 21:48 ` Alex Williamson 2017-05-11 21:48 ` [Qemu-devel] " Alex Williamson 2017-05-05 2:03 ` [PATCH v7 08/13] vfio/ccw: get io region info Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-09 8:20 ` Auger Eric 2017-05-11 21:48 ` Alex Williamson 2017-05-11 21:48 ` [Qemu-devel] " Alex Williamson 2017-05-05 2:03 ` Dong Jia Shi [this message] 2017-05-05 2:03 ` [Qemu-devel] [PATCH v7 09/13] vfio/ccw: get irqs info and set the eventfd fd Dong Jia Shi 2017-05-09 8:21 ` Auger Eric 2017-05-09 8:21 ` [Qemu-devel] " Auger Eric 2017-05-09 8:35 ` Dong Jia Shi 2017-05-11 21:49 ` Alex Williamson 2017-05-11 21:49 ` [Qemu-devel] " Alex Williamson 2017-05-15 2:31 ` Dong Jia Shi 2017-05-15 2:35 ` Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 10/13] s390x/css: introduce and realize ccw-request callback Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-11 21:49 ` Alex Williamson 2017-05-11 21:49 ` [Qemu-devel] " Alex Williamson 2017-05-05 2:03 ` [PATCH v7 11/13] s390x/css: ccw translation infrastructure Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 2:03 ` [PATCH v7 12/13] vfio/ccw: update sense data if a unit check is pending Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-11 21:49 ` Alex Williamson 2017-05-11 21:49 ` [Qemu-devel] " Alex Williamson 2017-05-05 2:03 ` [PATCH v7 13/13] MAINTAINERS: Add vfio-ccw maintainer Dong Jia Shi 2017-05-05 2:03 ` [Qemu-devel] " Dong Jia Shi 2017-05-05 12:20 ` Cornelia Huck 2017-05-05 12:20 ` [Qemu-devel] " Cornelia Huck 2017-05-08 5:29 ` Dong Jia Shi 2017-05-08 9:09 ` Cornelia Huck 2017-05-08 9:09 ` [Qemu-devel] " Cornelia Huck 2017-05-09 1:41 ` Dong Jia Shi 2017-05-09 7:33 ` Cornelia Huck 2017-05-09 7:33 ` [Qemu-devel] " Cornelia Huck 2017-05-11 21:49 ` Alex Williamson 2017-05-11 21:49 ` [Qemu-devel] " Alex Williamson 2017-05-05 12:22 ` [PATCH v7 00/13] basic channel IO passthrough infrastructure based on vfio Cornelia Huck 2017-05-05 12:22 ` [Qemu-devel] " Cornelia Huck 2017-05-08 5:31 ` Dong Jia Shi
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=20170505020352.8984-10-bjsdjshi@linux.vnet.ibm.com \ --to=bjsdjshi@linux.vnet.ibm.com \ --cc=agraf@suse.com \ --cc=alex.williamson@redhat.com \ --cc=borntraeger@de.ibm.com \ --cc=cornelia.huck@de.ibm.com \ --cc=eric.auger@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.