[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/24] bsd-user: Use page_find_range_empty for mmap_find_vma_rese
From: |
Richard Henderson |
Subject: |
[PATCH 15/24] bsd-user: Use page_find_range_empty for mmap_find_vma_reserved |
Date: |
Fri, 30 Jun 2023 15:21:50 +0200 |
Use the interval tree to find empty space, rather than
probing each page in turn.
Cc: Warner Losh <imp@bsdimp.com>
Cc: Kyle Evans <kevans@freebsd.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/mmap.c | 47 ++++++-----------------------------------------
1 file changed, 6 insertions(+), 41 deletions(-)
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 07b5b8055e..0d06bd457d 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -222,50 +222,15 @@ unsigned long last_brk;
static abi_ulong mmap_find_vma_reserved(abi_ulong start, abi_ulong size,
abi_ulong alignment)
{
- abi_ulong addr;
- abi_ulong end_addr;
- int prot;
- int looped = 0;
+ abi_ulong ret;
- if (size > reserved_va) {
- return (abi_ulong)-1;
+ ret = page_find_range_empty(start, reserved_va, size, align);
+ if (ret == -1 && start > TARGET_PAGE_SIZE) {
+ /* Restart at the beginning of the address space. */
+ ret = page_find_range_empty(TARGET_PAGE_SIZE, start - 1, size, align);
}
- size = HOST_PAGE_ALIGN(size) + alignment;
- end_addr = start + size;
- if (end_addr > reserved_va) {
- end_addr = reserved_va + 1;
- }
- addr = end_addr - qemu_host_page_size;
-
- while (1) {
- if (addr > end_addr) {
- if (looped) {
- return (abi_ulong)-1;
- }
- end_addr = reserved_va + 1;
- addr = end_addr - qemu_host_page_size;
- looped = 1;
- continue;
- }
- prot = page_get_flags(addr);
- if (prot) {
- end_addr = addr;
- }
- if (end_addr - addr >= size) {
- break;
- }
- addr -= qemu_host_page_size;
- }
-
- if (start == mmap_next_start) {
- mmap_next_start = addr;
- }
- /* addr is sufficiently low to align it up */
- if (alignment != 0) {
- addr = (addr + alignment) & ~(alignment - 1);
- }
- return addr;
+ return ret;
}
/*
--
2.34.1
- [PATCH 03/24] linux-user/strace: Expand struct flags to hold a mask, (continued)
- [PATCH 03/24] linux-user/strace: Expand struct flags to hold a mask, Richard Henderson, 2023/06/30
- [PATCH 05/24] linux-user: Split TARGET_PROT_* out of syscall_defs.h, Richard Henderson, 2023/06/30
- [PATCH 08/24] bsd-user: Use page_check_range_empty for MAP_EXCL, Richard Henderson, 2023/06/30
- [PATCH 11/24] linux-user: Widen target_mmap offset argument to off_t, Richard Henderson, 2023/06/30
- [PATCH 12/24] linux-user: Rewrite target_mprotect, Richard Henderson, 2023/06/30
- [PATCH 09/24] linux-user: Implement MAP_FIXED_NOREPLACE, Richard Henderson, 2023/06/30
- [PATCH 10/24] linux-user: Split out target_to_host_prot, Richard Henderson, 2023/06/30
- [PATCH 14/24] accel/tcg: Introduce page_find_range_empty, Richard Henderson, 2023/06/30
- [PATCH 13/24] linux-user: Rewrite mmap_frag, Richard Henderson, 2023/06/30
- [PATCH 18/24] linux-user: Rewrite mmap_reserve, Richard Henderson, 2023/06/30
- [PATCH 15/24] bsd-user: Use page_find_range_empty for mmap_find_vma_reserved,
Richard Henderson <=
- [PATCH 16/24] linux-user: Use page_find_range_empty for mmap_find_vma_reserved, Richard Henderson, 2023/06/30
- [PATCH 17/24] linux-user: Use 'last' instead of 'end' in target_mmap, Richard Henderson, 2023/06/30
- [PATCH 20/24] linux-user: Simplify target_munmap, Richard Henderson, 2023/06/30
- [PATCH 21/24] accel/tcg: Accept more page flags in page_check_range, Richard Henderson, 2023/06/30
- [PATCH 19/24] linux-user: Rename mmap_reserve to mmap_reserve_or_unmap, Richard Henderson, 2023/06/30
- [PATCH 22/24] accel/tcg: Return bool from page_check_range, Richard Henderson, 2023/06/30
- [PATCH 23/24] linux-user: Remove can_passthrough_madvise, Richard Henderson, 2023/06/30
- [PATCH 24/24] linux-user: Simplify target_madvise, Richard Henderson, 2023/06/30