From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUluK-0005mO-I7 for qemu-devel@nongnu.org; Mon, 10 Jul 2017 23:32:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUluH-0004cE-9F for qemu-devel@nongnu.org; Mon, 10 Jul 2017 23:32:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49974) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dUluH-0004bw-0C for qemu-devel@nongnu.org; Mon, 10 Jul 2017 23:32:13 -0400 Date: Tue, 11 Jul 2017 11:31:59 +0800 From: Peter Xu Message-ID: <20170711033159.GE21344@pxdev.xzpeter.org> References: <20170628190047.26159-1-dgilbert@redhat.com> <20170628190047.26159-17-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170628190047.26159-17-dgilbert@redhat.com> Subject: Re: [Qemu-devel] [RFC 16/29] vhost+postcopy: Stash RAMBlock and offset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: qemu-devel@nongnu.org, a.perevalov@samsung.com, marcandre.lureau@redhat.com, maxime.coquelin@redhat.com, mst@redhat.com, quintela@redhat.com, lvivier@redhat.com, aarcange@redhat.com On Wed, Jun 28, 2017 at 08:00:34PM +0100, Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" > > Stash the RAMBlock and offset for later use looking up > addresses. > > Signed-off-by: Dr. David Alan Gilbert > --- > hw/virtio/trace-events | 1 + > hw/virtio/vhost-user.c | 11 +++++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index f7be340a45..1fd194363a 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -3,6 +3,7 @@ > # hw/virtio/vhost-user.c > vhost_user_postcopy_listen(void) "" > vhost_user_set_mem_table_postcopy(uint64_t client_addr, uint64_t qhva, int reply_i, int region_i) "client:%"PRIx64" for hva: %"PRIx64" reply %d region %d" > +vhost_user_set_mem_table_withfd(int index, const char *name, uint64_t memory_size, uint64_t guest_phys_addr, uint64_t userspace_addr, uint64_t offset) "%d:%s: size:%"PRIx64" GPA:%"PRIx64" QVA/userspace:%"PRIx64" RB offset:%"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 6be3e7ff2d..3185af7a45 100644 > --- a/hw/virtio/vhost-user.c > +++ b/hw/virtio/vhost-user.c > @@ -133,6 +133,11 @@ struct vhost_user { > NotifierWithReturn postcopy_notifier; > struct PostCopyFD postcopy_fd; > uint64_t postcopy_client_bases[VHOST_MEMORY_MAX_NREGIONS]; > + RAMBlock *region_rb[VHOST_MEMORY_MAX_NREGIONS]; > + /* The offset from the start of the RAMBlock to the start of the > + * vhost region. > + */ > + ram_addr_t region_rb_offset[VHOST_MEMORY_MAX_NREGIONS]; Here the array size is VHOST_MEMORY_MAX_NREGIONS, while... > }; > > static bool ioeventfd_enabled(void) > @@ -324,8 +329,14 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev, > assert((uintptr_t)reg->userspace_addr == reg->userspace_addr); > mr = memory_region_from_host((void *)(uintptr_t)reg->userspace_addr, > &offset); > + u->region_rb_offset[i] = offset; > + u->region_rb[i] = mr->ram_block; ... can i>=VHOST_MEMORY_MAX_NREGIONS here? Or do we only need to note this down if fd > 0 below? Thanks, > fd = 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, offset); > msg.payload.memory.regions[fd_num].userspace_addr = reg->userspace_addr; > msg.payload.memory.regions[fd_num].memory_size = reg->memory_size; > msg.payload.memory.regions[fd_num].guest_phys_addr = reg->guest_phys_addr; > -- > 2.13.0 > -- Peter Xu