From patchwork Wed Feb 12 13:42:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 11378605 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E95E6924 for ; Wed, 12 Feb 2020 13:53:13 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C16FC2082F for ; Wed, 12 Feb 2020 13:53:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RcN6dMjC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C16FC2082F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:38206 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1sS1-0007KT-0Q for patchwork-qemu-devel@patchwork.kernel.org; Wed, 12 Feb 2020 08:53:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39437) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j1sJ8-0007hs-Jo for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:44:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j1sJ6-0004Rm-FG for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:44:02 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34853 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j1sJ5-0004QC-7T for qemu-devel@nongnu.org; Wed, 12 Feb 2020 08:43:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581515038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tha9YJ740MpzJF2OZkPvucAf9Y+sGM5RvzSXdztglkY=; b=RcN6dMjCfBQ9RAFeMUmNuCTrEU8nfdsyLjVfzwvjwAOoXBihLUudltnl3tbhAJF7plWuxy t1dYoRlHb+79dmN7/3HkayaLeXSaXtHBErkrlLUWyUO0HPgqP7YNgio8fQ0SA+KDEYzoVL yOAr03qxeGtVpsH5s92hVhEoZc1UWs4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-346-kVqOpsjBMCiSkq2yW5Vgew-1; Wed, 12 Feb 2020 08:43:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 007311005510; Wed, 12 Feb 2020 13:43:54 +0000 (UTC) Received: from t480s.redhat.com (ovpn-117-92.ams2.redhat.com [10.36.117.92]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C0D31001B08; Wed, 12 Feb 2020 13:43:51 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v2 fixed 11/16] util/mmap-alloc: Prepare for resizable mmaps Date: Wed, 12 Feb 2020 14:42:49 +0100 Message-Id: <20200212134254.11073-12-david@redhat.com> In-Reply-To: <20200212134254.11073-1-david@redhat.com> References: <20200212134254.11073-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: kVqOpsjBMCiSkq2yW5Vgew-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: , Cc: Igor Kotrasinski , Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Richard Henderson , "Dr . David Alan Gilbert" , Greg Kurz , Murilo Opsfelder Araujo , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" When shrinking a mmap we want to re-reserve the already populated area. When growing a memory region, we want to populate starting with a given fd_offset. Prepare by allowing to pass these parameters. Also, let's make sure we always process full pages, to avoid unmapping/remapping pages that are already in use when growing/shrinking. Add some asserts. Reviewed-by: Richard Henderson Cc: Igor Kotrasinski Cc: Murilo Opsfelder Araujo Cc: "Michael S. Tsirkin" Cc: Greg Kurz Cc: Murilo Opsfelder Araujo Cc: Eduardo Habkost Cc: "Dr. David Alan Gilbert" Cc: Igor Mammedov Signed-off-by: David Hildenbrand Reviewed-by: Peter Xu --- util/mmap-alloc.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 2f366dae72..fb7ef588fe 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -83,12 +83,12 @@ size_t qemu_mempath_getpagesize(const char *mem_path) } /* - * Reserve a new memory region of the requested size to be used for mapping - * from the given fd (if any). + * Reserve a new memory region of the requested size or re-reserve parts + * of an existing region to be used for mapping from the given fd (if any). */ -static void *mmap_reserve(size_t size, int fd) +static void *mmap_reserve(void *ptr, size_t size, int fd) { - int flags = MAP_PRIVATE; + int flags = MAP_PRIVATE | (ptr ? MAP_FIXED : 0); #if defined(__powerpc64__) && defined(__linux__) /* @@ -111,19 +111,23 @@ static void *mmap_reserve(size_t size, int fd) flags |= MAP_ANONYMOUS; #endif - return mmap(0, size, PROT_NONE, flags, fd, 0); + return mmap(ptr, size, PROT_NONE, flags, fd, 0); } /* * Populate memory in a reserved region from the given fd (if any). */ -static void *mmap_populate(void *ptr, size_t size, int fd, bool shared, - bool is_pmem) +static void *mmap_populate(void *ptr, size_t size, int fd, size_t fd_offset, + bool shared, bool is_pmem) { int map_sync_flags = 0; int flags = MAP_FIXED; void *populated_ptr; + if (fd == -1) { + fd_offset = 0; + } + flags |= fd == -1 ? MAP_ANONYMOUS : 0; flags |= shared ? MAP_SHARED : MAP_PRIVATE; if (shared && is_pmem) { @@ -131,7 +135,7 @@ static void *mmap_populate(void *ptr, size_t size, int fd, bool shared, } populated_ptr = mmap(ptr, size, PROT_READ | PROT_WRITE, - flags | map_sync_flags, fd, 0); + flags | map_sync_flags, fd, fd_offset); if (populated_ptr == MAP_FAILED && map_sync_flags) { if (errno == ENOTSUP) { char *proc_link = g_strdup_printf("/proc/self/fd/%d", fd); @@ -153,7 +157,8 @@ static void *mmap_populate(void *ptr, size_t size, int fd, bool shared, * If mmap failed with MAP_SHARED_VALIDATE | MAP_SYNC, we will try * again without these flags to handle backwards compatibility. */ - populated_ptr = mmap(ptr, size, PROT_READ | PROT_WRITE, flags, fd, 0); + populated_ptr = mmap(ptr, size, PROT_READ | PROT_WRITE, flags, fd, + fd_offset); } return populated_ptr; } @@ -178,13 +183,15 @@ void *qemu_ram_mmap(int fd, size_t offset, total; void *ptr, *guardptr; + g_assert(QEMU_IS_ALIGNED(size, pagesize)); + /* * Note: this always allocates at least one extra page of virtual address * space, even if size is already aligned. */ total = size + align; - guardptr = mmap_reserve(total, fd); + guardptr = mmap_reserve(0, total, fd); if (guardptr == MAP_FAILED) { return MAP_FAILED; } @@ -195,7 +202,7 @@ void *qemu_ram_mmap(int fd, offset = QEMU_ALIGN_UP((uintptr_t)guardptr, align) - (uintptr_t)guardptr; - ptr = mmap_populate(guardptr + offset, size, fd, shared, is_pmem); + ptr = mmap_populate(guardptr + offset, size, fd, 0, shared, is_pmem); if (ptr == MAP_FAILED) { munmap(guardptr, total); return MAP_FAILED; @@ -221,6 +228,8 @@ void qemu_ram_munmap(int fd, void *ptr, size_t size) { const size_t pagesize = mmap_pagesize(fd); + g_assert(QEMU_IS_ALIGNED(size, pagesize)); + if (ptr) { /* Unmap both the RAM block and the guard page */ munmap(ptr, size + pagesize);