From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38668) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL2i4-0001ee-Fi for qemu-devel@nongnu.org; Wed, 14 Jun 2017 03:27:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL2i1-0003pM-AW for qemu-devel@nongnu.org; Wed, 14 Jun 2017 03:27:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49518) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dL2i1-0003p7-2M for qemu-devel@nongnu.org; Wed, 14 Jun 2017 03:27:21 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC19DC04B320 for ; Wed, 14 Jun 2017 07:27:19 +0000 (UTC) Date: Wed, 14 Jun 2017 15:27:06 +0800 From: Peter Xu Message-ID: <20170614072706.GK11751@pxdev.xzpeter.org> References: <20170613095432.11623-1-quintela@redhat.com> <20170613095432.11623-2-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170613095432.11623-2-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 1/2] 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, dgilbert@redhat.com, lvivier@redhat.com On Tue, Jun 13, 2017 at 11:54:31AM +0200, Juan Quintela 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. > --- > migration/ram.c | 16 +++++++++++++++- > 1 file changed, 15 insertions(+), 1 deletion(-) > > diff --git a/migration/ram.c b/migration/ram.c > index f35d65a..f2d1bce 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2477,7 +2477,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; > /* > @@ -2494,6 +2494,11 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > ret = -EINVAL; > } > > + invalid_flags = 0; Nit: set zero when declare (just like flags, ret)? > + > + 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 > @@ -2514,6 +2519,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) { ^ Nit: one extra space -------------------+ > + error_report("Received an unexpected compressed page"); > + } > + > + ret = -EINVAL; > + break; > + } > + > if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE | > RAM_SAVE_FLAG_COMPRESS_PAGE | RAM_SAVE_FLAG_XBZRLE)) { > RAMBlock *block = ram_block_from_stream(f, flags); > -- > 2.9.4 > Besides the nits: Reviewed-by: Peter Xu -- Peter Xu