From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59603C4BA24 for ; Thu, 27 Feb 2020 10:21:28 +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 D793324688 for ; Thu, 27 Feb 2020 10:21:27 +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="WpulvFU+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D793324688 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+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7GIF-0002FR-Lv for qemu-devel@archiver.kernel.org; Thu, 27 Feb 2020 05:21:24 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40226) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7GBZ-0003uo-JN for qemu-devel@nongnu.org; Thu, 27 Feb 2020 05:14:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7GBY-0000h9-3V for qemu-devel@nongnu.org; Thu, 27 Feb 2020 05:14:29 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:27948 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 1j7GBX-0000e9-Tm for qemu-devel@nongnu.org; Thu, 27 Feb 2020 05:14:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582798466; 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=40hhBbONGQBxpq10wEMGQ4Cqgszu2Aqt/JdYW098rXc=; b=WpulvFU+xgNbOoQYQ0UPlLf1vvCrXt1zAQ+8hlcw6hRFe3vh42dndUZMn4xnsi5ZIC61KU o6t543Q4zuXqBrTRLS5P3MziJ71HoGC8yHf1eNxaWGo9deLaUiPxFZGmIWGOq6wc6kJr0Y hf8og3cn5dqn1/SLxAfZapuGnjss/X8= 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-397-awGq2DrlMqeDQDbP8-q4Ag-1; Thu, 27 Feb 2020 05:14:25 -0500 X-MC-Unique: awGq2DrlMqeDQDbP8-q4Ag-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C03398017CC; Thu, 27 Feb 2020 10:14:23 +0000 (UTC) Received: from t480s.redhat.com (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AA9F90CCB; Thu, 27 Feb 2020 10:14:20 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Subject: [PATCH v3 11/15] util/mmap-alloc: Implement resizeable mmaps Date: Thu, 27 Feb 2020 11:12:01 +0100 Message-Id: <20200227101205.5616-12-david@redhat.com> In-Reply-To: <20200227101205.5616-1-david@redhat.com> References: <20200227101205.5616-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.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: Eduardo Habkost , "Michael S . Tsirkin" , Richard Henderson , Igor Kotrasinski , David Hildenbrand , "Dr . David Alan Gilbert" , Peter Xu , Greg Kurz , Murilo Opsfelder Araujo , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Implement resizeable mmaps. For now, the actual resizing is not wired up. Introduce qemu_ram_mmap_resizeable() and qemu_ram_mmap_resize(). Make qemu_ram_mmap() a wrapper of qemu_ram_mmap_resizeable(). Cc: Richard Henderson Cc: Igor Kotrasinski Cc: Murilo Opsfelder Araujo Cc: "Michael S. Tsirkin" Cc: Greg Kurz Cc: Eduardo Habkost Cc: "Dr. David Alan Gilbert" Cc: Igor Mammedov Signed-off-by: David Hildenbrand --- include/qemu/mmap-alloc.h | 21 +++++++++++-------- util/mmap-alloc.c | 43 ++++++++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h index e786266b92..ca8f7edf70 100644 --- a/include/qemu/mmap-alloc.h +++ b/include/qemu/mmap-alloc.h @@ -7,11 +7,13 @@ size_t qemu_fd_getpagesize(int fd); size_t qemu_mempath_getpagesize(const char *mem_path); =20 /** - * qemu_ram_mmap: mmap the specified file or device. + * qemu_ram_mmap_resizeable: reserve a memory region of @max_size to mmap = the + * specified file or device and mmap @size of it= . * * Parameters: * @fd: the file or the device to mmap * @size: the number of bytes to be mmaped + * @max_size: the number of bytes to be reserved * @align: if not zero, specify the alignment of the starting mapping add= ress; * otherwise, the alignment in use will be determined by QEMU. * @shared: map has RAM_SHARED flag. @@ -21,12 +23,15 @@ size_t qemu_mempath_getpagesize(const char *mem_path); * On success, return a pointer to the mapped area. * On failure, return MAP_FAILED. */ -void *qemu_ram_mmap(int fd, - size_t size, - size_t align, - bool shared, - bool is_pmem); - -void qemu_ram_munmap(int fd, void *ptr, size_t size); +void *qemu_ram_mmap_resizeable(int fd, size_t size, size_t max_size, + size_t align, bool shared, bool is_pmem); +bool qemu_ram_mmap_resize(void *ptr, int fd, size_t old_size, size_t new_s= ize, + bool shared, bool is_pmem); +static inline void *qemu_ram_mmap(int fd, size_t size, size_t align, + bool shared, bool is_pmem) +{ + return qemu_ram_mmap_resizeable(fd, size, size, align, shared, is_pmem= ); +} +void qemu_ram_munmap(int fd, void *ptr, size_t max_size); =20 #endif diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index c6a6075215..8f9c533f32 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -173,11 +173,8 @@ static inline size_t mmap_guard_pagesize(int fd) #endif } =20 -void *qemu_ram_mmap(int fd, - size_t size, - size_t align, - bool shared, - bool is_pmem) +void *qemu_ram_mmap_resizeable(int fd, size_t size, size_t max_size, + size_t align, bool shared, bool is_pmem) { const size_t guard_pagesize =3D mmap_guard_pagesize(fd); const size_t pagesize =3D qemu_fd_getpagesize(fd); @@ -185,12 +182,14 @@ void *qemu_ram_mmap(int fd, void *ptr, *guardptr; =20 g_assert(QEMU_IS_ALIGNED(size, pagesize)); + g_assert(QEMU_IS_ALIGNED(max_size, pagesize)); =20 /* * Note: this always allocates at least one extra page of virtual addr= ess - * space, even if size is already aligned. + * space, even if the size is already aligned. We will reserve an area= of + * at least max_size, but only populate the requested part of it. */ - total =3D size + align; + total =3D max_size + align; =20 guardptr =3D mmap_reserve(NULL, total, fd); if (guardptr =3D=3D MAP_FAILED) { @@ -218,21 +217,41 @@ void *qemu_ram_mmap(int fd, * a guard page guarding against potential buffer overflows. */ total -=3D offset; - if (total > size + guard_pagesize) { - munmap(ptr + size + guard_pagesize, total - size - guard_pagesize)= ; + if (total > max_size + guard_pagesize) { + munmap(ptr + max_size + guard_pagesize, + total - max_size - guard_pagesize); } =20 return ptr; } =20 -void qemu_ram_munmap(int fd, void *ptr, size_t size) +bool qemu_ram_mmap_resize(void *ptr, int fd, size_t old_size, size_t new_s= ize, + bool shared, bool is_pmem) { const size_t pagesize =3D qemu_fd_getpagesize(fd); =20 - g_assert(QEMU_IS_ALIGNED(size, pagesize)); + g_assert(QEMU_IS_ALIGNED(old_size, pagesize)); + g_assert(QEMU_IS_ALIGNED(new_size, pagesize)); + + if (old_size < new_size) { + /* populate the missing piece into the reserved area */ + ptr =3D mmap_populate(ptr + old_size, new_size - old_size, fd, old= _size, + shared, is_pmem); + } else if (old_size > new_size) { + /* discard this piece, marking it reserved */ + ptr =3D mmap_reserve(ptr + new_size, old_size - new_size, fd); + } + return ptr !=3D MAP_FAILED; +} + +void qemu_ram_munmap(int fd, void *ptr, size_t max_size) +{ + const size_t pagesize =3D qemu_fd_getpagesize(fd); + + g_assert(QEMU_IS_ALIGNED(max_size, pagesize)); =20 if (ptr) { /* Unmap both the RAM block and the guard page */ - munmap(ptr, size + mmap_guard_pagesize(fd)); + munmap(ptr, max_size + mmap_guard_pagesize(fd)); } } --=20 2.24.1