From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnSjK-0002cT-Ps for qemu-devel@nongnu.org; Mon, 13 Mar 2017 12:21:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnSjH-0004Mr-NM for qemu-devel@nongnu.org; Mon, 13 Mar 2017 12:21:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35450) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnSjH-0004MF-HH for qemu-devel@nongnu.org; Mon, 13 Mar 2017 12:21:51 -0400 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0FA4C0ADB7B for ; Mon, 13 Mar 2017 16:21:51 +0000 (UTC) Date: Mon, 13 Mar 2017 16:21:47 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20170313162146.GC5512@work-vm> References: <20170313124434.1043-1-quintela@redhat.com> <20170313124434.1043-4-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170313124434.1043-4-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 03/16] migration: Test for disabled features on reception List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org * Juan Quintela (quintela@redhat.com) wrote: > Right now, if we receive a compressed page while this features are > disabled, Bad Things (TM) can happen. Just add a test for them. > > Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > > -- > > I had XBZRLE here also, but it don't need extra resources on > destination, only on source. Additionally libvirt don't enable it on > destination, so don't put it here. > > Signed-off-by: Juan Quintela > --- > migration/ram.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 719425b..65419c1 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2514,7 +2514,7 @@ static int ram_load_postcopy(QEMUFile *f) > > static int ram_load(QEMUFile *f, void *opaque, int version_id) > { > - int flags = 0, ret = 0; > + int flags = 0, ret = 0, invalid_flags; > static uint64_t seq_iter; > int len = 0; > /* > @@ -2531,6 +2531,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > ret = -EINVAL; > } > > + invalid_flags = 0; > + > + if (!migrate_use_compression()) { > + invalid_flags |= RAM_SAVE_FLAG_COMPRESS_PAGE; > + } > /* This RCU critical section can be very long running. > * When RCU reclaims in the code start to become numerous, > * it will be necessary to reduce the granularity of this > @@ -2551,6 +2556,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > flags = addr & ~TARGET_PAGE_MASK; > addr &= TARGET_PAGE_MASK; > > + if (flags & invalid_flags) { > + if (flags & invalid_flags & RAM_SAVE_FLAG_COMPRESS_PAGE) { > + error_report("Received an unexpected compressed page"); > + } > + > + ret = -EINVAL; > + break; > + } > + > if (flags & (RAM_SAVE_FLAG_COMPRESS | RAM_SAVE_FLAG_PAGE | > RAM_SAVE_FLAG_COMPRESS_PAGE | RAM_SAVE_FLAG_XBZRLE)) { > RAMBlock *block = ram_block_from_stream(f, flags); > -- > 2.9.3 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK