From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpuAS-0000Wu-Vq for qemu-devel@nongnu.org; Wed, 06 May 2015 03:54:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpuAN-0004E8-Kr for qemu-devel@nongnu.org; Wed, 06 May 2015 03:54:56 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:13353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpuAN-0004Du-Ce for qemu-devel@nongnu.org; Wed, 06 May 2015 03:54:51 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NNX00HBQ4NCE400@mailout3.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 06 May 2015 08:54:48 +0100 (BST) Received: from fedinw7x64 ([106.109.131.169]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NNX00MCP4NBFX90@eusync2.samsung.com> for qemu-devel@nongnu.org; Wed, 06 May 2015 08:54:48 +0100 (BST) From: Pavel Fedin Date: Wed, 06 May 2015 10:54:47 +0300 Message-id: <000b01d087d1$ec9f93a0$c5debae0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit Content-language: ru Subject: [Qemu-devel] [PATCH 3/4] virtio-mmio: start ioeventfd when status gets DRIVER_OK List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Ying-Shiuan Pan Signed-off-by: Pavel Fedin --- hw/virtio/virtio-mmio.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/hw/virtio/virtio-mmio.c b/hw/virtio/virtio-mmio.c index eab74ce..97a1fb0 100644 --- a/hw/virtio/virtio-mmio.c +++ b/hw/virtio/virtio-mmio.c @@ -118,7 +118,43 @@ static int virtio_mmio_set_host_notifier_internal(VirtIOMMIOProxy *proxy, } return r; } - + +static void virtio_mmio_start_ioeventfd(VirtIOMMIOProxy *proxy) +{ + VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus); + int n, r; + + if (proxy->ioeventfd_disabled || + proxy->ioeventfd_started) { + return; + } + + for (n = 0; n < VIRTIO_PCI_QUEUE_MAX; n++) { + if (!virtio_queue_get_num(vdev, n)) { + continue; + } + + r = virtio_mmio_set_host_notifier_internal(proxy, n, true, true); + if (r < 0) { + goto assign_error; + } + } + proxy->ioeventfd_started = true; + return; + +assign_error: + while (--n >= 0) { + if (!virtio_queue_get_num(vdev, n)) { + continue; + } + + r = virtio_mmio_set_host_notifier_internal(proxy, n, false, false); + assert(r >= 0); + } + proxy->ioeventfd_started = false; + error_report("%s: failed. Fallback to a userspace (slower).", __func__); +} + static void virtio_mmio_stop_ioeventfd(VirtIOMMIOProxy *proxy) { int r; @@ -317,7 +353,16 @@ static void virtio_mmio_write(void *opaque, hwaddr offset, uint64_t value, virtio_update_irq(vdev); break; case VIRTIO_MMIO_STATUS: + if (!(value & VIRTIO_CONFIG_S_DRIVER_OK)) { + virtio_mmio_stop_ioeventfd(proxy); + } + virtio_set_status(vdev, value & 0xff); + + if (value & VIRTIO_CONFIG_S_DRIVER_OK) { + virtio_mmio_start_ioeventfd(proxy); + } + if (vdev->status == 0) { virtio_reset(vdev); } -- 1.9.5.msysgit.0