From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46641) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evPh1-0006NU-4v for qemu-devel@nongnu.org; Mon, 12 Mar 2018 11:49:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evPg7-0003gc-Ia for qemu-devel@nongnu.org; Mon, 12 Mar 2018 11:48:55 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:46781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evPg6-0003ay-Dm for qemu-devel@nongnu.org; Mon, 12 Mar 2018 11:47:59 -0400 Received: by mail-wr0-x244.google.com with SMTP id m12so16166098wrm.13 for ; Mon, 12 Mar 2018 08:47:58 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20180308195811.24894-22-dgilbert@redhat.com> References: <20180308195811.24894-1-dgilbert@redhat.com> <20180308195811.24894-22-dgilbert@redhat.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Mon, 12 Mar 2018 16:47:55 +0100 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v4 21/29] vhost+postcopy: Add vhost waker List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: QEMU , "Michael S. Tsirkin" , Maxime Coquelin , Peter Xu , Juan Quintela , Andrea Arcangeli On Thu, Mar 8, 2018 at 8:58 PM, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > Register a waker function in vhost-user code to be notified when > pages arrive or requests to previously mapped pages get requested. > > Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Marc-Andr=C3=A9 Lureau > --- > hw/virtio/trace-events | 3 +++ > hw/virtio/vhost-user.c | 30 ++++++++++++++++++++++++++++++ > 2 files changed, 33 insertions(+) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index 3afd12cfea..fe5e0ff856 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -13,6 +13,9 @@ vhost_user_postcopy_fault_handler_found(int i, uint64_t= region_offset, uint64_t > vhost_user_postcopy_listen(void) "" > vhost_user_set_mem_table_postcopy(uint64_t client_addr, uint64_t qhva, i= nt reply_i, int region_i) "client:0x%"PRIx64" for hva: 0x%"PRIx64" reply %d= region %d" > vhost_user_set_mem_table_withfd(int index, const char *name, uint64_t me= mory_size, uint64_t guest_phys_addr, uint64_t userspace_addr, uint64_t offs= et) "%d:%s: size:0x%"PRIx64" GPA:0x%"PRIx64" QVA/userspace:0x%"PRIx64" RB o= ffset:0x%"PRIx64 > +vhost_user_postcopy_waker(const char *rb, uint64_t rb_offset) "%s + 0x%"= PRIx64 > +vhost_user_postcopy_waker_found(uint64_t client_addr) "0x%"PRIx64 > +vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%= s + 0x%"PRIx64 > > # hw/virtio/virtio.c > virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned= out_num) "elem %p size %zd in_num %u out_num %u" > diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c > index e19b9ef9cf..b304bc475e 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -1006,6 +1006,35 @@ static int vhost_user_postcopy_fault_handler(struc= t PostCopyFD *pcfd, > return -1; > } > > +static int vhost_user_postcopy_waker(struct PostCopyFD *pcfd, RAMBlock *= rb, > + uint64_t offset) > +{ > + struct vhost_dev *dev =3D pcfd->data; > + struct vhost_user *u =3D dev->opaque; > + int i; > + > + trace_vhost_user_postcopy_waker(qemu_ram_get_idstr(rb), offset); > + > + if (!u) { > + return 0; > + } > + /* Translate the offset into an address in the clients address space= */ > + for (i =3D 0; i < MIN(dev->mem->nregions, u->region_rb_len); i++) { > + if (u->region_rb[i] =3D=3D rb && > + offset >=3D u->region_rb_offset[i] && > + offset < (u->region_rb_offset[i] + > + dev->mem->regions[i].memory_size)) { > + uint64_t client_addr =3D (offset - u->region_rb_offset[i]) + > + u->postcopy_client_bases[i]; > + trace_vhost_user_postcopy_waker_found(client_addr); > + return postcopy_wake_shared(pcfd, client_addr, rb); > + } > + } > + > + trace_vhost_user_postcopy_waker_nomatch(qemu_ram_get_idstr(rb), offs= et); > + return 0; > +} > + > /* > * Called at the start of an inbound postcopy on reception of the > * 'advise' command. > @@ -1051,6 +1080,7 @@ static int vhost_user_postcopy_advise(struct vhost_= dev *dev, Error **errp) > u->postcopy_fd.fd =3D ufd; > u->postcopy_fd.data =3D dev; > u->postcopy_fd.handler =3D vhost_user_postcopy_fault_handler; > + u->postcopy_fd.waker =3D vhost_user_postcopy_waker; > u->postcopy_fd.idstr =3D "vhost-user"; /* Need to find unique name *= / > postcopy_register_shared_ufd(&u->postcopy_fd); > return 0; > -- > 2.14.3 > > --=20 Marc-Andr=C3=A9 Lureau