From patchwork Tue Jun 16 10:26:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 484931 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 82D3114027F for ; Tue, 16 Jun 2015 20:41:23 +1000 (AEST) Received: from localhost ([::1]:39217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4oIz-0003fZ-O3 for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 06:41:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53805) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4o6E-0007V1-0v for qemu-devel@nongnu.org; Tue, 16 Jun 2015 06:28:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4o6A-0001CS-Gc for qemu-devel@nongnu.org; Tue, 16 Jun 2015 06:28:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36501) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4o6A-0001C5-A9 for qemu-devel@nongnu.org; Tue, 16 Jun 2015 06:28:06 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id ED07C373F35; Tue, 16 Jun 2015 10:28:05 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-116-112.ams2.redhat.com [10.36.116.112]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5GAQtaC017611; Tue, 16 Jun 2015 06:28:03 -0400 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Tue, 16 Jun 2015 11:26:40 +0100 Message-Id: <1434450415-11339-28-git-send-email-dgilbert@redhat.com> In-Reply-To: <1434450415-11339-1-git-send-email-dgilbert@redhat.com> References: <1434450415-11339-1-git-send-email-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, quintela@redhat.com, liang.z.li@intel.com, luis@cs.umu.se, amit.shah@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v7 27/42] postcopy: ram_enable_notify to switch on userfault X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Dr. David Alan Gilbert" Mark the area of RAM as 'userfault' Start up a fault-thread to handle any userfaults we might receive from it (to be filled in later) Signed-off-by: Dr. David Alan Gilbert Reviewed-by: David Gibson Reviewed-by: Juan Quintela Reviewed-by: Amit Shah --- include/migration/migration.h | 3 ++ include/migration/postcopy-ram.h | 6 ++++ migration/postcopy-ram.c | 69 +++++++++++++++++++++++++++++++++++++++- migration/savevm.c | 9 ++++++ 4 files changed, 86 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index 98e2568..e6585c5 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -69,6 +69,9 @@ struct MigrationIncomingState { */ QemuEvent main_thread_load_event; + QemuThread fault_thread; + QemuSemaphore fault_thread_sem; + /* For the kernel to send us notifications */ int userfault_fd; QEMUFile *return_path; diff --git a/include/migration/postcopy-ram.h b/include/migration/postcopy-ram.h index 4192108..8a8616b 100644 --- a/include/migration/postcopy-ram.h +++ b/include/migration/postcopy-ram.h @@ -17,6 +17,12 @@ bool postcopy_ram_supported_by_host(void); /* + * Make all of RAM sensitive to accesses to areas that haven't yet been written + * and wire up anything necessary to deal with it. + */ +int postcopy_ram_enable_notify(MigrationIncomingState *mis); + +/* * Initialise postcopy-ram, setting the RAM to a state where we can go into * postcopy later; must be called prior to any precopy. * called from ram.c's similarly named ram_postcopy_incoming_init diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 35c87b4..7158d08 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -282,9 +282,71 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis) return 0; } +/* + * Mark the given area of RAM as requiring notification to unwritten areas + * Used as a callback on qemu_ram_foreach_block. + * host_addr: Base of area to mark + * offset: Offset in the whole ram arena + * length: Length of the section + * opaque: MigrationIncomingState pointer + * Returns 0 on success + */ +static int ram_block_enable_notify(const char *block_name, void *host_addr, + ram_addr_t offset, ram_addr_t length, + void *opaque) +{ + MigrationIncomingState *mis = opaque; + struct uffdio_register reg_struct; + + reg_struct.range.start = (uintptr_t)host_addr; + reg_struct.range.len = length; + reg_struct.mode = UFFDIO_REGISTER_MODE_MISSING; + + /* Now tell our userfault_fd that it's responsible for this area */ + if (ioctl(mis->userfault_fd, UFFDIO_REGISTER, ®_struct)) { + error_report("%s userfault register: %s", __func__, strerror(errno)); + return -1; + } + + return 0; +} + +/* + * Handle faults detected by the USERFAULT markings + */ +static void *postcopy_ram_fault_thread(void *opaque) +{ + MigrationIncomingState *mis = (MigrationIncomingState *)opaque; + + fprintf(stderr, "postcopy_ram_fault_thread\n"); + /* TODO: In later patch */ + qemu_sem_post(&mis->fault_thread_sem); + while (1) { + /* TODO: In later patch */ + } + + return NULL; +} + +int postcopy_ram_enable_notify(MigrationIncomingState *mis) +{ + /* Create the fault handler thread and wait for it to be ready */ + qemu_sem_init(&mis->fault_thread_sem, 0); + qemu_thread_create(&mis->fault_thread, "postcopy/fault", + postcopy_ram_fault_thread, mis, QEMU_THREAD_JOINABLE); + qemu_sem_wait(&mis->fault_thread_sem); + qemu_sem_destroy(&mis->fault_thread_sem); + + /* Mark so that we get notified of accesses to unwritten areas */ + if (qemu_ram_foreach_block(ram_block_enable_notify, mis)) { + return -1; + } + + return 0; +} + #else /* No target OS support, stubs just fail */ - bool postcopy_ram_supported_by_host(void) { error_report("%s: No OS support", __func__); @@ -307,6 +369,11 @@ int postcopy_ram_discard_range(MigrationIncomingState *mis, uint8_t *start, { assert(0); } + +int postcopy_ram_enable_notify(MigrationIncomingState *mis) +{ + assert(0); +} #endif /* ------------------------------------------------------------------------- */ diff --git a/migration/savevm.c b/migration/savevm.c index f4de52d..b87238a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1324,6 +1324,15 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis) return -1; } + /* + * Sensitise RAM - can now generate requests for blocks that don't exist + * However, at this point the CPU shouldn't be running, and the IO + * shouldn't be doing anything yet so don't actually expect requests + */ + if (postcopy_ram_enable_notify(mis)) { + return -1; + } + /* TODO start up the postcopy listening thread */ return 0; }