From nobody Sun Feb 8 07:34:54 2026 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=1563782084; cv=none; d=zoho.com; s=zohoarc; b=MEAEC51y5D4j4IJz1rj7tR8Syk9T4sgvkEPLk+wNgUOkfiGL41RvhXEv1P75ogbjcvCgHmFF/jpxQAI6DYFloCcayGzWOMVnORwzGqdwfoujavXrwXj1H3DLqiiJUHVpSQBXjKKnUVV3Calt5hrKRBAZlmyPCYx+iBtX5EGJSHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563782084; 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:ARC-Authentication-Results; bh=NmNTu6p/QtEw5Otp2vafYROA5uESvpox1qgxg8Y8Cew=; b=GZzLf6Dnxl4gUJ+7KStYLmQdd4ALzsn7gzSYf0VYx4aXgvj3THk28yq0KePpEv+qXvoIa2rVc/OL8gnnpa8cRCmBH1Suc8c4bY8gScDPyItFrq+ZTw8mvb3HfhbewksxXz2uad13Esut1q7HWO9stsaQxJvT1Nx92+XRWzjKaU4= 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 1563782084851323.556768347834; Mon, 22 Jul 2019 00:54:44 -0700 (PDT) Received: from localhost ([::1]:59528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpT9f-00034B-UY for importer@patchew.org; Mon, 22 Jul 2019 03:54:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39576) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpT9K-0001da-0w for qemu-devel@nongnu.org; Mon, 22 Jul 2019 03:54:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpT9J-0000xE-1E for qemu-devel@nongnu.org; Mon, 22 Jul 2019 03:54:21 -0400 Received: from mga03.intel.com ([134.134.136.65]:6620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpT9I-0000uj-Oa for qemu-devel@nongnu.org; Mon, 22 Jul 2019 03:54:20 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 00:54:16 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 22 Jul 2019 00:54:14 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,294,1559545200"; d="scan'208";a="188554613" From: Wei Yang To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 15:53:38 +0800 Message-Id: <20190722075339.25121-2-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190722075339.25121-1-richardw.yang@linux.intel.com> References: <20190722075339.25121-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH 1/2] migration: return -EINVAL directly when version_id mismatch 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: Wei Yang , dgilbert@redhat.com, quintela@redhat.com 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" It is not reasonable to continue when version_id mismatch. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 7e34c82a72..6bfdfae16e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4216,7 +4216,7 @@ static int ram_load(QEMUFile *f, void *opaque, int ve= rsion_id) seq_iter++; =20 if (version_id !=3D 4) { - ret =3D -EINVAL; + return -EINVAL; } =20 if (!migrate_use_compression()) { --=20 2.17.1 From nobody Sun Feb 8 07:34:54 2026 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=1563782110; cv=none; d=zoho.com; s=zohoarc; b=TB8b2BK/TtDpw2HTcUNID5XhvakHmSr82gg564rX19/QR0b2fTrniKgA0bVnSlk9Oq7QSms8AJrKc/22PxbfyUHQ3KyIcNRmU2FybP0Q/QBIy5bmn2xY2zLxPUcFaIKkxnBwocz3+Izo98Gz4QOg7OiVySZ0TZCc884OX5FCyJA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563782110; 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:ARC-Authentication-Results; bh=KuGYNZAUFQpN4g5cxFA2BEAKInJwCYWlmg0us4rwH8g=; b=P8RMe9M5Ywj6r4upKAqT3HKamzZGR8qNEuGcOB1snV+S50bSqgOk9r7N3YH6h3r2NM1TaRrd9bd03fF6A0Vsy1tugLqwcas6q5YO+JN0fXiPwbeT0cqYSSPbh8y5EOJbyJrPUuMFAOWqIcs+mLxllvpWj2TLeqIgZsvTnCWF9X8= 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 1563782110209511.8294915828719; Mon, 22 Jul 2019 00:55:10 -0700 (PDT) Received: from localhost ([::1]:59540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpTA4-0004e7-Tj for importer@patchew.org; Mon, 22 Jul 2019 03:55:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39589) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpT9K-0001gA-L0 for qemu-devel@nongnu.org; Mon, 22 Jul 2019 03:54:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpT9J-0000yf-Gn for qemu-devel@nongnu.org; Mon, 22 Jul 2019 03:54:22 -0400 Received: from mga03.intel.com ([134.134.136.65]:6620) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpT9J-0000uj-7o for qemu-devel@nongnu.org; Mon, 22 Jul 2019 03:54:21 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 00:54:17 -0700 Received: from richard.sh.intel.com (HELO localhost) ([10.239.159.54]) by fmsmga001.fm.intel.com with ESMTP; 22 Jul 2019 00:54:16 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,294,1559545200"; d="scan'208";a="188554615" From: Wei Yang To: qemu-devel@nongnu.org Date: Mon, 22 Jul 2019 15:53:39 +0800 Message-Id: <20190722075339.25121-3-richardw.yang@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190722075339.25121-1-richardw.yang@linux.intel.com> References: <20190722075339.25121-1-richardw.yang@linux.intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH 2/2] migration: extract ram_load_precopy 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: Wei Yang , dgilbert@redhat.com, quintela@redhat.com 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" After cleanup, it would be clear to audience there are two cases ram_load: * precopy * postcopy And it is not necessary to check postcopy_running on each iteration for precopy. Signed-off-by: Wei Yang Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 73 +++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 6bfdfae16e..5f6f07b255 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -4200,40 +4200,26 @@ static void colo_flush_ram_cache(void) trace_colo_flush_ram_cache_end(); } =20 -static int ram_load(QEMUFile *f, void *opaque, int version_id) +/** + * ram_load_precopy: load a page in precopy case + * + * Returns 0 for success or -errno in case of error + * + * Called in precopy mode by ram_load(). + * rcu_read_lock is taken prior to this being called. + * + * @f: QEMUFile where to send the data + */ +static int ram_load_precopy(QEMUFile *f) { - int flags =3D 0, ret =3D 0, invalid_flags =3D 0; - static uint64_t seq_iter; - int len =3D 0; - /* - * If system is running in postcopy mode, page inserts to host memory = must - * be atomic - */ - bool postcopy_running =3D postcopy_is_running(); + int flags =3D 0, ret =3D 0, invalid_flags =3D 0, len =3D 0; /* ADVISE is earlier, it shows the source has the postcopy capability = on */ bool postcopy_advised =3D postcopy_is_advised(); - - seq_iter++; - - if (version_id !=3D 4) { - return -EINVAL; - } - if (!migrate_use_compression()) { invalid_flags |=3D RAM_SAVE_FLAG_COMPRESS_PAGE; } - /* This RCU critical section can be very long running. - * When RCU reclaims in the code start to become numerous, - * it will be necessary to reduce the granularity of this - * critical section. - */ - rcu_read_lock(); - - if (postcopy_running) { - ret =3D ram_load_postcopy(f); - } =20 - while (!postcopy_running && !ret && !(flags & RAM_SAVE_FLAG_EOS)) { + while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) { ram_addr_t addr, total_ram_bytes; void *host =3D NULL; uint8_t ch; @@ -4390,6 +4376,39 @@ static int ram_load(QEMUFile *f, void *opaque, int v= ersion_id) } } =20 + return ret; +} + +static int ram_load(QEMUFile *f, void *opaque, int version_id) +{ + int ret =3D 0; + static uint64_t seq_iter; + /* + * If system is running in postcopy mode, page inserts to host memory = must + * be atomic + */ + bool postcopy_running =3D postcopy_is_running(); + + seq_iter++; + + if (version_id !=3D 4) { + return -EINVAL; + } + + /* + * This RCU critical section can be very long running. + * When RCU reclaims in the code start to become numerous, + * it will be necessary to reduce the granularity of this + * critical section. + */ + rcu_read_lock(); + + if (postcopy_running) { + ret =3D ram_load_postcopy(f); + } else { + ret =3D ram_load_precopy(f); + } + ret |=3D wait_for_decompress_done(); rcu_read_unlock(); trace_ram_load_complete(ret, seq_iter); --=20 2.17.1