From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: David Hildenbrand <david@redhat.com>, qemu-devel@nongnu.org
Cc: Marcel Apfelbaum <mapfelba@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Murilo Opsfelder Araujo <muriloo@linux.ibm.com>,
Richard Henderson <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Peter Xu <peterx@redhat.com>, Greg Kurz <groug@kaod.org>,
Stefan Hajnoczi <stefanha@redhat.com>,
Igor Mammedov <imammedo@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate()
Date: Tue, 20 Apr 2021 12:20:51 +0200 [thread overview]
Message-ID: <34931ee0-1bde-16f5-d929-1c9d9157f45a@redhat.com> (raw)
In-Reply-To: <20210413091421.7707-6-david@redhat.com>
Hi David,
On 4/13/21 11:14 AM, David Hildenbrand wrote:
> Let's forward ram_flags instead, renaming
> memory_region_init_ram_shared_nomigrate() into
> memory_region_init_ram_flags_nomigrate(). Forward flags to
> qemu_ram_alloc() and qemu_ram_alloc_internal().
>
> Reviewed-by: Peter Xu <peterx@redhat.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> backends/hostmem-ram.c | 6 +++--
> hw/m68k/next-cube.c | 4 ++--
> include/exec/memory.h | 24 +++++++++----------
> include/exec/ram_addr.h | 2 +-
> .../memory-region-housekeeping.cocci | 8 +++----
> softmmu/memory.c | 20 ++++++++--------
OK up to here, but the qemu_ram_alloc_internal() changes
in softmmu/physmem.c belong to a different patch (except
the line adding "new_block->flags = ram_flags").
Do you mind splitting it?
> diff --git a/softmmu/physmem.c b/softmmu/physmem.c
> index cc59f05593..fdcd38ba61 100644
> --- a/softmmu/physmem.c
> +++ b/softmmu/physmem.c
> @@ -2108,12 +2108,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
> void (*resized)(const char*,
> uint64_t length,
> void *host),
> - void *host, bool resizeable, bool share,
> + void *host, uint32_t ram_flags,
> MemoryRegion *mr, Error **errp)
> {
> RAMBlock *new_block;
> Error *local_err = NULL;
>
> + assert((ram_flags & ~(RAM_SHARED | RAM_RESIZEABLE)) == 0);
> +
> size = HOST_PAGE_ALIGN(size);
> max_size = HOST_PAGE_ALIGN(max_size);
> new_block = g_malloc0(sizeof(*new_block));
> @@ -2125,15 +2127,10 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
> new_block->fd = -1;
> new_block->page_size = qemu_real_host_page_size;
> new_block->host = host;
> + new_block->flags = ram_flags;
> if (host) {
> new_block->flags |= RAM_PREALLOC;
> }
> - if (share) {
> - new_block->flags |= RAM_SHARED;
> - }
> - if (resizeable) {
> - new_block->flags |= RAM_RESIZEABLE;
> - }
> ram_block_add(new_block, &local_err);
> if (local_err) {
> g_free(new_block);
> @@ -2146,15 +2143,14 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
> RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
> MemoryRegion *mr, Error **errp)
> {
> - return qemu_ram_alloc_internal(size, size, NULL, host, false,
> - false, mr, errp);
> + return qemu_ram_alloc_internal(size, size, NULL, host, 0, mr, errp);
> }
>
> -RAMBlock *qemu_ram_alloc(ram_addr_t size, bool share,
> +RAMBlock *qemu_ram_alloc(ram_addr_t size, uint32_t ram_flags,
> MemoryRegion *mr, Error **errp)
> {
> - return qemu_ram_alloc_internal(size, size, NULL, NULL, false,
> - share, mr, errp);
> + assert((ram_flags & ~RAM_SHARED) == 0);
> + return qemu_ram_alloc_internal(size, size, NULL, NULL, ram_flags, mr, errp);
> }
>
> RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,
> @@ -2163,8 +2159,8 @@ RAMBlock *qemu_ram_alloc_resizeable(ram_addr_t size, ram_addr_t maxsz,
> void *host),
> MemoryRegion *mr, Error **errp)
> {
> - return qemu_ram_alloc_internal(size, maxsz, resized, NULL, true,
> - false, mr, errp);
> + return qemu_ram_alloc_internal(size, maxsz, resized, NULL,
> + RAM_RESIZEABLE, mr, errp);
> }
>
> static void reclaim_ramblock(RAMBlock *block)
>
next prev parent reply other threads:[~2021-04-20 10:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 9:14 [PATCH v5 00/14] RAM_NORESERVE, MAP_NORESERVE and hostmem "reserve" property David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 01/14] util/mmap-alloc: Factor out calculation of the pagesize for the guard page David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 02/14] util/mmap-alloc: Factor out reserving of a memory region to mmap_reserve() David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 03/14] util/mmap-alloc: Factor out activating of memory to mmap_activate() David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 04/14] softmmu/memory: Pass ram_flags to qemu_ram_alloc_from_fd() David Hildenbrand
2021-04-20 9:52 ` Philippe Mathieu-Daudé
2021-04-20 10:18 ` Philippe Mathieu-Daudé
2021-04-20 10:36 ` David Hildenbrand
2021-04-20 10:45 ` Philippe Mathieu-Daudé
2021-04-20 11:03 ` David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 05/14] softmmu/memory: Pass ram_flags to memory_region_init_ram_shared_nomigrate() David Hildenbrand
2021-04-20 10:20 ` Philippe Mathieu-Daudé [this message]
2021-04-20 10:27 ` David Hildenbrand
2021-04-20 10:40 ` Philippe Mathieu-Daudé
2021-04-20 11:10 ` David Hildenbrand
2021-04-20 11:43 ` David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 06/14] util/mmap-alloc: Pass flags instead of separate bools to qemu_ram_mmap() David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 07/14] memory: Introduce RAM_NORESERVE and wire it up in qemu_ram_mmap() David Hildenbrand
2021-04-20 10:25 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 08/14] util/mmap-alloc: Support RAM_NORESERVE via MAP_NORESERVE under Linux David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 09/14] hostmem: Wire up RAM_NORESERVE via "reserve" property David Hildenbrand
2021-04-13 9:14 ` [PATCH v5 10/14] qmp: Clarify memory backend properties returned via query-memdev David Hildenbrand
2021-04-20 10:27 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 11/14] qmp: Include "share" property of memory backends David Hildenbrand
2021-04-20 10:28 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 12/14] hmp: Print "share" property of memory backends with "info memdev" David Hildenbrand
2021-04-14 18:56 ` Dr. David Alan Gilbert
2021-04-20 10:46 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 13/14] qmp: Include "reserve" property of memory backends David Hildenbrand
2021-04-20 10:47 ` Philippe Mathieu-Daudé
2021-04-13 9:14 ` [PATCH v5 14/14] hmp: Print "reserve" property of memory backends with "info memdev" David Hildenbrand
2021-04-20 10:49 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=34931ee0-1bde-16f5-d929-1c9d9157f45a@redhat.com \
--to=philmd@redhat.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=groug@kaod.org \
--cc=imammedo@redhat.com \
--cc=mapfelba@redhat.com \
--cc=mst@redhat.com \
--cc=muriloo@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).