From nobody Sun Apr 28 11:09:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574955020; cv=none; d=zohomail.com; s=zohoarc; b=YRU9RJa8H2UlFRS8bAj0oWUZMnA86yPGPInhwRscBa7EY7fOBaDjm21ugP6lK0bfnMQiMTyRICYbsN1e3VcAs8KT7gBIXrxXB5gwrDSoZ7khuIlgk7Cjdj8g1NiYyRJPwh6ErGnntHdHGZXmzMHaiA1YrT3x9IiPv6R0lizEtQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574955020; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bydEE1qnKs+JVZUR+AXSzVH6gywXJ4tlI8Hls5A/xa0=; b=n6bcY1OwltR1frfEPayDND04hc+/GNVQC8glyoPTkNThFQNOuyaGb3DVrRzCRgB9dB+ORi0ZXyrSCjB9VGCF2Qv8ebKnBODUFRP0MDCYg0DQB0EFo8Jwv4B7+damT96RmkIEFP8UcrJorVxmgnAkA1AFQWuUxGQIWtA/ejz8iQA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 157495502070229.58960245051958; Thu, 28 Nov 2019 07:30:20 -0800 (PST) Received: from localhost ([::1]:50044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaLkI-0007QF-2q for importer@patchew.org; Thu, 28 Nov 2019 10:30:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60118) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaKaJ-0003ca-GA for qemu-devel@nongnu.org; Thu, 28 Nov 2019 09:15:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaKaB-0000gu-34 for qemu-devel@nongnu.org; Thu, 28 Nov 2019 09:15:49 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37116 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 1iaKaA-0000Zc-Tp for qemu-devel@nongnu.org; Thu, 28 Nov 2019 09:15:47 -0500 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-218-nrqXq9XFNL60ksPtM-kCbw-1; Thu, 28 Nov 2019 09:15:44 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1E1CB8017CC; Thu, 28 Nov 2019 14:15:43 +0000 (UTC) Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 79D65600CC; Thu, 28 Nov 2019 14:15:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574950545; 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=bydEE1qnKs+JVZUR+AXSzVH6gywXJ4tlI8Hls5A/xa0=; b=FyOb+VsrGBGQI4oBKFKXsOBlL9bY9Yi7d4H5aLNntiaXNNANQeY0imVMhi9gLhoJiq86LZ crkxuAOSWvUvKBd+UXqpjDTUmqxYCE1CbmVaGJnU0GRvw4mnKdLUUIBLODnHJ7hFvrjeBm aaIGTON/idvvuWGFb3y0hNglR6+XVwk= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 1/2] memfd: add qemu_memfd_open() Date: Thu, 28 Nov 2019 18:15:17 +0400 Message-Id: <20191128141518.628245-2-marcandre.lureau@redhat.com> In-Reply-To: <20191128141518.628245-1-marcandre.lureau@redhat.com> References: <20191128141518.628245-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: nrqXq9XFNL60ksPtM-kCbw-1 X-Mimecast-Spam-Score: 0 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: 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: Eduardo Habkost , stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Refactor qemu_memfd_alloc() to simply return the opened fd. mmap() can be done later by the caller. Signed-off-by: Marc-Andr=C3=A9 Lureau --- include/qemu/memfd.h | 3 +++ util/memfd.c | 39 +++++++++++++++++++++++++-------------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/include/qemu/memfd.h b/include/qemu/memfd.h index 975b6bdb77..1642af9459 100644 --- a/include/qemu/memfd.h +++ b/include/qemu/memfd.h @@ -44,4 +44,7 @@ void *qemu_memfd_alloc(const char *name, size_t size, uns= igned int seals, void qemu_memfd_free(void *ptr, size_t size, int fd); bool qemu_memfd_check(unsigned int flags); =20 +int qemu_memfd_open(const char *name, size_t size, + unsigned int seals, Error **errp); + #endif /* QEMU_MEMFD_H */ diff --git a/util/memfd.c b/util/memfd.c index 4a3c07e0be..523b943b62 100644 --- a/util/memfd.c +++ b/util/memfd.c @@ -104,10 +104,9 @@ err: * memfd with sealing, but may fallback on other methods without * sealing. */ -void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals, - int *fd, Error **errp) +int qemu_memfd_open(const char *name, size_t size, unsigned int seals, + Error **errp) { - void *ptr; int mfd =3D qemu_memfd_create(name, size, false, 0, seals, NULL); =20 /* some systems have memfd without sealing */ @@ -124,26 +123,38 @@ void *qemu_memfd_alloc(const char *name, size_t size,= unsigned int seals, unlink(fname); g_free(fname); =20 - if (mfd =3D=3D -1 || - ftruncate(mfd, size) =3D=3D -1) { - goto err; + if (mfd !=3D -1 && ftruncate(mfd, size) =3D=3D -1) { + close(mfd); + mfd =3D -1; } } =20 + if (mfd =3D=3D -1) { + error_setg_errno(errp, errno, "qemu_memfd_open() failed"); + } + + return mfd; +} + +void *qemu_memfd_alloc(const char *name, size_t size, unsigned int seals, + int *fd, Error **errp) +{ + int mfd =3D qemu_memfd_open(name, size, seals, errp); + void *ptr; + + if (mfd =3D=3D -1) { + return NULL; + } + ptr =3D mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, mfd, 0); if (ptr =3D=3D MAP_FAILED) { - goto err; + error_setg_errno(errp, errno, "failed to allocate shared memory"); + close(mfd); + return NULL; } =20 *fd =3D mfd; return ptr; - -err: - error_setg_errno(errp, errno, "failed to allocate shared memory"); - if (mfd >=3D 0) { - close(mfd); - } - return NULL; } =20 void qemu_memfd_free(void *ptr, size_t size, int fd) --=20 2.24.0 From nobody Sun Apr 28 11:09:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1574955572; cv=none; d=zohomail.com; s=zohoarc; b=lkiRCl0YH5eyp2700u2Y0yQlDKudxVj9zc+QJTPMkR8wZBoNURktae5tTox9YT+41yMRzjGoM7KidPH93cAQCAMa4IDrjUYzE+7YIbgo64J+BOdsR48jaUx9rgQXsU6U3t/ynEWDSED5atWX1l4wxPKWZXquuSWynSPt8eltSQk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1574955572; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=YgnpYoryusYSkHCOF8hvM58bDZMeirroeyZIwZLJWCA=; b=Xcr7BCofchK0Tb4cbLAse+hAazilVRbG0sPTXm3T29aTMc8Lg0R44BKow51qAlhNf3xVFxJouJMBn6VevPobg2ro/uCyHsiIUSeuHlKLFjcwT2TxeJ4nxWPXJRsKp/ofq1XYyHz/YG4nKB9gM6qKULOlLVLF3vKNRb+X9jMYf90= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1574955572160283.2333971937519; Thu, 28 Nov 2019 07:39:32 -0800 (PST) Received: from localhost ([::1]:50108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaLt9-0003rp-Vq for importer@patchew.org; Thu, 28 Nov 2019 10:39:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32845) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaKab-0003ix-0c for qemu-devel@nongnu.org; Thu, 28 Nov 2019 09:16:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaKaT-0001gn-TH for qemu-devel@nongnu.org; Thu, 28 Nov 2019 09:16:09 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:34659 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaKaS-0001Ut-U8 for qemu-devel@nongnu.org; Thu, 28 Nov 2019 09:16:05 -0500 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-62-Q0ZrvZ_vMsuwe9JUMflljQ-1; Thu, 28 Nov 2019 09:15:56 -0500 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 C85CB107ACC4; Thu, 28 Nov 2019 14:15:55 +0000 (UTC) Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8ED2608BF; Thu, 28 Nov 2019 14:15:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574950559; 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=YgnpYoryusYSkHCOF8hvM58bDZMeirroeyZIwZLJWCA=; b=fctopaUXrH/9SFBG0wLTlM9gwqXNi21h1Rk0oBneMwf5Kt5FVft6Zf9yvBebZob6v1GshQ Vhg7/G0M3nAx9bk6ZfFslll/diDsXk1vvAPq2Vcs7dMBSTW/u+3x0pQElKQOWmU7v6oYDx fXgstAq9Sftb09HHCLL8wXZgrEFuljI= From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Subject: [PATCH 2/2] Add -mem-shared option Date: Thu, 28 Nov 2019 18:15:18 +0400 Message-Id: <20191128141518.628245-3-marcandre.lureau@redhat.com> In-Reply-To: <20191128141518.628245-1-marcandre.lureau@redhat.com> References: <20191128141518.628245-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Q0ZrvZ_vMsuwe9JUMflljQ-1 X-Mimecast-Spam-Score: 0 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: 205.139.110.61 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 , stefanha@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Add an option to simplify shared memory / vhost-user setup. Currently, using vhost-user requires NUMA setup such as: -m 4G -object memory-backend-file,id=3Dmem,size=3D4G,mem-path=3D/dev/shm,sh= are=3Don -numa node,memdev=3Dmem As there is no other way to allocate shareable RAM, afaik. -mem-shared aims to have a simple way instead: -m 4G -mem-shared Signed-off-by: Marc-Andr=C3=A9 Lureau --- exec.c | 11 ++++++++++- hw/core/numa.c | 16 +++++++++++++++- include/sysemu/sysemu.h | 1 + qemu-options.hx | 10 ++++++++++ vl.c | 4 ++++ 5 files changed, 40 insertions(+), 2 deletions(-) diff --git a/exec.c b/exec.c index ffdb518535..4e53937eaf 100644 --- a/exec.c +++ b/exec.c @@ -72,6 +72,10 @@ #include "qemu/mmap-alloc.h" #endif =20 +#ifdef CONFIG_POSIX +#include "qemu/memfd.h" +#endif + #include "monitor/monitor.h" =20 //#define DEBUG_SUBPAGE @@ -2347,7 +2351,12 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, = MemoryRegion *mr, bool created; RAMBlock *block; =20 - fd =3D file_ram_open(mem_path, memory_region_name(mr), &created, errp); + if (mem_path) { + fd =3D file_ram_open(mem_path, memory_region_name(mr), &created, e= rrp); + } else { + fd =3D qemu_memfd_open(mr->name, size, + F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEAL, er= rp); + } if (fd < 0) { return NULL; } diff --git a/hw/core/numa.c b/hw/core/numa.c index e3332a984f..6f72cddb1c 100644 --- a/hw/core/numa.c +++ b/hw/core/numa.c @@ -493,7 +493,8 @@ static void allocate_system_memory_nonnuma(MemoryRegion= *mr, Object *owner, if (mem_path) { #ifdef __linux__ Error *err =3D NULL; - memory_region_init_ram_from_file(mr, owner, name, ram_size, 0, 0, + memory_region_init_ram_from_file(mr, owner, name, ram_size, 0, + mem_shared ? RAM_SHARED : 0, mem_path, &err); if (err) { error_report_err(err); @@ -513,6 +514,19 @@ static void allocate_system_memory_nonnuma(MemoryRegio= n *mr, Object *owner, #else fprintf(stderr, "-mem-path not supported on this host\n"); exit(1); +#endif + } else if (mem_shared) { +#ifdef CONFIG_POSIX + Error *err =3D NULL; + memory_region_init_ram_from_file(mr, owner, NULL, ram_size, 0, + RAM_SHARED, NULL, &err); + if (err) { + error_report_err(err); + exit(1); + } +#else + fprintf(stderr, "-mem-shared not supported on this host\n"); + exit(1); #endif } else { memory_region_init_ram_nomigrate(mr, owner, name, ram_size, &error= _fatal); diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 80c57fdc4e..80db8465a9 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -55,6 +55,7 @@ extern bool enable_cpu_pm; extern QEMUClockType rtc_clock; extern const char *mem_path; extern int mem_prealloc; +extern int mem_shared; =20 #define MAX_OPTION_ROMS 16 typedef struct QEMUOptionRom { diff --git a/qemu-options.hx b/qemu-options.hx index 65c9473b73..4c69b03ad3 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -394,6 +394,16 @@ STEXI Preallocate memory when using -mem-path. ETEXI =20 +DEF("mem-shared", 0, QEMU_OPTION_mem_shared, + "-mem-shared allocate shared memory\n", QEMU_ARCH_ALL) +STEXI +@item -mem-shared +@findex -mem-shared +Allocate guest RAM with shared mapping. Whether the allocation is +anonymous or not (with -mem-path), QEMU will allocate a shared memory that +can be shared by unrelated processes, such as vhost-user backends. +ETEXI + DEF("k", HAS_ARG, QEMU_OPTION_k, "-k language use keyboard layout (for example 'fr' for French)\n", QEMU_ARCH_ALL) diff --git a/vl.c b/vl.c index 6a65a64bfd..53b1155455 100644 --- a/vl.c +++ b/vl.c @@ -143,6 +143,7 @@ const char* keyboard_layout =3D NULL; ram_addr_t ram_size; const char *mem_path =3D NULL; int mem_prealloc =3D 0; /* force preallocation of physical target memory */ +int mem_shared =3D 0; bool enable_mlock =3D false; bool enable_cpu_pm =3D false; int nb_nics; @@ -3172,6 +3173,9 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_mem_prealloc: mem_prealloc =3D 1; break; + case QEMU_OPTION_mem_shared: + mem_shared =3D 1; + break; case QEMU_OPTION_d: log_mask =3D optarg; break; --=20 2.24.0