From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cVyPx-0002Wd-Df for qemu-devel@nongnu.org; Tue, 24 Jan 2017 05:33:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cVyPu-0000W8-4N for qemu-devel@nongnu.org; Tue, 24 Jan 2017 05:33:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41404) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cVyPt-0000Vv-Vh for qemu-devel@nongnu.org; Tue, 24 Jan 2017 05:33:34 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2B61F8047E for ; Tue, 24 Jan 2017 10:33:34 +0000 (UTC) Date: Tue, 24 Jan 2017 10:33:29 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20170124103329.GA2220@work-vm> References: <1485207141-1941-1-git-send-email-quintela@redhat.com> <1485207141-1941-4-git-send-email-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1485207141-1941-4-git-send-email-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 03/17] 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, amit.shah@redhat.com * Juan Quintela (quintela@redhat.com) wrote: > Right now, if we receive a compressed page or a xbzrle page while this > features are disabled, Bad Things (TM) can happen. Just add a test for > them. > > Signed-off-by: Juan Quintela > --- > migration/ram.c | 23 ++++++++++++++++++++++- > 1 file changed, 22 insertions(+), 1 deletion(-) > > diff --git a/migration/ram.c b/migration/ram.c > index ef8fadf..4ad814a 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2455,7 +2455,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; > /* > @@ -2470,6 +2470,15 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) > ret = -EINVAL; > } > > + invalid_flags = 0; > + > + if (!migrate_use_xbzrle()) { > + invalid_flags |= RAM_SAVE_FLAG_XBZRLE; > + } Is that really the case? I thought we used to ignore the flags on the incoming side and didn't need to enable xbzrle on the destination? Dave > + 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 > @@ -2490,6 +2499,18 @@ 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_XBZRLE) { > + error_report("Received an unexpected XBRLE page"); > + } > + 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