From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: joel@jms.id.au, akihiko.odaki@daynix.com, laurent@vivier.eu,
deller@gmx.de
Subject: [PATCH v8 14/17] linux-user: Properly set image_info.brk in flatload
Date: Thu, 3 Aug 2023 18:45:14 -0700 [thread overview]
Message-ID: <20230804014517.6361-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230804014517.6361-1-richard.henderson@linaro.org>
The heap starts at "brk" not "start_brk". With this fixed,
image_info.start_brk is unused and may be removed.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/qemu.h | 1 -
linux-user/flatload.c | 2 +-
linux-user/main.c | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 4b0c9da0dc..4f8b55e2fb 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -29,7 +29,6 @@ struct image_info {
abi_ulong end_code;
abi_ulong start_data;
abi_ulong end_data;
- abi_ulong start_brk;
abi_ulong brk;
abi_ulong start_mmap;
abi_ulong start_stack;
diff --git a/linux-user/flatload.c b/linux-user/flatload.c
index 5efec2630e..8f5e9f489b 100644
--- a/linux-user/flatload.c
+++ b/linux-user/flatload.c
@@ -811,7 +811,7 @@ int load_flt_binary(struct linux_binprm *bprm, struct image_info *info)
info->end_code = libinfo[0].start_code + libinfo[0].text_len;
info->start_data = libinfo[0].start_data;
info->end_data = libinfo[0].end_data;
- info->start_brk = libinfo[0].start_brk;
+ info->brk = libinfo[0].start_brk;
info->start_stack = sp;
info->stack_limit = libinfo[0].start_brk;
info->entry = start_addr;
diff --git a/linux-user/main.c b/linux-user/main.c
index e089123cfa..51ee8649e2 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -953,8 +953,6 @@ int main(int argc, char **argv, char **envp)
fprintf(f, "page layout changed following binary load\n");
page_dump(f);
- fprintf(f, "start_brk 0x" TARGET_ABI_FMT_lx "\n",
- info->start_brk);
fprintf(f, "end_code 0x" TARGET_ABI_FMT_lx "\n",
info->end_code);
fprintf(f, "start_code 0x" TARGET_ABI_FMT_lx "\n",
--
2.34.1
next prev parent reply other threads:[~2023-08-04 1:47 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-04 1:45 [PATCH for-8.1 v8 00/17] linux-user: brk fixes Richard Henderson
2023-08-04 1:45 ` [PATCH v8 01/17] linux-user: Unset MAP_FIXED_NOREPLACE for host Richard Henderson
2023-08-04 1:45 ` [PATCH v8 02/17] linux-user: Fix MAP_FIXED_NOREPLACE on old kernels Richard Henderson
2023-08-04 1:45 ` [PATCH v8 03/17] linux-user: Do not call get_errno() in do_brk() Richard Henderson
2023-08-04 1:45 ` [PATCH v8 04/17] linux-user: Use MAP_FIXED_NOREPLACE for do_brk() Richard Henderson
2023-08-04 1:45 ` [PATCH v8 05/17] linux-user: Do nothing if too small brk is specified Richard Henderson
2023-08-04 1:45 ` [PATCH v8 06/17] linux-user: Do not align brk with host page size Richard Henderson
2023-08-04 1:45 ` [PATCH v8 07/17] linux-user: Remove last_brk Richard Henderson
2023-08-04 5:09 ` Akihiko Odaki
2023-08-04 8:51 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 08/17] linux-user: Adjust task_unmapped_base for reserved_va Richard Henderson
2023-08-04 5:14 ` Akihiko Odaki
2023-08-04 1:45 ` [PATCH v8 09/17] linux-user: Define TASK_UNMAPPED_BASE in $guest/target_mman.h Richard Henderson
2023-08-04 5:17 ` Akihiko Odaki
2023-08-04 10:17 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 10/17] linux-user: Define ELF_ET_DYN_BASE " Richard Henderson
2023-08-04 5:20 ` Akihiko Odaki
2023-08-04 14:09 ` Richard Henderson
2023-08-04 9:50 ` Helge Deller
2023-08-04 14:09 ` Richard Henderson
2023-08-04 1:45 ` [PATCH v8 11/17] linux-user: Use MAP_FIXED_NOREPLACE for initial image mmap Richard Henderson
2023-08-04 5:22 ` Akihiko Odaki
2023-08-04 10:18 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 12/17] linux-user: Use elf_et_dyn_base for ET_DYN with interpreter Richard Henderson
2023-08-04 5:24 ` Akihiko Odaki
2023-08-04 10:20 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 13/17] linux-user: Adjust initial brk when interpreter is close to executable Richard Henderson
2023-08-04 5:26 ` Akihiko Odaki
2023-08-04 1:45 ` Richard Henderson [this message]
2023-08-04 5:27 ` [PATCH v8 14/17] linux-user: Properly set image_info.brk in flatload Akihiko Odaki
2023-08-04 10:22 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 15/17] linux-user: Do not adjust image mapping for host page size Richard Henderson
2023-08-04 5:28 ` Akihiko Odaki
2023-08-04 10:23 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 16/17] linux-user: Do not adjust zero_bss " Richard Henderson
2023-08-04 5:56 ` Akihiko Odaki
2023-08-04 10:24 ` Helge Deller
2023-08-04 1:45 ` [PATCH v8 17/17] linux-user: Use zero_bss for PT_LOAD with no file contents too Richard Henderson
2023-08-04 6:02 ` Akihiko Odaki
2023-08-04 10:25 ` Helge Deller
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=20230804014517.6361-15-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=akihiko.odaki@daynix.com \
--cc=deller@gmx.de \
--cc=joel@jms.id.au \
--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).