From nobody Tue Feb 10 00:59:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659010101; cv=none; d=zohomail.com; s=zohoarc; b=ZjYh4cFdEbhMUa8xWaZPQXzwt3ygPY8JEgdBfk6I7ndgixX4msI6YnFhDmacLG1WkwS/mcpvSMzEiL3Hwpf6oZOCvRhq55M+n/njZU9HpjMj/0/HPtZBsxrMMBTGYjehS6i2Ltvqn2b2rLTxqtMAD0Fu8UQvVTmobb63hOWzw+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659010101; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZlPntIRJj9BXF9pQct0SK0auD/ClxUCDfmxA47cebgo=; b=FI8lxiwGz9ZSFZsCSVxkRLDSJu8VchRZpjMOxQ7uS6U6AAfvYrVA9Wj8hu3vqLq+SkTOVEPip9gZ4rRnVp++hr6MuuAMhz/grlsUYRr8Ja0U8yrPhq6mkjiWTJ2K0nifXkzYQa/GTakPlQ58aoLEZ7wJ/nOl26Gvd446q0ZwkqA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659010101794295.7333560563628; Thu, 28 Jul 2022 05:08:21 -0700 (PDT) Received: from localhost ([::1]:57620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oH2JQ-00019k-QN for importer@patchew.org; Thu, 28 Jul 2022 08:08:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH2Bf-0001bg-PN for qemu-devel@nongnu.org; Thu, 28 Jul 2022 08:00:19 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH2BZ-0001vo-3M for qemu-devel@nongnu.org; Thu, 28 Jul 2022 08:00:19 -0400 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-551-jNkz-ik-PymEg-LUZcWOwg-1; Thu, 28 Jul 2022 08:00:09 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A34B4811E75; Thu, 28 Jul 2022 12:00:08 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 459EC18EB5; Thu, 28 Jul 2022 12:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659009612; 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=ZlPntIRJj9BXF9pQct0SK0auD/ClxUCDfmxA47cebgo=; b=hMEnW7OK506phxxb99M2TwYWVkJiPZx1huAoJW739fk3S+uBC/RKdJvIWhNR2kMKmXYWPA M85X15bnHLLRaL+0kAW1ouHNifFhaiaYIx3gq2ptvh3YY6/C7le981BemHGFthefnHV6iA 75WdM7ly0HO0mi3HRy85YGCZzVKKpKA= X-MC-Unique: jNkz-ik-PymEg-LUZcWOwg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Juan Quintela , "Dr. David Alan Gilbert" , Eduardo Habkost , Yanan Wang Subject: [PATCH v2 4/6] migration: Make find_dirty_block() return a single parameter Date: Thu, 28 Jul 2022 13:59:55 +0200 Message-Id: <20220728115957.5554-5-quintela@redhat.com> In-Reply-To: <20220728115957.5554-1-quintela@redhat.com> References: <20220728115957.5554-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659010104571100001 Content-Type: text/plain; charset="utf-8" We used to return two bools, just return a single int with the following meaning: old return / again / new return false false PAGE_ALL_CLEAN false true PAGE_TRY_AGAIN true true PAGE_DIRTY_FOUND /* We don't care about again at all = */ Signed-off-by: Juan Quintela --- migration/ram.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index c2c939ee03..1507ba1991 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1532,17 +1532,23 @@ retry: return pages; } =20 +#define PAGE_ALL_CLEAN 0 +#define PAGE_TRY_AGAIN 1 +#define PAGE_DIRTY_FOUND 2 /** * find_dirty_block: find the next dirty page and update any state * associated with the search process. * - * Returns true if a page is found + * Returns: + * PAGE_ALL_CLEAN: no dirty page found, give up + * PAGE_TRY_AGAIN: no dirty page found, retry for next block + * PAGE_DIRTY_FOUND: dirty page found * * @rs: current RAM state * @pss: data about the state of the current dirty page scan * @again: set to false if the search has scanned the whole of RAM */ -static bool find_dirty_block(RAMState *rs, PageSearchStatus *pss, bool *ag= ain) +static int find_dirty_block(RAMState *rs, PageSearchStatus *pss) { /* * This is not a postcopy requested page, mark it "not urgent", and use @@ -1558,8 +1564,7 @@ static bool find_dirty_block(RAMState *rs, PageSearch= Status *pss, bool *again) * We've been once around the RAM and haven't found anything. * Give up. */ - *again =3D false; - return false; + return PAGE_ALL_CLEAN; } if (!offset_in_ramblock(pss->block, ((ram_addr_t)pss->page) << TARGET_PAGE_BITS)) { @@ -1588,13 +1593,10 @@ static bool find_dirty_block(RAMState *rs, PageSear= chStatus *pss, bool *again) } } /* Didn't find anything this time, but try again on the new block = */ - *again =3D true; - return false; + return PAGE_TRY_AGAIN; } else { - /* Can go around again, but... */ - *again =3D true; - /* We've found something so probably don't need to */ - return true; + /* We've found something */ + return PAGE_DIRTY_FOUND; } } =20 @@ -2538,7 +2540,7 @@ static int ram_find_and_save_block(RAMState *rs) pss.block =3D QLIST_FIRST_RCU(&ram_list.blocks); } =20 - do { + while (true){ if (!get_queued_page(rs, &pss)) { /* * Recover previous precopy ramblock/offset if postcopy has @@ -2548,16 +2550,21 @@ static int ram_find_and_save_block(RAMState *rs) postcopy_preempt_restore(rs, &pss, false); } else { /* priority queue empty, so just search for something dirt= y */ - bool again =3D true; - if (!find_dirty_block(rs, &pss, &again)) { - if (!again) { + int res =3D find_dirty_block(rs, &pss); + if (res !=3D PAGE_DIRTY_FOUND) { + if (res =3D=3D PAGE_ALL_CLEAN) { break; + } else if (res =3D=3D PAGE_TRY_AGAIN) { + continue; } } } } pages =3D ram_save_host_page(rs, &pss); - } while (!pages); + if (pages) { + break; + } + } =20 rs->last_seen_block =3D pss.block; rs->last_page =3D pss.page; --=20 2.37.1