From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYd47-0003BQ-Oo for qemu-devel@nongnu.org; Mon, 29 Sep 2014 11:40:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XYd42-0004cm-Bj for qemu-devel@nongnu.org; Mon, 29 Sep 2014 11:40:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23148) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XYd41-0004bC-IZ for qemu-devel@nongnu.org; Mon, 29 Sep 2014 11:40:37 -0400 From: Stefan Hajnoczi Date: Mon, 29 Sep 2014 16:40:12 +0100 Message-Id: <1412005212-18266-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1412005212-18266-1-git-send-email-stefanha@redhat.com> References: <1412005212-18266-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 2/2] libqos: use microseconds instead of iterations for virtio timeout List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marc.mari.barcelo@gmail.com, Peter Maydell , Andreas Faerber , Stefan Hajnoczi Some hosts are slow or overloaded so test execution takes a long time. Test cases use timeouts to protect against an infinite loop stalling the test forever (especially important in automated test setups). Commit 6cd14054b67774cc58a51fca6660cfa1d3c08059 ("libqos virtio: Increase ISR timeout") increased the clock_step() value in an attempt to lengthen the virtio interrupt wait timeout, but timeout failures are still occuring on the Travis automated testing platform. This is because clock_step() only affects the guest's virtual time. Virtio requests can be bottlenecked on host disk I/O latency - which cannot be improved by stepping the clock, so the fix was ineffective. This patch changes the qvirtio_wait_queue_isr() and qvirtio_wait_config_isr() timeout mechanism from loop iterations to microseconds. This way the test case can specify an absolute 30 second timeout. Number of loop iterations is not a reliable timeout mechanism since the speed depends on many factors including host performance. Tests should no longer timeout on overloaded Travis instances. Cc: Marc Mar=C3=AD Reported-by: Peter Maydell Signed-off-by: Stefan Hajnoczi --- tests/libqos/virtio.c | 30 ++++++++++++++++-------------- tests/libqos/virtio.h | 8 ++++---- tests/virtio-blk-test.c | 47 ++++++++++++++++++++++---------------------= ---- 3 files changed, 42 insertions(+), 43 deletions(-) diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c index 009325d..a061289 100644 --- a/tests/libqos/virtio.c +++ b/tests/libqos/virtio.c @@ -78,17 +78,18 @@ void qvirtio_set_driver_ok(const QVirtioBus *bus, QVi= rtioDevice *d) QVIRTIO_DRIVER_OK | QVIRTIO_DRIVER | QVIRTIO_ACKNOWLEDGE= ); } =20 -bool qvirtio_wait_queue_isr(const QVirtioBus *bus, QVirtioDevice *d, - QVirtQueue *vq, uint64_t tim= eout) +void qvirtio_wait_queue_isr(const QVirtioBus *bus, QVirtioDevice *d, + QVirtQueue *vq, gint64 timeout_us) { - do { + gint64 start_time =3D g_get_monotonic_time(); + + for (;;) { clock_step(100); if (bus->get_queue_isr_status(d, vq)) { - break; /* It has ended */ + return; } - } while (--timeout); - - return timeout !=3D 0; + g_assert(g_get_monotonic_time() - start_time <=3D timeout_us); + } } =20 /* Wait for the status byte at given guest memory address to be set @@ -113,17 +114,18 @@ uint8_t qvirtio_wait_status_byte_no_isr(const QVirt= ioBus *bus, return val; } =20 -bool qvirtio_wait_config_isr(const QVirtioBus *bus, QVirtioDevice *d, - uint64_t tim= eout) +void qvirtio_wait_config_isr(const QVirtioBus *bus, QVirtioDevice *d, + gint64 timeout_us) { - do { + gint64 start_time =3D g_get_monotonic_time(); + + for (;;) { clock_step(100); if (bus->get_config_isr_status(d)) { - break; /* It has ended */ + return; } - } while (--timeout); - - return timeout !=3D 0; + g_assert(g_get_monotonic_time() - start_time <=3D timeout_us); + } } =20 void qvring_init(const QGuestAllocator *alloc, QVirtQueue *vq, uint64_t = addr) diff --git a/tests/libqos/virtio.h b/tests/libqos/virtio.h index bc7518e..29fbacb 100644 --- a/tests/libqos/virtio.h +++ b/tests/libqos/virtio.h @@ -160,15 +160,15 @@ void qvirtio_set_acknowledge(const QVirtioBus *bus,= QVirtioDevice *d); void qvirtio_set_driver(const QVirtioBus *bus, QVirtioDevice *d); void qvirtio_set_driver_ok(const QVirtioBus *bus, QVirtioDevice *d); =20 -bool qvirtio_wait_queue_isr(const QVirtioBus *bus, QVirtioDevice *d, - QVirtQueue *vq, uint64_t tim= eout); +void qvirtio_wait_queue_isr(const QVirtioBus *bus, QVirtioDevice *d, + QVirtQueue *vq, gint64 timeout_us); uint8_t qvirtio_wait_status_byte_no_isr(const QVirtioBus *bus, QVirtioDevice *d, QVirtQueue *vq, uint64_t addr, gint64 timeout_us); -bool qvirtio_wait_config_isr(const QVirtioBus *bus, QVirtioDevice *d, - uint64_t tim= eout); +void qvirtio_wait_config_isr(const QVirtioBus *bus, QVirtioDevice *d, + gint64 timeout_us); QVirtQueue *qvirtqueue_setup(const QVirtioBus *bus, QVirtioDevice *d, QGuestAllocator *alloc, uint16_t= index); =20 diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 0e3bfa7..5ce6e79 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -41,7 +41,6 @@ #define QVIRTIO_BLK_T_GET_ID 8 =20 #define TEST_IMAGE_SIZE (64 * 1024 * 1024) -#define QVIRTIO_BLK_TIMEOUT 100 #define QVIRTIO_BLK_TIMEOUT_US (30 * 1000 * 1000) #define PCI_SLOT 0x04 #define PCI_FN 0x00 @@ -184,8 +183,8 @@ static void pci_basic(void) qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -206,8 +205,8 @@ static void pci_basic(void) =20 qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -234,8 +233,8 @@ static void pci_basic(void) =20 qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -257,8 +256,8 @@ static void pci_basic(void) =20 qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -330,8 +329,8 @@ static void pci_indirect(void) free_head =3D qvirtqueue_add_indirect(&vqpci->vq, indirect); qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -355,8 +354,8 @@ static void pci_indirect(void) free_head =3D qvirtqueue_add_indirect(&vqpci->vq, indirect); qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); =20 @@ -397,8 +396,7 @@ static void pci_config(void) =20 qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0',= " " 'size': %d } }", n= _size); - g_assert(qvirtio_wait_config_isr(&qvirtio_pci, &dev->vdev, - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_config_isr(&qvirtio_pci, &dev->vdev, QVIRTIO_BLK_TIMEOU= T_US); =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, addr); g_assert_cmpint(capacity, =3D=3D, n_size / 512); @@ -453,8 +451,7 @@ static void pci_msix(void) qmp("{ 'execute': 'block_resize', 'arguments': { 'device': 'drive0',= " " 'size': %d } }", n= _size); =20 - g_assert(qvirtio_wait_config_isr(&qvirtio_pci, &dev->vdev, - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_config_isr(&qvirtio_pci, &dev->vdev, QVIRTIO_BLK_TIMEOU= T_US); =20 capacity =3D qvirtio_config_readq(&qvirtio_pci, &dev->vdev, addr); g_assert_cmpint(capacity, =3D=3D, n_size / 512); @@ -474,8 +471,8 @@ static void pci_msix(void) qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -498,8 +495,8 @@ static void pci_msix(void) qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); @@ -575,8 +572,8 @@ static void pci_idx(void) qvirtqueue_add(&vqpci->vq, req_addr + 528, 1, true, false); qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); =20 /* Write request */ req.type =3D QVIRTIO_BLK_T_OUT; @@ -619,8 +616,8 @@ static void pci_idx(void) qvirtqueue_kick(&qvirtio_pci, &dev->vdev, &vqpci->vq, free_head); =20 =20 - g_assert(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq= , - QVIRTIO_BLK_TIME= OUT)); + qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq, + QVIRTIO_BLK_TIMEOUT_US); =20 status =3D readb(req_addr + 528); g_assert_cmpint(status, =3D=3D, 0); --=20 1.9.3