qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH 0/2] virtio-pci: fix abort when fail to allocate ioeventfd
@ 2012-03-13 10:42 Amos Kong
  2012-03-13 10:42 ` [Qemu-devel] [PATCH 1/2] return available ioeventfds count in kvm_has_many_ioeventfds() Amos Kong
                   ` (3 more replies)
  0 siblings, 4 replies; 24+ messages in thread
From: Amos Kong @ 2012-03-13 10:42 UTC (permalink / raw)
  To: aliguori, stefanha, kvm, mtosatti, qemu-devel, avi

Boot up guest with 232 virtio-blk disk, qemu will abort for fail to
allocate ioeventfd. This patchset changes kvm_has_many_ioeventfds(),
and check if available ioeventfd exists. If not, virtio-pci will
fallback to userspace, and don't use ioeventfd for io notification.

---

Amos Kong (2):
      return available ioeventfds count in kvm_has_many_ioeventfds()
      virtio-pci: fallback to userspace when there is no enough available ioeventfd


 hw/virtio-pci.c |    5 ++++-
 kvm-all.c       |    9 +++------
 2 files changed, 7 insertions(+), 7 deletions(-)

-- 
Amos Kong

^ permalink raw reply	[flat|nested] 24+ messages in thread
* [Qemu-devel] [PATCH 1/2] return available ioeventfds count in kvm_has_many_ioeventfds()
@ 2012-03-13 10:35 Amos Kong
  0 siblings, 0 replies; 24+ messages in thread
From: Amos Kong @ 2012-03-13 10:35 UTC (permalink / raw)
  To: aliguori, stefanha, kvm, mtosatti, qemu-devel, avi

Older kernels have a 6 device limit on the KVM io bus.
This patch makes kvm_has_many_ioeventfds() return available
ioeventfd count. ioeventfd will be disabled if there is
no 7 available ioeventfds.

Signed-off-by: Amos Kong <akong@redhat.com>
---
 hw/virtio-pci.c |    2 +-
 kvm-all.c       |    9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index a0fb7c1..d63f303 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -678,7 +678,7 @@ void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev)
     pci_register_bar(&proxy->pci_dev, 0, PCI_BASE_ADDRESS_SPACE_IO,
                      &proxy->bar);
 
-    if (!kvm_has_many_ioeventfds()) {
+    if (kvm_has_many_ioeventfds() != 7) {
         proxy->flags &= ~VIRTIO_PCI_FLAG_USE_IOEVENTFD;
     }
 
diff --git a/kvm-all.c b/kvm-all.c
index 3c6b4f0..d12694b 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -78,7 +78,6 @@ struct KVMState
     int pit_in_kernel;
     int pit_state2;
     int xsave, xcrs;
-    int many_ioeventfds;
     int irqchip_inject_ioctl;
 #ifdef KVM_CAP_IRQ_ROUTING
     struct kvm_irq_routing *irq_routes;
@@ -510,8 +509,8 @@ static int kvm_check_many_ioeventfds(void)
         }
     }
 
-    /* Decide whether many devices are supported or not */
-    ret = i == ARRAY_SIZE(ioeventfds);
+    /* If i equals to 7, many devices are supported */
+    ret = i;
 
     while (i-- > 0) {
         kvm_set_ioeventfd_pio_word(ioeventfds[i], 0, i, false);
@@ -1078,8 +1077,6 @@ int kvm_init(void)
     kvm_state = s;
     memory_listener_register(&kvm_memory_listener, NULL);
 
-    s->many_ioeventfds = kvm_check_many_ioeventfds();
-
     cpu_interrupt_handler = kvm_handle_interrupt;
 
     return 0;
@@ -1407,7 +1404,7 @@ int kvm_has_many_ioeventfds(void)
     if (!kvm_enabled()) {
         return 0;
     }
-    return kvm_state->many_ioeventfds;
+    return kvm_check_many_ioeventfds();
 }
 
 int kvm_has_gsi_routing(void)

^ permalink raw reply related	[flat|nested] 24+ messages in thread

end of thread, other threads:[~2012-03-19 10:11 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-13 10:42 [Qemu-devel] [PATCH 0/2] virtio-pci: fix abort when fail to allocate ioeventfd Amos Kong
2012-03-13 10:42 ` [Qemu-devel] [PATCH 1/2] return available ioeventfds count in kvm_has_many_ioeventfds() Amos Kong
2012-03-13 11:50   ` Jan Kiszka
2012-03-13 12:00     ` Amos Kong
2012-03-13 12:24       ` Jan Kiszka
2012-03-13 13:05         ` Amos Kong
2012-03-13 10:42 ` [Qemu-devel] [PATCH 2/2] virtio-pci: fallback to userspace when there is no enough available ioeventfd Amos Kong
2012-03-13 11:23 ` [Qemu-devel] [PATCH 0/2] virtio-pci: fix abort when fail to allocate ioeventfd Stefan Hajnoczi
2012-03-13 11:51   ` Amos Kong
2012-03-13 14:30     ` Stefan Hajnoczi
2012-03-13 14:47       ` Amos Kong
2012-03-13 16:36         ` Stefan Hajnoczi
2012-03-14  0:30           ` Amos Kong
2012-03-14  8:57             ` Stefan Hajnoczi
2012-03-14  9:22 ` Avi Kivity
2012-03-14  9:59   ` Stefan Hajnoczi
2012-03-14 10:05     ` Avi Kivity
2012-03-14 10:39       ` Stefan Hajnoczi
2012-03-14 10:46         ` Avi Kivity
2012-03-14 11:46           ` Stefan Hajnoczi
2012-03-16  8:59             ` Amos Kong
2012-03-19  8:21               ` Stefan Hajnoczi
2012-03-19 10:11               ` Avi Kivity
  -- strict thread matches above, loose matches on Subject: below --
2012-03-13 10:35 [Qemu-devel] [PATCH 1/2] return available ioeventfds count in kvm_has_many_ioeventfds() Amos Kong

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).