From nobody Tue Feb 10 01:16:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603709795; cv=none; d=zohomail.com; s=zohoarc; b=bVfTGcu0X44ghSdLJJAP9rL+9Wvwi5xHi+JzNeYgxzRikA7FA/X7wK9Pzf6WIOqXStphakjo0RqjD6wQ7U8Ru8DrO5plEjcsJZIaPBCbv6S6wkjR4twFqGGRjgALQiARybLgwuZ0wKttkoTnezQit7uQQtvAp8h4BpgMgvZyp3Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603709795; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ydqt7ygZQ+vGx48L3P+H0ZAxD/ypFxd/RVZSJiZUfNY=; b=WPVzFXicavanSWGT1/m3mVFdVsf8AYFOPLy6y3CCGeMKQAhlXHhiVjcIdu2scyi/aR330pb7i8PO9h0cUlpxWOLPoAS6Ko9uubleRXBOcXbHisoL4m5x3tdyazbu+/0KhPMlDOACRATlqlYjHd4NsFk6t72tYVHipHlFXqedTXU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1603709795205981.0864295323261; Mon, 26 Oct 2020 03:56:35 -0700 (PDT) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-qV0OuJoHM72-O-RbqTInBQ-1; Mon, 26 Oct 2020 06:56:30 -0400 Received: by mail-wr1-f72.google.com with SMTP id j15so835803wro.4 for ; Mon, 26 Oct 2020 03:56:30 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (237.red-88-18-140.staticip.rima-tde.net. [88.18.140.237]) by smtp.gmail.com with ESMTPSA id b18sm560693wmj.41.2020.10.26.03.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Oct 2020 03:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603709794; 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=ydqt7ygZQ+vGx48L3P+H0ZAxD/ypFxd/RVZSJiZUfNY=; b=jLtDIb89LONPj/pHFtydONP8sLmeF1AUkmNHQTwV1turXLRgyDQ6rOEV3/TTYURL+oOLqR PsgU+EZReMRavwjDYcAvZwcJFIPVErJNS4UD5DRoTO+1OpA67+d0d+UpnsJulkTDgh5giC 7UCxisLjbj+FxtfaPHTlsFIVAVHesu4= X-MC-Unique: qV0OuJoHM72-O-RbqTInBQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ydqt7ygZQ+vGx48L3P+H0ZAxD/ypFxd/RVZSJiZUfNY=; b=LiCUMcOr2DpLhXg6aXBOYMtAc2Arcnk3DNMYlbnF0saqDrysV9/5OW0B+w0cpSiPZe OXhfnvTPomDMD3juMh3a7uQ5V/LLmQ9e3JXUeVpHTUd9+kUtsprrKdFPv7YAlUBESC6x beJrhRJBE6SzfR6/jXjFfVCfNa6lHtks/Yuid9/z32IRVt9sCJ2soafiYH1OxtKSfd9A hv5ZcNjjJ/qsW6ySn4ycsn9oo6B4Co5FFSrrjNVI2cpg6PNbg00Fm36Rv/4LKvelFi6H HtvMxc6QzbbzWNO2zsGYefMReGjj8A3dAwsDWovKkXjcSgLl9TKsLgAkXxzHk1HxnR2O 6jMw== X-Gm-Message-State: AOAM533HAgXfMq2QdqNs3SjGbzrJDhlqVVJCEKwTNRs3GHBqGfuondq5 0MNPdiJoTeGtmBu469bmg2PjChFQR1MgFSHEIGu+i4vf0DgHpVtoW1+4krd8h4Xj/qfPxkcFeZq SXFydsQW02cMaHg== X-Received: by 2002:a1c:2e0d:: with SMTP id u13mr15163895wmu.179.1603709789225; Mon, 26 Oct 2020 03:56:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxPFE5fIdETrd2j5V94vFl6M6DfV5yIMRzBqLdbfj1qvPlySncn2YE2eVEohtVt+EE23O6jNA== X-Received: by 2002:a1c:2e0d:: with SMTP id u13mr15163877wmu.179.1603709789067; Mon, 26 Oct 2020 03:56:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Eric Auger , Alex Williamson , qemu-block@nongnu.org, Fam Zheng , Max Reitz , Stefan Hajnoczi , Kevin Wolf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 17/19] util/vfio-helpers: Introduce qemu_vfio_pci_msix_set_irq() Date: Mon, 26 Oct 2020 11:55:02 +0100 Message-Id: <20201026105504.4023620-18-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201026105504.4023620-1-philmd@redhat.com> References: <20201026105504.4023620-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @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. Reviewed-by: Stefan Hajnoczi Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Eric Auger --- 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, EventNotifie= r *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); =20 #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, EventNoti= fier *e, return 0; } =20 +/** + * 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 =3D 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 =3D sizeof(*irq_set) + sizeof(int32_t); + irq_set =3D g_malloc0(irq_set_size); + /* Get to a known IRQ state */ + *irq_set =3D (struct vfio_irq_set) { + .argsz =3D irq_set_size, + .flags =3D VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER, + .index =3D VFIO_PCI_MSIX_IRQ_INDEX, + .start =3D irq_index, + .count =3D 1, + }; + ((int32_t *)&irq_set->data)[0] =3D fd; + r =3D 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 %"PRIu= 32" (asked: %u)" +qemu_vfio_pci_msix_set_irq(unsigned irq_index, int fd) "msix irq %u notifi= er_fd %d" qemu_vfio_iommu_iova_pgsizes(uint64_t iova_pgsizes) "iommu page size bitma= sk: 0x%08"PRIx64 qemu_vfio_pci_read_config(void *buf, int ofs, int size, uint64_t region_of= s, 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_o= fs, uint64_t region_size) "write cfg ptr %p ofs 0x%x size %d (region ofs 0x= %"PRIx64" size %"PRId64")" --=20 2.26.2