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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id AD8CCC433FE for ; Mon, 3 Oct 2022 03:19:46 +0000 (UTC) Received: from localhost ([::1]:49186 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ofBzd-00030I-Pz for qemu-devel@archiver.kernel.org; Sun, 02 Oct 2022 23:19:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofBwO-00053h-Dz for qemu-devel@nongnu.org; Sun, 02 Oct 2022 23:16:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:49149) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ofBwL-0007W4-P8 for qemu-devel@nongnu.org; Sun, 02 Oct 2022 23:16:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664766981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C8b+n7qI3SJroMtAL0rndE14xTRYBp9eMbtC+fFP/Aw=; b=D1TSkjoHnVWEGxllKE9y+UDEDmqASuCDm4dPYQrnj3+RDIXqnc2GRTnrA2VeSZuAERqmVr q5fNkFZ/EzyYE6I5E1XGQrD/h+H0KaQvhJQCbA7PzNOKFYa62eiWfjdZuvqKMitDpPL0FR tBMp+dOQEUXfILu5Mv9rLgEYotBgryk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-674-UfSUNzFCMhySYlSEtWPhZQ-1; Sun, 02 Oct 2022 23:16:16 -0400 X-MC-Unique: UfSUNzFCMhySYlSEtWPhZQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3AD8987B2A7; Mon, 3 Oct 2022 03:16:16 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.212]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17B5140C206B; Mon, 3 Oct 2022 03:16:12 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Cc: Alex Williamson , Eric Blake , Stefan Hajnoczi , Fam Zheng , qemu-s390x@nongnu.org, Cornelia Huck , Thomas Huth , Vladimir Sementsov-Ogievskiy , Laurent Vivier , John Snow , "Dr. David Alan Gilbert" , Christian Borntraeger , Halil Pasic , Juan Quintela , Paolo Bonzini , qemu-block@nongnu.org, Eric Farman , Richard Henderson , David Hildenbrand Subject: [RFC 3/7] migration: Block migration comment or code is wrong Date: Mon, 3 Oct 2022 05:15:56 +0200 Message-Id: <20221003031600.20084-4-quintela@redhat.com> In-Reply-To: <20221003031600.20084-1-quintela@redhat.com> References: <20221003031600.20084-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" And it appears that what is wrong is the code. During bulk stage we need to make sure that some block is dirty, but no games with max_size at all. Signed-off-by: Juan Quintela --- migration/block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/migration/block.c b/migration/block.c index b3d680af75..39ce4003c6 100644 --- a/migration/block.c +++ b/migration/block.c @@ -879,8 +879,8 @@ static void block_save_pending(void *opaque, uint64_t max_size, blk_mig_unlock(); /* Report at least one block pending during bulk phase */ - if (pending <= max_size && !block_mig_state.bulk_completed) { - pending = max_size + BLK_MIG_BLOCK_SIZE; + if (!pending && !block_mig_state.bulk_completed) { + pending = BLK_MIG_BLOCK_SIZE; } trace_migration_block_save_pending(pending); -- 2.37.2