From nobody Sat May 11 20:13:47 2024 Delivered-To: importer@patchew.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=1609780554; cv=none; d=zohomail.com; s=zohoarc; b=BcZ6LZYts1qcoJR7MW2pUgoPEowt7UgGuMziY657Q9yd1a6FOIMIDS5qRo/FcvuLVDjtsqr1UaG39zII2ThAbsSAYszG37aTwsqpJZ4zBaYOsbEmMFiArjgvARLd16fnlHhYyqnNHpiOKAJRF2al4k/ndDZuKFF5CzmcPCcMFjs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609780554; 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=42pLyzKDZ/gxRKMRifq1wFLLa5fytpU5alp2iv0kz9I=; b=I4Uxaq8SvdXQPjxHsgsU4Vel5q55SyqOT63J+keqbUWDZrcCfvQTu7S0dUp33RPdZOOIt1iD/IHKffnrVgND1lkmw+wuf89dzEN93Z2gyGkC/ueLaaGXJve5taH/8jU3aGkN74eS4ZzvfgIyJ01YEDIg9vVJ4K1umNxwU/NDGFQ= 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 1609780554385342.5422716506225; Mon, 4 Jan 2021 09:15:54 -0800 (PST) Received: from localhost ([::1]:38288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwTST-0003ot-Ao for importer@patchew.org; Mon, 04 Jan 2021 12:15:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwTQS-0001z8-QL for qemu-devel@nongnu.org; Mon, 04 Jan 2021 12:13:50 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:57320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kwTQL-0002Rj-SY for qemu-devel@nongnu.org; Mon, 04 Jan 2021 12:13: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-296-RltI-H2zPdu3Sn2IYGDW0g-1; Mon, 04 Jan 2021 12:13:38 -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 4C384107ACE3; Mon, 4 Jan 2021 17:13:37 +0000 (UTC) Received: from localhost (ovpn-113-37.ams2.redhat.com [10.36.113.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 800C61002388; Mon, 4 Jan 2021 17:13:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609780420; 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=42pLyzKDZ/gxRKMRifq1wFLLa5fytpU5alp2iv0kz9I=; b=BJCkvEdNJY1LPJKNo2ifW17Cw9ONwcE7fcPunGmpT+nIcgP5WDsozeeiRk+9z68ZopXoxq FwOEV6XJ+ktAkFsZIRNlyIHnYYd28dYnuoGKyKAkYuH8ZIhiyGW7iXFLsQqDOwraQLEyjg xpFKwjJvKiwE3A9R0DlsV59z5MTopoc= X-MC-Unique: RltI-H2zPdu3Sn2IYGDW0g-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] memory: add readonly support to memory_region_init_ram_from_file() Date: Mon, 4 Jan 2021 17:13:18 +0000 Message-Id: <20210104171320.575838-2-stefanha@redhat.com> In-Reply-To: <20210104171320.575838-1-stefanha@redhat.com> References: <20210104171320.575838-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Xiao Guangrong , "Michael S. Tsirkin" , Julio Montes , Eduardo Habkost , eric.g.ernst@gmail.com, Stefan Hajnoczi , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" There is currently no way to open(O_RDONLY) and mmap(PROT_READ) when creating a memory region from a file. This functionality is needed since the underlying host file may not allow writing. Add a bool readonly argument to memory_region_init_ram_from_file() and the APIs it calls. Extend memory_region_init_ram_from_file() rather than introducing a memory_region_init_rom_from_file() API so that callers can easily make a choice between read/write and read-only at runtime without calling different APIs. No new RAMBlock flag is introduced for read-only because it's unclear whether RAMBlocks need to know that they are read-only. Pass a bool readonly argument instead. Both of these design decisions can be changed in the future. It just seemed like the simplest approach to me. Acked-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Igor Mammedov Reviewed-by: Liam Merwick Signed-off-by: Stefan Hajnoczi --- include/exec/memory.h | 2 ++ include/exec/ram_addr.h | 5 +++-- include/qemu/mmap-alloc.h | 2 ++ backends/hostmem-file.c | 2 +- softmmu/memory.c | 7 +++++-- softmmu/physmem.c | 18 +++++++++++------- util/mmap-alloc.c | 10 ++++++---- util/oslib-posix.c | 2 +- 8 files changed, 31 insertions(+), 17 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 521d9901d7..c6ce74fb79 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -966,6 +966,7 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, * - RAM_PMEM: the memory is persistent memory * Other bits are ignored now. * @path: the path in which to allocate the RAM. + * @readonly: true to open @path for reading, false for read/write. * @errp: pointer to Error*, to store an error if it happens. * * Note that this function does not do anything to cause the data in the @@ -978,6 +979,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, uint64_t align, uint32_t ram_flags, const char *path, + bool readonly, Error **errp); =20 /** diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index c6d2ef1d07..40b16609ab 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -110,6 +110,7 @@ long qemu_maxrampagesize(void); * - RAM_PMEM: the backend @mem_path or @fd is persistent mem= ory * Other bits are ignored. * @mem_path or @fd: specify the backing file or device + * @readonly: true to open @path for reading, false for read/write. * @errp: pointer to Error*, to store an error if it happens * * Return: @@ -118,9 +119,9 @@ long qemu_maxrampagesize(void); */ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, uint32_t ram_flags, const char *mem_pat= h, - Error **errp); + bool readonly, Error **errp); RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, - uint32_t ram_flags, int fd, + uint32_t ram_flags, int fd, bool readonly, Error **errp); =20 RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h index e786266b92..8b7a5c70f3 100644 --- a/include/qemu/mmap-alloc.h +++ b/include/qemu/mmap-alloc.h @@ -14,6 +14,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path); * @size: the number of bytes to be mmaped * @align: if not zero, specify the alignment of the starting mapping add= ress; * otherwise, the alignment in use will be determined by QEMU. + * @readonly: true for a read-only mapping, false for read/write. * @shared: map has RAM_SHARED flag. * @is_pmem: map has RAM_PMEM flag. * @@ -24,6 +25,7 @@ size_t qemu_mempath_getpagesize(const char *mem_path); void *qemu_ram_mmap(int fd, size_t size, size_t align, + bool readonly, bool shared, bool is_pmem); =20 diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index 40e1e5b3e3..e827692124 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -56,7 +56,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) backend->size, fb->align, (backend->share ? RAM_SHARED : 0) | (fb->is_pmem ? RAM_PMEM : 0), - fb->mem_path, errp); + fb->mem_path, false, errp); g_free(name); #endif } diff --git a/softmmu/memory.c b/softmmu/memory.c index 333e1ed7b0..676c298b60 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -1587,15 +1587,18 @@ void memory_region_init_ram_from_file(MemoryRegion = *mr, uint64_t align, uint32_t ram_flags, const char *path, + bool readonly, Error **errp) { Error *err =3D NULL; memory_region_init(mr, owner, name, size); mr->ram =3D true; + mr->readonly =3D readonly; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; mr->align =3D align; - mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, = &err); + mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, ram_flags, path, + readonly, &err); if (err) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); @@ -1618,7 +1621,7 @@ void memory_region_init_ram_from_fd(MemoryRegion *mr, mr->destructor =3D memory_region_destructor_ram; mr->ram_block =3D qemu_ram_alloc_from_fd(size, mr, share ? RAM_SHARED : 0, - fd, &err); + fd, false, &err); if (err) { mr->size =3D int128_zero(); object_unparent(OBJECT(mr)); diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 2cd1de4a2c..5753cfc39f 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -1398,6 +1398,7 @@ static int64_t get_file_align(int fd) =20 static int file_ram_open(const char *path, const char *region_name, + bool readonly, bool *created, Error **errp) { @@ -1408,7 +1409,7 @@ static int file_ram_open(const char *path, =20 *created =3D false; for (;;) { - fd =3D open(path, O_RDWR); + fd =3D open(path, readonly ? O_RDONLY : O_RDWR); if (fd >=3D 0) { /* @path names an existing file, use it */ break; @@ -1460,6 +1461,7 @@ static int file_ram_open(const char *path, static void *file_ram_alloc(RAMBlock *block, ram_addr_t memory, int fd, + bool readonly, bool truncate, Error **errp) { @@ -1510,7 +1512,7 @@ static void *file_ram_alloc(RAMBlock *block, perror("ftruncate"); } =20 - area =3D qemu_ram_mmap(fd, memory, block->mr->align, + area =3D qemu_ram_mmap(fd, memory, block->mr->align, readonly, block->flags & RAM_SHARED, block->flags & RAM_PME= M); if (area =3D=3D MAP_FAILED) { error_setg_errno(errp, errno, @@ -1942,7 +1944,7 @@ static void ram_block_add(RAMBlock *new_block, Error = **errp, bool shared) =20 #ifdef CONFIG_POSIX RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr, - uint32_t ram_flags, int fd, + uint32_t ram_flags, int fd, bool readonly, Error **errp) { RAMBlock *new_block; @@ -1996,7 +1998,8 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, Mem= oryRegion *mr, new_block->used_length =3D size; new_block->max_length =3D size; new_block->flags =3D ram_flags; - new_block->host =3D file_ram_alloc(new_block, size, fd, !file_size, er= rp); + new_block->host =3D file_ram_alloc(new_block, size, fd, readonly, + !file_size, errp); if (!new_block->host) { g_free(new_block); return NULL; @@ -2015,18 +2018,19 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, M= emoryRegion *mr, =20 RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, uint32_t ram_flags, const char *mem_pat= h, - Error **errp) + bool readonly, Error **errp) { int fd; bool created; RAMBlock *block; =20 - fd =3D file_ram_open(mem_path, memory_region_name(mr), &created, errp); + fd =3D file_ram_open(mem_path, memory_region_name(mr), readonly, &crea= ted, + errp); if (fd < 0) { return NULL; } =20 - block =3D qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, errp); + block =3D qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, readonly, er= rp); if (!block) { if (created) { unlink(mem_path); diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c index 27dcccd8ec..890fda6a35 100644 --- a/util/mmap-alloc.c +++ b/util/mmap-alloc.c @@ -85,9 +85,11 @@ size_t qemu_mempath_getpagesize(const char *mem_path) void *qemu_ram_mmap(int fd, size_t size, size_t align, + bool readonly, bool shared, bool is_pmem) { + int prot; int flags; int map_sync_flags =3D 0; int guardfd; @@ -146,8 +148,9 @@ void *qemu_ram_mmap(int fd, =20 offset =3D QEMU_ALIGN_UP((uintptr_t)guardptr, align) - (uintptr_t)guar= dptr; =20 - ptr =3D mmap(guardptr + offset, size, PROT_READ | PROT_WRITE, - flags | map_sync_flags, fd, 0); + prot =3D PROT_READ | (readonly ? 0 : PROT_WRITE); + + ptr =3D mmap(guardptr + offset, size, prot, flags | map_sync_flags, fd= , 0); =20 if (ptr =3D=3D MAP_FAILED && map_sync_flags) { if (errno =3D=3D ENOTSUP) { @@ -171,8 +174,7 @@ void *qemu_ram_mmap(int fd, * if map failed with MAP_SHARED_VALIDATE | MAP_SYNC, * we will remove these flags to handle compatibility. */ - ptr =3D mmap(guardptr + offset, size, PROT_READ | PROT_WRITE, - flags, fd, 0); + ptr =3D mmap(guardptr + offset, size, prot, flags, fd, 0); } =20 if (ptr =3D=3D MAP_FAILED) { diff --git a/util/oslib-posix.c b/util/oslib-posix.c index f15234b5c0..cfe86553da 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -227,7 +227,7 @@ void *qemu_memalign(size_t alignment, size_t size) void *qemu_anon_ram_alloc(size_t size, uint64_t *alignment, bool shared) { size_t align =3D QEMU_VMALLOC_ALIGN; - void *ptr =3D qemu_ram_mmap(-1, size, align, shared, false); + void *ptr =3D qemu_ram_mmap(-1, size, align, false, shared, false); =20 if (ptr =3D=3D MAP_FAILED) { return NULL; --=20 2.29.2 From nobody Sat May 11 20:13:47 2024 Delivered-To: importer@patchew.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=1609780505; cv=none; d=zohomail.com; s=zohoarc; b=m2/Dj5exlqpKKtuTDj9kQEIgGgM3+H3whdNGHu84e1wJ8pA6Bgdd77nBWAseKoz5Me62GM0zgrdHLd4sc15mx6AzcKB+E158+WeoWLNyzZnph/4/28FsRDbg+o5gN4rUGmzY1RC1LA+4kbXSXFAIy9JD1wYj2SMxSOmizTEj1m8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609780505; 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=JjgYdtXItrBRDuOEDu+e3r/gEkmIeLeFz46RVO5XZug=; b=UlimGLawTbRCTn6wTubm58xTnh9gIFhvnNkYoWs8+nxszSLPVb0PK8jJuaxS6pB4EPQwCa1DNPTodQYGZnH4KIXfx5czAiKbDmxZiQnlG2K879V3sKcmoJkWFoblbdCNmjbrdzX6Tsvpfp13iEHSmvd9p25IJi+ohX+fMjXAG4I= 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 1609780505873343.00157041365117; Mon, 4 Jan 2021 09:15:05 -0800 (PST) Received: from localhost ([::1]:37258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwTRf-0003LU-Ts for importer@patchew.org; Mon, 04 Jan 2021 12:15:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwTQY-00020m-UP for qemu-devel@nongnu.org; Mon, 04 Jan 2021 12:13:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55485) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kwTQS-0002SN-LK for qemu-devel@nongnu.org; Mon, 04 Jan 2021 12:13:54 -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-75-NMpLlB24OieqIXwOyiqX5g-1; Mon, 04 Jan 2021 12:13:46 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C6E16C281; Mon, 4 Jan 2021 17:13:44 +0000 (UTC) Received: from localhost (ovpn-113-37.ams2.redhat.com [10.36.113.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8DCE25D735; Mon, 4 Jan 2021 17:13:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609780428; 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=JjgYdtXItrBRDuOEDu+e3r/gEkmIeLeFz46RVO5XZug=; b=jKRLVZOt0XB7hBWrEs8NA5NSPzsJhz03qgA212/SaTZOJI1GaAJNLJ8rK2rHxEQMhk28rI Xqp6NgLJiknSR3P6UQaoShZ/UcuqlDgj0ol4vLCdtLgckMTZIrXrcqSehCQo0yO0rOcKZR 9jUD6PZT4F0855x4ZcBmi9bWEV9GWbM= X-MC-Unique: NMpLlB24OieqIXwOyiqX5g-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v3 2/3] hostmem-file: add readonly=on|off option Date: Mon, 4 Jan 2021 17:13:19 +0000 Message-Id: <20210104171320.575838-3-stefanha@redhat.com> In-Reply-To: <20210104171320.575838-1-stefanha@redhat.com> References: <20210104171320.575838-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Xiao Guangrong , "Michael S. Tsirkin" , Julio Montes , Eduardo Habkost , eric.g.ernst@gmail.com, Stefan Hajnoczi , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" Let -object memory-backend-file work on read-only files when the readonly=3Don option is given. This can be used to share the contents of a file between multiple guests while preventing them from consuming Copy-on-Write memory if guests dirty the pages, for example. Acked-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Liam Merwick Signed-off-by: Stefan Hajnoczi --- v3: * Use Object *obj instead of Object *o [Igor] * Do not dereference MEMORY_BACKEND_FILE(o)->readonly directly, use a local variable to hold the HostMemoryBackendFile pointer. [Igor] --- backends/hostmem-file.c | 28 +++++++++++++++++++++++++++- qemu-options.hx | 5 ++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index e827692124..733408e076 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -29,6 +29,7 @@ struct HostMemoryBackendFile { uint64_t align; bool discard_data; bool is_pmem; + bool readonly; }; =20 static void @@ -56,7 +57,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) backend->size, fb->align, (backend->share ? RAM_SHARED : 0) | (fb->is_pmem ? RAM_PMEM : 0), - fb->mem_path, false, errp); + fb->mem_path, fb->readonly, errp); g_free(name); #endif } @@ -151,6 +152,28 @@ static void file_memory_backend_set_pmem(Object *o, bo= ol value, Error **errp) fb->is_pmem =3D value; } =20 +static bool file_memory_backend_get_readonly(Object *obj, Error **errp) +{ + HostMemoryBackendFile *fb =3D MEMORY_BACKEND_FILE(obj); + + return fb->readonly; +} + +static void file_memory_backend_set_readonly(Object *obj, bool value, + Error **errp) +{ + HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); + HostMemoryBackendFile *fb =3D MEMORY_BACKEND_FILE(obj); + + if (host_memory_backend_mr_inited(backend)) { + error_setg(errp, "cannot change property 'readonly' of %s.", + object_get_typename(obj)); + return; + } + + fb->readonly =3D value; +} + static void file_backend_unparent(Object *obj) { HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); @@ -182,6 +205,9 @@ file_backend_class_init(ObjectClass *oc, void *data) NULL, NULL); object_class_property_add_bool(oc, "pmem", file_memory_backend_get_pmem, file_memory_backend_set_pmem); + object_class_property_add_bool(oc, "readonly", + file_memory_backend_get_readonly, + file_memory_backend_set_readonly); } =20 static void file_backend_instance_finalize(Object *o) diff --git a/qemu-options.hx b/qemu-options.hx index 459c916d3d..4732c6b45e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4407,7 +4407,7 @@ SRST they are specified. Note that the 'id' property must be set. These objects are placed in the '/objects' path. =20 - ``-object memory-backend-file,id=3Did,size=3Dsize,mem-path=3Ddir,share= =3Don|off,discard-data=3Don|off,merge=3Don|off,dump=3Don|off,prealloc=3Don|= off,host-nodes=3Dhost-nodes,policy=3Ddefault|preferred|bind|interleave,alig= n=3Dalign`` + ``-object memory-backend-file,id=3Did,size=3Dsize,mem-path=3Ddir,share= =3Don|off,discard-data=3Don|off,merge=3Don|off,dump=3Don|off,prealloc=3Don|= off,host-nodes=3Dhost-nodes,policy=3Ddefault|preferred|bind|interleave,alig= n=3Dalign,readonly=3Don|off`` Creates a memory file backend object, which can be used to back the guest RAM with huge pages. =20 @@ -4490,6 +4490,9 @@ SRST 4.15) and the filesystem of ``mem-path`` mounted with DAX option. =20 + The ``readonly`` option specifies whether the backing file is open= ed + read-only or read-write (default). + ``-object memory-backend-ram,id=3Did,merge=3Don|off,dump=3Don|off,shar= e=3Don|off,prealloc=3Don|off,size=3Dsize,host-nodes=3Dhost-nodes,policy=3Dd= efault|preferred|bind|interleave`` Creates a memory backend object, which can be used to back the guest RAM. Memory backend objects offer more control than the --=20 2.29.2 From nobody Sat May 11 20:13:47 2024 Delivered-To: importer@patchew.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=1609780725; cv=none; d=zohomail.com; s=zohoarc; b=Omh+KSkKm0J5I9YFNLbpGuHfnZRLY6LKB+Id62uVUrtzozhIs1/XBdKNSbw9r2aEjb0GL50T35RjLyXBv4VDzyqwDcJWA/wHOwc4vDTwdlbqu5DDlbPRxemIgLxjUE527s9xbae10Rz19fN5EvuLodlkujh8mSs2rwM016wD4sw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609780725; 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=wmziWGG3iR9SW4enWSD6rryB71UeydLuL8gvMlFBO8k=; b=lRkG68Hc72V3UFcluaGTe3jDtKTKjRjiBC61thiM840NGimqgg6iMlrJ8pkI8ZV0HEewOc2THIaQuGmEOVnQ3aYNBeSpoYGFwWG8n/oFC3JMUQiwSQ1ylE/p1BR8/3MnI4fSH7CgDMjRVF/Kye0lDRNDiofYwkvh2+XmgXiNJVE= 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 1609780725734860.471106180172; Mon, 4 Jan 2021 09:18:45 -0800 (PST) Received: from localhost ([::1]:44870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kwTVE-0006nl-Rp for importer@patchew.org; Mon, 04 Jan 2021 12:18:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kwTQZ-00021S-PP for qemu-devel@nongnu.org; Mon, 04 Jan 2021 12:13:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kwTQX-0002Sg-4m for qemu-devel@nongnu.org; Mon, 04 Jan 2021 12:13:55 -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-369-riqY7QKJOSKgznmq_SFEVQ-1; Mon, 04 Jan 2021 12:13:47 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9AC08107ACF8; Mon, 4 Jan 2021 17:13:46 +0000 (UTC) Received: from localhost (ovpn-113-37.ams2.redhat.com [10.36.113.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3EA685D751; Mon, 4 Jan 2021 17:13:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609780431; 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=wmziWGG3iR9SW4enWSD6rryB71UeydLuL8gvMlFBO8k=; b=MfBR5ptZFLZIPbQ0XzJUx6X34mJQFoi1a2ld+K8QvHh4/DK2pz3asiR6lOKEiG48JnmBXS R771yCJEqwqGWLomkKhpVDcbFsc9ZnliPDWFtJgft98cN7q8PWK+c9yM6ncZuMUfGGoOEr p4z4kvFlvHiUZhaV2q2daweaWn7fKqA= X-MC-Unique: riqY7QKJOSKgznmq_SFEVQ-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Subject: [PATCH v3 3/3] nvdimm: check -object memory-backend-file, readonly=on option Date: Mon, 4 Jan 2021 17:13:20 +0000 Message-Id: <20210104171320.575838-4-stefanha@redhat.com> In-Reply-To: <20210104171320.575838-1-stefanha@redhat.com> References: <20210104171320.575838-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Xiao Guangrong , "Michael S. Tsirkin" , Julio Montes , Eduardo Habkost , eric.g.ernst@gmail.com, Stefan Hajnoczi , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , 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" Check that -device nvdimm,unarmed=3Don is used when -object memory-backend-file,readonly=3Don and document that -device nvdimm,unarmed=3Don|off controls whether the NVDIMM appears read-only to the guest. Acked-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Liam Merwick Signed-off-by: Stefan Hajnoczi --- v3: * Produce an error when -device nvdimm,unarmed=3Doff is used with -object memory-backend-file,readonly=3Don instead of silently switching on unarmed. [Igor] --- docs/nvdimm.txt | 24 +++++++++++++++++------- hw/mem/nvdimm.c | 9 +++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/docs/nvdimm.txt b/docs/nvdimm.txt index c2c6e441b3..0aae682be3 100644 --- a/docs/nvdimm.txt +++ b/docs/nvdimm.txt @@ -17,8 +17,8 @@ following command line options: =20 -machine pc,nvdimm -m $RAM_SIZE,slots=3D$N,maxmem=3D$MAX_SIZE - -object memory-backend-file,id=3Dmem1,share=3Don,mem-path=3D$PATH,size=3D= $NVDIMM_SIZE - -device nvdimm,id=3Dnvdimm1,memdev=3Dmem1 + -object memory-backend-file,id=3Dmem1,share=3Don,mem-path=3D$PATH,size=3D= $NVDIMM_SIZE,readonly=3Doff + -device nvdimm,id=3Dnvdimm1,memdev=3Dmem1,unarmed=3Doff =20 Where, =20 @@ -31,9 +31,10 @@ Where, of normal RAM devices and vNVDIMM devices, e.g. $MAX_SIZE should be >=3D $RAM_SIZE + $NVDIMM_SIZE here. =20 - - "object memory-backend-file,id=3Dmem1,share=3Don,mem-path=3D$PATH,size= =3D$NVDIMM_SIZE" - creates a backend storage of size $NVDIMM_SIZE on a file $PATH. All - accesses to the virtual NVDIMM device go to the file $PATH. + - "object memory-backend-file,id=3Dmem1,share=3Don,mem-path=3D$PATH, + size=3D$NVDIMM_SIZE,readonly=3Doff" creates a backend storage of size + $NVDIMM_SIZE on a file $PATH. All accesses to the virtual NVDIMM device= go + to the file $PATH. =20 "share=3Don/off" controls the visibility of guest writes. If "share=3Don", then guest writes will be applied to the backend @@ -42,8 +43,17 @@ Where, "share=3Doff", then guest writes won't be applied to the backend file and thus will be invisible to other guests. =20 - - "device nvdimm,id=3Dnvdimm1,memdev=3Dmem1" creates a virtual NVDIMM - device whose storage is provided by above memory backend device. + "readonly=3Don/off" controls whether the file $PATH is opened read-only= or + read/write (default). + + - "device nvdimm,id=3Dnvdimm1,memdev=3Dmem1,unarmed=3Doff" creates a read= /write + virtual NVDIMM device whose storage is provided by above memory backend + device. + + "unarmed" controls the ACPI NFIT NVDIMM Region Mapping Structure "NVDIMM + State Flags" Bit 3 indicating that the device is "unarmed" and cannot a= ccept + persistent writes. Linux guest drivers set the device to read-only when= this + bit is present. Set unarmed to on when the memdev has readonly=3Don. =20 Multiple vNVDIMM devices can be created if multiple pairs of "-object" and "-device" are provided. diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c index 03c2201b56..e0a9d606e1 100644 --- a/hw/mem/nvdimm.c +++ b/hw/mem/nvdimm.c @@ -146,6 +146,15 @@ static void nvdimm_prepare_memory_region(NVDIMMDevice = *nvdimm, Error **errp) return; } =20 + if (!nvdimm->unarmed && memory_region_is_rom(mr)) { + HostMemoryBackend *hostmem =3D dimm->hostmem; + + error_setg(errp, "'unarmed' property must be off since memdev %s " + "is read-only", + object_get_canonical_path_component(OBJECT(hostmem))); + return; + } + nvdimm->nvdimm_mr =3D g_new(MemoryRegion, 1); memory_region_init_alias(nvdimm->nvdimm_mr, OBJECT(dimm), "nvdimm-memory", mr, 0, pmem_size); --=20 2.29.2