[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 5/9] bsd-user: mmap prefer MAP_ANON for BSD
From: |
Warner Losh |
Subject: |
[PATCH 5/9] bsd-user: mmap prefer MAP_ANON for BSD |
Date: |
Thu, 16 Sep 2021 20:56:31 -0600 |
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>
---
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 0acc2db712..bafbdacd31 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -284,7 +284,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);
}
@@ -408,7 +408,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) {
@@ -430,7 +430,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;
}
@@ -532,7 +532,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' */
@@ -694,8 +694,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
- [PATCH 0/9] bsd-user mmap fixes, Warner Losh, 2021/09/16
- [PATCH 2/9] bsd-user: Apply fb7e378cf9c from linux-user (fix FORTIFY warnings), Warner Losh, 2021/09/16
- [PATCH 1/9] bsd-user: Apply e6deac9cf99 from linux-user (zero anonymous memory), Warner Losh, 2021/09/16
- [PATCH 3/9] bsd-user: MAP_ symbols are defined, so no need for ifdefs, Warner Losh, 2021/09/16
- [PATCH 4/9] bsd-user: mmap return ENOMEM on overflow, Warner Losh, 2021/09/16
- [PATCH 5/9] bsd-user: mmap prefer MAP_ANON for BSD,
Warner Losh <=
- [PATCH 6/9] bsd-user: mmap line wrap change, Warner Losh, 2021/09/16
- [PATCH 7/9] bsd-user: Don't try to mmap fd when it is -1 independently from MAP_ANONYMOUS flag, Warner Losh, 2021/09/16
- [PATCH 8/9] bsd-user: Implement MAP_EXCL, required by jemalloc in head, Warner Losh, 2021/09/16
- [PATCH 9/9] bsd-user: Apply 86abac06c14 from linux-user (target_mprotect can't fail), Warner Losh, 2021/09/16