From nobody Fri Apr 26 12:58:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1560270530; cv=none; d=zoho.com; s=zohoarc; b=TKxn0X3/btIeTSAQpbQJIBnDYXG+QPCY/EvBLRWjv3dYtO7o5sA//El9Hf+vrOw5QOQr+8zmnX6xwphwbHXkTeG89lOVfU5aPAn3UUCqeu2hr0Q082SutOJBNJsffLszAaI0hCp3hXiR1t8Hj8idSp+PA1U7szDtgMkdUXHKwLw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560270530; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=8D1QO9eofCMx4jjIn936FsvJxCOo9uH77Vc4zQilV2Y=; b=Yp/J42gUQFMkkVDznpbs3ZXQVGJ2hsURixdBbTxXYILZY/EnDX3gIZkN0GkI3ch9Cq9UZJpBWX/bV8XwJtuRzWKBvGjUr+t10ENJzuWfkbKk4xE0QHvb07GwNbwtrwEGwQq5mGR3wuvLPNnwt6dwoRypG/w14ZVBXjN2uBanSlU= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560270530937705.5023397742129; Tue, 11 Jun 2019 09:28:50 -0700 (PDT) Received: from localhost ([::1]:60800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hajda-0005ik-Q5 for importer@patchew.org; Tue, 11 Jun 2019 12:28:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36352) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1haj0a-0003dR-B5 for qemu-devel@nongnu.org; Tue, 11 Jun 2019 11:48:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1haj0U-0007r7-R5 for qemu-devel@nongnu.org; Tue, 11 Jun 2019 11:48:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37737) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1haj0U-0007mP-E5 for qemu-devel@nongnu.org; Tue, 11 Jun 2019 11:48:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B92330833C5; Tue, 11 Jun 2019 15:48:12 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-67.ams2.redhat.com [10.36.116.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B84760C47; Tue, 11 Jun 2019 15:48:04 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, alex.williamson@redhat.com Date: Tue, 11 Jun 2019 17:47:25 +0200 Message-Id: <20190611154725.5343-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 11 Jun 2019 15:48:12 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3] vfio/common: Introduce vfio_set_irq_signaling helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The code used to assign an interrupt index/subindex to an eventfd is duplicated many times. Let's introduce an helper that allows to set/unset the signaling for an ACTION_TRIGGER, ACTION_MASK or ACTION_UNMASK action. Signed-off-by: Eric Auger --- v2 -> v3: - irq_to_str() simply outputs the IRQ index if the VFIO device is not of PCI type - removed "vfio: failed to start eventfd signaling ../.." in vfio_platform v1 -> v2: - don't call GET_IRQ_INFO in vfio_set_irq_signaling() and restore quiet check in vfio_register_req_notifier. Nicer display of the IRQ name. This is a follow-up to [PATCH v2 0/2] vfio-pci: Introduce vfio_set_event_handler(). It looks to me that introducing vfio_set_irq_signaling() has more benefits in term of code reduction and the helper abstraction looks cleaner. --- hw/vfio/common.c | 83 +++++++++++++ hw/vfio/pci.c | 217 ++++++++-------------------------- hw/vfio/platform.c | 62 ++++------ include/hw/vfio/vfio-common.h | 2 + 4 files changed, 156 insertions(+), 208 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 4374cc6176..4b8acd556f 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -95,6 +95,89 @@ void vfio_mask_single_irqindex(VFIODevice *vbasedev, int= index) ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, &irq_set); } =20 +static inline const char *action_to_str(int action) +{ + switch (action) { + case VFIO_IRQ_SET_ACTION_MASK: + return "MASK"; + case VFIO_IRQ_SET_ACTION_UNMASK: + return "UNMASK"; + case VFIO_IRQ_SET_ACTION_TRIGGER: + return "TRIGGER"; + default: + return "UNKNOWN ACTION"; + } +} + +static char *irq_to_str(VFIODevice *vbasedev, int index, int subindex) +{ + char *str; + + if (vbasedev->type !=3D VFIO_DEVICE_TYPE_PCI) { + str =3D g_strdup_printf("index %d", index); + return str; + } + + switch (index) { + case VFIO_PCI_INTX_IRQ_INDEX: + str =3D g_strdup_printf("INTX-%d", subindex); + break; + case VFIO_PCI_MSI_IRQ_INDEX: + str =3D g_strdup_printf("MSI-%d", subindex); + break; + case VFIO_PCI_MSIX_IRQ_INDEX: + str =3D g_strdup_printf("MSIX-%d", subindex); + break; + case VFIO_PCI_ERR_IRQ_INDEX: + str =3D g_strdup_printf("ERR-%d", subindex); + break; + case VFIO_PCI_REQ_IRQ_INDEX: + str =3D g_strdup_printf("REQ-%d", subindex); + break; + default: + str =3D g_strdup_printf("index %d (unknown)", index); + break; + } + return str; +} + +int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, + int action, int fd, Error **errp) +{ + struct vfio_irq_set *irq_set; + int argsz, ret =3D 0; + int32_t *pfd; + char *irq_name; + + argsz =3D sizeof(*irq_set) + sizeof(*pfd); + + irq_set =3D g_malloc0(argsz); + irq_set->argsz =3D argsz; + irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | action; + irq_set->index =3D index; + irq_set->start =3D subindex; + irq_set->count =3D 1; + pfd =3D (int32_t *)&irq_set->data; + *pfd =3D fd; + + ret =3D ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, irq_set); + + g_free(irq_set); + + if (!ret) { + return 0; + } + + error_setg_errno(errp, -ret, "VFIO_DEVICE_SET_IRQS failure"); + irq_name =3D irq_to_str(vbasedev, index, subindex); + error_prepend(errp, + "Failed to %s %s eventfd signaling for interrupt %s: ", + fd < 0 ? "tear down" : "set up", action_to_str(action), + irq_name); + g_free(irq_name); + return ret; +} + /* * IO Port/MMIO - Beware of the endians, VFIO is always little endian */ diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c index 2a4091d216..65c2e17028 100644 --- a/hw/vfio/pci.c +++ b/hw/vfio/pci.c @@ -113,9 +113,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, E= rror **errp) .gsi =3D vdev->intx.route.irq, .flags =3D KVM_IRQFD_FLAG_RESAMPLE, }; - struct vfio_irq_set *irq_set; - int ret, argsz; - int32_t *pfd; + Error *err =3D NULL; =20 if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || vdev->intx.route.mode !=3D PCI_INTX_ENABLED || @@ -143,22 +141,10 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev,= Error **errp) goto fail_irqfd; } =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_UNM= ASK; - irq_set->index =3D VFIO_PCI_INTX_IRQ_INDEX; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - - *pfd =3D irqfd.resamplefd; - - ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); - g_free(irq_set); - if (ret) { - error_setg_errno(errp, -ret, "failed to setup INTx unmask fd"); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_UNMASK, + irqfd.resamplefd, &err)) { + error_propagate(errp, err); goto fail_vfio; } =20 @@ -262,10 +248,10 @@ static void vfio_intx_update(PCIDevice *pdev) static int vfio_intx_enable(VFIOPCIDevice *vdev, Error **errp) { uint8_t pin =3D vfio_pci_read_config(&vdev->pdev, PCI_INTERRUPT_PIN, 1= ); - int ret, argsz, retval =3D 0; - struct vfio_irq_set *irq_set; - int32_t *pfd; Error *err =3D NULL; + int32_t fd; + int ret; + =20 if (!pin) { return 0; @@ -292,27 +278,15 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Erro= r **errp) error_setg_errno(errp, -ret, "event_notifier_init failed"); return ret; } + fd =3D event_notifier_get_fd(&vdev->intx.interrupt); + qemu_set_fd_handler(fd, vfio_intx_interrupt, NULL, vdev); =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRI= GGER; - irq_set->index =3D VFIO_PCI_INTX_IRQ_INDEX; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - - *pfd =3D event_notifier_get_fd(&vdev->intx.interrupt); - qemu_set_fd_handler(*pfd, vfio_intx_interrupt, NULL, vdev); - - ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); - if (ret) { - error_setg_errno(errp, -ret, "failed to setup INTx fd"); - qemu_set_fd_handler(*pfd, NULL, NULL, vdev); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err)) { + error_propagate(errp, err); + qemu_set_fd_handler(fd, NULL, NULL, vdev); event_notifier_cleanup(&vdev->intx.interrupt); - retval =3D -errno; - goto cleanup; + return -errno; } =20 vfio_intx_enable_kvm(vdev, &err); @@ -323,11 +297,7 @@ static int vfio_intx_enable(VFIOPCIDevice *vdev, Error= **errp) vdev->interrupt =3D VFIO_INT_INTx; =20 trace_vfio_intx_enable(vdev->vbasedev.name); - -cleanup: - g_free(irq_set); - - return retval; + return 0; } =20 static void vfio_intx_disable(VFIOPCIDevice *vdev) @@ -530,31 +500,19 @@ static int vfio_msix_vector_do_use(PCIDevice *pdev, u= nsigned int nr, error_report("vfio: failed to enable vectors, %d", ret); } } else { - int argsz; - struct vfio_irq_set *irq_set; - int32_t *pfd; - - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | - VFIO_IRQ_SET_ACTION_TRIGGER; - irq_set->index =3D VFIO_PCI_MSIX_IRQ_INDEX; - irq_set->start =3D nr; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; + Error *err =3D NULL; + int32_t fd; =20 if (vector->virq >=3D 0) { - *pfd =3D event_notifier_get_fd(&vector->kvm_interrupt); + fd =3D event_notifier_get_fd(&vector->kvm_interrupt); } else { - *pfd =3D event_notifier_get_fd(&vector->interrupt); + fd =3D event_notifier_get_fd(&vector->interrupt); } =20 - ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); - g_free(irq_set); - if (ret) { - error_report("vfio: failed to modify vector, %d", ret); + if (vfio_set_irq_signaling(&vdev->vbasedev, + VFIO_PCI_MSIX_IRQ_INDEX, nr, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err= )) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); } } =20 @@ -591,26 +549,10 @@ static void vfio_msix_vector_release(PCIDevice *pdev,= unsigned int nr) * be re-asserted on unmask. Nothing to do if already using QEMU mode. */ if (vector->virq >=3D 0) { - int argsz; - struct vfio_irq_set *irq_set; - int32_t *pfd; + int32_t fd =3D event_notifier_get_fd(&vector->interrupt); =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | - VFIO_IRQ_SET_ACTION_TRIGGER; - irq_set->index =3D VFIO_PCI_MSIX_IRQ_INDEX; - irq_set->start =3D nr; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - - *pfd =3D event_notifier_get_fd(&vector->interrupt); - - ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); - - g_free(irq_set); + vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_MSIX_IRQ_INDEX, n= r, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, NULL); } } =20 @@ -2636,10 +2578,8 @@ static void vfio_err_notifier_handler(void *opaque) */ static void vfio_register_err_notifier(VFIOPCIDevice *vdev) { - int ret; - int argsz; - struct vfio_irq_set *irq_set; - int32_t *pfd; + Error *err =3D NULL; + int32_t fd; =20 if (!vdev->pci_aer) { return; @@ -2651,58 +2591,30 @@ static void vfio_register_err_notifier(VFIOPCIDevic= e *vdev) return; } =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); + fd =3D event_notifier_get_fd(&vdev->err_notifier); + qemu_set_fd_handler(fd, vfio_err_notifier_handler, NULL, vdev); =20 - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | - VFIO_IRQ_SET_ACTION_TRIGGER; - irq_set->index =3D VFIO_PCI_ERR_IRQ_INDEX; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - - *pfd =3D event_notifier_get_fd(&vdev->err_notifier); - qemu_set_fd_handler(*pfd, vfio_err_notifier_handler, NULL, vdev); - - ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); - if (ret) { - error_report("vfio: Failed to set up error notification"); - qemu_set_fd_handler(*pfd, NULL, NULL, vdev); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_ERR_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err)) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); + qemu_set_fd_handler(fd, NULL, NULL, vdev); event_notifier_cleanup(&vdev->err_notifier); vdev->pci_aer =3D false; } - g_free(irq_set); } =20 static void vfio_unregister_err_notifier(VFIOPCIDevice *vdev) { - int argsz; - struct vfio_irq_set *irq_set; - int32_t *pfd; - int ret; + Error *err =3D NULL; =20 if (!vdev->pci_aer) { return; } =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | - VFIO_IRQ_SET_ACTION_TRIGGER; - irq_set->index =3D VFIO_PCI_ERR_IRQ_INDEX; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - *pfd =3D -1; - - ret =3D ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set); - if (ret) { - error_report("vfio: Failed to de-assign error fd: %m"); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_ERR_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); } - g_free(irq_set); qemu_set_fd_handler(event_notifier_get_fd(&vdev->err_notifier), NULL, NULL, vdev); event_notifier_cleanup(&vdev->err_notifier); @@ -2727,9 +2639,8 @@ static void vfio_register_req_notifier(VFIOPCIDevice = *vdev) { struct vfio_irq_info irq_info =3D { .argsz =3D sizeof(irq_info), .index =3D VFIO_PCI_REQ_IRQ_INDEX }; - int argsz; - struct vfio_irq_set *irq_set; - int32_t *pfd; + Error *err =3D NULL; + int32_t fd; =20 if (!(vdev->features & VFIO_FEATURE_ENABLE_REQ)) { return; @@ -2745,57 +2656,31 @@ static void vfio_register_req_notifier(VFIOPCIDevic= e *vdev) return; } =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); + fd =3D event_notifier_get_fd(&vdev->req_notifier); + qemu_set_fd_handler(fd, vfio_req_notifier_handler, NULL, vdev); =20 - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | - VFIO_IRQ_SET_ACTION_TRIGGER; - irq_set->index =3D VFIO_PCI_REQ_IRQ_INDEX; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - - *pfd =3D event_notifier_get_fd(&vdev->req_notifier); - qemu_set_fd_handler(*pfd, vfio_req_notifier_handler, NULL, vdev); - - if (ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) { - error_report("vfio: Failed to set up device request notification"); - qemu_set_fd_handler(*pfd, NULL, NULL, vdev); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_REQ_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err)) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); + qemu_set_fd_handler(fd, NULL, NULL, vdev); event_notifier_cleanup(&vdev->req_notifier); } else { vdev->req_enabled =3D true; } - - g_free(irq_set); } =20 static void vfio_unregister_req_notifier(VFIOPCIDevice *vdev) { - int argsz; - struct vfio_irq_set *irq_set; - int32_t *pfd; + Error *err =3D NULL; =20 if (!vdev->req_enabled) { return; } =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | - VFIO_IRQ_SET_ACTION_TRIGGER; - irq_set->index =3D VFIO_PCI_REQ_IRQ_INDEX; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - *pfd =3D -1; - - if (ioctl(vdev->vbasedev.fd, VFIO_DEVICE_SET_IRQS, irq_set)) { - error_report("vfio: Failed to de-assign device request fd: %m"); + if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_REQ_IRQ_INDEX, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, -1, &err)) { + error_reportf_err(err, VFIO_MSG_PREFIX, vdev->vbasedev.name); } - g_free(irq_set); qemu_set_fd_handler(event_notifier_get_fd(&vdev->req_notifier), NULL, NULL, vdev); event_notifier_cleanup(&vdev->req_notifier); diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c index d52d6552e0..8d6012857e 100644 --- a/hw/vfio/platform.c +++ b/hw/vfio/platform.c @@ -106,26 +106,19 @@ static int vfio_set_trigger_eventfd(VFIOINTp *intp, eventfd_user_side_handler_t handler) { VFIODevice *vbasedev =3D &intp->vdev->vbasedev; - struct vfio_irq_set *irq_set; - int argsz, ret; - int32_t *pfd; + int32_t fd =3D event_notifier_get_fd(intp->interrupt); + Error *err =3D NULL; + int ret; =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRI= GGER; - irq_set->index =3D intp->pin; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - *pfd =3D event_notifier_get_fd(intp->interrupt); - qemu_set_fd_handler(*pfd, (IOHandler *)handler, NULL, intp); - ret =3D ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, irq_set); - if (ret < 0) { - error_report("vfio: Failed to set trigger eventfd: %m"); - qemu_set_fd_handler(*pfd, NULL, NULL, NULL); + qemu_set_fd_handler(fd, (IOHandler *)handler, NULL, intp); + + ret =3D vfio_set_irq_signaling(vbasedev, intp->pin, 0, + VFIO_IRQ_SET_ACTION_TRIGGER, fd, &err); + if (ret) { + error_reportf_err(err, VFIO_MSG_PREFIX, vbasedev->name); + qemu_set_fd_handler(fd, NULL, NULL, NULL); } - g_free(irq_set); + return ret; } =20 @@ -330,7 +323,6 @@ static void vfio_platform_eoi(VFIODevice *vbasedev) =20 static void vfio_start_eventfd_injection(SysBusDevice *sbdev, qemu_irq irq) { - int ret; VFIOPlatformDevice *vdev =3D VFIO_PLATFORM_DEVICE(sbdev); VFIOINTp *intp; =20 @@ -341,10 +333,7 @@ static void vfio_start_eventfd_injection(SysBusDevice = *sbdev, qemu_irq irq) } assert(intp); =20 - ret =3D vfio_set_trigger_eventfd(intp, vfio_intp_interrupt); - if (ret) { - error_report("vfio: failed to start eventfd signaling for IRQ %d: = %m", - intp->pin); + if (vfio_set_trigger_eventfd(intp, vfio_intp_interrupt)) { abort(); } } @@ -361,25 +350,16 @@ static void vfio_start_eventfd_injection(SysBusDevice= *sbdev, qemu_irq irq) */ static int vfio_set_resample_eventfd(VFIOINTp *intp) { + int32_t fd =3D event_notifier_get_fd(intp->unmask); VFIODevice *vbasedev =3D &intp->vdev->vbasedev; - struct vfio_irq_set *irq_set; - int argsz, ret; - int32_t *pfd; + Error *err =3D NULL; + int ret; =20 - argsz =3D sizeof(*irq_set) + sizeof(*pfd); - irq_set =3D g_malloc0(argsz); - irq_set->argsz =3D argsz; - irq_set->flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_UNM= ASK; - irq_set->index =3D intp->pin; - irq_set->start =3D 0; - irq_set->count =3D 1; - pfd =3D (int32_t *)&irq_set->data; - *pfd =3D event_notifier_get_fd(intp->unmask); - qemu_set_fd_handler(*pfd, NULL, NULL, NULL); - ret =3D ioctl(vbasedev->fd, VFIO_DEVICE_SET_IRQS, irq_set); - g_free(irq_set); - if (ret < 0) { - error_report("vfio: Failed to set resample eventfd: %m"); + qemu_set_fd_handler(fd, NULL, NULL, NULL); + ret =3D vfio_set_irq_signaling(vbasedev, intp->pin, 0, + VFIO_IRQ_SET_ACTION_UNMASK, fd, &err); + if (ret) { + error_reportf_err(err, VFIO_MSG_PREFIX, vbasedev->name); } return ret; } @@ -435,8 +415,6 @@ static void vfio_start_irqfd_injection(SysBusDevice *sb= dev, qemu_irq irq) return; fail_vfio: kvm_irqchip_remove_irqfd_notifier(kvm_state, intp->interrupt, irq); - error_report("vfio: failed to start eventfd signaling for IRQ %d: %m", - intp->pin); abort(); fail_irqfd: vfio_start_eventfd_injection(sbdev, irq); diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 1155b79678..686d99ff8c 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -167,6 +167,8 @@ void vfio_put_base_device(VFIODevice *vbasedev); void vfio_disable_irqindex(VFIODevice *vbasedev, int index); void vfio_unmask_single_irqindex(VFIODevice *vbasedev, int index); void vfio_mask_single_irqindex(VFIODevice *vbasedev, int index); +int vfio_set_irq_signaling(VFIODevice *vbasedev, int index, int subindex, + int action, int fd, Error **errp); void vfio_region_write(void *opaque, hwaddr addr, uint64_t data, unsigned size); uint64_t vfio_region_read(void *opaque, --=20 2.20.1