From: Alex Williamson <alex.williamson@redhat.com> To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, kvm@vger.kernel.org Subject: [RFC PATCH 2/5] vfio/quirks: Add generic support for ioveventfds Date: Tue, 06 Feb 2018 17:26:23 -0700 [thread overview] Message-ID: <20180207002623.1156.71094.stgit@gimli.home> (raw) In-Reply-To: <20180207001615.1156.10547.stgit@gimli.home> We might wish to handle some quirks via ioeventfds, add a list of ioeventfds to the quirk. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> --- hw/vfio/pci-quirks.c | 17 +++++++++++++++++ hw/vfio/pci.h | 11 +++++++++++ 2 files changed, 28 insertions(+) diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 10af23217292..e4cf4ea2dd9c 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/range.h" #include "qapi/error.h" #include "qapi/visitor.h" @@ -278,12 +279,24 @@ static const MemoryRegionOps vfio_ati_3c3_quirk = { static VFIOQuirk *vfio_quirk_alloc(int nr_mem) { VFIOQuirk *quirk = g_malloc0(sizeof(*quirk)); + QLIST_INIT(&quirk->ioeventfds); quirk->mem = g_new0(MemoryRegion, nr_mem); quirk->nr_mem = nr_mem; return quirk; } +static void vfio_ioeventfd_exit(VFIOIOEventFD *ioeventfd) +{ + QLIST_REMOVE(ioeventfd, next); + memory_region_del_eventfd(ioeventfd->mr, ioeventfd->addr, ioeventfd->size, + ioeventfd->match_data, ioeventfd->data, + &ioeventfd->e); + qemu_set_fd_handler(event_notifier_get_fd(&ioeventfd->e), NULL, NULL, NULL); + event_notifier_cleanup(&ioeventfd->e); + g_free(ioeventfd); +} + static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev) { VFIOQuirk *quirk; @@ -1668,6 +1681,10 @@ void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr) int i; QLIST_FOREACH(quirk, &bar->quirks, next) { + while (!QLIST_EMPTY(&quirk->ioeventfds)) { + vfio_ioeventfd_exit(QLIST_FIRST(&quirk->ioeventfds)); + } + for (i = 0; i < quirk->nr_mem; i++) { memory_region_del_subregion(bar->region.mem, &quirk->mem[i]); } diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index f4aa13e021fa..146065c2f715 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -24,9 +24,20 @@ struct VFIOPCIDevice; +typedef struct VFIOIOEventFD { + QLIST_ENTRY(VFIOIOEventFD) next; + MemoryRegion *mr; + hwaddr addr; + unsigned size; + bool match_data; + uint64_t data; + EventNotifier e; +} VFIOIOEventFD; + typedef struct VFIOQuirk { QLIST_ENTRY(VFIOQuirk) next; void *data; + QLIST_HEAD(, VFIOIOEventFD) ioeventfds; int nr_mem; MemoryRegion *mem; } VFIOQuirk;
WARNING: multiple messages have this Message-ID (diff)
From: Alex Williamson <alex.williamson@redhat.com> To: qemu-devel@nongnu.org Cc: alex.williamson@redhat.com, kvm@vger.kernel.org Subject: [Qemu-devel] [RFC PATCH 2/5] vfio/quirks: Add generic support for ioveventfds Date: Tue, 06 Feb 2018 17:26:23 -0700 [thread overview] Message-ID: <20180207002623.1156.71094.stgit@gimli.home> (raw) In-Reply-To: <20180207001615.1156.10547.stgit@gimli.home> We might wish to handle some quirks via ioeventfds, add a list of ioeventfds to the quirk. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> --- hw/vfio/pci-quirks.c | 17 +++++++++++++++++ hw/vfio/pci.h | 11 +++++++++++ 2 files changed, 28 insertions(+) diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c index 10af23217292..e4cf4ea2dd9c 100644 --- a/hw/vfio/pci-quirks.c +++ b/hw/vfio/pci-quirks.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/main-loop.h" #include "qemu/range.h" #include "qapi/error.h" #include "qapi/visitor.h" @@ -278,12 +279,24 @@ static const MemoryRegionOps vfio_ati_3c3_quirk = { static VFIOQuirk *vfio_quirk_alloc(int nr_mem) { VFIOQuirk *quirk = g_malloc0(sizeof(*quirk)); + QLIST_INIT(&quirk->ioeventfds); quirk->mem = g_new0(MemoryRegion, nr_mem); quirk->nr_mem = nr_mem; return quirk; } +static void vfio_ioeventfd_exit(VFIOIOEventFD *ioeventfd) +{ + QLIST_REMOVE(ioeventfd, next); + memory_region_del_eventfd(ioeventfd->mr, ioeventfd->addr, ioeventfd->size, + ioeventfd->match_data, ioeventfd->data, + &ioeventfd->e); + qemu_set_fd_handler(event_notifier_get_fd(&ioeventfd->e), NULL, NULL, NULL); + event_notifier_cleanup(&ioeventfd->e); + g_free(ioeventfd); +} + static void vfio_vga_probe_ati_3c3_quirk(VFIOPCIDevice *vdev) { VFIOQuirk *quirk; @@ -1668,6 +1681,10 @@ void vfio_bar_quirk_exit(VFIOPCIDevice *vdev, int nr) int i; QLIST_FOREACH(quirk, &bar->quirks, next) { + while (!QLIST_EMPTY(&quirk->ioeventfds)) { + vfio_ioeventfd_exit(QLIST_FIRST(&quirk->ioeventfds)); + } + for (i = 0; i < quirk->nr_mem; i++) { memory_region_del_subregion(bar->region.mem, &quirk->mem[i]); } diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index f4aa13e021fa..146065c2f715 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -24,9 +24,20 @@ struct VFIOPCIDevice; +typedef struct VFIOIOEventFD { + QLIST_ENTRY(VFIOIOEventFD) next; + MemoryRegion *mr; + hwaddr addr; + unsigned size; + bool match_data; + uint64_t data; + EventNotifier e; +} VFIOIOEventFD; + typedef struct VFIOQuirk { QLIST_ENTRY(VFIOQuirk) next; void *data; + QLIST_HEAD(, VFIOIOEventFD) ioeventfds; int nr_mem; MemoryRegion *mem; } VFIOQuirk;
next prev parent reply other threads:[~2018-02-07 0:26 UTC|newest] Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-07 0:26 [RFC PATCH 0/5] vfio: ioeventfd support Alex Williamson 2018-02-07 0:26 ` [Qemu-devel] " Alex Williamson 2018-02-07 0:26 ` [RFC PATCH 1/5] vfio/quirks: Add common quirk alloc helper Alex Williamson 2018-02-07 0:26 ` [Qemu-devel] " Alex Williamson 2018-02-08 11:10 ` Auger Eric 2018-02-08 11:10 ` [Qemu-devel] " Auger Eric 2018-02-08 18:28 ` Alex Williamson 2018-02-08 18:28 ` [Qemu-devel] " Alex Williamson 2018-02-07 0:26 ` Alex Williamson [this message] 2018-02-07 0:26 ` [Qemu-devel] [RFC PATCH 2/5] vfio/quirks: Add generic support for ioveventfds Alex Williamson 2018-02-08 11:11 ` Auger Eric 2018-02-08 11:11 ` [Qemu-devel] " Auger Eric 2018-02-08 18:33 ` Alex Williamson 2018-02-08 18:33 ` [Qemu-devel] " Alex Williamson 2018-02-08 20:37 ` Auger Eric 2018-02-07 0:26 ` [RFC PATCH 3/5] vfio/quirks: Automatic ioeventfd enabling for NVIDIA BAR0 quirks Alex Williamson 2018-02-07 0:26 ` [Qemu-devel] " Alex Williamson 2018-02-08 11:10 ` Auger Eric 2018-02-08 11:10 ` [Qemu-devel] " Auger Eric 2018-02-08 11:33 ` Auger Eric 2018-02-08 18:24 ` Alex Williamson 2018-02-08 18:24 ` [Qemu-devel] " Alex Williamson 2018-02-08 20:52 ` Auger Eric 2018-02-08 20:52 ` [Qemu-devel] " Auger Eric 2018-02-07 0:26 ` [RFC PATCH 4/5] vfio: Update linux header Alex Williamson 2018-02-07 0:26 ` [Qemu-devel] " Alex Williamson 2018-02-07 0:26 ` [RFC PATCH 5/5] vfio/quirks: Enable ioeventfd quirks to be handled by vfio directly Alex Williamson 2018-02-07 0:26 ` [Qemu-devel] " Alex Williamson 2018-02-08 11:42 ` Auger Eric 2018-02-08 11:42 ` [Qemu-devel] " Auger Eric 2018-02-08 18:41 ` Alex Williamson 2018-02-08 18:41 ` [Qemu-devel] " Alex Williamson 2018-02-09 7:11 ` Peter Xu 2018-02-09 22:09 ` Alex Williamson 2018-02-11 2:38 ` Peter Xu
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=20180207002623.1156.71094.stgit@gimli.home \ --to=alex.williamson@redhat.com \ --cc=kvm@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.