From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D8E8C1975A for ; Tue, 17 Mar 2020 22:58:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5203B20714 for ; Tue, 17 Mar 2020 22:58:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dMhJTm79" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5203B20714 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jELAd-0002Gu-GP for qemu-devel@archiver.kernel.org; Tue, 17 Mar 2020 18:58:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52116) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEL9r-0001QQ-D8 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 18:58:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEL9q-00076P-6P for qemu-devel@nongnu.org; Tue, 17 Mar 2020 18:57:59 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:22840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEL9q-00074j-1q for qemu-devel@nongnu.org; Tue, 17 Mar 2020 18:57:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584485877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OBWZKnFuVmOYref0i51L31CtQO6pe9rAdovXC3JCYoc=; b=dMhJTm7988jbvxA13H5Lt18EP4+hJ+ePAohoA6bfgDaz3cMUjY/MJmC4rftFjwnMNrwXDW fWG1eNz7YnFf6GlKlMFbRSzzQeIkcsTKdfvreC2Kw7KrHklcsnE722imMq+x8F1Dm1v2Ev G5PlSuKVrVRgIVBnjrlyEiNnqreugI4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-260-M1Q0z193PAWrTMHX8-V_UA-1; Tue, 17 Mar 2020 18:57:55 -0400 X-MC-Unique: M1Q0z193PAWrTMHX8-V_UA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EEFD8107ACC4 for ; Tue, 17 Mar 2020 22:57:54 +0000 (UTC) Received: from w520.home (ovpn-112-162.phx2.redhat.com [10.3.112.162]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03AEA48; Tue, 17 Mar 2020 22:57:49 +0000 (UTC) Date: Tue, 17 Mar 2020 16:57:38 -0600 From: Alex Williamson To: Peter Xu Subject: Re: [PATCH v3 2/5] vfio/pci: Use kvm_irqchip_add_irqfd_notifier_gsi() for irqfds Message-ID: <20200317165738.1221dc06@w520.home> In-Reply-To: <20200317195042.282977-3-peterx@redhat.com> References: <20200317195042.282977-1-peterx@redhat.com> <20200317195042.282977-3-peterx@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 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: Paolo Bonzini , Cornelia Huck , qemu-devel@nongnu.org, Eric Auger Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 17 Mar 2020 15:50:39 -0400 Peter Xu wrote: > VFIO is currently the only one left that is not using the generic > function (kvm_irqchip_add_irqfd_notifier_gsi()) to register irqfds. > Let VFIO use the common framework too. > > Follow up patches will introduce extra features for kvm irqfd, so that > VFIO can easily leverage that after the switch. > > Reviewed-by: Eric Auger > Reviewed-by: Cornelia Huck > Signed-off-by: Peter Xu > --- > hw/vfio/pci.c | 37 +++++++++++++++---------------------- > 1 file changed, 15 insertions(+), 22 deletions(-) Reviewed-by: Alex Williamson Acked-by: Alex Williamson > diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c > index 98e0e0c994..09703362df 100644 > --- a/hw/vfio/pci.c > +++ b/hw/vfio/pci.c > @@ -115,11 +115,7 @@ static void vfio_intx_eoi(VFIODevice *vbasedev) > static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > { > #ifdef CONFIG_KVM > - struct kvm_irqfd irqfd = { > - .fd = event_notifier_get_fd(&vdev->intx.interrupt), > - .gsi = vdev->intx.route.irq, > - .flags = KVM_IRQFD_FLAG_RESAMPLE, > - }; > + int irq_fd = event_notifier_get_fd(&vdev->intx.interrupt); > Error *err = NULL; > > if (vdev->no_kvm_intx || !kvm_irqfds_enabled() || > @@ -141,7 +137,7 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > } > > /* Get to a known interrupt state */ > - qemu_set_fd_handler(irqfd.fd, NULL, NULL, vdev); > + qemu_set_fd_handler(irq_fd, NULL, NULL, vdev); > vfio_mask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); > vdev->intx.pending = false; > pci_irq_deassert(&vdev->pdev); > @@ -152,17 +148,18 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > goto fail; > } > > - /* KVM triggers it, VFIO listens for it */ > - irqfd.resamplefd = event_notifier_get_fd(&vdev->intx.unmask); > - > - if (kvm_vm_ioctl(kvm_state, KVM_IRQFD, &irqfd)) { > + if (kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, > + &vdev->intx.interrupt, > + &vdev->intx.unmask, > + vdev->intx.route.irq)) { > error_setg_errno(errp, errno, "failed to setup resample irqfd"); > goto fail_irqfd; > } > > if (vfio_set_irq_signaling(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX, 0, > VFIO_IRQ_SET_ACTION_UNMASK, > - irqfd.resamplefd, &err)) { > + event_notifier_get_fd(&vdev->intx.unmask), > + &err)) { > error_propagate(errp, err); > goto fail_vfio; > } > @@ -177,12 +174,12 @@ static void vfio_intx_enable_kvm(VFIOPCIDevice *vdev, Error **errp) > return; > > fail_vfio: > - irqfd.flags = KVM_IRQFD_FLAG_DEASSIGN; > - kvm_vm_ioctl(kvm_state, KVM_IRQFD, &irqfd); > + kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &vdev->intx.interrupt, > + vdev->intx.route.irq); > fail_irqfd: > event_notifier_cleanup(&vdev->intx.unmask); > fail: > - qemu_set_fd_handler(irqfd.fd, vfio_intx_interrupt, NULL, vdev); > + qemu_set_fd_handler(irq_fd, vfio_intx_interrupt, NULL, vdev); > vfio_unmask_single_irqindex(&vdev->vbasedev, VFIO_PCI_INTX_IRQ_INDEX); > #endif > } > @@ -190,12 +187,6 @@ fail: > static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) > { > #ifdef CONFIG_KVM > - struct kvm_irqfd irqfd = { > - .fd = event_notifier_get_fd(&vdev->intx.interrupt), > - .gsi = vdev->intx.route.irq, > - .flags = KVM_IRQFD_FLAG_DEASSIGN, > - }; > - > if (!vdev->intx.kvm_accel) { > return; > } > @@ -209,7 +200,8 @@ static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) > pci_irq_deassert(&vdev->pdev); > > /* Tell KVM to stop listening for an INTx irqfd */ > - if (kvm_vm_ioctl(kvm_state, KVM_IRQFD, &irqfd)) { > + if (kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &vdev->intx.interrupt, > + vdev->intx.route.irq)) { > error_report("vfio: Error: Failed to disable INTx irqfd: %m"); > } > > @@ -217,7 +209,8 @@ static void vfio_intx_disable_kvm(VFIOPCIDevice *vdev) > event_notifier_cleanup(&vdev->intx.unmask); > > /* QEMU starts listening for interrupt events. */ > - qemu_set_fd_handler(irqfd.fd, vfio_intx_interrupt, NULL, vdev); > + qemu_set_fd_handler(event_notifier_get_fd(&vdev->intx.interrupt), > + vfio_intx_interrupt, NULL, vdev); > > vdev->intx.kvm_accel = false; >