[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v3 5/9] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD
|
From: |
Kyle Evans |
|
Subject: |
Re: [PATCH v3 5/9] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD |
|
Date: |
Thu, 14 Oct 2021 10:06:24 -0500 |
On Fri, Oct 8, 2021 at 4:24 PM Warner Losh <imp@bsdimp.com> wrote:
>
> MAP_ANON and MAP_ANONYMOUS are identical. Prefer MAP_ANON for BSD since
> the file is now a confusing mix of the two.
>
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> bsd-user/mmap.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
> index f0be3b12cf..301108ed25 100644
> --- a/bsd-user/mmap.c
> +++ b/bsd-user/mmap.c
> @@ -285,7 +285,7 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start,
> abi_ulong size,
> addr = start;
> wrapped = repeat = 0;
> prev = 0;
> - flags = MAP_ANONYMOUS | MAP_PRIVATE;
> + flags = MAP_ANON | MAP_PRIVATE;
> if (alignment != 0) {
> flags |= MAP_ALIGNED(alignment);
> }
> @@ -409,7 +409,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
> prot,
> if (flags & MAP_FIXED) {
> printf("MAP_FIXED ");
> }
> - if (flags & MAP_ANONYMOUS) {
> + if (flags & MAP_ANON) {
> printf("MAP_ANON ");
> }
> if (flags & MAP_EXCL) {
> @@ -431,7 +431,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
> prot,
> }
> #endif
>
> - if ((flags & MAP_ANONYMOUS) && fd != -1) {
> + if ((flags & MAP_ANON) && fd != -1) {
> errno = EINVAL;
> goto fail;
> }
> @@ -533,7 +533,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int
> prot,
> * qemu_real_host_page_size
> */
> p = mmap(g2h_untagged(start), host_len, prot,
> - flags | MAP_FIXED | ((fd != -1) ? MAP_ANONYMOUS : 0), -1,
> 0);
> + flags | MAP_FIXED | ((fd != -1) ? MAP_ANON : 0), -1, 0);
> if (p == MAP_FAILED)
> goto fail;
> /* update start so that it points to the file position at 'offset' */
> @@ -696,8 +696,7 @@ static void mmap_reserve(abi_ulong start, abi_ulong size)
> }
> if (real_start != real_end) {
> mmap(g2h_untagged(real_start), real_end - real_start, PROT_NONE,
> - MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE,
> - -1, 0);
> + MAP_FIXED | MAP_ANON | MAP_PRIVATE, -1, 0);
> }
> }
>
> --
> 2.32.0
>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
- Re: [PATCH v3 2/9] bsd-user/mmap.c: check pread's return value to fix warnings with _FORTIFY_SOURCE, (continued)
- [PATCH v3 6/9] bsd-user/mmap.c: Convert to qemu_log logging for mmap debugging, Warner Losh, 2021/10/08
- [PATCH v3 4/9] bsd-user/mmap.c: mmap return ENOMEM on overflow, Warner Losh, 2021/10/08
- [PATCH v3 3/9] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs, Warner Losh, 2021/10/08
- [PATCH v3 5/9] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD, Warner Losh, 2021/10/08
- Re: [PATCH v3 5/9] bsd-user/mmap.c: mmap prefer MAP_ANON for BSD,
Kyle Evans <=
- [PATCH v3 8/9] bsd-user/mmap.c: Implement MAP_EXCL, required by jemalloc in head, Warner Losh, 2021/10/08
- [PATCH v3 7/9] bsd-user/mmap.c: Don't mmap fd == -1 independently from MAP_ANON flag, Warner Losh, 2021/10/08
- [PATCH v3 9/9] bsd-user/mmap.c: assert that target_mprotect cannot fail, Warner Losh, 2021/10/08