From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdwnV-0003Fc-AY for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:50:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdwnS-00029G-4I for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:50:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdwnR-00026M-P8 for qemu-devel@nongnu.org; Mon, 21 Sep 2015 04:50:02 -0400 Date: Mon, 21 Sep 2015 11:49:57 +0300 From: "Michael S. Tsirkin" Message-ID: <20150921114747-mutt-send-email-mst@redhat.com> References: <1442657533-13030-1-git-send-email-marcandre.lureau@redhat.com> <1442657533-13030-12-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1442657533-13030-12-git-send-email-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 11/22] vhost-user: send log shm fd along with log_base List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com Cc: haifeng.lin@huawei.com, thibaut.collet@6wind.com, jasowang@redhat.com, qemu-devel@nongnu.org, pbonzini@redhat.com On Sat, Sep 19, 2015 at 12:12:02PM +0200, marcandre.lureau@redhat.com wro= te: > From: Marc-Andr=E9 Lureau >=20 > Send the shm for the dirty pages logging if the backend supports > VHOST_USER_PROTOCOL_F_LOG_SHMFD. >=20 > Signed-off-by: Marc-Andr=E9 Lureau > --- > hw/virtio/vhost-backend.c | 3 ++- > hw/virtio/vhost-user.c | 17 ++++++++++++++--- > hw/virtio/vhost.c | 5 +++-- > include/hw/virtio/vhost-backend.h | 4 +++- > 4 files changed, 22 insertions(+), 7 deletions(-) >=20 > diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c > index bf2d1d4..3f2d6ea 100644 > --- a/hw/virtio/vhost-backend.c > +++ b/hw/virtio/vhost-backend.c > @@ -66,7 +66,8 @@ static int vhost_scsi_get_abi_version(struct vhost_de= v *dev, int *version) > return vhost_kernel_call(dev, VHOST_SCSI_GET_ABI_VERSION, version)= ; > } > =20 > -static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base) > +static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base, > + struct vhost_log *log) > { > return vhost_kernel_call(dev, VHOST_SET_LOG_BASE, &base); > } > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index d3334f5..3cb5559 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -26,7 +26,9 @@ > #define VHOST_MEMORY_MAX_NREGIONS 8 > =20 > #define VHOST_USER_F_PROTOCOL_FEATURES 30 > -#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x0ULL > + > +#define VHOST_USER_PROTOCOL_FEATURE_MASK 0x1ULL > +#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 0 > =20 > typedef enum VhostUserRequest { > VHOST_USER_NONE =3D 0, > @@ -182,8 +184,11 @@ static int vhost_scsi_get_abi_version(struct vhost= _dev *dev, int *version) > return -1; > } > =20 > -static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base) > +static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base, > + struct vhost_log *log) > { > + int fds[VHOST_MEMORY_MAX_NREGIONS]; > + size_t fd_num =3D 0; > VhostUserMsg msg =3D { > .request =3D VHOST_USER_SET_LOG_BASE, > .flags =3D VHOST_USER_VERSION, > @@ -191,7 +196,13 @@ static int vhost_set_log_base(struct vhost_dev *de= v, uint64_t base) > .size =3D sizeof(m.u64), > }; > =20 > - vhost_user_write(dev, &msg, NULL, 0); > + if (virtio_has_feature(dev->protocol_features, > + VHOST_USER_PROTOCOL_F_LOG_SHMFD) && > + log->fd !=3D -1) { > + fds[fd_num++] =3D log->fd; > + } > + > + vhost_user_write(dev, &msg, fds, fd_num); > =20 > return 0; > } Doesn't this one have to get a response? Otherwise the other side might still be using the old buffer after we've updated this one. Probably need a protocol feature, but I guess we can reuse VHOST_USER_PROTOCOL_F_LOG_SHMFD - IIUC logging doesn't work without this anyway ... > diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c > index 83ef164..0fa7b69 100644 > --- a/hw/virtio/vhost.c > +++ b/hw/virtio/vhost.c > @@ -359,7 +359,7 @@ static inline void vhost_dev_log_resize(struct vhos= t_dev* dev, uint64_t size) > =20 > /* 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); > + r =3D dev->vhost_ops->vhost_set_log_base(dev, log_base, log); > assert(r >=3D 0); > vhost_log_put(dev, true); > dev->log =3D log; > @@ -1167,7 +1167,8 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtI= ODevice *vdev) > hdev->log =3D vhost_log_get(hdev->log_size, share); > log_base =3D (uintptr_t)hdev->log->log; > r =3D hdev->vhost_ops->vhost_set_log_base(hdev, > - hdev->log_size ? log_b= ase : 0); > + hdev->log_size ? log_b= ase : 0, > + hdev->log); > if (r < 0) { > r =3D -errno; > goto fail_log; > diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhos= t-backend.h > index 42cfb87..a87f0b3 100644 > --- a/include/hw/virtio/vhost-backend.h > +++ b/include/hw/virtio/vhost-backend.h > @@ -20,6 +20,7 @@ typedef enum VhostBackendType { > =20 > struct vhost_dev; > struct vhost_memory; > +struct vhost_log; > struct vhost_vring_file; > struct vhost_vring_state; > struct vhost_vring_addr; > @@ -36,7 +37,8 @@ typedef int (*vhost_scsi_clear_endpoint_op)(struct vh= ost_dev *dev, > struct vhost_scsi_target *= target); > typedef int (*vhost_scsi_get_abi_version_op)(struct vhost_dev *dev, > int *version); > -typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t b= ase); > +typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t b= ase, > + struct vhost_log *log); > typedef int (*vhost_set_mem_table_op)(struct vhost_dev *dev, > struct vhost_memory *mem); > typedef int (*vhost_set_vring_addr_op)(struct vhost_dev *dev, > --=20 > 2.4.3