From nobody Sat May 4 23:05:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1617269074; cv=none; d=zohomail.com; s=zohoarc; b=nvUlJSh9hIr+gXgcS2ZnDIZ8WRYaCuG2Ci4ZrlsAfgu15z2wp4qrctgAG2Uxi2Qvlp3cIjB3aqYnTzxm9M4yfxULnXeaQxY5Zg4v9obXWnZVqaBpAX2RiQhd6sH45//cZCTsjdgIhWrIGnKTa9DrtPM7JgnGPMFmm7zNKJhflxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617269074; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=dsT5zM3LWm54KXJKp+koHgDkvBukDrpfrwMHQpQFtts=; b=LZFWN8pPbymm2dELMqQocT1hPkDRMkqCY7eFNspIkNEf+yvx6kASkOZqsJ/VDXiYI9zME2CtKo3ChrrNpi6HyLOVhYBK9Q83MC/fEzyKCxfj8SIu/E3Qg3OWkMmjyAucT1dk2heiB1HoOAE4cSSZNznHdrgS3EDcIf+X++z0xVA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine 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 1617269074480204.47204846961063; Thu, 1 Apr 2021 02:24:34 -0700 (PDT) Received: from localhost ([::1]:42730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRtZ3-000097-Cu for importer@patchew.org; Thu, 01 Apr 2021 05:24:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtXH-0006uH-SD for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:44 -0400 Received: from relay.sw.ru ([185.231.240.75]:49890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtX5-0006Uv-6h for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:43 -0400 Received: from [192.168.15.162] (helo=andrey-MS-7B54.sw.ru) by relay.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1lRtX1-000DxR-Eq; Thu, 01 Apr 2021 12:22:27 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-Id:Date:Subject:From: Content-Type; bh=dsT5zM3LWm54KXJKp+koHgDkvBukDrpfrwMHQpQFtts=; b=sxaZUZK0L+fj U2ENCId29ZfoIff7emFCaDQofdJJje0+V2AaPdOEMFbc8R4l+5FIRy1gItPNSLxUBDNwElmg5JH6W 8vREjz4Id1nNVV21/xYUhsO1YZYhxxKVN0plm8UmVDFzCRj267d59dTdsZ/XxNK2EwpQs6VlSL2jx koFEU=; From: Andrey Gruzdev To: qemu-devel@nongnu.org Cc: Den Lunev , Eric Blake , Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Markus Armbruster , Peter Xu , David Hildenbrand , Andrey Gruzdev Subject: [PATCH for-6.0 v1 1/4] migration: Fix missing qemu_fflush() on buffer file in bg_migration_thread Date: Thu, 1 Apr 2021 12:22:23 +0300 Message-Id: <20210401092226.102804-2-andrey.gruzdev@virtuozzo.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> References: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.gruzdev@virtuozzo.com; helo=relay.sw.ru X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Added missing qemu_fflush() on buffer file holding precopy device state. Increased initial QIOChannelBuffer allocation to 512KB to avoid reallocs. Typical configurations often require >200KB for device state and VMDESC. Fixes: 8518278a6af589ccc401f06e35f171b1e6fae800 (migration: implementation of background snapshot thread) Signed-off-by: Andrey Gruzdev Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/migration/migration.c b/migration/migration.c index ca8b97baa5..00e13f9d58 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3812,7 +3812,7 @@ static void *bg_migration_thread(void *opaque) * with vCPUs running and, finally, write stashed non-RAM part of * the vmstate from the buffer to the migration stream. */ - s->bioc =3D qio_channel_buffer_new(128 * 1024); + s->bioc =3D qio_channel_buffer_new(512 * 1024); qio_channel_set_name(QIO_CHANNEL(s->bioc), "vmstate-buffer"); fb =3D qemu_fopen_channel_output(QIO_CHANNEL(s->bioc)); object_unref(OBJECT(s->bioc)); @@ -3866,6 +3866,12 @@ static void *bg_migration_thread(void *opaque) if (qemu_savevm_state_complete_precopy_non_iterable(fb, false, false))= { goto fail; } + /* + * Since we are going to get non-iterable state data directly + * from s->bioc->data, explicit flush is needed here. + */ + qemu_fflush(fb); + /* Now initialize UFFD context and start tracking RAM writes */ if (ram_write_tracking_start()) { goto fail; --=20 2.27.0 From nobody Sat May 4 23:05:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1617269073; cv=none; d=zohomail.com; s=zohoarc; b=QcHaOxZnDalnbKBTSxx67FsSyZzriv9S17WsJGgkh1MGelc33SIpW6OpUSegSKmYAKlS2gAYyfFpWZWzpzqP8jBfc0OLkKroqa53wHm3pNghn13316tv4U/qFfHb4TonQomNjE2NkNOjh6AeB+qHPBbbOpMt0Y3BoPCrwBgdRTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617269073; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IaYDXLpsx8dXdhtbVkcPoomSxkPgq7RsGQc6eyw3BAY=; b=m9bhJ+6M/HhA+iuESXB/m1/a+o6cPxBhSIreRnQDgiXVM88niFGZMU+PVkNYY77wIwNuL+xbqr+7p+qUMDdfh1hk2ln5A2MAu/hyhq2HXYEUEQgE4TkIdwWhIzwTnmwKprHmhNLp7JyDM5ijU2yGeg9bHBx4GlpLh34TN/A1mBQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine 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 1617269073037181.56280951957467; Thu, 1 Apr 2021 02:24:33 -0700 (PDT) Received: from localhost ([::1]:42550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRtZ1-0008WT-SG for importer@patchew.org; Thu, 01 Apr 2021 05:24:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtX9-0006rL-I1 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:39 -0400 Received: from relay.sw.ru ([185.231.240.75]:49896) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtX5-0006Uu-5x for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:35 -0400 Received: from [192.168.15.162] (helo=andrey-MS-7B54.sw.ru) by relay.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1lRtX1-000DxR-IO; Thu, 01 Apr 2021 12:22:27 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-Id:Date:Subject:From: Content-Type; bh=IaYDXLpsx8dXdhtbVkcPoomSxkPgq7RsGQc6eyw3BAY=; b=AAlCZtVYsddM HfwsF0HjhpPes+kLbIfiEPpVAMsQAEj19k3adCYzrrHGpRV8TdhTJmOdlT+SxoqRDKBDEGJfcW3Q0 oUPEjJtIjPeFMoiUzA8tPRV40JrM/QmdxEGGdDqgYFNhLFmxeaj8gwLNrQn2QY4POJqy6XuUMgos6 9re5g=; From: Andrey Gruzdev To: qemu-devel@nongnu.org Cc: Den Lunev , Eric Blake , Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Markus Armbruster , Peter Xu , David Hildenbrand , Andrey Gruzdev Subject: [PATCH for-6.0 v1 2/4] migration: Inhibit virtio-balloon for the duration of background snapshot Date: Thu, 1 Apr 2021 12:22:24 +0300 Message-Id: <20210401092226.102804-3-andrey.gruzdev@virtuozzo.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> References: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.gruzdev@virtuozzo.com; helo=relay.sw.ru X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" The same thing as for incoming postcopy - we cannot deal with concurrent RAM discards when using background snapshot feature in outgoing migration. Fixes: 8518278a6af589ccc401f06e35f171b1e6fae800 (migration: implementation of background snapshot thread) Signed-off-by: Andrey Gruzdev Reported-by: David Hildenbrand Reviewed-by: David Hildenbrand --- hw/virtio/virtio-balloon.c | 8 ++++++-- include/migration/misc.h | 2 ++ migration/migration.c | 8 ++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c index e770955176..d120bf8f43 100644 --- a/hw/virtio/virtio-balloon.c +++ b/hw/virtio/virtio-balloon.c @@ -66,8 +66,12 @@ static bool virtio_balloon_pbp_matches(PartiallyBalloone= dPage *pbp, =20 static bool virtio_balloon_inhibited(void) { - /* Postcopy cannot deal with concurrent discards, so it's special. */ - return ram_block_discard_is_disabled() || migration_in_incoming_postco= py(); + /* + * Postcopy cannot deal with concurrent discards, + * so it's special, as well as background snapshots. + */ + return ram_block_discard_is_disabled() || migration_in_incoming_postco= py() || + migration_in_bg_snapshot(); } =20 static void balloon_inflate_page(VirtIOBalloon *balloon, diff --git a/include/migration/misc.h b/include/migration/misc.h index bccc1b6b44..738675ef52 100644 --- a/include/migration/misc.h +++ b/include/migration/misc.h @@ -70,6 +70,8 @@ bool migration_in_postcopy_after_devices(MigrationState *= ); void migration_global_dump(Monitor *mon); /* True if incomming migration entered POSTCOPY_INCOMING_DISCARD */ bool migration_in_incoming_postcopy(void); +/* True if background snapshot is active */ +bool migration_in_bg_snapshot(void); =20 /* migration/block-dirty-bitmap.c */ void dirty_bitmap_mig_init(void); diff --git a/migration/migration.c b/migration/migration.c index 00e13f9d58..be4729e7c8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1976,6 +1976,14 @@ bool migration_in_incoming_postcopy(void) return ps >=3D POSTCOPY_INCOMING_DISCARD && ps < POSTCOPY_INCOMING_END; } =20 +bool migration_in_bg_snapshot(void) +{ + MigrationState *s =3D migrate_get_current(); + + return migrate_background_snapshot() && + migration_is_setup_or_active(s->state); +} + bool migration_is_idle(void) { MigrationState *s =3D current_migration; --=20 2.27.0 From nobody Sat May 4 23:05:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1617269155; cv=none; d=zohomail.com; s=zohoarc; b=ijKUPWFeRv4jV74eebd9jPrqMgygIMRzfg9BAygItbl+UlYRvnNGYyvyYdnZYFC64u1AmDrJ3lWGRdE7ZqgqTwEtXunRlgx+36RICNhzIgqoP6gmwkR5Vm64ZegdqDubGOWPhoEz8qzp5jgqMydYUxsz4xJJGmbRQ9x8oc4QPGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617269155; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gJXkUTonPtKXDepjvSsGeQ76zv3tjexQliHyYevf2yU=; b=M4Qku65lrUFl9QGALb9Sr2r2mJbHvN0jA7xew8ryc0+2r0QhVV3toCBavyIMvTLP6VraPorlR6XqJmLoTJDs+1LDwEGPy1+3e0E+bimnBAEWwKPz67G4N7PcGrOBgOScf9RRIUwxVfsPvBf4Z2JlDvPkn6mtRbH0SeMGNAUabNc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine 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 1617269155792367.00423744216357; Thu, 1 Apr 2021 02:25:55 -0700 (PDT) Received: from localhost ([::1]:48580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRtaM-0002VX-RD for importer@patchew.org; Thu, 01 Apr 2021 05:25:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtXD-0006rj-BB for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:40 -0400 Received: from relay.sw.ru ([185.231.240.75]:49888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtX5-0006Us-6Z for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:39 -0400 Received: from [192.168.15.162] (helo=andrey-MS-7B54.sw.ru) by relay.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1lRtX1-000DxR-Ly; Thu, 01 Apr 2021 12:22:27 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-Id:Date:Subject:From: Content-Type; bh=gJXkUTonPtKXDepjvSsGeQ76zv3tjexQliHyYevf2yU=; b=ufzKjGnNuQTE EDyYsjGC4CqQsn5mvOxpxHj796UyU83uD445rlIwSFlAtR38oiUkk2FOtzzVnkuMkox7Lbqtsliny /jG4mcLsTn+oTFrE+ucWotZXSO2lyNYcGUQJIf4BVj4oI2+r+sdg7NQnBEZaLJXb2RU/cr4jQVIF8 AObQs=; From: Andrey Gruzdev To: qemu-devel@nongnu.org Cc: Den Lunev , Eric Blake , Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Markus Armbruster , Peter Xu , David Hildenbrand , Andrey Gruzdev Subject: [PATCH for-6.0 v1 3/4] migration: Pre-fault memory before starting background snasphot Date: Thu, 1 Apr 2021 12:22:25 +0300 Message-Id: <20210401092226.102804-4-andrey.gruzdev@virtuozzo.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> References: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.gruzdev@virtuozzo.com; helo=relay.sw.ru X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" This commit solves the issue with userfault_fd WP feature that background snapshot is based on. For any never poluated or discarded memory page, the UFFDIO_WRITEPROTECT ioctl() would skip updating PTE for that page, thereby loosing WP setting for it. So we need to pre-fault pages for each RAM block to be protected before making a userfault_fd wr-protect ioctl(). Fixes: 278e2f551a095b234de74dca9c214d5502a1f72c (migration: support UFFD write fault processing in ram_save_iterate()) Signed-off-by: Andrey Gruzdev Reported-by: David Hildenbrand Reviewed-by: David Hildenbrand --- migration/migration.c | 6 ++++++ migration/ram.c | 49 +++++++++++++++++++++++++++++++++++++++++++ migration/ram.h | 1 + 3 files changed, 56 insertions(+) diff --git a/migration/migration.c b/migration/migration.c index be4729e7c8..71bce15a1b 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3827,6 +3827,12 @@ static void *bg_migration_thread(void *opaque) =20 update_iteration_initial_status(s); =20 + /* + * Prepare for tracking memory writes with UFFD-WP - populate + * RAM pages before protecting. + */ + ram_write_tracking_prepare(); + qemu_savevm_state_header(s->to_dst_file); qemu_savevm_state_setup(s->to_dst_file); =20 diff --git a/migration/ram.c b/migration/ram.c index 40e78952ad..7e2bc0fdd3 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1560,6 +1560,55 @@ out: return ret; } =20 +/* + * ram_block_populate_pages: populate memory in the RAM block by reading + * an integer from the beginning of each page. + * + * Since it's solely used for userfault_fd WP feature, here we just + * hardcode page size to qemu_real_host_page_size. + * + * @bs: RAM block to populate + */ +static void ram_block_populate_pages(RAMBlock *bs) +{ + char *ptr =3D (char *) bs->host; + + for (ram_addr_t offset =3D 0; offset < bs->used_length; + offset +=3D qemu_real_host_page_size) { + char tmp =3D *(ptr + offset); + + /* Don't optimize the read out */ + asm volatile("" : "+r" (tmp)); + } +} + +/* + * ram_write_tracking_prepare: prepare for UFFD-WP memory tracking + */ +void ram_write_tracking_prepare(void) +{ + RAMBlock *bs; + + RCU_READ_LOCK_GUARD(); + + RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + /* Nothing to do with read-only and MMIO-writable regions */ + if (bs->mr->readonly || bs->mr->rom_device) { + continue; + } + + /* + * Populate pages of the RAM block before enabling userfault_fd + * write protection. + * + * This stage is required since ioctl(UFFDIO_WRITEPROTECT) with + * UFFDIO_WRITEPROTECT_MODE_WP mode setting would silently skip + * pages with pte_none() entries in page table. + */ + ram_block_populate_pages(bs); + } +} + /* * ram_write_tracking_start: start UFFD-WP memory tracking * diff --git a/migration/ram.h b/migration/ram.h index 6378bb3ebc..4833e9fd5b 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -82,6 +82,7 @@ void colo_incoming_start_dirty_log(void); /* Background snapshot */ bool ram_write_tracking_available(void); bool ram_write_tracking_compatible(void); +void ram_write_tracking_prepare(void); int ram_write_tracking_start(void); void ram_write_tracking_stop(void); =20 --=20 2.27.0 From nobody Sat May 4 23:05:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=1; a=rsa-sha256; t=1617269129; cv=none; d=zohomail.com; s=zohoarc; b=OfydFi/5ZoWyFQJuSiTaxE2vE4N+BRefktO+eQ9NKpx7FmdQj0fA+WJknn5/i6mIOzOQdRkr6Hf4gyheB0mKXVmWH55hyZ3xS+EsF7YEm1TbMglBpdUcXw/ZsYSFvrtF7aU7/L4fEvOUU6QCgBatg0+/YylXwy16criEnGAxlPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617269129; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=McC5C32Zg767HvLvApGCciGf9axYsg3x1uHo0LehNds=; b=Xm4r9HsNsm6lRHqXqK4eyssaHfrORXu2ciXvYpcwXsxmrs+pZFZvm8xHqbvoRR/aunm5t13YdC4iEXIdr3kzAB+V1FxyY+qWO60dNxVR3DIG+IPv0YXNfzKeYAiu15MKYmqJeToeWIeAHofCw7BO+CMaBGC1XAp0b5RasLwL++Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine 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 1617269129352898.9786931717044; Thu, 1 Apr 2021 02:25:29 -0700 (PDT) Received: from localhost ([::1]:47884 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRtZt-0002DE-TK for importer@patchew.org; Thu, 01 Apr 2021 05:25:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtX8-0006qX-O4 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:39 -0400 Received: from relay.sw.ru ([185.231.240.75]:49894) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRtX5-0006Ut-6k for qemu-devel@nongnu.org; Thu, 01 Apr 2021 05:22:33 -0400 Received: from [192.168.15.162] (helo=andrey-MS-7B54.sw.ru) by relay.sw.ru with esmtp (Exim 4.94) (envelope-from ) id 1lRtX1-000DxR-PZ; Thu, 01 Apr 2021 12:22:27 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-Id:Date:Subject:From: Content-Type; bh=McC5C32Zg767HvLvApGCciGf9axYsg3x1uHo0LehNds=; b=qUJnFm1GErX1 62tcR3A7I8pMMpvwlDiEwUFgxteTeUQA1TTvo54X30nmp93GKfBNQiBSahMUCfeRewHhHC9jtCQtT vBqz+BwAT6uP0lQE9MKjeG+QnSVAXPq7xfvmPhAOJT7m6aPIZEZldf3rUiHYPOxhl9qlm6vet5s9W 4F+DU=; From: Andrey Gruzdev To: qemu-devel@nongnu.org Cc: Den Lunev , Eric Blake , Paolo Bonzini , Juan Quintela , "Dr . David Alan Gilbert" , Markus Armbruster , Peter Xu , David Hildenbrand , Andrey Gruzdev Subject: [PATCH for-6.0 v1 4/4] migration: Rename 'bs' to 'block' in background snapshot code Date: Thu, 1 Apr 2021 12:22:26 +0300 Message-Id: <20210401092226.102804-5-andrey.gruzdev@virtuozzo.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> References: <20210401092226.102804-1-andrey.gruzdev@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=185.231.240.75; envelope-from=andrey.gruzdev@virtuozzo.com; helo=relay.sw.ru X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Rename 'bs' to commonly used 'block' in migration/ram.c background snapshot code. Signed-off-by: Andrey Gruzdev Reported-by: David Hildenbrand Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 86 +++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 7e2bc0fdd3..4682f3625c 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1455,7 +1455,7 @@ static RAMBlock *poll_fault_page(RAMState *rs, ram_ad= dr_t *offset) { struct uffd_msg uffd_msg; void *page_address; - RAMBlock *bs; + RAMBlock *block; int res; =20 if (!migrate_background_snapshot()) { @@ -1468,9 +1468,9 @@ static RAMBlock *poll_fault_page(RAMState *rs, ram_ad= dr_t *offset) } =20 page_address =3D (void *)(uintptr_t) uffd_msg.arg.pagefault.address; - bs =3D qemu_ram_block_from_host(page_address, false, offset); - assert(bs && (bs->flags & RAM_UF_WRITEPROTECT) !=3D 0); - return bs; + block =3D qemu_ram_block_from_host(page_address, false, offset); + assert(block && (block->flags & RAM_UF_WRITEPROTECT) !=3D 0); + return block; } =20 /** @@ -1526,7 +1526,7 @@ bool ram_write_tracking_compatible(void) { const uint64_t uffd_ioctls_mask =3D BIT(_UFFDIO_WRITEPROTECT); int uffd_fd; - RAMBlock *bs; + RAMBlock *block; bool ret =3D false; =20 /* Open UFFD file descriptor */ @@ -1537,15 +1537,15 @@ bool ram_write_tracking_compatible(void) =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { uint64_t uffd_ioctls; =20 /* Nothing to do with read-only and MMIO-writable regions */ - if (bs->mr->readonly || bs->mr->rom_device) { + if (block->mr->readonly || block->mr->rom_device) { continue; } /* Try to register block memory via UFFD-IO to track writes */ - if (uffd_register_memory(uffd_fd, bs->host, bs->max_length, + if (uffd_register_memory(uffd_fd, block->host, block->max_length, UFFDIO_REGISTER_MODE_WP, &uffd_ioctls)) { goto out; } @@ -1567,13 +1567,13 @@ out: * Since it's solely used for userfault_fd WP feature, here we just * hardcode page size to qemu_real_host_page_size. * - * @bs: RAM block to populate + * @block: RAM block to populate */ -static void ram_block_populate_pages(RAMBlock *bs) +static void ram_block_populate_pages(RAMBlock *block) { - char *ptr =3D (char *) bs->host; + char *ptr =3D (char *) block->host; =20 - for (ram_addr_t offset =3D 0; offset < bs->used_length; + for (ram_addr_t offset =3D 0; offset < block->used_length; offset +=3D qemu_real_host_page_size) { char tmp =3D *(ptr + offset); =20 @@ -1587,13 +1587,13 @@ static void ram_block_populate_pages(RAMBlock *bs) */ void ram_write_tracking_prepare(void) { - RAMBlock *bs; + RAMBlock *block; =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { /* Nothing to do with read-only and MMIO-writable regions */ - if (bs->mr->readonly || bs->mr->rom_device) { + if (block->mr->readonly || block->mr->rom_device) { continue; } =20 @@ -1605,7 +1605,7 @@ void ram_write_tracking_prepare(void) * UFFDIO_WRITEPROTECT_MODE_WP mode setting would silently skip * pages with pte_none() entries in page table. */ - ram_block_populate_pages(bs); + ram_block_populate_pages(block); } } =20 @@ -1618,7 +1618,7 @@ int ram_write_tracking_start(void) { int uffd_fd; RAMState *rs =3D ram_state; - RAMBlock *bs; + RAMBlock *block; =20 /* Open UFFD file descriptor */ uffd_fd =3D uffd_create_fd(UFFD_FEATURE_PAGEFAULT_FLAG_WP, true); @@ -1629,27 +1629,27 @@ int ram_write_tracking_start(void) =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { /* Nothing to do with read-only and MMIO-writable regions */ - if (bs->mr->readonly || bs->mr->rom_device) { + if (block->mr->readonly || block->mr->rom_device) { continue; } =20 /* Register block memory with UFFD to track writes */ - if (uffd_register_memory(rs->uffdio_fd, bs->host, - bs->max_length, UFFDIO_REGISTER_MODE_WP, NULL)) { + if (uffd_register_memory(rs->uffdio_fd, block->host, + block->max_length, UFFDIO_REGISTER_MODE_WP, NULL)) { goto fail; } /* Apply UFFD write protection to the block memory range */ - if (uffd_change_protection(rs->uffdio_fd, bs->host, - bs->max_length, true, false)) { + if (uffd_change_protection(rs->uffdio_fd, block->host, + block->max_length, true, false)) { goto fail; } - bs->flags |=3D RAM_UF_WRITEPROTECT; - memory_region_ref(bs->mr); + block->flags |=3D RAM_UF_WRITEPROTECT; + memory_region_ref(block->mr); =20 - trace_ram_write_tracking_ramblock_start(bs->idstr, bs->page_size, - bs->host, bs->max_length); + trace_ram_write_tracking_ramblock_start(block->idstr, block->page_= size, + block->host, block->max_length); } =20 return 0; @@ -1657,19 +1657,20 @@ int ram_write_tracking_start(void) fail: error_report("ram_write_tracking_start() failed: restoring initial mem= ory state"); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { - if ((bs->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { + if ((block->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { continue; } /* * In case some memory block failed to be write-protected * remove protection and unregister all succeeded RAM blocks */ - uffd_change_protection(rs->uffdio_fd, bs->host, bs->max_length, fa= lse, false); - uffd_unregister_memory(rs->uffdio_fd, bs->host, bs->max_length); + uffd_change_protection(rs->uffdio_fd, block->host, block->max_leng= th, + false, false); + uffd_unregister_memory(rs->uffdio_fd, block->host, block->max_leng= th); /* Cleanup flags and remove reference */ - bs->flags &=3D ~RAM_UF_WRITEPROTECT; - memory_region_unref(bs->mr); + block->flags &=3D ~RAM_UF_WRITEPROTECT; + memory_region_unref(block->mr); } =20 uffd_close_fd(uffd_fd); @@ -1683,24 +1684,25 @@ fail: void ram_write_tracking_stop(void) { RAMState *rs =3D ram_state; - RAMBlock *bs; + RAMBlock *block; =20 RCU_READ_LOCK_GUARD(); =20 - RAMBLOCK_FOREACH_NOT_IGNORED(bs) { - if ((bs->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { + RAMBLOCK_FOREACH_NOT_IGNORED(block) { + if ((block->flags & RAM_UF_WRITEPROTECT) =3D=3D 0) { continue; } /* Remove protection and unregister all affected RAM blocks */ - uffd_change_protection(rs->uffdio_fd, bs->host, bs->max_length, fa= lse, false); - uffd_unregister_memory(rs->uffdio_fd, bs->host, bs->max_length); + uffd_change_protection(rs->uffdio_fd, block->host, block->max_leng= th, + false, false); + uffd_unregister_memory(rs->uffdio_fd, block->host, block->max_leng= th); =20 - trace_ram_write_tracking_ramblock_stop(bs->idstr, bs->page_size, - bs->host, bs->max_length); + trace_ram_write_tracking_ramblock_stop(block->idstr, block->page_s= ize, + block->host, block->max_length); =20 /* Cleanup flags and remove reference */ - bs->flags &=3D ~RAM_UF_WRITEPROTECT; - memory_region_unref(bs->mr); + block->flags &=3D ~RAM_UF_WRITEPROTECT; + memory_region_unref(block->mr); } =20 /* Finally close UFFD file descriptor */ --=20 2.27.0