From nobody Wed Nov 12 16:29:45 2025 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=1572050102; cv=none; d=zoho.com; s=zohoarc; b=VaVGOdVD1bloqR66nuHyvLjWpq0Juj8+IiciMaIHTSpZ+7tPN9c1g4RyluRo3rRQYkefe7LJQ+xnSYa455TeJJ+k4+j7Uxu0ONWEQclbB41djJc0M3oMBdj969Mjd6PGpOyHQgpKg+xqQbJ9BJPA1lK+6jK5WhXW9FcHTbPauL8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572050102; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=98D4sVqGH1Hb+0g09k5BCD5iL6MmoRpqGSq4oncAfiQ=; b=VQLxDgPMf8Qj+odNY3YOSuzCJuKVMOgLjER3GAK3fyhBmlqgtttgH/QycxAVtxRVwaUOLvbu27QhWO++B3aOya5wwRx8gyiz0cnmTN/jP4p96syiMEB0bsPdNo/XYXBisTeX+QaGKtH1TML7C4krPffB7WfECSBlPvWTEPv6PVA= 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572050102278221.00035182541046; Fri, 25 Oct 2019 17:35:02 -0700 (PDT) Received: from localhost ([::1]:37472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iOA2n-0006oG-85 for importer@patchew.org; Fri, 25 Oct 2019 20:35:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49008) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO8se-0008E7-Mv for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:20:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO8sc-0000AP-Lh for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:20:28 -0400 Received: from mga11.intel.com ([192.55.52.93]:32856) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO8sa-000086-Nh for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:20:25 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Oct 2019 16:20:18 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga005.jf.intel.com with ESMTP; 25 Oct 2019 16:20:17 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,230,1569308400"; d="scan'208";a="373689598" From: Wei Yang To: quintela@redhat.com, dgilbert@redhat.com Subject: [PATCH 1/2] migration/multifd: clean pages after filling packet Date: Sat, 26 Oct 2019 07:19:59 +0800 Message-Id: <20191025232000.25857-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025232000.25857-1-richardw.yang@linux.intel.com> References: <20191025232000.25857-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 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: qemu-devel@nongnu.org, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a preparation for the next patch: not use multifd during postcopy. Without enabling postcopy, everything looks good. While after enabling postcopy, migration may fail even not use multifd during postcopy. The reason is the pages is not properly cleared and *old* target page will continue to be transferred. After clean pages, migration succeeds. Signed-off-by: Wei Yang Reviewed-by: Juan Quintela --- migration/ram.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 80dd2d55f9..7087bb73ed 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -929,10 +929,10 @@ static int multifd_send_pages(RAMState *rs) } qemu_mutex_unlock(&p->mutex); } - p->pages->used =3D 0; + assert(!p->pages->used); + assert(!p->pages->block); =20 p->packet_num =3D multifd_send_state->packet_num++; - p->pages->block =3D NULL; multifd_send_state->pages =3D p->pages; p->pages =3D pages; transferred =3D ((uint64_t) pages->used) * TARGET_PAGE_SIZE + p->packe= t_len; @@ -1114,6 +1114,8 @@ static void *multifd_send_thread(void *opaque) p->flags =3D 0; p->num_packets++; p->num_pages +=3D used; + p->pages->used =3D 0; + p->pages->block =3D NULL; qemu_mutex_unlock(&p->mutex); =20 trace_multifd_send(p->id, packet_num, used, flags, --=20 2.17.1 From nobody Wed Nov 12 16:29:45 2025 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=1572045769; cv=none; d=zoho.com; s=zohoarc; b=Abp8fJgcFB2IJ7W3JTN1/8LoaFpMyPKQsOTJwn5RdCI8EoNjgSUSb+VQPUGszLtUB6hfHXpSu3tWVqel057tUbKi8fOOXFdExcdXxY3fjS1i09ltkRiP5kzROmK9L1h+sFZpdisXvHgbFWKhPdrw0AAA5BWG6lYrNtbwoMXz7sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1572045769; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=khe4Twa/Szztir97LE7kFfhZtHExFT89DmmEs835u1c=; b=UXWN6PXmnxb91qauzkURxSB6CydCZgu6Omg44JTQYtkaP9rl7pw/Blp7cKcAx02DIwpfgxcfYZjr6iJtdWlacsFSqruuqr7Z+B/ap7WfjEflmTP5nwxUD/chADsaA1OC8B9VAXAtxtGZjFFGTZp1Y01VBS13dG3IpliaUASFz5M= 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1572045769976214.85016776251655; Fri, 25 Oct 2019 16:22:49 -0700 (PDT) Received: from localhost ([::1]:36668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO8uu-00038G-Lt for importer@patchew.org; Fri, 25 Oct 2019 19:22:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49006) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iO8se-0008E3-Mn for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:20:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iO8sc-0000AF-LD for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:20:28 -0400 Received: from mga11.intel.com ([192.55.52.93]:32857) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iO8sa-00008L-NY for qemu-devel@nongnu.org; Fri, 25 Oct 2019 19:20:25 -0400 Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Oct 2019 16:20:19 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by orsmga005.jf.intel.com with ESMTP; 25 Oct 2019 16:20:18 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,230,1569308400"; d="scan'208";a="373689603" From: Wei Yang To: quintela@redhat.com, dgilbert@redhat.com Subject: [PATCH 2/2] migration/multifd: not use multifd during postcopy Date: Sat, 26 Oct 2019 07:20:00 +0800 Message-Id: <20191025232000.25857-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191025232000.25857-1-richardw.yang@linux.intel.com> References: <20191025232000.25857-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 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: qemu-devel@nongnu.org, Wei Yang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We don't support multifd during postcopy, but user still could enable both multifd and postcopy. This leads to migration failure. Skip multifd during postcopy. Signed-off-by: Wei Yang Reviewed-by: Juan Quintela --- migration/ram.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 7087bb73ed..5876054195 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2547,10 +2547,13 @@ static int ram_save_target_page(RAMState *rs, PageS= earchStatus *pss, } =20 /* - * do not use multifd for compression as the first page in the new - * block should be posted out before sending the compressed page + * Do not use multifd for: + * 1. Compression as the first page in the new block should be posted = out + * before sending the compressed page + * 2. In postcopy as one whole host page should be placed */ - if (!save_page_use_compression(rs) && migrate_use_multifd()) { + if (!save_page_use_compression(rs) && migrate_use_multifd() + && !migration_in_postcopy()) { return ram_save_multifd_page(rs, block, offset); } =20 --=20 2.17.1