From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8oF6-0008LX-Qe for qemu-devel@nongnu.org; Mon, 12 Aug 2013 05:16:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8oF0-0001P1-Rv for qemu-devel@nongnu.org; Mon, 12 Aug 2013 05:16:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8oF0-0001Ov-J7 for qemu-devel@nongnu.org; Mon, 12 Aug 2013 05:16:42 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7C9Gf6S001621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 12 Aug 2013 05:16:41 -0400 Date: Mon, 12 Aug 2013 12:18:18 +0300 From: "Michael S. Tsirkin" Message-ID: <20130812091818.GA30401@redhat.com> References: <1376298489-13391-1-git-send-email-stefanha@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1376298489-13391-1-git-send-email-stefanha@redhat.com> Subject: Re: [Qemu-devel] [PATCH for-1.6] virtio: clear signalled_used_valid when switching from dataplane List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi Cc: Kevin Wolf , qemu-devel@nongnu.org On Mon, Aug 12, 2013 at 11:08:09AM +0200, Stefan Hajnoczi wrote: > When the dataplane thread stops, its vring.c implementation synchronizes > vring state back to virtio.c so we can continue emulating the virtio > device. > > This patch ensures that virtio.c's signalled_used_valid flag is reset so > that we do not suppress guest notifications due to stale signalled_used > values. > > Suggested-by: Kevin Wolf > Signed-off-by: Stefan Hajnoczi Good point Reviewed-by: Michael S. Tsirkin and we also need this for vhost.c right? > --- > hw/virtio/dataplane/vring.c | 1 + > hw/virtio/virtio.c | 5 +++++ > include/hw/virtio/virtio.h | 1 + > 3 files changed, 7 insertions(+) > > diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c > index 82cc151..351a343 100644 > --- a/hw/virtio/dataplane/vring.c > +++ b/hw/virtio/dataplane/vring.c > @@ -52,6 +52,7 @@ bool vring_setup(Vring *vring, VirtIODevice *vdev, int n) > void vring_teardown(Vring *vring, VirtIODevice *vdev, int n) > { > virtio_queue_set_last_avail_idx(vdev, n, vring->last_avail_idx); > + virtio_queue_invalidate_signalled_used(vdev, n); > > hostmem_finalize(&vring->hostmem); > } > diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c > index 09f62c6..706bdf4 100644 > --- a/hw/virtio/virtio.c > +++ b/hw/virtio/virtio.c > @@ -1059,6 +1059,11 @@ void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx) > vdev->vq[n].last_avail_idx = idx; > } > > +void virtio_queue_invalidate_signalled_used(VirtIODevice *vdev, int n) > +{ > + vdev->vq[n].signalled_used_valid = false; > +} > + > VirtQueue *virtio_get_queue(VirtIODevice *vdev, int n) > { > return vdev->vq + n; > diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h > index d7e9e0f..a90522d 100644 > --- a/include/hw/virtio/virtio.h > +++ b/include/hw/virtio/virtio.h > @@ -237,6 +237,7 @@ hwaddr virtio_queue_get_used_size(VirtIODevice *vdev, int n); > hwaddr virtio_queue_get_ring_size(VirtIODevice *vdev, int n); > uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n); > void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx); > +void virtio_queue_invalidate_signalled_used(VirtIODevice *vdev, int n); > VirtQueue *virtio_get_queue(VirtIODevice *vdev, int n); > uint16_t virtio_get_queue_index(VirtQueue *vq); > int virtio_queue_get_id(VirtQueue *vq); > -- > 1.8.3.1