From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF682C38A2A for ; Thu, 7 May 2020 15:43:37 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94128207DD for ; Thu, 7 May 2020 15:43:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C31L+S7r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94128207DD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jWigS-0005S0-Or for qemu-devel@archiver.kernel.org; Thu, 07 May 2020 11:43:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jWifo-00050S-8P for qemu-devel@nongnu.org; Thu, 07 May 2020 11:42:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:29387 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jWifm-0004BG-FZ for qemu-devel@nongnu.org; Thu, 07 May 2020 11:42:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588866172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ynuFrpiDjO03cG3Hh6JDELA3aCp8PJvhKO7IY9Jg0r0=; b=C31L+S7rvUD6SEeLK4RV1oj/R8u8fAXfnps8eA4pMsEJjs0vqGCTKNxvIFRDfZsS+GaOmJ T37mMv40ViYaptXvWDMUROE9Eer9rMzvHOz39JYs6XGJmq9Uah2tjLNICimwGrxrVyw2AL KflpTPn6clauxDXEy7UdgO1Glx2z9gg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-418-P64fppmYNRCq-hVc61ywvw-1; Thu, 07 May 2020 11:42:50 -0400 X-MC-Unique: P64fppmYNRCq-hVc61ywvw-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id CEC7B846377; Thu, 7 May 2020 15:42:49 +0000 (UTC) Received: from work-vm (ovpn-114-224.ams2.redhat.com [10.36.114.224]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D10F65D9C5; Thu, 7 May 2020 15:42:47 +0000 (UTC) Date: Thu, 7 May 2020 16:42:45 +0100 From: "Dr. David Alan Gilbert" To: David Hildenbrand Subject: Re: [PATCH v4 09/13] migration/ram: Consolidate variable reset after placement in ram_load_postcopy() Message-ID: <20200507154245.GF17348@work-vm> References: <20200421085300.7734-1-david@redhat.com> <20200421085300.7734-10-david@redhat.com> <20200424102514.GD3106@work-vm> MIME-Version: 1.0 In-Reply-To: <20200424102514.GD3106@work-vm> User-Agent: Mutt/1.13.4 (2020-02-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=dgilbert@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/07 03:15:48 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001, T_HK_NAME_DR=0.01 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Juan Quintela , "Michael S . Tsirkin" , qemu-devel@nongnu.org, Peter Xu , Paolo Bonzini , Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Dr. David Alan Gilbert (dgilbert@redhat.com) wrote: > * David Hildenbrand (david@redhat.com) wrote: > > Let's consolidate resetting the variables. > >=20 > > Cc: "Dr. David Alan Gilbert" > > Cc: Juan Quintela > > Cc: Peter Xu > > Signed-off-by: David Hildenbrand >=20 > Reviewed-by: Dr. David Alan Gilbert Queued this one only; I had to do manual patch application due to some renaming in 91ba442; but I think it's still OK. > > --- > > migration/ram.c | 10 +++++----- > > 1 file changed, 5 insertions(+), 5 deletions(-) > >=20 > > diff --git a/migration/ram.c b/migration/ram.c > > index 2a2165b478..7eca3165c8 100644 > > --- a/migration/ram.c > > +++ b/migration/ram.c > > @@ -3150,7 +3150,7 @@ static int ram_load_postcopy(QEMUFile *f) > > /* Temporary page that is later 'placed' */ > > void *postcopy_host_page =3D mis->postcopy_tmp_page; > > void *host_page =3D NULL; > > - bool all_zero =3D false; > > + bool all_zero =3D true; > > int target_pages =3D 0; > > =20 > > while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) { > > @@ -3176,7 +3176,6 @@ static int ram_load_postcopy(QEMUFile *f) > > addr &=3D TARGET_PAGE_MASK; > > =20 > > trace_ram_load_postcopy_loop((uint64_t)addr, flags); > > - place_needed =3D false; > > if (flags & (RAM_SAVE_FLAG_ZERO | RAM_SAVE_FLAG_PAGE | > > RAM_SAVE_FLAG_COMPRESS_PAGE)) { > > block =3D ram_block_from_stream(f, flags); > > @@ -3204,9 +3203,7 @@ static int ram_load_postcopy(QEMUFile *f) > > */ > > page_buffer =3D postcopy_host_page + > > host_page_offset_from_ram_block_offset(block= , addr); > > - /* If all TP are zero then we can optimise the place */ > > if (target_pages =3D=3D 1) { > > - all_zero =3D true; > > host_page =3D host_page_from_ram_block_offset(block, a= ddr); > > } else if (host_page !=3D host_page_from_ram_block_offset(= block, > > ad= dr)) { > > @@ -3223,7 +3220,6 @@ static int ram_load_postcopy(QEMUFile *f) > > */ > > if (target_pages =3D=3D (block->page_size / TARGET_PAGE_SI= ZE)) { > > place_needed =3D true; > > - target_pages =3D 0; > > } > > place_source =3D postcopy_host_page; > > } > > @@ -3300,6 +3296,10 @@ static int ram_load_postcopy(QEMUFile *f) > > ret =3D postcopy_place_page(mis, host_page, place_sour= ce, > > block); > > } > > + place_needed =3D false; > > + target_pages =3D 0; > > + /* Assume we have a zero page until we detect something di= fferent */ > > + all_zero =3D true; > > } > > } > > =20 > > --=20 > > 2.25.1 > >=20 > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK >=20 >=20 -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK