From nobody Sun Apr 28 04:37:14 2024 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 1489059404803800.169235919744; Thu, 9 Mar 2017 03:36:44 -0800 (PST) Received: from localhost ([::1]:33387 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwN8-000600-IM for importer@patchew.org; Thu, 09 Mar 2017 06:36:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60925) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwLu-0005wq-6L for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clwLs-0004jn-ME for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:26 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:32801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clwLs-0004jf-Ft for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:24 -0500 Received: by mail-wm0-x241.google.com with SMTP id n11so10461883wma.0 for ; Thu, 09 Mar 2017 03:35:24 -0800 (PST) Received: from bumma.localdomain ([151.67.127.177]) by smtp.googlemail.com with ESMTPSA id 36sm7876460wrk.57.2017.03.09.03.35.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 03:35:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r/wgdnyg3qUbFrWQsrLWkvfsCVEh/Dl46WgeUDJ28Rs=; b=If5sKOV9nVEUjm6jzuv0Z/c7yU6SsrtieroBqbKprJ1Jvh7MxWCJd7ZHnswSizihQa BrKerxkFjNdPHnYUr7jP8hoPJ904vt0gjAZGTaaoj0JiuPpQNJX2BptC4zlxr659zUiG m++zCpBdnOKadjtVYJ3j/7vew9C7tZxQP3UOVYuAPWBuL0zagrhJ05X3DGSwLbBvfCg2 QVtmzk2GdU10WMII4r4U9vO2/p2K4vL4Nw8MLypF5grtemkQdQ/LxxCIpUqf86cHfbkd PJPASR4D5rw6AWLycuCzX1EEuL4n9VjDLqk2bGHXjC6nVSOkDke1S4YIx/O8scZVS5Um ImLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r/wgdnyg3qUbFrWQsrLWkvfsCVEh/Dl46WgeUDJ28Rs=; b=juU1LmHfh+bbPLCyvay/gRrOdppvBC3+aAQoaiZOQMeQSXijHozct0j6oEpdWZhH2p ZuTXemjq30ASxQcjmE/KXQcr4wpe3gadlAPBBbGAODOYbvtu/oT27EI1xfV+fws0bTNa jzkSwdTV/aIzslkSJ1G78Rc0MG9iIBRd0r0w3q/HSrPF6ta7+3Ko/YRqDzFblEHvcnY2 jXTsoWlscGncHi6URhncAV44IlExewMZXYsRj3pvWj1iMfSeKwEwj6KHZudroJ26irrj Az2tUcwqcd0qKo+/hXVmQ4H0aNA5Le0g+JWyJKhyrtl+kWis3CeQMOI39PbMcOn9F6Ml r6/w== X-Gm-Message-State: AMke39mSpnZSGaR3CQ1ySWvLzhBRUuRuAJjL1+NU+wCfbzCqmIYnVo7LoMVIO5moPa1XKw== X-Received: by 10.28.230.83 with SMTP id d80mr9964920wmh.18.1489059323414; Thu, 09 Mar 2017 03:35:23 -0800 (PST) From: Christian Pinto To: zhang.zhanghailiang@huawei.com Date: Thu, 9 Mar 2017 12:34:34 +0100 Message-Id: <20170309113437.9667-2-c.pinto@virtualopensystems.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170309113437.9667-1-c.pinto@virtualopensystems.com> References: <57B7F948.9040701@huawei.com> <20170309113437.9667-1-c.pinto@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [RFC PATCH 1/4] migration/postcopy-ram: check pagefault flags in userfaultfd thread 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: aarcange@redhat.com, b.reynal@virtualopensystems.com, quintela@redhat.com, qemu-devel@nongnu.org, hanweidong@huawei.com, peter.huangpeng@huawei.com, Christian Pinto , dgilbert@redhat.com, amit.shah@redhat.com, tech@virtualopensystems.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" The UFFD_PAGEFAULT_FLAG_WP should be set every time the page fault is due t= o a write to a write-protected page. Flag should be checked at every time to be sure the page fault is due to a write into WP area. Signed-off-by: Christian Pinto Signed-off-by: Baptiste Reynal --- migration/postcopy-ram.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index ea70bd5d16..9c45f1059f 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -534,7 +534,12 @@ static void *postcopy_ram_fault_thread(void *opaque) migrate_send_rp_req_pages(mis, NULL, rb_offset, hostpagesize); } - } else { /* UFFDIO_REGISTER_MODE_WP */ + } else if (msg.arg.pagefault.flags & + UFFD_PAGEFAULT_FLAG_WP) { /* UFFDIO_REGISTER_MODE_WP */ + /* + * msg.arg.pagefault.flags &UFFD_PAGEFAULT_FLAG_WP expected to + * be set in case of pagefault due to write protected page + * */ MigrationState *ms =3D container_of(us, MigrationState, userfault_state); ret =3D ram_save_queue_pages(ms, qemu_ram_get_idstr(rb), rb_of= fset, --=20 2.11.0 From nobody Sun Apr 28 04:37:14 2024 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 1489059522449179.85569405477793; Thu, 9 Mar 2017 03:38:42 -0800 (PST) Received: from localhost ([::1]:33394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwP1-00080k-3j for importer@patchew.org; Thu, 09 Mar 2017 06:38:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwLy-0005z5-7J for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clwLu-0004kj-VU for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:30 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34784) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clwLu-0004kK-PP for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:26 -0500 Received: by mail-wm0-x244.google.com with SMTP id u132so10439156wmg.1 for ; Thu, 09 Mar 2017 03:35:26 -0800 (PST) Received: from bumma.localdomain ([151.67.127.177]) by smtp.googlemail.com with ESMTPSA id 36sm7876460wrk.57.2017.03.09.03.35.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 03:35:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7jBwjdB+oWeqe36f4z96Isj5MxjmDRSykRniu76fhNA=; b=Zcf5FAhfcTbPvdpkmQ+uigKqc3YwFku2tHvDOACtet662zuAxsd06prnt5qSgPkbxm 8CTe+4cZ0hSgdnFJqu7yZM/nWYQ/9UWnjMIuIdICbGDBxMEeOfdy/P2q37X4JFNZmWYt bDGmzxbEgdJ479DK84hRCRQibqQF6lzor1OH+H6nzgP9ML2GlHAb4OVCFAtPjH31Xctw BhTxyXX+PurpkrYtqZPPutnCyfRId18aRcByTD9NesKQiu82lRVkAyXb1bselvaFgQxp 20tPh+uTpXdJW7GgghqNpEXeefBEl+JDe5QcQXw27BITMctdYYdmxU14Cr0nagEBpFA4 O0bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7jBwjdB+oWeqe36f4z96Isj5MxjmDRSykRniu76fhNA=; b=CHVDcEYEVpBK/amOisfWnrQbnT9LwiFtBNzciqIU/LjBMcl+cPy6Q13iDJw00IDWZV 4uDVnaqM25sKYIhdxxNeafJK7m6xSMXrGIPVATf7cCx2zFwOARXvrjlJKm153Gs1RyFH FAQFgjnYK4y+5eXtGT5uhSEtEVV2L6CC5b/iBleylm0HLeAPtFuhNcttpckSn6JONo+e eRwgH9xoy41NsfnvobZ40yKFQ+80hK5L3lc0zCMbv/eLmnUOwQa22ZUygtQ6pMfC60PB sUm7lxD0ao7mBthOMMmhGz8ZmQKWh0sdRMrdwN4lBa6vyFdftiZBW9rwH7MLMQF7UIg/ Zy8A== X-Gm-Message-State: AMke39nhxalZNHtkpunSP+bukLkqW78GHfej5OPqIe8pYlQ4JexPPfVhdsrJkC6E/J+vIg== X-Received: by 10.28.150.136 with SMTP id y130mr9860892wmd.103.1489059325654; Thu, 09 Mar 2017 03:35:25 -0800 (PST) From: Christian Pinto To: zhang.zhanghailiang@huawei.com Date: Thu, 9 Mar 2017 12:34:35 +0100 Message-Id: <20170309113437.9667-3-c.pinto@virtualopensystems.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170309113437.9667-1-c.pinto@virtualopensystems.com> References: <57B7F948.9040701@huawei.com> <20170309113437.9667-1-c.pinto@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [RFC PATCH 2/4] migration/ram: Fix for ARM/ARM64 page size 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: aarcange@redhat.com, b.reynal@virtualopensystems.com, quintela@redhat.com, qemu-devel@nongnu.org, hanweidong@huawei.com, peter.huangpeng@huawei.com, Christian Pinto , dgilbert@redhat.com, amit.shah@redhat.com, tech@virtualopensystems.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" Architecture such as ARM use a page size of 1KB, while write protection is done at the granularity of host pages (generally 4KB). All addresses must always be aligned to the size of a host page. Signed-off-by: Christian Pinto Signed-off-by: Baptiste Reynal --- migration/postcopy-ram.c | 6 +++--- migration/ram.c | 18 ++++++++++++++---- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 9c45f1059f..97382067b3 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -373,7 +373,7 @@ int postcopy_ram_prepare_discard(MigrationIncomingState= *mis) return 0; } =20 -int ram_set_pages_wp(uint64_t page_addr, +int ram_set_pages_wp(ram_addr_t page_addr, uint64_t size, bool remove, int uffd) @@ -556,10 +556,10 @@ static void *postcopy_ram_fault_thread(void *opaque) * will be an deadlock error. */ if (migration_in_setup(ms)) { - uint64_t host =3D msg.arg.pagefault.address; + ram_addr_t host =3D msg.arg.pagefault.address; =20 host &=3D ~(hostpagesize - 1); - ret =3D ram_set_pages_wp(host, getpagesize(), true, + ret =3D ram_set_pages_wp(host, hostpagesize, true, us->userfault_fd); if (ret < 0) { error_report("Remove page's write-protect failed"); diff --git a/migration/ram.c b/migration/ram.c index 3417c56f29..7a3b1c7ed3 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1383,14 +1383,24 @@ static int ram_find_and_save_block(QEMUFile *f, boo= l last_stage, /* For snapshot, we will remove the page write-protect here */ if (migration_in_snapshot(ms)) { int ret; - uint64_t host_addr =3D (uint64_t)(pss.block->host + pss.of= fset); - + /* + * Some architectures in QEMU use a smaller memory page si= ze + * with respect to the host page size. ARM as an example + * uses 1K memory pages, while Linux supports pages of min= imum + * size of 4K. + * Userfault write protection works at the level of a host= page + * and thus one full host page has to be protected/unprote= cted + * every time. + */ + ram_addr_t host_addr =3D (ram_addr_t)(pss.block->host + + pss.offset) & (~(qemu_host_page_size -= 1)); ret =3D ram_set_pages_wp(host_addr, getpagesize(), true, ms->userfault_state.userfault_fd); if (ret < 0) { error_report("Failed to remove the write-protect for p= age:" - "%"PRIx64 " length: %d, block: %s", host_= addr, - getpagesize(), pss.block->idstr); + "%"PRIx64 " length: %d, offset: %"PRIx64 + ", block: %s", host_addr, getpagesize(), + pss.offset, pss.block->idstr); } } } --=20 2.11.0 From nobody Sun Apr 28 04:37:14 2024 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 1489059407145753.6016083364119; Thu, 9 Mar 2017 03:36:47 -0800 (PST) Received: from localhost ([::1]:33386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwNA-0005zy-QH for importer@patchew.org; Thu, 09 Mar 2017 06:36:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwLy-0005z6-8Q for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clwLx-0004m5-4A for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:30 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clwLw-0004lv-UB for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:29 -0500 Received: by mail-wm0-x244.google.com with SMTP id u132so10439319wmg.1 for ; Thu, 09 Mar 2017 03:35:28 -0800 (PST) Received: from bumma.localdomain ([151.67.127.177]) by smtp.googlemail.com with ESMTPSA id 36sm7876460wrk.57.2017.03.09.03.35.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 03:35:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7Dx3dt79Q+m0FsmvOY5ePq3+9zOgItY1MTtuDlUmvwk=; b=z0VvXd65IP9kgsWfPcEj5xadJFtvedaHwoE87pUdUoXjD9ECqIONBpi8gE2aBrRMIg ndudVjcMWDJ9W1XI/oJ57YBGVHSJ66+dxAW9sf19cKahKcAAGAvqC4bOjTQK8HL7aKlP gZHwEZiNoaL7S7O9J6GYNVaCqZira17LPf4jpsybYVaaCVyBE6DAy0LnxYQgeaGFnmzZ 2x/YgM/QKrulYyGn+/Pg9L1F0JhX3L8NqWvYhHyRYK3NV1RQEMc4mNTz3dXECApwf+eR h4NX6oPYIhR3ElQRiOpVY3YgHQCvs7vLUTCo/mA10dqXg1RRMtaCcW4qYkhzvQE6lUJ7 cqRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7Dx3dt79Q+m0FsmvOY5ePq3+9zOgItY1MTtuDlUmvwk=; b=hD8vcjI/VwXeazn70imNa9GCuajeM4nqdu9YFD4b9sKebPOcDZeB6PRLOHmsJ1YXXC V46DfFmGM4WHTPE/9mgXCtFYl76kd7Ol/rr+U+S3UAdzlbGmQMa45/ZXWiyLdDkn8YUK mZiy6s39tqc8QrQOboCVo59XAW6xgF/bJ2mpBaVWx2E9NxeKpS116VUP1haAHLOxN/zA 3bhhKoJcOmoadaFybaXuH4h4yRKpGotz8VVTgZb1bkhowUiU5zh5XbmbEU4WeIew9Pwa epHOUlrDYzP9ykiIRs2gkFcmMp9rk0yevXplHrdYQyPVHHCkhKl5b/MsD9Z+qyFeDbv3 WybQ== X-Gm-Message-State: AMke39nzTqbBRymKivqNjfNBBqwoeLJX8Y0jogPs2xyLAXTt+HOWAegq0ARXhRDJCovilA== X-Received: by 10.28.183.4 with SMTP id h4mr29065576wmf.140.1489059327957; Thu, 09 Mar 2017 03:35:27 -0800 (PST) From: Christian Pinto To: zhang.zhanghailiang@huawei.com Date: Thu, 9 Mar 2017 12:34:36 +0100 Message-Id: <20170309113437.9667-4-c.pinto@virtualopensystems.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170309113437.9667-1-c.pinto@virtualopensystems.com> References: <57B7F948.9040701@huawei.com> <20170309113437.9667-1-c.pinto@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [RFC PATCH 3/4] migration: snapshot thread 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: aarcange@redhat.com, b.reynal@virtualopensystems.com, quintela@redhat.com, qemu-devel@nongnu.org, hanweidong@huawei.com, peter.huangpeng@huawei.com, Christian Pinto , dgilbert@redhat.com, amit.shah@redhat.com, tech@virtualopensystems.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" VM execution was resumed while migration was still in setup. This was causing a bus error because the userfault thread was waking up VM too early during migration setup. Signed-off-by: Christian Pinto Signed-off-by: Baptiste Reynal --- migration/migration.c | 9 +++++---- migration/postcopy-ram.c | 14 -------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index f6d68ca020..19e8da1f84 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1894,15 +1894,16 @@ static void *snapshot_thread(void *opaque) postcopy_ram_enable_notify(&ms->userfault_state, UFFDIO_REGISTER_MODE_= WP); buffer =3D qemu_save_device_buffer(); =20 + migrate_set_state(&ms->state, MIGRATION_STATUS_SETUP, + MIGRATION_STATUS_ACTIVE); + + trace_snapshot_thread_setup_complete(); + if (old_vm_running) { vm_start(); } qemu_mutex_unlock_iothread(); =20 - migrate_set_state(&ms->state, MIGRATION_STATUS_SETUP, MIGRATION_STATUS= _ACTIVE); - - trace_snapshot_thread_setup_complete(); - while (qemu_file_get_error(ms->to_dst_file) =3D=3D 0) { if (qemu_savevm_state_iterate(ms->to_dst_file, false) > 0) { break; diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 97382067b3..6252eb379a 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -551,20 +551,6 @@ static void *postcopy_ram_fault_thread(void *opaque) break; } =20 - /* Note: In the setup process, snapshot_thread may modify VM's - * write-protected pages, we should not block it there, or there - * will be an deadlock error. - */ - if (migration_in_setup(ms)) { - ram_addr_t host =3D msg.arg.pagefault.address; - - host &=3D ~(hostpagesize - 1); - ret =3D ram_set_pages_wp(host, hostpagesize, true, - us->userfault_fd); - if (ret < 0) { - error_report("Remove page's write-protect failed"); - } - } } } trace_postcopy_ram_fault_thread_exit(); --=20 2.11.0 From nobody Sun Apr 28 04:37:14 2024 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 1489059412399270.97606371857046; Thu, 9 Mar 2017 03:36:52 -0800 (PST) Received: from localhost ([::1]:33388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwNF-00063f-SI for importer@patchew.org; Thu, 09 Mar 2017 06:36:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1clwM0-0005zm-KI for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1clwLz-0004mn-BH for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:32 -0500 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:36728) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1clwLz-0004mb-52 for qemu-devel@nongnu.org; Thu, 09 Mar 2017 06:35:31 -0500 Received: by mail-wm0-x241.google.com with SMTP id v190so10451982wme.3 for ; Thu, 09 Mar 2017 03:35:31 -0800 (PST) Received: from bumma.localdomain ([151.67.127.177]) by smtp.googlemail.com with ESMTPSA id 36sm7876460wrk.57.2017.03.09.03.35.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Mar 2017 03:35:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtualopensystems-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5KRMPeHjrmfI54FrHLSgg3sfa9cedIJuSuq0fWLPaLg=; b=PtHMJbXgo7SiUGiO2DItnwxaLmdQaztuhePkDqecXka94d5ZVFvPiWXAGdBVkyQb/O mXgY26Fkut/OdVwuyXdoIlNmUrLWlICie9mHABsBrl70Hf1XckGHtKk6qW6XG7AuzUTl Fs8eqlfXOWEfKIiUYoHmNfS0cch7TFmz47XeP7jblzIh0XtnqD6qb9Jd/YBZmFRTh45X 4mkYlHAguGc2vkuyT1gbjt9DEI6CJF873EfNV/P17KRa7bVQuJYhuaHivYjjk3UcBWCe 6kBNN4QR+t+4MAUkh/FVH1bYTxfquamoI86sbVuvzh8blchrJtKRD+S0Vp/ZmHGz4elS GORA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5KRMPeHjrmfI54FrHLSgg3sfa9cedIJuSuq0fWLPaLg=; b=lNBQYvNQxCqUe7QGCQaNwI36sZ7p+OBmu6gobG9mnc30ynAEGSSth0dg8AZ65MhHzk 2QPVvoVjvIwNdB/EhZmvSlcdDZR1mZpACWJR+uhBNYOVMZLURTHL39YDsBmv7fd9udDU luKzjebHjp9kKN+xGuRbrb7cP4b1ONF7a79Ehwm51OQtNMi1FIxHB7LjhAlSm7EEYvvD /mic9MXwDX/DJa4mTDp62aR3N3ECjuHXdqwKjIx+gCKf4E16SS96DsqHrYzF/2f+crni eCnSuEEEzbM9/hHIxB2vnT9rQdjp6poKEt8Tfh3LKck3mPVxTJOY8/woi0wXPeTBvgVg HSTA== X-Gm-Message-State: AMke39lC/VIj5Rw5YG1Mz5NEbfPxgyCWqddGEIAbE95txW0dXMilsTYyQ8HRKQA1ZiiJXw== X-Received: by 10.28.142.16 with SMTP id q16mr27608126wmd.78.1489059330216; Thu, 09 Mar 2017 03:35:30 -0800 (PST) From: Christian Pinto To: zhang.zhanghailiang@huawei.com Date: Thu, 9 Mar 2017 12:34:37 +0100 Message-Id: <20170309113437.9667-5-c.pinto@virtualopensystems.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170309113437.9667-1-c.pinto@virtualopensystems.com> References: <57B7F948.9040701@huawei.com> <20170309113437.9667-1-c.pinto@virtualopensystems.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [RFC PATCH 4/4] migration/postcopy-ram: ram_set_pages_wp fix 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: aarcange@redhat.com, b.reynal@virtualopensystems.com, quintela@redhat.com, qemu-devel@nongnu.org, hanweidong@huawei.com, peter.huangpeng@huawei.com, Christian Pinto , dgilbert@redhat.com, amit.shah@redhat.com, tech@virtualopensystems.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" setting UFFDIO_WRITEPROTECT_MODE_DONTWAKE when write un-protecting a page does not wake up the faulting thread. Set to 0 to force the faulting (VM) thread to wake-up. Signed-off-by: Christian Pinto Signed-off-by: Baptiste Reynal --- migration/postcopy-ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 6252eb379a..684faae614 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -384,7 +384,7 @@ int ram_set_pages_wp(ram_addr_t page_addr, wp_struct.range.start =3D (uint64_t)(uintptr_t)page_addr; wp_struct.range.len =3D size; if (remove) { - wp_struct.mode =3D UFFDIO_WRITEPROTECT_MODE_DONTWAKE; + wp_struct.mode =3D 0; } else { wp_struct.mode =3D UFFDIO_WRITEPROTECT_MODE_WP; } --=20 2.11.0