From nobody Wed Nov 5 15:20:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497472345956926.7523365661082; Wed, 14 Jun 2017 13:32:25 -0700 (PDT) Received: from localhost ([::1]:50730 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLExk-0002M2-Ho for importer@patchew.org; Wed, 14 Jun 2017 16:32:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLEvx-00019t-E6 for qemu-devel@nongnu.org; Wed, 14 Jun 2017 16:30:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLEvw-0005oV-EG for qemu-devel@nongnu.org; Wed, 14 Jun 2017 16:30:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51518) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dLEvw-0005oO-4r for qemu-devel@nongnu.org; Wed, 14 Jun 2017 16:30:32 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 235BAC04B302 for ; Wed, 14 Jun 2017 20:30:31 +0000 (UTC) Received: from localhost (ovpn-116-27.gru2.redhat.com [10.97.116.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8CFFC78486; Wed, 14 Jun 2017 20:30:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 235BAC04B302 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=ehabkost@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 235BAC04B302 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Wed, 14 Jun 2017 17:29:59 -0300 Message-Id: <20170614203000.19984-5-ehabkost@redhat.com> In-Reply-To: <20170614203000.19984-1-ehabkost@redhat.com> References: <20170614203000.19984-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 14 Jun 2017 20:30:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 4/5] memory: Add 'persistent' parameter to memory_region_init_ram_from_file() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Dr. David Alan Gilbert" , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Make it possible to set the RAM_NONPERSISTENT flag on the RAMBlock when mapping a file. Signed-off-by: Eduardo Habkost Reviewed-by: Dr. David Alan Gilbert --- include/exec/memory.h | 4 ++++ include/exec/ram_addr.h | 4 ++-- backends/hostmem-file.c | 2 +- exec.c | 7 +++++-- memory.c | 4 +++- numa.c | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/exec/memory.h b/include/exec/memory.h index 80e605a96a..f47c534179 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -446,6 +446,9 @@ void memory_region_init_resizeable_ram(MemoryRegion *mr, * must be unique within any device * @size: size of the region. * @share: %true if memory must be mmaped with the MAP_SHARED flag + * @persistent: %false if RAM contents can be discarded and don't + * need to be flushed to disk when the memory region + * is freed. * @path: the path in which to allocate the RAM. * @errp: pointer to Error*, to store an error if it happens. */ @@ -454,6 +457,7 @@ void memory_region_init_ram_from_file(MemoryRegion *mr, const char *name, uint64_t size, bool share, + bool persistent, const char *path, Error **errp); #endif diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 140efa840c..67dc099355 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -63,8 +63,8 @@ static inline void *ramblock_ptr(RAMBlock *block, ram_add= r_t offset) long qemu_getrampagesize(void); unsigned long last_ram_page(void); RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, - bool share, const char *mem_path, - Error **errp); + bool share, bool persistent, + const char *mem_path, Error **errp); RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host, MemoryRegion *mr, Error **errp); RAMBlock *qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr, Error **errp); diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c index fc4ef46d11..d078775b4b 100644 --- a/backends/hostmem-file.c +++ b/backends/hostmem-file.c @@ -57,7 +57,7 @@ file_backend_memory_alloc(HostMemoryBackend *backend, Err= or **errp) path =3D object_get_canonical_path(OBJECT(backend)); memory_region_init_ram_from_file(&backend->mr, OBJECT(backend), path, - backend->size, fb->share, + backend->size, fb->share, true, fb->mem_path, errp); g_free(path); } diff --git a/exec.c b/exec.c index a6e9ed4ece..77734198d0 100644 --- a/exec.c +++ b/exec.c @@ -1937,8 +1937,8 @@ static void ram_block_add(RAMBlock *new_block, Error = **errp) =20 #ifdef __linux__ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, - bool share, const char *mem_path, - Error **errp) + bool share, bool persistent, + const char *mem_path, Error **errp) { RAMBlock *new_block; Error *local_err =3D NULL; @@ -1965,6 +1965,9 @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, M= emoryRegion *mr, new_block->used_length =3D size; new_block->max_length =3D size; new_block->flags =3D share ? RAM_SHARED : 0; + if (!persistent) { + new_block->flags |=3D RAM_NONPERSISTENT; + } new_block->host =3D file_ram_alloc(new_block, size, mem_path, errp); if (!new_block->host) { diff --git a/memory.c b/memory.c index 0ddc4cc28d..3c0c0ff141 100644 --- a/memory.c +++ b/memory.c @@ -1387,6 +1387,7 @@ void memory_region_init_ram_from_file(MemoryRegion *m= r, const char *name, uint64_t size, bool share, + bool persistent, const char *path, Error **errp) { @@ -1394,7 +1395,8 @@ void memory_region_init_ram_from_file(MemoryRegion *m= r, mr->ram =3D true; mr->terminates =3D true; mr->destructor =3D memory_region_destructor_ram; - mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, share, path, errp= ); + mr->ram_block =3D qemu_ram_alloc_from_file(size, mr, share, persistent, + path, errp); mr->dirty_log_mask =3D tcg_enabled() ? (1 << DIRTY_MEMORY_CODE) : 0; } #endif diff --git a/numa.c b/numa.c index 65701cb6c8..825d5933ca 100644 --- a/numa.c +++ b/numa.c @@ -531,7 +531,7 @@ 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, false, + memory_region_init_ram_from_file(mr, owner, name, ram_size, false,= true, mem_path, &err); if (err) { error_report_err(err); --=20 2.11.0.259.g40922b1