From nobody Mon Feb 9 06:48:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=hotmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520990716956657.1923842451711; Tue, 13 Mar 2018 18:25:16 -0700 (PDT) Received: from localhost ([::1]:43912 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evvAK-0003w4-5D for importer@patchew.org; Tue, 13 Mar 2018 21:25:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evv61-0000e4-33 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 21:20:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evv5w-0006YA-7J for qemu-devel@nongnu.org; Tue, 13 Mar 2018 21:20:49 -0400 Received: from mga18.intel.com ([134.134.136.126]:28906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evv5v-0006Hx-UK for qemu-devel@nongnu.org; Tue, 13 Mar 2018 21:20:44 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Mar 2018 18:20:43 -0700 Received: from natrouter.sh.intel.com (HELO robinhe-hp.domain) ([10.239.13.3]) by orsmga001.jf.intel.com with ESMTP; 13 Mar 2018 18:20:41 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,466,1515484800"; d="scan'208";a="38632892" From: junyan.he@hotmail.com To: qemu-devel@nongnu.org Date: Wed, 14 Mar 2018 09:20:18 +0800 Message-Id: <1520990418-28258-11-git-send-email-junyan.he@hotmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520990418-28258-1-git-send-email-junyan.he@hotmail.com> References: <1520990418-28258-1-git-send-email-junyan.he@hotmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.126 Subject: [Qemu-devel] [PATCH 10/10] RFC: Enable nvdimm snapshot functions. 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: kwolf@redhat.com, famz@redhat.com, crosthwaite.peter@gmail.com, quintela@redhat.com, dgilbert@redhat.com, mreitz@redhat.com, Junyan He , pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Junyan He In snapshot saving, all nvdimm kind memory will be saved in different way and we exclude all nvdimm kind memory region in ram.c Signed-off-by: Junyan He --- migration/ram.c | 17 +++++++++++++++++ vl.c | 1 + 2 files changed, 18 insertions(+) diff --git a/migration/ram.c b/migration/ram.c index d1db422..ad32469 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1219,9 +1219,15 @@ static bool find_dirty_block(RAMState *rs, PageSearc= hStatus *pss, bool *again) /* Didn't find anything in this RAM Block */ pss->page =3D 0; pss->block =3D QLIST_NEXT_RCU(pss->block, next); + while (ram_block_is_nvdimm_active(pss->block)) { + pss->block =3D QLIST_NEXT_RCU(pss->block, next); + } if (!pss->block) { /* Hit the end of the list */ pss->block =3D QLIST_FIRST_RCU(&ram_list.blocks); + while (ram_block_is_nvdimm_active(pss->block)) { + pss->block =3D QLIST_NEXT_RCU(pss->block, next); + } /* Flag that we've looped */ pss->complete_round =3D true; rs->ram_bulk_stage =3D false; @@ -1541,6 +1547,9 @@ static int ram_find_and_save_block(RAMState *rs, bool= last_stage) =20 if (!pss.block) { pss.block =3D QLIST_FIRST_RCU(&ram_list.blocks); + while (ram_block_is_nvdimm_active(pss.block)) { + pss.block =3D QLIST_NEXT_RCU(pss.block, next); + } } =20 do { @@ -1583,6 +1592,10 @@ uint64_t ram_bytes_total(void) =20 rcu_read_lock(); RAMBLOCK_FOREACH(block) { + if (ram_block_is_nvdimm_active(block)) { + // If snapshot and the block is nvdimm, let nvdimm do the job + continue; + } total +=3D block->used_length; } rcu_read_unlock(); @@ -2222,6 +2235,10 @@ static int ram_save_setup(QEMUFile *f, void *opaque) qemu_put_be64(f, ram_bytes_total() | RAM_SAVE_FLAG_MEM_SIZE); =20 RAMBLOCK_FOREACH(block) { + if (ram_block_is_nvdimm_active(block)) { + // If snapshot and the block is nvdimm, let nvdimm do the job + continue; + } qemu_put_byte(f, strlen(block->idstr)); qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idstr)); qemu_put_be64(f, block->used_length); diff --git a/vl.c b/vl.c index 3ef04ce..1bd5711 100644 --- a/vl.c +++ b/vl.c @@ -4502,6 +4502,7 @@ int main(int argc, char **argv, char **envp) =20 blk_mig_init(); ram_mig_init(); + nvdimm_snapshot_init(); =20 /* If the currently selected machine wishes to override the units-per-= bus * property of its default HBA interface type, do so now. */ --=20 2.7.4