From nobody Tue Oct 28 12:15:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15155887799581014.785788107011; Wed, 10 Jan 2018 04:52:59 -0800 (PST) Received: from localhost ([::1]:39027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZFsJ-0001Vj-3b for importer@patchew.org; Wed, 10 Jan 2018 07:52:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZFnF-00068s-PP for qemu-devel@nongnu.org; Wed, 10 Jan 2018 07:47:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZFnE-0004ao-OD for qemu-devel@nongnu.org; Wed, 10 Jan 2018 07:47:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59626) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZFnE-0004Zn-Fs for qemu-devel@nongnu.org; Wed, 10 Jan 2018 07:47:44 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95C9D7854B for ; Wed, 10 Jan 2018 12:47:43 +0000 (UTC) Received: from secure.mitica (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id B09A57B8E4; Wed, 10 Jan 2018 12:47:41 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 10 Jan 2018 13:47:17 +0100 Message-Id: <20180110124723.11879-9-quintela@redhat.com> In-Reply-To: <20180110124723.11879-1-quintela@redhat.com> References: <20180110124723.11879-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 10 Jan 2018 12:47:43 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v10 08/14] migration: Transfer pages over new channels X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We switch for sending the page number to send real pages. Signed-off-by: Juan Quintela -- Remove the HACK bit, now we have the function that calculates the size of a page exported. Rename multifd_pages{_now}, to sent pages Remove multifd pages field, it is the same than normal pages Merge test channels here Make sent_pages also work for non multifd case Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 10 +++++++++- migration/ram.c | 41 +++++++++++++++++++++++++++++------------ 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 1545f3a0b0..6ebcfa36cc 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2230,6 +2230,8 @@ static void *migration_thread(void *opaque) */ int64_t threshold_size =3D 0; int64_t qemu_file_bytes =3D 0; + /* Stores how many pages we have sent */ + int64_t sent_pages =3D 0; int64_t start_time =3D initial_time; int64_t end_time; bool old_vm_running =3D false; @@ -2318,8 +2320,13 @@ static void *migration_thread(void *opaque) current_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); if (current_time >=3D initial_time + BUFFER_DELAY) { uint64_t qemu_file_bytes_now =3D qemu_ftell(s->to_dst_file); + uint64_t sent_pages_now =3D ram_counters.normal; + /* multifd sends data out of the qemu_file */ + uint64_t multifd_transferred =3D migrate_use_multifd() ? + (sent_pages_now - sent_pages) * qemu_target_page_size() : = 0; uint64_t transferred_bytes =3D - qemu_file_bytes_now - qemu_file_bytes; + (qemu_file_bytes_now - qemu_file_bytes) + + multifd_transferred; uint64_t time_spent =3D current_time - initial_time; double bandwidth =3D (double)transferred_bytes / time_spent; threshold_size =3D bandwidth * s->parameters.downtime_limit; @@ -2339,6 +2346,7 @@ static void *migration_thread(void *opaque) qemu_file_reset_rate_limit(s->to_dst_file); initial_time =3D current_time; qemu_file_bytes =3D qemu_file_bytes_now; + sent_pages =3D sent_pages_now; } if (qemu_file_rate_limit(s->to_dst_file)) { /* usleep expects microseconds */ diff --git a/migration/ram.c b/migration/ram.c index 8443806f12..20f3726909 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -542,12 +542,20 @@ static void *multifd_send_thread(void *opaque) break; } if (p->pages->used) { + Error *local_err =3D NULL; + size_t ret; + uint32_t used; + + used =3D p->pages->used; p->pages->used =3D 0; qemu_mutex_unlock(&p->mutex); =20 - trace_multifd_send(p->id, p->pages->seq, p->pages->used); - /* ToDo: send page here */ - + trace_multifd_send(p->id, p->pages->seq, used); + ret =3D qio_channel_writev_all(p->c, p->pages->iov, used, &loc= al_err); + if (ret !=3D 0) { + terminate_multifd_send_threads(local_err); + return NULL; + } qemu_mutex_lock(&multifd_send_state->mutex); p->done =3D true; p->packets_sent++; @@ -754,12 +762,21 @@ static void *multifd_recv_thread(void *opaque) break; } if (p->pages->used) { + Error *local_err =3D NULL; + size_t ret; + uint32_t used; + + used =3D p->pages->used; p->pages->used =3D 0; + qemu_mutex_unlock(&p->mutex); =20 - trace_multifd_recv(p->id, p->pages->seq, p->pages->used); - - /* ToDo: receive pages here */ - + trace_multifd_recv(p->id, p->pages->seq, used); + ret =3D qio_channel_readv_all(p->c, p->pages->iov, used, &loca= l_err); + if (ret !=3D 0) { + terminate_multifd_recv_threads(local_err); + return NULL; + } + qemu_mutex_lock(&p->mutex); p->done =3D true; p->packets_recv++; qemu_mutex_unlock(&p->mutex); @@ -1311,12 +1328,9 @@ static int ram_multifd_page(RAMState *rs, PageSearch= Status *pss, { int pages; uint16_t fd_num; - uint8_t *p; RAMBlock *block =3D pss->block; ram_addr_t offset =3D pss->page << TARGET_PAGE_BITS; =20 - p =3D block->host + offset; - pages =3D save_zero_page(rs, block, offset); if (pages =3D=3D -1) { ram_counters.transferred +=3D @@ -1325,8 +1339,12 @@ static int ram_multifd_page(RAMState *rs, PageSearch= Status *pss, fd_num =3D multifd_send_page(block, offset, rs->migration_dirty_pages =3D=3D 1); qemu_put_be16(rs->f, fd_num); + if (fd_num !=3D MULTIFD_CONTINUE) { + /* We start with a different channel. + Flush pending work */ + qemu_fflush(rs->f); + } ram_counters.transferred +=3D 2; /* size of fd_num */ - qemu_put_buffer(rs->f, p, TARGET_PAGE_SIZE); ram_counters.transferred +=3D TARGET_PAGE_SIZE; pages =3D 1; ram_counters.normal++; @@ -3278,7 +3296,6 @@ static int ram_load(QEMUFile *f, void *opaque, int ve= rsion_id) case RAM_SAVE_FLAG_MULTIFD_PAGE: fd_num =3D qemu_get_be16(f); multifd_recv_page(block, addr, host, fd_num); - qemu_get_buffer(f, host, TARGET_PAGE_SIZE); break; =20 case RAM_SAVE_FLAG_EOS: --=20 2.14.3