{"id":807134,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807134/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170829144805.28872-2-marcandre.lureau@redhat.com>","date":"2017-08-29T14:48:04","name":"[1/2] libvhost-user: support resuming vq->last_avail_idx based on used_idx","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c69bcec60db74bbbda9f85d63db1b7cee21b5da3","submitter":{"id":66774,"url":"http://patchwork.ozlabs.org/api/1.0/people/66774/?format=json","name":"Marc-André Lureau","email":"marcandre.lureau@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170829144805.28872-2-marcandre.lureau@redhat.com/mbox/","series":[{"id":385,"url":"http://patchwork.ozlabs.org/api/1.0/series/385/?format=json","date":"2017-08-29T14:48:03","name":"vhost-user-bridge reconnect regression","version":1,"mbox":"http://patchwork.ozlabs.org/series/385/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807134/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=marcandre.lureau@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhWk45vy1z9t38\n\tfor ;\n\tWed, 30 Aug 2017 00:49:16 +1000 (AEST)","from localhost ([::1]:45323 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmhpK-0004SL-Mc\n\tfor incoming@patchwork.ozlabs.org; Tue, 29 Aug 2017 10:49:14 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33848)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmhoc-0004Qw-Et\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 10:48:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmhoW-0000zH-MP\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 10:48:30 -0400","from mx1.redhat.com ([209.132.183.28]:51138)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmhoW-0000ys-Fi\n\tfor qemu-devel@nongnu.org; Tue, 29 Aug 2017 10:48:24 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 66457356FC\n\tfor ; Tue, 29 Aug 2017 14:48:23 +0000 (UTC)","from localhost (ovpn-112-47.ams2.redhat.com [10.36.112.47])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 297FE6364A;\n\tTue, 29 Aug 2017 14:48:14 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 66457356FC","From":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ","To":"qemu-devel@nongnu.org","Date":"Tue, 29 Aug 2017 16:48:04 +0200","Message-Id":"<20170829144805.28872-2-marcandre.lureau@redhat.com>","In-Reply-To":"<20170829144805.28872-1-marcandre.lureau@redhat.com>","References":"<20170829144805.28872-1-marcandre.lureau@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.30]);\n\tTue, 29 Aug 2017 14:48:23 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH 1/2] libvhost-user: support resuming\n\tvq->last_avail_idx based on used_idx","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"=?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n\tvictork@redhat.com, mst@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This is the same workaround as commit 523b018dde3b765, which was lost\nwith libvhost-user transition in commit e10e798c85c2331.\n\nSigned-off-by: Marc-André Lureau \n---\n contrib/libvhost-user/libvhost-user.h | 5 +++++\n contrib/libvhost-user/libvhost-user.c | 13 +++++++++++++\n 2 files changed, 18 insertions(+)","diff":"diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h\nindex 53ef222c0b..aca71717c1 100644\n--- a/contrib/libvhost-user/libvhost-user.h\n+++ b/contrib/libvhost-user/libvhost-user.h\n@@ -132,6 +132,7 @@ typedef void (*vu_set_features_cb) (VuDev *dev, uint64_t features);\n typedef int (*vu_process_msg_cb) (VuDev *dev, VhostUserMsg *vmsg,\n int *do_reply);\n typedef void (*vu_queue_set_started_cb) (VuDev *dev, int qidx, bool started);\n+typedef bool (*vu_queue_resume_to_used_cb) (VuDev *dev, int qidx);\n \n typedef struct VuDevIface {\n /* called by VHOST_USER_GET_FEATURES to get the features bitmask */\n@@ -148,6 +149,10 @@ typedef struct VuDevIface {\n vu_process_msg_cb process_msg;\n /* tells when queues can be processed */\n vu_queue_set_started_cb queue_set_started;\n+ /* If the queue must be resumed to vring.used->idx. */\n+ /* This can help to support resuming on unmanaged exit/crash when\n+ * the slave/driver processes elements in order. */\n+ vu_queue_resume_to_used_cb queue_resume_to_used;\n } VuDevIface;\n \n typedef void (*vu_queue_handler_cb) (VuDev *dev, int qidx);\ndiff --git a/contrib/libvhost-user/libvhost-user.c b/contrib/libvhost-user/libvhost-user.c\nindex 35fa0c5e56..36439caed6 100644\n--- a/contrib/libvhost-user/libvhost-user.c\n+++ b/contrib/libvhost-user/libvhost-user.c\n@@ -521,6 +521,19 @@ vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)\n \n vq->used_idx = vq->vring.used->idx;\n \n+ if (vq->last_avail_idx != vq->used_idx) {\n+ bool resume = dev->iface->queue_resume_to_used &&\n+ dev->iface->queue_resume_to_used(dev, index);\n+\n+ DPRINT(\"Last avail index != used index: %u != %u%s\\n\",\n+ vq->last_avail_idx, vq->used_idx,\n+ resume ? \", resuming\" : \"\");\n+\n+ if (resume) {\n+ vq->shadow_avail_idx = vq->last_avail_idx = vq->used_idx;\n+ }\n+ }\n+\n return false;\n }\n \n","prefixes":["1/2"]}