From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, alex.bennee@linaro.org
Subject: [PATCH v2 14/33] softmmu/physmem: Remove HOST_PAGE_ALIGN
Date: Thu, 31 Aug 2023 19:23:12 -0700 [thread overview]
Message-ID: <20230901022331.115247-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230901022331.115247-1-richard.henderson@linaro.org>
Align allocation sizes to the maximum of host and target page sizes.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
softmmu/physmem.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 6f963ea127..04d8423b68 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -1662,7 +1662,8 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp)
assert(block);
- newsize = HOST_PAGE_ALIGN(newsize);
+ newsize = TARGET_PAGE_ALIGN(newsize);
+ newsize = REAL_HOST_PAGE_ALIGN(newsize);
if (block->used_length == newsize) {
/*
@@ -1897,7 +1898,9 @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
return NULL;
}
- size = HOST_PAGE_ALIGN(size);
+ size = TARGET_PAGE_ALIGN(size);
+ size = REAL_HOST_PAGE_ALIGN(size);
+
file_size = get_file_size(fd);
if (file_size > offset && file_size < (offset + size)) {
error_setg(errp, "backing store size 0x%" PRIx64
@@ -1975,13 +1978,17 @@ RAMBlock *qemu_ram_alloc_internal(ram_addr_t size, ram_addr_t max_size,
{
RAMBlock *new_block;
Error *local_err = NULL;
+ int align;
assert((ram_flags & ~(RAM_SHARED | RAM_RESIZEABLE | RAM_PREALLOC |
RAM_NORESERVE)) == 0);
assert(!host ^ (ram_flags & RAM_PREALLOC));
- size = HOST_PAGE_ALIGN(size);
- max_size = HOST_PAGE_ALIGN(max_size);
+ align = qemu_real_host_page_size();
+ align = MAX(align, TARGET_PAGE_SIZE);
+ size = ROUND_UP(size, align);
+ max_size = ROUND_UP(max_size, align);
+
new_block = g_malloc0(sizeof(*new_block));
new_block->mr = mr;
new_block->resized = resized;
--
2.34.1
next prev parent reply other threads:[~2023-09-01 2:28 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 2:22 [PATCH v2 00/33] linux-user: Improve host and guest page size handling Richard Henderson
2023-09-01 2:22 ` [PATCH v2 01/33] accel/tcg: Remove qemu_host_page_size from page_protect/page_unprotect Richard Henderson
2023-09-01 2:23 ` [PATCH v2 02/33] linux-user: Adjust SVr4 NULL page mapping Richard Henderson
2023-09-01 2:23 ` [PATCH v2 03/33] linux-user: Remove qemu_host_page_{size, mask} in probe_guest_base Richard Henderson
2023-09-01 2:23 ` [PATCH v2 04/33] linux-user: Remove qemu_host_page_size from create_elf_tables Richard Henderson
2023-09-01 2:23 ` [PATCH v2 05/33] linux-user/hppa: Simplify init_guest_commpage Richard Henderson
2023-09-01 2:23 ` [PATCH v2 06/33] linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage Richard Henderson
2023-09-01 2:23 ` [PATCH v2 07/33] linux-user/arm: " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 08/33] linux-user: Remove qemu_host_page_{size, mask} from mmap.c Richard Henderson
2023-09-01 2:23 ` [PATCH v2 09/33] linux-user: Remove REAL_HOST_PAGE_ALIGN " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 10/33] linux-user: Remove HOST_PAGE_ALIGN " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 11/33] migration: Remove qemu_host_page_size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 12/33] hw/tpm: Remove HOST_PAGE_ALIGN from tpm_ppi_init Richard Henderson
2023-09-01 2:23 ` [PATCH v2 13/33] softmmu/physmem: Remove qemu_host_page_size Richard Henderson
2023-09-01 2:23 ` Richard Henderson [this message]
2023-09-01 2:23 ` [PATCH v2 15/33] linux-user: Remove qemu_host_page_size from main Richard Henderson
2023-09-01 2:23 ` [PATCH v2 16/33] linux-user: Split out target_mmap__locked Richard Henderson
2023-09-01 2:23 ` [PATCH v2 17/33] linux-user: Move some mmap checks outside the lock Richard Henderson
2023-09-01 2:23 ` [PATCH v2 18/33] linux-user: Fix sub-host-page mmap Richard Henderson
2023-09-01 2:23 ` [PATCH v2 19/33] linux-user: Split out mmap_end Richard Henderson
2023-09-01 2:23 ` [PATCH v2 20/33] linux-user: Do early mmap placement only for reserved_va Richard Henderson
2023-09-01 2:23 ` [PATCH v2 21/33] linux-user: Split out mmap_h_eq_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 22/33] linux-user: Split out mmap_h_lt_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 23/33] linux-user: Split out mmap_h_gt_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 24/33] tests/tcg: Remove run-test-mmap-* Richard Henderson
2023-09-01 2:23 ` [PATCH v2 25/33] tests/tcg: Extend file in linux-madvise.c Richard Henderson
2023-09-01 2:23 ` [PATCH v2 26/33] *-user: Deprecate and disable -p pagesize Richard Henderson
2023-09-01 2:26 ` Warner Losh
2023-09-01 2:23 ` [PATCH v2 27/33] cpu: Remove page_size_init Richard Henderson
2023-09-01 2:31 ` Warner Losh
2023-09-01 2:23 ` [PATCH v2 28/33] accel/tcg: Disconnect TargetPageDataNode from page size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 29/33] linux-user: Allow TARGET_PAGE_BITS_VARY Richard Henderson
2023-09-01 2:23 ` [PATCH v2 30/33] target/arm: Enable TARGET_PAGE_BITS_VARY for AArch64 user-only Richard Henderson
2023-09-01 2:23 ` [PATCH v2 31/33] linux-user: Bound mmap_min_addr by host page size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 32/33] target/ppc: Enable TARGET_PAGE_BITS_VARY for user-only Richard Henderson
2023-09-01 2:23 ` [PATCH v2 33/33] target/alpha: " Richard Henderson
2023-09-29 1:05 ` [PATCH v2 00/33] linux-user: Improve host and guest page size handling Richard Henderson
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=20230901022331.115247-15-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=qemu-devel@nongnu.org \
/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).