From nobody Mon Feb 9 20:12:24 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 149865473932997.4749161649579; Wed, 28 Jun 2017 05:58:59 -0700 (PDT) Received: from localhost ([::1]:33233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCYb-0003Ws-Vq for importer@patchew.org; Wed, 28 Jun 2017 08:58:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48310) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQCSQ-0005kM-5g for qemu-devel@nongnu.org; Wed, 28 Jun 2017 08:52:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQCSM-0002xq-6I for qemu-devel@nongnu.org; Wed, 28 Jun 2017 08:52:34 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:15478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQCSL-0002xJ-Uj for qemu-devel@nongnu.org; Wed, 28 Jun 2017 08:52:30 -0400 Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OS900GBTD3E1H30@mailout1.w1.samsung.com> for qemu-devel@nongnu.org; Wed, 28 Jun 2017 13:52:26 +0100 (BST) Received: from eusmges4.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170628125225eucas1p27ac9e1dc5083700d8606c05272aca518~MSi-uya-h0206002060eucas1p21; Wed, 28 Jun 2017 12:52:25 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges4.samsung.com (EUCPMTA) with SMTP id B7.92.04729.986A3595; Wed, 28 Jun 2017 13:52:25 +0100 (BST) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170628125224eucas1p20961fd8d4b71906d84446cd50d59cfb8~MSi_5v5Bt1019910199eucas1p2w; Wed, 28 Jun 2017 12:52:24 +0000 (GMT) Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 54.1D.20206.886A3595; Wed, 28 Jun 2017 13:52:24 +0100 (BST) Received: from minion.rnd.samsung.ru ([106.109.131.134]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OS900J3VD2QR510@eusync2.samsung.com>; Wed, 28 Jun 2017 13:52:24 +0100 (BST) X-AuditID: cbfec7f4-f79806d000001279-69-5953a6898631 From: Alexey Perevalov To: qemu-devel@nongnu.org Date: Wed, 28 Jun 2017 08:49:30 -0400 Message-id: <1498654172-26570-2-git-send-email-a.perevalov@samsung.com> X-Mailer: git-send-email 1.8.3.1 In-reply-to: <1498654172-26570-1-git-send-email-a.perevalov@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsWy7djP87qdy4IjDVaslLWYe/c8i0Xvtnvs Flfaf7JbbNn/jd3ieO8OFos7W/qYHNg8nlzbzOTxft9VNo++LasYA5ijuGxSUnMyy1KL9O0S uDI+fN3KXDBBoaKxawtzA2O/WBcjJ4eEgIlEe9NeNghbTOLCvfVANheHkMBSRonbv1dBOZ8Z JTbd+sAO07Hu+ixmiMQyRokVJ+9AVTUwSdw9+x8ow8HBJmAgse+eLUiDiICkxO+u02ANzAKt jBLtfY/AaoQFXCT2vtADqWERUJXY92I9M4jNK+Au0db8jRlimYLElIfvwWxOAQ+JwwsWsILM kRC4zSYxfXIrK8gcCQFZiU0HoOpdJBY2f2eCsIUlXh3fAnW0jMTlyd0sEL3tjBLdOzuhBk1g lDgz/S9Ulb3EqZtXwbqZBfgkJm2bzgyxgFeio00IosRDYvKRm1ALHCXa/x9igXh+NqPE9Y09 7BMYZRYwMqxiFEktLc5NTy020StOzC0uzUvXS87P3cQIjNPT/45/2cG4+JjVIUYBDkYlHt4V IsGRQqyJZcWVuYcYJTiYlUR4WxcChXhTEiurUovy44tKc1KLDzFKc7AoifNynboWISSQnliS mp2aWpBaBJNl4uCUamBkkefxMGFzmvp/lkD9n9f3q9bwHCgQ7fRbOik72vPRhI0egb7eb76t PHFo9Y8NR9a0CrJl7hdadiuvvyw5Na1fZO9q80aD2I6H0wJt6nmnxazpOnU5KsMw5P8P6wvb u45I+t0VT72mtFN/9e3eaSv2VV7eeifXb2ZLz/m1DA2Vejd/73fkebtFiaU4I9FQi7moOBEA U1cILs8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsVy+t/xK7ody4IjDTbuV7GYe/c8i0Xvtnvs Flfaf7JbbNn/jd3ieO8OFos7W/qYHNg8nlzbzOTxft9VNo++LasYA5ij3GwyUhNTUosUUvOS 81My89JtlUJD3HQtlBTyEnNTbZUidH1DgpQUyhJzSoE8IwM04OAc4B6spG+X4Jbx4etW5oIJ ChWNXVuYGxj7xboYOTkkBEwk1l2fxQxhi0lcuLeerYuRi0NIYAmjxKOTb1khnCYmiTcHjwJV cXCwCRhI7LtnC9IgIiAp8bvrNDNIDbNAK6PEk8ZZ7CA1wgIuEntf6IHUsAioSux7sR5sAa+A u0Rb8zeoZQoSUx6+B7M5BTwkDi9YwApiCwHVPN9zi3ECI+8CRoZVjCKppcW56bnFRnrFibnF pXnpesn5uZsYgeG67djPLTsYu94FH2IU4GBU4uFdIRIcKcSaWFZcmXuIUYKDWUmEt3UhUIg3 JbGyKrUoP76oNCe1+BCjKdBRE5mlRJPzgbGUVxJvaGJobmloZGxhYW5kpCTOO/XDlXAhgfTE ktTs1NSC1CKYPiYOTqkGRsNby7ij2BwOaHQGP/oSahT2epVStFzgVPPVDAft9LQfTjLWXCq7 eem7WukLd5mSqkykmXNyN1ysuZjuKTBtj8f15TfPKizzefJR33RzMdMv52Aj/x3n6lnV7rA2 P5d4YvEhiM37r47y6tr9qssym5gtDP9viU39oPJrpvqBt3/9lxSF3RGZpMRSnJFoqMVcVJwI AAKB3UltAgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170628125224eucas1p20961fd8d4b71906d84446cd50d59cfb8 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?QWxleGV5IFBlcmV2YWxvdhtTUlItVmlydHVhbGl6YXRpb24g?= =?UTF-8?B?TGFiG+yCvOyEseyghOyekBtTZW5pb3IgRW5naW5lZXI=?= X-Global-Sender: =?UTF-8?B?QWxleGV5IFBlcmV2YWxvdhtTUlItVmlydHVhbGl6YXRpb24g?= =?UTF-8?B?TGFiG1NhbXN1bmcgRWxlY3Ryb25pY3MbU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG0NJU0hRG0MxMEdEMDFHRDAxMDE1NA==?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170628125224eucas1p20961fd8d4b71906d84446cd50d59cfb8 X-RootMTR: 20170628125224eucas1p20961fd8d4b71906d84446cd50d59cfb8 References: <1498654172-26570-1-git-send-email-a.perevalov@samsung.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 210.118.77.11 Subject: [Qemu-devel] [PATCH v6 1/3] migration: postcopy_place_page factoring out 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: i.maximets@samsung.com, dgilbert@redhat.com, Alexey Perevalov , peterx@redhat.com, quintela@redhat.com 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" Need to mark copied pages as closer as possible to the place where it tracks down. That will be necessary in futher patch. Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu Reviewed-by: Juan Quintela Signed-off-by: Alexey Perevalov --- migration/postcopy-ram.c | 13 +++++++------ migration/postcopy-ram.h | 4 ++-- migration/ram.c | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index c8c4500..dae41b5 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -566,9 +566,10 @@ int postcopy_ram_enable_notify(MigrationIncomingState = *mis) * returns 0 on success */ int postcopy_place_page(MigrationIncomingState *mis, void *host, void *fro= m, - size_t pagesize) + RAMBlock *rb) { struct uffdio_copy copy_struct; + size_t pagesize =3D qemu_ram_pagesize(rb); =20 copy_struct.dst =3D (uint64_t)(uintptr_t)host; copy_struct.src =3D (uint64_t)(uintptr_t)from; @@ -597,11 +598,11 @@ int postcopy_place_page(MigrationIncomingState *mis, = void *host, void *from, * returns 0 on success */ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, - size_t pagesize) + RAMBlock *rb) { trace_postcopy_place_page_zero(host); =20 - if (pagesize =3D=3D getpagesize()) { + if (qemu_ram_pagesize(rb) =3D=3D getpagesize()) { struct uffdio_zeropage zero_struct; zero_struct.range.start =3D (uint64_t)(uintptr_t)host; zero_struct.range.len =3D getpagesize(); @@ -631,7 +632,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mi= s, void *host, memset(mis->postcopy_tmp_zero_page, '\0', mis->largest_page_si= ze); } return postcopy_place_page(mis, host, mis->postcopy_tmp_zero_page, - pagesize); + rb); } =20 return 0; @@ -694,14 +695,14 @@ int postcopy_ram_enable_notify(MigrationIncomingState= *mis) } =20 int postcopy_place_page(MigrationIncomingState *mis, void *host, void *fro= m, - size_t pagesize) + RAMBlock *rb) { assert(0); return -1; } =20 int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, - size_t pagesize) + RAMBlock *rb) { assert(0); return -1; diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h index 52d51e8..78a3591 100644 --- a/migration/postcopy-ram.h +++ b/migration/postcopy-ram.h @@ -72,14 +72,14 @@ void postcopy_discard_send_finish(MigrationState *ms, * returns 0 on success */ int postcopy_place_page(MigrationIncomingState *mis, void *host, void *fro= m, - size_t pagesize); + RAMBlock *rb); =20 /* * Place a zero page at (host) atomically * returns 0 on success */ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, - size_t pagesize); + RAMBlock *rb); =20 /* The current postcopy state is read/set by postcopy_state_get/set * which update it atomically. diff --git a/migration/ram.c b/migration/ram.c index 8dbdfdb..f50479d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2465,10 +2465,10 @@ static int ram_load_postcopy(QEMUFile *f) =20 if (all_zero) { ret =3D postcopy_place_page_zero(mis, place_dest, - block->page_size); + block); } else { ret =3D postcopy_place_page(mis, place_dest, - place_source, block->page_size); + place_source, block); } } if (!ret) { --=20 1.8.3.1