{"id":811625,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811625/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-13-git-send-email-mst@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1504880304-12069-13-git-send-email-mst@redhat.com>","list_archive_url":null,"date":"2017-09-08T14:19:25","name":"[PULL,12/17] libvhost-user: support resuming vq->last_avail_idx based on used_idx","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ff8f43e344312223cdb32f1991f5893026d8f373","submitter":{"id":2235,"url":"http://patchwork.ozlabs.org/api/1.2/people/2235/?format=json","name":"Michael S. Tsirkin","email":"mst@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504880304-12069-13-git-send-email-mst@redhat.com/mbox/","series":[{"id":2227,"url":"http://patchwork.ozlabs.org/api/1.2/series/2227/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2227","date":"2017-09-08T14:18:52","name":"[PULL,01/17] vhost: Release memory references on cleanup","version":1,"mbox":"http://patchwork.ozlabs.org/series/2227/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811625/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811625/checks/","tags":{},"related":[],"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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mst@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 3xpffw0fyXz9s7G\n\tfor ;\n\tSat, 9 Sep 2017 00:22:48 +1000 (AEST)","from localhost ([::1]:45684 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dqKBC-0000ZT-4u\n\tfor incoming@patchwork.ozlabs.org; Fri, 08 Sep 2017 10:22:46 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49167)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dqK85-0006pB-B4\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dqK83-0005AE-7O\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:33 -0400","from mx1.redhat.com ([209.132.183.28]:47352)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dqK83-00059Z-07\n\tfor qemu-devel@nongnu.org; Fri, 08 Sep 2017 10:19:31 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 199C3C058EA8;\n\tFri, 8 Sep 2017 14:19:30 +0000 (UTC)","from redhat.com (ovpn-120-144.rdu2.redhat.com [10.10.120.144])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id CB38E6031B;\n\tFri, 8 Sep 2017 14:19:25 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 199C3C058EA8","Date":"Fri, 8 Sep 2017 17:19:25 +0300","From":"\"Michael S. Tsirkin\" ","To":"qemu-devel@nongnu.org","Message-ID":"<1504880304-12069-13-git-send-email-mst@redhat.com>","References":"<1504880304-12069-1-git-send-email-mst@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<1504880304-12069-1-git-send-email-mst@redhat.com>","X-Mutt-Fcc":"=sent","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tFri, 08 Sep 2017 14:19:30 +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] [PULL 12/17] 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":"Peter Maydell , Felipe Franciosi\n\t, Philippe =?utf-8?q?Mathieu-Daud=C3=A9?=\n\t, \tJens Freimann ,\n\t=?utf-8?q?Marc-Andr=C3=A9?= Lureau ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Marc-André Lureau \n\nThis is the same workaround as commit 523b018dde3b765, which was lost\nwith libvhost-user transition in commit e10e798c85c2331.\n\nSigned-off-by: Marc-André Lureau \nReviewed-by: Michael S. Tsirkin \nSigned-off-by: Michael S. Tsirkin \n---\n contrib/libvhost-user/libvhost-user.h | 7 +++++++\n contrib/libvhost-user/libvhost-user.c | 13 +++++++++++++\n 2 files changed, 20 insertions(+)","diff":"diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h\nindex 53ef222..4021f11 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_is_processed_in_order_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,12 @@ 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+ /*\n+ * If the queue is processed in order, in which case it will be\n+ * resumed to vring.used->idx. This can help to support resuming\n+ * on unmanaged exit/crash.\n+ */\n+ vu_queue_is_processed_in_order_cb queue_is_processed_in_order;\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 35fa0c5..d27d630 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_is_processed_in_order &&\n+ dev->iface->queue_is_processed_in_order(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":["PULL","12/17"]}