From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48590) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zoora-0007km-Lt for qemu-devel@nongnu.org; Wed, 21 Oct 2015 04:35:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZoorX-0003i8-F6 for qemu-devel@nongnu.org; Wed, 21 Oct 2015 04:35:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZoorX-0003hx-9L for qemu-devel@nongnu.org; Wed, 21 Oct 2015 04:35:11 -0400 From: Juan Quintela In-Reply-To: <1443515898-3594-34-git-send-email-dgilbert@redhat.com> (David Alan Gilbert's message of "Tue, 29 Sep 2015 09:37:57 +0100") References: <1443515898-3594-1-git-send-email-dgilbert@redhat.com> <1443515898-3594-34-git-send-email-dgilbert@redhat.com> Date: Wed, 21 Oct 2015 10:35:07 +0200 Message-ID: <87d1w8bow4.fsf@neno.neno> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v8 33/54] postcopy: Incoming initialisation Reply-To: quintela@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Dr. David Alan Gilbert (git)" Cc: aarcange@redhat.com, liang.z.li@intel.com, qemu-devel@nongnu.org, luis@cs.umu.se, bharata@linux.vnet.ibm.com, amit.shah@redhat.com, pbonzini@redhat.com "Dr. David Alan Gilbert (git)" wrote: > From: "Dr. David Alan Gilbert" > > Signed-off-by: Dr. David Alan Gilbert > Reviewed-by: David Gibson > Reviewed-by: Amit Shah > +/* > + * At the end of migration, undo the effects of init_range > + * opaque should be the MIS. > + */ > +static int cleanup_range(const char *block_name, void *host_addr, > + ram_addr_t offset, ram_addr_t length, void *opaque) > +{ > + MigrationIncomingState *mis = opaque; > + struct uffdio_range range_struct; > + trace_postcopy_cleanup_range(block_name, host_addr, offset, length); > + > + /* > + * We turned off hugepage for the precopy stage with postcopy enabled > + * we can turn it back on now. > + */ > +#ifdef MADV_HUGEPAGE > + if (madvise(host_addr, length, MADV_HUGEPAGE)) { > + error_report("%s HUGEPAGE: %s", __func__, strerror(errno)); > + return -1; > + } > +#endif this should be the same than: qemu_madvise(host_addr, lenght, QEMU_MADV_HUGEPAGE); Only problem I can see, is that there is no way to differentiate that madvise() has given one error or that MADV_HUGEPAGE is not defined. If we really want that: if (QEMU_MADV_HUGEPAGE != QEM_MADV_INVALID) { if (qemu_madvise(host_addr, length, QEMU_MADV_HUGEPAGE)) { error_report("%s HUGEPAGE: %s", __func__, strerror(errno)); return -1; } But I am not sure if we want it. > + > + /* > + * We can also turn off userfault now since we should have all the > + * pages. It can be useful to leave it on to debug postcopy > + * if you're not sure it's always getting every page. > + */ > + range_struct.start = (uintptr_t)host_addr; > + range_struct.len = length; > + > + if (ioctl(mis->userfault_fd, UFFDIO_UNREGISTER, &range_struct)) { > + error_report("%s: userfault unregister %s", __func__, strerror(errno)); > + > + return -1; > + } > + > + return 0; > +} I still think that exposing the userfault API all around is a bad idea, that it would be easier to just export: qemu_userfault_register_range(addr, lenght); qemu_userfault_unregister_range(addr, lenght); And hide the details on a header file. Later, Juan.