From nobody Sun May 5 05:43:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1559697004; cv=none; d=zoho.com; s=zohoarc; b=R7Do3kID8naHNHyJSjNkUPrfet23yfPzwP/d9kC/sA/AZBhYmgvC8AA3yTOI6uDLuuex9+qEQaEneK8nQ7Lnx4kf2JbmiFsK7s1g6VioXPYqRhP+URv/4JNJTRXhrz3TCLV62NJuwSRL5U4lL1Xmwj1fnLu5j0V1MP5h96hVfXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1559697004; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=ew+ejagZrUgG5TSTNTzkooinsn28RR7XzmZSBAzY+Fs=; b=IzrEQ5+ay9RksaxJfoiLCKoT7ahTeNVg4enCuXchiw7TcfZH5LBUo7ZMjpRY+uGofK82Rr/nLQ0T5eJVuSJasAtR4MPYBfXL5Ry78M/zJq40v2+iXt3GH3KD/96vQUW6+wPlzGda56qYdgydxlz5g9c+ElYq14eONTruVzVklHg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1559697003963932.5895476534345; Tue, 4 Jun 2019 18:10:03 -0700 (PDT) Received: from localhost ([127.0.0.1]:33602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYKR8-000120-Eb for importer@patchew.org; Tue, 04 Jun 2019 21:09:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYKQG-0000jV-VH for qemu-devel@nongnu.org; Tue, 04 Jun 2019 21:09:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYKQG-0001Gu-0y for qemu-devel@nongnu.org; Tue, 04 Jun 2019 21:09:00 -0400 Received: from mga12.intel.com ([192.55.52.136]:38830) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYKQF-0001Dl-OX for qemu-devel@nongnu.org; Tue, 04 Jun 2019 21:08:59 -0400 Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Jun 2019 18:08:55 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga004.fm.intel.com with ESMTP; 04 Jun 2019 18:08:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Wei Yang To: qemu-devel@nongnu.org Date: Wed, 5 Jun 2019 09:08:28 +0800 Message-Id: <20190605010828.6969-1-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.136 Subject: [Qemu-devel] [PATCH] migratioin/ram.c: reset complete_round when we gets a queued page X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wei Yang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In case we gets a queued page, the order of block is interrupted. We may not rely on the complete_round flag to say we have already searched the whole blocks on the list. Signed-off-by: Wei Yang Reviewed-by: Juan Quintela --- migration/ram.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index d881981876..e9b40d636d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2290,6 +2290,12 @@ static bool get_queued_page(RAMState *rs, PageSearch= Status *pss) */ pss->block =3D block; pss->page =3D offset >> TARGET_PAGE_BITS; + + /* + * This unqueued page would break the "one round" check, even is + * really rare. + */ + pss->complete_round =3D false; } =20 return !!block; --=20 2.19.1