{"id":807491,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807491/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1504081950-2528-8-git-send-email-peterx@redhat.com>","date":"2017-08-30T08:32:04","name":"[RFC,v2,07/33] migration: provide postcopy_fault_thread_notify()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bb2082f75b233777400d717faf3367f0c616bbcd","submitter":{"id":67717,"url":"http://patchwork.ozlabs.org/api/1.0/people/67717/?format=json","name":"Peter Xu","email":"peterx@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504081950-2528-8-git-send-email-peterx@redhat.com/mbox/","series":[{"id":552,"url":"http://patchwork.ozlabs.org/api/1.0/series/552/?format=json","date":"2017-08-30T08:31:59","name":"Migration: postcopy failure recovery","version":2,"mbox":"http://patchwork.ozlabs.org/series/552/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807491/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=peterx@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xhzPZ0rqHz9sRq\n\tfor ;\n\tWed, 30 Aug 2017 18:36:34 +1000 (AEST)","from localhost ([::1]:49025 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmyUB-00016J-P6\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 04:36:31 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:34035)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmyQx-00072y-Ib\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmyQw-0003GB-Ln\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:11 -0400","from mx1.redhat.com ([209.132.183.28]:47976)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dmyQw-0003Fr-C1\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 04:33:10 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 5F6073295;\n\tWed, 30 Aug 2017 08:33:09 +0000 (UTC)","from pxdev.xzpeter.org.com (dhcp-14-103.nay.redhat.com\n\t[10.66.14.103])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 35A52871DD;\n\tWed, 30 Aug 2017 08:33:04 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 5F6073295","From":"Peter Xu ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 16:32:04 +0800","Message-Id":"<1504081950-2528-8-git-send-email-peterx@redhat.com>","In-Reply-To":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","References":"<1504081950-2528-1-git-send-email-peterx@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.29]);\n\tWed, 30 Aug 2017 08:33:09 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [RFC v2 07/33] migration: provide\n\tpostcopy_fault_thread_notify()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Laurent Vivier ,\n\tAndrea Arcangeli , \n\tJuan Quintela ,\n\tAlexey Perevalov , peterx@redhat.com,\n\t\"Dr . David Alan Gilbert\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"A general helper to notify the fault thread.\n\nReviewed-by: Dr. David Alan Gilbert \nSigned-off-by: Peter Xu \n---\n migration/postcopy-ram.c | 35 ++++++++++++++++++++---------------\n migration/postcopy-ram.h | 2 ++\n 2 files changed, 22 insertions(+), 15 deletions(-)","diff":"diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c\nindex 0138a49..c28e340 100644\n--- a/migration/postcopy-ram.c\n+++ b/migration/postcopy-ram.c\n@@ -287,6 +287,21 @@ int postcopy_ram_incoming_init(MigrationIncomingState *mis, size_t ram_pages)\n return 0;\n }\n \n+void postcopy_fault_thread_notify(MigrationIncomingState *mis)\n+{\n+ uint64_t tmp64 = 1;\n+\n+ /*\n+ * Wakeup the fault_thread. It's an eventfd that should currently\n+ * be at 0, we're going to increment it to 1\n+ */\n+ if (write(mis->userfault_event_fd, &tmp64, 8) != 8) {\n+ /* Not much we can do here, but may as well report it */\n+ error_report(\"%s: incrementing failed: %s\", __func__,\n+ strerror(errno));\n+ }\n+}\n+\n /*\n * At the end of a migration where postcopy_ram_incoming_init was called.\n */\n@@ -295,25 +310,15 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis)\n trace_postcopy_ram_incoming_cleanup_entry();\n \n if (mis->have_fault_thread) {\n- uint64_t tmp64;\n-\n if (qemu_ram_foreach_block(cleanup_range, mis)) {\n return -1;\n }\n- /*\n- * Tell the fault_thread to exit, it's an eventfd that should\n- * currently be at 0, we're going to increment it to 1\n- */\n- tmp64 = 1;\n+ /* Let the fault thread quit */\n atomic_set(&mis->fault_thread_quit, 1);\n- if (write(mis->userfault_event_fd, &tmp64, 8) == 8) {\n- trace_postcopy_ram_incoming_cleanup_join();\n- qemu_thread_join(&mis->fault_thread);\n- } else {\n- /* Not much we can do here, but may as well report it */\n- error_report(\"%s: incrementing userfault_event_fd: %s\", __func__,\n- strerror(errno));\n- }\n+ postcopy_fault_thread_notify(mis);\n+ trace_postcopy_ram_incoming_cleanup_join();\n+ qemu_thread_join(&mis->fault_thread);\n+\n trace_postcopy_ram_incoming_cleanup_closeuf();\n close(mis->userfault_fd);\n close(mis->userfault_event_fd);\ndiff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h\nindex 78a3591..4a7644d 100644\n--- a/migration/postcopy-ram.h\n+++ b/migration/postcopy-ram.h\n@@ -114,4 +114,6 @@ PostcopyState postcopy_state_get(void);\n /* Set the state and return the old state */\n PostcopyState postcopy_state_set(PostcopyState new_state);\n \n+void postcopy_fault_thread_notify(MigrationIncomingState *mis);\n+\n #endif\n","prefixes":["RFC","v2","07/33"]}