From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ey7md-0006zb-OJ for qemu-devel@nongnu.org; Mon, 19 Mar 2018 23:17:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ey7mc-0008Lb-FS for qemu-devel@nongnu.org; Mon, 19 Mar 2018 23:17:55 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:51864 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ey7mc-0008LP-9o for qemu-devel@nongnu.org; Mon, 19 Mar 2018 23:17:54 -0400 Date: Tue, 20 Mar 2018 05:17:53 +0200 From: "Michael S. Tsirkin" Message-ID: <1521515720-612046-38-git-send-email-mst@redhat.com> References: <1521515720-612046-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1521515720-612046-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL v2 37/50] vhost+postcopy: Stash RAMBlock and offset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , "Dr. David Alan Gilbert" , =?utf-8?Q?Marc-Andr=C3=A9?= Lureau From: "Dr. David Alan Gilbert" Stash the RAMBlock and offset for later use looking up addresses. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user.c | 34 ++++++++++++++++++++++++++++++++++ hw/virtio/trace-events | 1 + 2 files changed, 35 insertions(+) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 1603d70..b47de62 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -175,6 +175,15 @@ struct vhost_user { NotifierWithReturn postcopy_notifier; struct PostCopyFD postcopy_fd; uint64_t postcopy_client_bases[VHOST_MEMORY_MAX_NREGIONS]; + /* Length of the region_rb and region_rb_offset arrays */ + size_t region_rb_len; + /* RAMBlock associated with a given region */ + RAMBlock **region_rb; + /* The offset from the start of the RAMBlock to the start of the + * vhost region. + */ + ram_addr_t *region_rb_offset; + /* True once we've entered postcopy_listen */ bool postcopy_listen; }; @@ -362,6 +371,17 @@ static int vhost_user_set_mem_table_postcopy(struct = vhost_dev *dev, msg.hdr.flags |=3D VHOST_USER_NEED_REPLY_MASK; } =20 + if (u->region_rb_len < dev->mem->nregions) { + u->region_rb =3D g_renew(RAMBlock*, u->region_rb, dev->mem->nreg= ions); + u->region_rb_offset =3D g_renew(ram_addr_t, u->region_rb_offset, + dev->mem->nregions); + memset(&(u->region_rb[u->region_rb_len]), '\0', + sizeof(RAMBlock *) * (dev->mem->nregions - u->region_rb_l= en)); + memset(&(u->region_rb_offset[u->region_rb_len]), '\0', + sizeof(ram_addr_t) * (dev->mem->nregions - u->region_rb_l= en)); + u->region_rb_len =3D dev->mem->nregions; + } + for (i =3D 0; i < dev->mem->nregions; ++i) { struct vhost_memory_region *reg =3D dev->mem->regions + i; ram_addr_t offset; @@ -372,6 +392,12 @@ static int vhost_user_set_mem_table_postcopy(struct = vhost_dev *dev, &offset); fd =3D memory_region_get_fd(mr); if (fd > 0) { + trace_vhost_user_set_mem_table_withfd(fd_num, mr->name, + reg->memory_size, + reg->guest_phys_addr, + reg->userspace_addr, o= ffset); + u->region_rb_offset[i] =3D offset; + u->region_rb[i] =3D mr->ram_block; msg.payload.memory.regions[fd_num].userspace_addr =3D reg->userspace_addr; msg.payload.memory.regions[fd_num].memory_size =3D reg->mem= ory_size; @@ -380,6 +406,9 @@ static int vhost_user_set_mem_table_postcopy(struct v= host_dev *dev, msg.payload.memory.regions[fd_num].mmap_offset =3D offset; assert(fd_num < VHOST_MEMORY_MAX_NREGIONS); fds[fd_num++] =3D fd; + } else { + u->region_rb_offset[i] =3D 0; + u->region_rb[i] =3D NULL; } } =20 @@ -1148,6 +1177,11 @@ static int vhost_user_cleanup(struct vhost_dev *de= v) close(u->slave_fd); u->slave_fd =3D -1; } + g_free(u->region_rb); + u->region_rb =3D NULL; + g_free(u->region_rb_offset); + u->region_rb_offset =3D NULL; + u->region_rb_len =3D 0; g_free(u); dev->opaque =3D 0; =20 diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index 05d18ad..d7e9e10 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -9,6 +9,7 @@ vhost_section(const char *name, int r) "%s:%d" # hw/virtio/vhost-user.c 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 of= fset) "%d:%s: size:0x%"PRIx64" GPA:0x%"PRIx64" QVA/userspace:0x%"PRIx64" = RB offset:0x%"PRIx64 =20 # 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" --=20 MST