[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v1 4/7] linux-user: more debug for init_guest_space
From: |
Laurent Vivier |
Subject: |
Re: [PATCH v1 4/7] linux-user: more debug for init_guest_space |
Date: |
Fri, 27 Mar 2020 11:50:04 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 |
Le 27/03/2020 à 10:49, Alex Bennée a écrit :
> 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>
> ---
> 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
>
Reviewed-by: Laurent Vivier <address@hidden>
- Re: [PATCH v1 1/7] elf-ops: bail out if we have no function symbols, (continued)
- [PATCH v1 3/7] tests/tcg: remove extraneous pasting macros, Alex Bennée, 2020/03/27
- [PATCH v1 2/7] linux-user: protect fcntl64 with an #ifdef, Alex Bennée, 2020/03/27
- [PATCH v1 4/7] linux-user: more debug for init_guest_space, Alex Bennée, 2020/03/27
- Re: [PATCH v1 4/7] linux-user: more debug for init_guest_space,
Laurent Vivier <=
- [PATCH v1 6/7] target/xtensa: add FIXME for translation memory leak, Alex Bennée, 2020/03/27
- [PATCH v1 5/7] fpu/softfloat: avoid undefined behaviour when normalising empty sigs, Alex Bennée, 2020/03/27
- Re: [PATCH v1 5/7] fpu/softfloat: avoid undefined behaviour when normalising empty sigs, Aleksandar Markovic, 2020/03/27
- [PATCH v1 7/7] gdbstub: fix compiler complaining, Alex Bennée, 2020/03/27
- Re: [PATCH for 5.0 v1 0/7] A selection of sanitiser fixes, no-reply, 2020/03/27