Commit 523b018d authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Michael S. Tsirkin
Browse files

tests/vhost-user-bridge: workaround stale vring base 



This patch is a similar solution to what Yuanhan Liu/Huawei Xie have
suggested for DPDK. When vubr quits (killed or crashed), a restart of
vubr would get stale vring base from QEMU. That would break the kernel
virtio net completely, making it non-work any more, unless a driver
reset is done.

So, instead of getting the stale vring base from QEMU, Huawei suggested
we could get a proper one from used->idx. This works because the queues
packets are processed in order.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Tested-by: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: default avatarYuanhan Liu <yuanhan.liu@linux.intel.com>
Reviewed-by: default avatarVictor Kaplansky <victork@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent aef8486e

tests/vhost-user-bridge.c

+7 −0
Original line number Diff line number Diff line
@@ -946,6 +946,13 @@ vubr_set_vring_addr_exec(VubrDev *dev, VhostUserMsg *vmsg) 
    DPRINT("    vring_avail at %p\n", vq->avail);



    vq->last_used_index = vq->used->idx;



    if (vq->last_avail_index != vq->used->idx) {

        DPRINT("Last avail index != used index: %d != %d, resuming",

               vq->last_avail_index, vq->used->idx);

        vq->last_avail_index = vq->used->idx;

    }



    return 0;

}