From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, alex.bennee@linaro.org
Subject: [PATCH v2 04/33] linux-user: Remove qemu_host_page_size from create_elf_tables
Date: Thu, 31 Aug 2023 19:23:02 -0700 [thread overview]
Message-ID: <20230901022331.115247-5-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230901022331.115247-1-richard.henderson@linaro.org>
AT_PAGESZ is supposed to advertise the guest page size.
The random adjustment made here using qemu_host_page_size
does not match anything else within linux-user.
The idea here is good, but should be done more systemically
via adjustment to TARGET_PAGE_SIZE.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/elfload.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 7851003147..885566c798 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2498,13 +2498,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,
NEW_AUX_ENT(AT_PHDR, (abi_ulong)(info->load_addr + exec->e_phoff));
NEW_AUX_ENT(AT_PHENT, (abi_ulong)(sizeof (struct elf_phdr)));
NEW_AUX_ENT(AT_PHNUM, (abi_ulong)(exec->e_phnum));
- if ((info->alignment & ~qemu_host_page_mask) != 0) {
- /* Target doesn't support host page size alignment */
- NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE));
- } else {
- NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(MAX(TARGET_PAGE_SIZE,
- qemu_host_page_size)));
- }
+ NEW_AUX_ENT(AT_PAGESZ, (abi_ulong)(TARGET_PAGE_SIZE));
NEW_AUX_ENT(AT_BASE, (abi_ulong)(interp_info ? interp_info->load_addr : 0));
NEW_AUX_ENT(AT_FLAGS, (abi_ulong)0);
NEW_AUX_ENT(AT_ENTRY, info->entry);
--
2.34.1
next prev parent reply other threads:[~2023-09-01 2:25 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 ` Richard Henderson [this message]
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 ` [PATCH v2 14/33] softmmu/physmem: Remove HOST_PAGE_ALIGN Richard Henderson
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-5-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).