[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 38/45] linux-user: Rename mmap_reserve to mmap_reserve_or_unmap
From: |
Richard Henderson |
Subject: |
[PATCH 38/45] linux-user: Rename mmap_reserve to mmap_reserve_or_unmap |
Date: |
Sun, 9 Jul 2023 19:29:27 +0100 |
If !reserved_va, munmap instead and assert success.
Update all callers.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230707204054.8792-22-richard.henderson@linaro.org>
---
linux-user/mmap.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 6308787942..22c2869be8 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -722,14 +722,14 @@ fail:
return -1;
}
-static void mmap_reserve(abi_ulong start, abi_ulong len)
+static void mmap_reserve_or_unmap(abi_ulong start, abi_ulong len)
{
abi_ulong real_start;
abi_ulong real_last;
abi_ulong real_len;
abi_ulong last;
abi_ulong a;
- void *host_start, *ptr;
+ void *host_start;
int prot;
last = start + len - 1;
@@ -776,9 +776,15 @@ static void mmap_reserve(abi_ulong start, abi_ulong len)
real_len = real_last - real_start + 1;
host_start = g2h_untagged(real_start);
- ptr = mmap(host_start, real_len, PROT_NONE,
- MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, -1, 0);
- assert(ptr == host_start);
+ if (reserved_va) {
+ void *ptr = mmap(host_start, real_len, PROT_NONE,
+ MAP_FIXED | MAP_ANONYMOUS
+ | MAP_PRIVATE | MAP_NORESERVE, -1, 0);
+ assert(ptr == host_start);
+ } else {
+ int ret = munmap(host_start, real_len);
+ assert(ret == 0);
+ }
}
int target_munmap(abi_ulong start, abi_ulong len)
@@ -830,11 +836,7 @@ int target_munmap(abi_ulong start, abi_ulong len)
ret = 0;
/* unmap what we can */
if (real_start < real_end) {
- if (reserved_va) {
- mmap_reserve(real_start, real_end - real_start);
- } else {
- ret = munmap(g2h_untagged(real_start), real_end - real_start);
- }
+ mmap_reserve_or_unmap(real_start, real_end - real_start);
}
if (ret == 0) {
@@ -871,7 +873,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong
old_size,
* If new and old addresses overlap then the above mremap will
* already have failed with EINVAL.
*/
- mmap_reserve(old_addr, old_size);
+ mmap_reserve_or_unmap(old_addr, old_size);
}
} else if (flags & MREMAP_MAYMOVE) {
abi_ulong mmap_start;
@@ -886,7 +888,7 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong
old_size,
flags | MREMAP_FIXED,
g2h_untagged(mmap_start));
if (reserved_va) {
- mmap_reserve(old_addr, old_size);
+ mmap_reserve_or_unmap(old_addr, old_size);
}
}
} else {
@@ -912,7 +914,8 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong
old_size,
errno = ENOMEM;
host_addr = MAP_FAILED;
} else if (reserved_va && old_size > new_size) {
- mmap_reserve(old_addr + old_size, old_size - new_size);
+ mmap_reserve_or_unmap(old_addr + old_size,
+ old_size - new_size);
}
}
} else {
--
2.34.1
- [PULL 23/37] target/i386: Use aesdec_ISB_ISR_IMC_AK, (continued)
- [PULL 23/37] target/i386: Use aesdec_ISB_ISR_IMC_AK, Richard Henderson, 2023/07/09
- [PATCH 27/45] bsd-user: Use page_check_range_empty for MAP_EXCL, Richard Henderson, 2023/07/09
- [PATCH 40/45] accel/tcg: Accept more page flags in page_check_range, Richard Henderson, 2023/07/09
- [PULL 37/37] crypto: Unexport AES_*_rot, AES_TeN, AES_TdN, Richard Henderson, 2023/07/09
- [PATCH 25/45] linux-user: Populate more bits in mmap_flags_tbl, Richard Henderson, 2023/07/09
- [PULL 30/37] target/riscv: Use aesdec_ISB_ISR_AK, Richard Henderson, 2023/07/09
- [PULL 35/37] crypto: Implement aesdec_IMC with AES_imc_rot, Richard Henderson, 2023/07/09
- [PATCH 41/45] accel/tcg: Return bool from page_check_range, Richard Henderson, 2023/07/09
- [PATCH 42/45] linux-user: Remove can_passthrough_madvise, Richard Henderson, 2023/07/09
- [PULL 26/37] target/arm: Use aesdec_ISB_ISR_AK, Richard Henderson, 2023/07/09
- [PATCH 38/45] linux-user: Rename mmap_reserve to mmap_reserve_or_unmap,
Richard Henderson <=
- [PATCH 39/45] linux-user: Simplify target_munmap, Richard Henderson, 2023/07/09
- [PATCH 24/45] linux-user: Split TARGET_PROT_* out of syscall_defs.h, Richard Henderson, 2023/07/09
- [PULL 29/37] target/riscv: Use aesenc_SB_SR_AK, Richard Henderson, 2023/07/09
- [PULL 36/37] crypto: Remove AES_imc, Richard Henderson, 2023/07/09
- [PATCH 37/45] linux-user: Rewrite mmap_reserve, Richard Henderson, 2023/07/09
- [PULL 31/37] target/riscv: Use aesdec_IMC, Richard Henderson, 2023/07/09
- [PATCH 31/45] linux-user: Rewrite target_mprotect, Richard Henderson, 2023/07/09
- [PATCH 43/45] linux-user: Simplify target_madvise, Richard Henderson, 2023/07/09
- [PATCH 44/45] linux-user: Drop uint and ulong, Richard Henderson, 2023/07/09
- [PATCH 45/45] linux-user/riscv: Add syscall riscv_hwprobe, Richard Henderson, 2023/07/09