[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/12] linux-user: more debug for init_guest_space
From: |
Alex Bennée |
Subject: |
[PATCH v3 04/12] linux-user: more debug for init_guest_space |
Date: |
Fri, 3 Apr 2020 20:11:42 +0100 |
Searching for memory space can cause problems so lets extend the
CPU_LOG_PAGE output so you can watch init_guest_space fail to
allocate memory. A more involved fix is actually required to make this
function play nicely with the large guard pages the sanitiser likes to
use.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
---
linux-user/elfload.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 8198be04460..619c054cc48 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -2172,6 +2172,8 @@ unsigned long init_guest_space(unsigned long host_start,
/* Check to see if the address is valid. */
if (host_start && real_start != current_start) {
+ qemu_log_mask(CPU_LOG_PAGE, "invalid %lx && %lx != %lx\n",
+ host_start, real_start, current_start);
goto try_again;
}
@@ -2240,7 +2242,11 @@ unsigned long init_guest_space(unsigned long host_start,
* probably a bad strategy if not, which means we got here
* because of trouble with ARM commpage setup.
*/
- munmap((void *)real_start, real_size);
+ if (munmap((void *)real_start, real_size) != 0) {
+ error_report("%s: failed to unmap %lx:%lx (%s)", __func__,
+ real_start, real_size, strerror(errno));
+ abort();
+ }
current_start += align;
if (host_start == current_start) {
/* Theoretically possible if host doesn't have any suitably
--
2.20.1
- [PATCH v3 for 5.0-rc2 00/12] a selection of random fixes, Alex Bennée, 2020/04/03
- [PATCH v3 01/12] elf-ops: bail out if we have no function symbols, Alex Bennée, 2020/04/03
- [PATCH v3 03/12] tests/tcg: remove extraneous pasting macros, Alex Bennée, 2020/04/03
- [PATCH v3 02/12] linux-user: protect fcntl64 with an #ifdef, Alex Bennée, 2020/04/03
- [PATCH v3 06/12] gdbstub: fix compiler complaining, Alex Bennée, 2020/04/03
- [PATCH v3 07/12] softfloat: Fix BAD_SHIFT from normalizeFloatx80Subnormal, Alex Bennée, 2020/04/03
- [PATCH v3 08/12] linux-user: factor out reading of /proc/self/maps, Alex Bennée, 2020/04/03
- [PATCH v3 04/12] linux-user: more debug for init_guest_space,
Alex Bennée <=
- [PATCH v3 05/12] target/xtensa: add FIXME for translation memory leak, Alex Bennée, 2020/04/03
- [PATCH v3 10/12] target/arm: don't expose "ieee_half" via gdbstub, Alex Bennée, 2020/04/03
- [PATCH v3 09/12] linux-user: clean-up padding on /proc/self/maps, Alex Bennée, 2020/04/03
- [PATCH v3 12/12] configure: Add -Werror to PIE probe, Alex Bennée, 2020/04/03
- [PATCH v3 11/12] hw/core: properly terminate loading .hex on EOF record, Alex Bennée, 2020/04/03