Received: from eggs.gnu.org ([209.51.188.92]:37135) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gwQUq-0007K2-85 for qemu-devel@nongnu.org; Wed, 20 Feb 2019 06:57:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gwQUo-0002cX-Cg for qemu-devel@nongnu.org; Wed, 20 Feb 2019 06:57:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58456) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gwQUo-0001DB-1h for qemu-devel@nongnu.org; Wed, 20 Feb 2019 06:57:02 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 39D35811DC for ; Wed, 20 Feb 2019 11:56:44 +0000 (UTC) From: Juan Quintela Date: Wed, 20 Feb 2019 12:56:08 +0100 Message-Id: <20190220115611.3192-6-quintela@redhat.com> In-Reply-To: <20190220115611.3192-1-quintela@redhat.com> References: <20190220115611.3192-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 5/8] multifd: Be flexible about packet size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , Eric Blake , Laurent Vivier , Juan Quintela , "Dr. David Alan Gilbert" , Markus Armbruster This way we can change the packet size in the future and everything will work. We choose an arbitrary big number (100 times configured size) as a limit about how big we will reallocate. Signed-off-by: Juan Quintela --- migration/ram.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index e22d02760b..75a8fc21f8 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -723,13 +723,13 @@ static void multifd_pages_clear(MultiFDPages_t *pag= es) static void multifd_send_fill_packet(MultiFDSendParams *p) { MultiFDPacket_t *packet =3D p->packet; - uint32_t page_count =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(= ); + uint32_t page_max =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(); int i; =20 packet->magic =3D cpu_to_be32(MULTIFD_MAGIC); packet->version =3D cpu_to_be32(MULTIFD_VERSION); packet->flags =3D cpu_to_be32(p->flags); - packet->pages_alloc =3D cpu_to_be32(page_count); + packet->pages_alloc =3D cpu_to_be32(page_max); packet->pages_used =3D cpu_to_be32(p->pages->used); packet->next_packet_size =3D cpu_to_be32(p->next_packet_size); packet->packet_num =3D cpu_to_be64(p->packet_num); @@ -746,7 +746,7 @@ static void multifd_send_fill_packet(MultiFDSendParam= s *p) static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp= ) { MultiFDPacket_t *packet =3D p->packet; - uint32_t page_count =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(= ); + uint32_t pages_max =3D MULTIFD_PACKET_SIZE / qemu_target_page_size()= ; RAMBlock *block; int i; =20 @@ -769,12 +769,24 @@ static int multifd_recv_unfill_packet(MultiFDRecvPa= rams *p, Error **errp) p->flags =3D be32_to_cpu(packet->flags); =20 packet->pages_alloc =3D be32_to_cpu(packet->pages_alloc); - if (packet->pages_alloc > page_count) { + /* + * If we recevied a packet that is 100 times bigger than expected + * just stop migration. It is a magic number. + */ + if (packet->pages_alloc > pages_max * 100) { error_setg(errp, "multifd: received packet " - "with size %d and expected maximum size %d", - packet->pages_alloc, page_count) ; + "with size %d and expected size %d", + packet->pages_alloc, pages_max) ; return -1; } + /* + * We received a packet that is bigger than expected but inside + * reasonable limits (see previous comment). Just reallocate. + */ + if (packet->pages_alloc > p->pages->allocated) { + multifd_pages_clear(p->pages); + multifd_pages_init(packet->pages_alloc); + } =20 p->pages->used =3D be32_to_cpu(packet->pages_used); if (p->pages->used > packet->pages_alloc) { --=20 2.20.1