From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47648) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fSQ9p-0002vd-Gy for qemu-devel@nongnu.org; Mon, 11 Jun 2018 12:59:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fSQ9l-0002Cg-Hq for qemu-devel@nongnu.org; Mon, 11 Jun 2018 12:59:05 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39220 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 1fSQ9l-0002CG-Am for qemu-devel@nongnu.org; Mon, 11 Jun 2018 12:59:01 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 94F3B7C6C4 for ; Mon, 11 Jun 2018 16:59:00 +0000 (UTC) Date: Mon, 11 Jun 2018 17:58:54 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20180611165854.GJ2661@work-vm> References: <20180523111817.1463-1-quintela@redhat.com> <20180523111817.1463-2-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180523111817.1463-2-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH v13 01/12] migration: Create multipage support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, peterx@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > We only create/destry the page list here. We will use it later. > > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > migration/ram.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) > > diff --git a/migration/ram.c b/migration/ram.c > index 5bcbf7a9f9..23cc5625eb 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -510,6 +510,20 @@ typedef struct { > uint8_t id; > } __attribute__((packed)) MultiFDInit_t; > > +typedef struct { > + /* number of used pages */ > + uint32_t used; > + /* number of allocated pages */ > + uint32_t allocated; > + /* global number of generated multifd packets */ > + uint32_t seq; > + /* offset of each page */ > + ram_addr_t *offset; > + /* pointer to each page */ > + struct iovec *iov; > + RAMBlock *block; > +} MultiFDPages_t; > + > typedef struct { > /* this fields are not changed once the thread is created */ > /* channel number */ > @@ -528,6 +542,8 @@ typedef struct { > bool running; > /* should this thread finish */ > bool quit; > + /* array of pages to sent */ > + MultiFDPages_t *pages; > } MultiFDSendParams; > > typedef struct { > @@ -548,6 +564,8 @@ typedef struct { > bool running; > /* should this thread finish */ > bool quit; > + /* array of pages to receive */ > + MultiFDPages_t *pages; > } MultiFDRecvParams; > > static int multifd_send_initial_packet(MultiFDSendParams *p, Error **errp) > @@ -612,10 +630,36 @@ static int multifd_recv_initial_packet(QIOChannel *c, Error **errp) > return msg.id; > } > > +static MultiFDPages_t *multifd_pages_init(size_t size) > +{ > + MultiFDPages_t *pages = g_new0(MultiFDPages_t, 1); > + > + pages->allocated = size; > + pages->iov = g_new0(struct iovec, size); > + pages->offset = g_new0(ram_addr_t, size); > + > + return pages; > +} > + > +static void multifd_pages_clear(MultiFDPages_t *pages) > +{ > + pages->used = 0; > + pages->allocated = 0; > + pages->seq = 0; > + pages->block = NULL; > + g_free(pages->iov); > + pages->iov = NULL; > + g_free(pages->offset); > + pages->offset = NULL; > + g_free(pages); > +} > + > struct { > MultiFDSendParams *params; > /* number of created threads */ > int count; > + /* array of pages to sent */ > + MultiFDPages_t *pages; > } *multifd_send_state; > > static void multifd_send_terminate_threads(Error *err) > @@ -665,9 +709,13 @@ int multifd_save_cleanup(Error **errp) > qemu_sem_destroy(&p->sem); > g_free(p->name); > p->name = NULL; > + multifd_pages_clear(p->pages); > + p->pages = NULL; > } > g_free(multifd_send_state->params); > multifd_send_state->params = NULL; > + multifd_pages_clear(multifd_send_state->pages); > + multifd_send_state->pages = NULL; > g_free(multifd_send_state); > multifd_send_state = NULL; > return ret; > @@ -728,6 +776,7 @@ static void multifd_new_send_channel_async(QIOTask *task, gpointer opaque) > int multifd_save_setup(void) > { > int thread_count; > + uint32_t page_count = migrate_multifd_page_count(); > uint8_t i; > > if (!migrate_use_multifd()) { > @@ -737,6 +786,8 @@ int multifd_save_setup(void) > multifd_send_state = g_malloc0(sizeof(*multifd_send_state)); > multifd_send_state->params = g_new0(MultiFDSendParams, thread_count); > atomic_set(&multifd_send_state->count, 0); > + multifd_send_state->pages = multifd_pages_init(page_count); > + > for (i = 0; i < thread_count; i++) { > MultiFDSendParams *p = &multifd_send_state->params[i]; > > @@ -744,6 +795,7 @@ int multifd_save_setup(void) > qemu_sem_init(&p->sem, 0); > p->quit = false; > p->id = i; > + p->pages = multifd_pages_init(page_count); > p->name = g_strdup_printf("multifdsend_%d", i); > socket_send_channel_create(multifd_new_send_channel_async, p); > } > @@ -801,6 +853,8 @@ int multifd_load_cleanup(Error **errp) > qemu_sem_destroy(&p->sem); > g_free(p->name); > p->name = NULL; > + multifd_pages_clear(p->pages); > + p->pages = NULL; > } > g_free(multifd_recv_state->params); > multifd_recv_state->params = NULL; > @@ -834,6 +888,7 @@ static void *multifd_recv_thread(void *opaque) > int multifd_load_setup(void) > { > int thread_count; > + uint32_t page_count = migrate_multifd_page_count(); > uint8_t i; > > if (!migrate_use_multifd()) { > @@ -843,6 +898,7 @@ int multifd_load_setup(void) > multifd_recv_state = g_malloc0(sizeof(*multifd_recv_state)); > multifd_recv_state->params = g_new0(MultiFDRecvParams, thread_count); > atomic_set(&multifd_recv_state->count, 0); > + > for (i = 0; i < thread_count; i++) { > MultiFDRecvParams *p = &multifd_recv_state->params[i]; > > @@ -850,6 +906,7 @@ int multifd_load_setup(void) > qemu_sem_init(&p->sem, 0); > p->quit = false; > p->id = i; > + p->pages = multifd_pages_init(page_count); > p->name = g_strdup_printf("multifdrecv_%d", i); > } > return 0; > -- > 2.17.0 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK