From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39470) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHh-0005sz-Ct for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSyHe-0002wv-92 for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34130) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSyHe-0002wr-0Z for qemu-devel@nongnu.org; Thu, 28 Jul 2016 23:16:22 -0400 Date: Fri, 29 Jul 2016 06:16:19 +0300 From: "Michael S. Tsirkin" Message-ID: <1469762011-7902-22-git-send-email-mst@redhat.com> References: <1469762011-7902-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1469762011-7902-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 21/41] vhost: do not assert() on vhost_ops failure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?iso-8859-1?Q?Marc-Andr=E9?= Lureau From: Marc-Andr=E9 Lureau Calling a vhost operation may fail, for example with disconnected vhost-user backend, but qemu shouldn't abort in this case. Log an error instead, except on error and cleanup code paths where it can be mostly ignored. Let's use a VHOST_OPS_DEBUG macro to easily disable those messages once disconnected backend stabilizes. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost.c | 49 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index e3091d1..1ece1ef 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -27,6 +27,18 @@ #include "hw/virtio/virtio-access.h" #include "migration/migration.h" =20 +/* enabled until disconnected backend stabilizes */ +#define _VHOST_DEBUG 1 + +#ifdef _VHOST_DEBUG +#define VHOST_OPS_DEBUG(fmt, ...) \ + do { error_report(fmt ": %s (%d)", ## __VA_ARGS__, \ + strerror(errno), errno); } while (0) +#else +#define VHOST_OPS_DEBUG(fmt, ...) \ + do { } while (0) +#endif + static struct vhost_log *vhost_log; static struct vhost_log *vhost_log_shm; =20 @@ -400,7 +412,10 @@ static inline void vhost_dev_log_resize(struct vhost= _dev *dev, uint64_t size) /* inform backend of log switching, this must be done before releasing the current log, to ensure no logging is lost */ r =3D dev->vhost_ops->vhost_set_log_base(dev, log_base, log); - assert(r >=3D 0); + if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_log_base failed"); + } + vhost_log_put(dev, true); dev->log =3D log; dev->log_size =3D size; @@ -567,7 +582,9 @@ static void vhost_commit(MemoryListener *listener) =20 if (!dev->log_enabled) { r =3D dev->vhost_ops->vhost_set_mem_table(dev, dev->mem); - assert(r >=3D 0); + if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_mem_table failed"); + } dev->memory_changed =3D false; return; } @@ -580,7 +597,9 @@ static void vhost_commit(MemoryListener *listener) vhost_dev_log_resize(dev, log_size + VHOST_LOG_BUFFER); } r =3D dev->vhost_ops->vhost_set_mem_table(dev, dev->mem); - assert(r >=3D 0); + if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_mem_table failed"); + } /* To log less, can only decrease log size after table update. */ if (dev->log_size > log_size + VHOST_LOG_BUFFER) { vhost_dev_log_resize(dev, log_size); @@ -667,7 +686,7 @@ static int vhost_dev_set_features(struct vhost_dev *d= ev, bool enable_log) =20 static int vhost_dev_set_log(struct vhost_dev *dev, bool enable_log) { - int r, t, i, idx; + int r, i, idx; r =3D vhost_dev_set_features(dev, enable_log); if (r < 0) { goto err_features; @@ -684,12 +703,10 @@ static int vhost_dev_set_log(struct vhost_dev *dev,= bool enable_log) err_vq: for (; i >=3D 0; --i) { idx =3D dev->vhost_ops->vhost_get_vq_index(dev, dev->vq_index + = i); - t =3D vhost_virtqueue_set_addr(dev, dev->vqs + i, idx, - dev->log_enabled); - assert(t >=3D 0); + vhost_virtqueue_set_addr(dev, dev->vqs + i, idx, + dev->log_enabled); } - t =3D vhost_dev_set_features(dev, dev->log_enabled); - assert(t >=3D 0); + vhost_dev_set_features(dev, dev->log_enabled); err_features: return r; } @@ -929,15 +946,11 @@ static void vhost_virtqueue_stop(struct vhost_dev *= dev, * native as legacy devices expect so by default. */ if (vhost_needs_vring_endian(vdev)) { - r =3D vhost_virtqueue_set_vring_endian_legacy(dev, - !virtio_is_big_endia= n(vdev), - vhost_vq_index); - if (r < 0) { - error_report("failed to reset vring endianness"); - } + vhost_virtqueue_set_vring_endian_legacy(dev, + !virtio_is_big_endian(vd= ev), + vhost_vq_index); } =20 - assert (r >=3D 0); cpu_physical_memory_unmap(vq->ring, virtio_queue_get_ring_size(vdev,= idx), 0, virtio_queue_get_ring_size(vdev, idx)); cpu_physical_memory_unmap(vq->used, virtio_queue_get_used_size(vdev,= idx), @@ -1228,7 +1241,9 @@ void vhost_virtqueue_mask(struct vhost_dev *hdev, V= irtIODevice *vdev, int n, =20 file.index =3D hdev->vhost_ops->vhost_get_vq_index(hdev, n); r =3D hdev->vhost_ops->vhost_set_vring_call(hdev, &file); - assert(r >=3D 0); + if (r < 0) { + VHOST_OPS_DEBUG("vhost_set_vring_call failed"); + } } =20 uint64_t vhost_get_features(struct vhost_dev *hdev, const int *feature_b= its, --=20 MST