diff mbox

[TRIVIAL,v2] libqos virtio: Increase ISR timeout

Message ID 1410428416-5046-1-git-send-email-marc.mari.barcelo@gmail.com
State New
Headers show

Commit Message

Marc Marí Sept. 11, 2014, 9:40 a.m. UTC
Increase the clock step to avoid Travis failure in some builds due to
overagressive timeout.

Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
---
 tests/libqos/virtio.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stefan Hajnoczi Sept. 12, 2014, 8:27 a.m. UTC | #1
On Thu, Sep 11, 2014 at 11:40:16AM +0200, Marc Marí wrote:
> Increase the clock step to avoid Travis failure in some builds due to
> overagressive timeout.
> 
> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
> ---
>  tests/libqos/virtio.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Peter Maydell Sept. 12, 2014, 8:30 a.m. UTC | #2
On 12 September 2014 09:27, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> On Thu, Sep 11, 2014 at 11:40:16AM +0200, Marc Marí wrote:
>> Increase the clock step to avoid Travis failure in some builds due to
>> overagressive timeout.
>>
>> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
>> ---
>>  tests/libqos/virtio.c |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Do you mind if I apply this directly to master to stop
travis grumbling at us on irc?

thanks
-- PMM
Peter Maydell Sept. 12, 2014, 1:24 p.m. UTC | #3
On 12 September 2014 09:30, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 12 September 2014 09:27, Stefan Hajnoczi <stefanha@redhat.com> wrote:
>> On Thu, Sep 11, 2014 at 11:40:16AM +0200, Marc Marí wrote:
>>> Increase the clock step to avoid Travis failure in some builds due to
>>> overagressive timeout.
>>>
>>> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
>>> ---
>>>  tests/libqos/virtio.c |    4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
>
> Do you mind if I apply this directly to master to stop
> travis grumbling at us on irc?

Applied to master, thanks.

-- PMM
Stefan Hajnoczi Sept. 15, 2014, 3:55 p.m. UTC | #4
On Fri, Sep 12, 2014 at 09:30:55AM +0100, Peter Maydell wrote:
> On 12 September 2014 09:27, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> > On Thu, Sep 11, 2014 at 11:40:16AM +0200, Marc Marí wrote:
> >> Increase the clock step to avoid Travis failure in some builds due to
> >> overagressive timeout.
> >>
> >> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
> >> ---
> >>  tests/libqos/virtio.c |    4 ++--
> >>  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> 
> Do you mind if I apply this directly to master to stop
> travis grumbling at us on irc?

No problem, especially when Kevin or I have already given a Reviewed-by:
or Acked-by:.
Peter Maydell Sept. 15, 2014, 9:47 p.m. UTC | #5
On 11 September 2014 02:40, Marc Marí <marc.mari.barcelo@gmail.com> wrote:
> Increase the clock step to avoid Travis failure in some builds due to
> overagressive timeout.
>
> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>

Unfortunately Travis is still failing with this:

ERROR:tests/virtio-blk-test.c:209:pci_basic: assertion failed:
(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq,
QVIRTIO_BLK_TIMEOUT))

GTester: last random seed: R02S490664995052f018e72f25518e90cb81

**

ERROR:tests/virtio-blk-test.c:578:pci_idx: assertion failed:
(qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq,
QVIRTIO_BLK_TIMEOUT))

GTester: last random seed: R02S5471c60ecfff4007d0adc9b0b7c265b6

thanks
-- PMM
Marc Marí Sept. 15, 2014, 10:17 p.m. UTC | #6
El Mon, 15 Sep 2014 14:47:41 -0700
Peter Maydell <peter.maydell@linaro.org> escribió:
> On 11 September 2014 02:40, Marc Marí <marc.mari.barcelo@gmail.com>
> wrote:
> > Increase the clock step to avoid Travis failure in some builds due
> > to overagressive timeout.
> >
> > Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
> 
> Unfortunately Travis is still failing with this:
> 
> ERROR:tests/virtio-blk-test.c:209:pci_basic: assertion failed:
> (qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq,
> QVIRTIO_BLK_TIMEOUT))
> 
> GTester: last random seed: R02S490664995052f018e72f25518e90cb81
> 
> **
> 
> ERROR:tests/virtio-blk-test.c:578:pci_idx: assertion failed:
> (qvirtio_wait_queue_isr(&qvirtio_pci, &dev->vdev, &vqpci->vq,
> QVIRTIO_BLK_TIMEOUT))
> 
> GTester: last random seed: R02S5471c60ecfff4007d0adc9b0b7c265b6
> 
> thanks
> -- PMM

This means agressive timeout is not the problem. The problem is the ISR
not being raised at all after sending a read or write request.

If this is the log of the failing case:
https://travis-ci.org/qemu/qemu/builds/35118444
(first time looking at Travis logs, not sure)

The difference between the one failing and the same arch not failing is:
brlapi support yes, linux AIO support yes, uuid support yes, licap-ng
support yes, virtio-blk-data-plane yes, vhdx yes (this configuration
fails).

The difference that is most likely to fail is virtio-blk-data-plane. So
we should start looking there.

Marc
Marc Marí Sept. 17, 2014, 4:04 p.m. UTC | #7
El Tue, 16 Sep 2014 00:17:57 +0200
Marc Marí <marc.mari.barcelo@gmail.com> escribió:
> 
> This means agressive timeout is not the problem. The problem is the
> ISR not being raised at all after sending a read or write request.
> 
> If this is the log of the failing case:
> https://travis-ci.org/qemu/qemu/builds/35118444
> (first time looking at Travis logs, not sure)
> 
> The difference between the one failing and the same arch not failing
> is: brlapi support yes, linux AIO support yes, uuid support yes,
> licap-ng support yes, virtio-blk-data-plane yes, vhdx yes (this
> configuration fails).

I have not been able to reproduce the bug. I have set a Ubuntu 14.04
x86_64, and I have the same configure parameters enabled (and the
libraries installed) as the log in Travis, but make check does not fail.

Any idea?

Marc
diff mbox

Patch

diff --git a/tests/libqos/virtio.c b/tests/libqos/virtio.c
index 128dbd0..9b6de2c 100644
--- a/tests/libqos/virtio.c
+++ b/tests/libqos/virtio.c
@@ -82,7 +82,7 @@  bool qvirtio_wait_queue_isr(const QVirtioBus *bus, QVirtioDevice *d,
                                             QVirtQueue *vq, uint64_t timeout)
 {
     do {
-        clock_step(10);
+        clock_step(100);
         if (bus->get_queue_isr_status(d, vq)) {
             break; /* It has ended */
         }
@@ -95,7 +95,7 @@  bool qvirtio_wait_config_isr(const QVirtioBus *bus, QVirtioDevice *d,
                                                             uint64_t timeout)
 {
     do {
-        clock_step(10);
+        clock_step(100);
         if (bus->get_config_isr_status(d)) {
             break; /* It has ended */
         }