From nobody Tue Oct 28 12:15:15 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 1515589185731300.27049689438445; Wed, 10 Jan 2018 04:59:45 -0800 (PST) Received: from localhost ([::1]:39180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZFyq-0007fG-Qp for importer@patchew.org; Wed, 10 Jan 2018 07:59:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZFnU-0006Ko-13 for qemu-devel@nongnu.org; Wed, 10 Jan 2018 07:48:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZFnT-0004oW-21 for qemu-devel@nongnu.org; Wed, 10 Jan 2018 07:48:00 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZFnS-0004nt-Q3 for qemu-devel@nongnu.org; Wed, 10 Jan 2018 07:47:59 -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 E63F063E03 for ; Wed, 10 Jan 2018 12:47:57 +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 4BDD07B608; Wed, 10 Jan 2018 12:47:56 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 10 Jan 2018 13:47:23 +0100 Message-Id: <20180110124723.11879-15-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.38]); Wed, 10 Jan 2018 12:47:57 +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 14/14] all works 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" Signed-off-by: Juan Quintela --- migration/ram.c | 69 ++++++++++++++++++++++++++++-------------------------= ---- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 6e45f668d1..a689d4a218 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -671,22 +671,25 @@ static uint16_t multifd_send_page(RAMBlock *block, ra= m_addr_t offset, int i; MultiFDSendParams *p =3D NULL; /* make happy gcc */ multifd_pages_t *pages =3D multifd_send_state->pages; + bool same_block; =20 if (!pages->block) { pages->block =3D block; } =20 - pages->packet->offset[pages->used] =3D offset; - pages->iov[pages->used].iov_base =3D block->host + offset; - pages->iov[pages->used].iov_len =3D TARGET_PAGE_SIZE; - pages->used++; + same_block =3D pages->block =3D=3D block; + if (same_block) { + pages->packet->offset[pages->used] =3D offset; + pages->iov[pages->used].iov_base =3D block->host + offset; + pages->iov[pages->used].iov_len =3D TARGET_PAGE_SIZE; + pages->used++; =20 - if (!last_page) { - if (pages->used < pages->allocated) { - return MULTIFD_CONTINUE; + if (!last_page) { + if (pages->used < pages->allocated) { + return MULTIFD_CONTINUE; + } } } - qemu_sem_wait(&multifd_send_state->sem); qemu_mutex_lock(&multifd_send_state->mutex); for (i =3D 0; i < multifd_send_state->count; i++) { @@ -709,7 +712,10 @@ static uint16_t multifd_send_page(RAMBlock *block, ram= _addr_t offset, p->pages->used, last_page); qemu_sem_post(&p->sem); =20 - return i; + if (!same_block) { + multifd_send_page(block, offset, last_page); + } + return 0; } =20 struct MultiFDRecvParams { @@ -809,14 +815,13 @@ static void *multifd_recv_thread(void *opaque) qemu_mutex_unlock(&p->mutex); break; } - if (p->pages->used) { + if (true) { MultiFDPacket_t *packet =3D p->pages->packet; RAMBlock *block; Error *local_err =3D NULL; size_t ret; int i; =20 - p->pages->used =3D 0; qemu_mutex_unlock(&p->mutex); =20 ret =3D qio_channel_read_all(p->c, (void *)packet, @@ -828,13 +833,8 @@ static void *multifd_recv_thread(void *opaque) block =3D qemu_ram_block_by_name(packet->ramblock); p->pages->seq =3D packet->seq; for (i =3D 0; i < packet->used; i++) { - if (block->host + packet->offset[i] - !=3D p->pages->iov[i].iov_base) { - printf("page offset %d packet %p pages %p\n", i, - block->host + packet->offset[i], - p->pages->iov[i].iov_base); - break; - } + p->pages->iov[i].iov_base =3D block->host + packet->offset= [i]; + p->pages->iov[i].iov_len =3D TARGET_PAGE_SIZE; } trace_multifd_recv(p->id, p->pages->seq, packet->used); ret =3D qio_channel_readv_all(p->c, p->pages->iov, @@ -851,11 +851,11 @@ static void *multifd_recv_thread(void *opaque) p->sync =3D false; } qemu_mutex_unlock(&p->mutex); - qemu_sem_post(&p->ready); +// qemu_sem_post(&p->ready); continue; } qemu_mutex_unlock(&p->mutex); - qemu_sem_wait(&p->sem); +// qemu_sem_wait(&p->sem); } trace_multifd_recv_thread(p->id, p->packets_recv); =20 @@ -953,7 +953,7 @@ static void multifd_recv_page(RAMBlock *block, ram_addr= _t offset, assert(fd_num < thread_count); p =3D &multifd_recv_state->params[fd_num]; =20 - qemu_sem_wait(&p->ready); +// qemu_sem_wait(&p->ready); =20 qemu_mutex_lock(&p->mutex); p->done =3D false; @@ -961,7 +961,7 @@ static void multifd_recv_page(RAMBlock *block, ram_addr= _t offset, multifd_recv_state->pages =3D p->pages; p->pages =3D pages; qemu_mutex_unlock(&p->mutex); - qemu_sem_post(&p->sem); +// qemu_sem_post(&p->sem); } =20 static int multifd_flush(void) @@ -1430,24 +1430,23 @@ static int ram_multifd_page(RAMState *rs, PageSearc= hStatus *pss, bool last_stage) { int pages; - uint16_t fd_num; +// uint16_t fd_num; RAMBlock *block =3D pss->block; ram_addr_t offset =3D pss->page << TARGET_PAGE_BITS; =20 pages =3D save_zero_page(rs, block, offset); if (pages =3D=3D -1) { - ram_counters.transferred +=3D - save_page_header(rs, rs->f, block, - offset | RAM_SAVE_FLAG_MULTIFD_PAGE); - 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 */ +// ram_counters.transferred +=3D +// save_page_header(rs, rs->f, block, +// offset | RAM_SAVE_FLAG_MULTIFD_PAGE); + 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 */ ram_counters.transferred +=3D TARGET_PAGE_SIZE; pages =3D 1; ram_counters.normal++; --=20 2.14.3