From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: laurent@vivier.eu, alex.bennee@linaro.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH v2 19/33] linux-user: Split out mmap_end
Date: Thu, 31 Aug 2023 19:23:17 -0700 [thread overview]
Message-ID: <20230901022331.115247-20-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230901022331.115247-1-richard.henderson@linaro.org>
Use a subroutine instead of a goto within target_mmap__locked.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
linux-user/mmap.c | 69 +++++++++++++++++++++++++++--------------------
1 file changed, 40 insertions(+), 29 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index e905b1b8f2..caa76eb11a 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -446,6 +446,42 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size, abi_ulong align)
}
}
+/*
+ * Record a successful mmap within the user-exec interval tree.
+ */
+static abi_long mmap_end(abi_ulong start, abi_ulong last,
+ abi_ulong passthrough_start,
+ abi_ulong passthrough_last,
+ int flags, int page_flags)
+{
+ if (flags & MAP_ANONYMOUS) {
+ page_flags |= PAGE_ANON;
+ }
+ page_flags |= PAGE_RESET;
+ if (passthrough_start > passthrough_last) {
+ page_set_flags(start, last, page_flags);
+ } else {
+ if (start < passthrough_start) {
+ page_set_flags(start, passthrough_start - 1, page_flags);
+ }
+ page_set_flags(passthrough_start, passthrough_last,
+ page_flags | PAGE_PASSTHROUGH);
+ if (passthrough_last < last) {
+ page_set_flags(passthrough_last + 1, last, page_flags);
+ }
+ }
+ trace_target_mmap_complete(start);
+ if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
+ FILE *f = qemu_log_trylock();
+ if (f) {
+ fprintf(f, "page layout changed following mmap\n");
+ page_dump(f);
+ qemu_log_unlock(f);
+ }
+ }
+ return start;
+}
+
static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
int target_prot, int flags, int page_flags,
int fd, off_t offset)
@@ -588,7 +624,7 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
ret = target_mprotect(start, len, target_prot);
assert(ret == 0);
}
- goto the_end;
+ return mmap_end(start, last, -1, 0, flags, page_flags);
}
/* handle the start of the mapping */
@@ -599,7 +635,7 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
target_prot, flags, fd, offset)) {
return -1;
}
- goto the_end;
+ return mmap_end(start, last, -1, 0, flags, page_flags);
}
if (!mmap_frag(real_start, start,
real_start + host_page_size - 1,
@@ -646,33 +682,8 @@ static abi_long target_mmap__locked(abi_ulong start, abi_ulong len,
passthrough_last = real_last;
}
}
- the_end:
- if (flags & MAP_ANONYMOUS) {
- page_flags |= PAGE_ANON;
- }
- page_flags |= PAGE_RESET;
- if (passthrough_start > passthrough_last) {
- page_set_flags(start, last, page_flags);
- } else {
- if (start < passthrough_start) {
- page_set_flags(start, passthrough_start - 1, page_flags);
- }
- page_set_flags(passthrough_start, passthrough_last,
- page_flags | PAGE_PASSTHROUGH);
- if (passthrough_last < last) {
- page_set_flags(passthrough_last + 1, last, page_flags);
- }
- }
- trace_target_mmap_complete(start);
- if (qemu_loglevel_mask(CPU_LOG_PAGE)) {
- FILE *f = qemu_log_trylock();
- if (f) {
- fprintf(f, "page layout changed following mmap\n");
- page_dump(f);
- qemu_log_unlock(f);
- }
- }
- return start;
+ return mmap_end(start, last, passthrough_start, passthrough_last,
+ flags, page_flags);
}
/* NOTE: all the constants are the HOST ones */
--
2.34.1
next prev parent reply other threads:[~2023-09-01 2:25 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-01 2:22 [PATCH v2 00/33] linux-user: Improve host and guest page size handling Richard Henderson
2023-09-01 2:22 ` [PATCH v2 01/33] accel/tcg: Remove qemu_host_page_size from page_protect/page_unprotect Richard Henderson
2023-09-01 2:23 ` [PATCH v2 02/33] linux-user: Adjust SVr4 NULL page mapping Richard Henderson
2023-09-01 2:23 ` [PATCH v2 03/33] linux-user: Remove qemu_host_page_{size, mask} in probe_guest_base Richard Henderson
2023-09-01 2:23 ` [PATCH v2 04/33] linux-user: Remove qemu_host_page_size from create_elf_tables Richard Henderson
2023-09-01 2:23 ` [PATCH v2 05/33] linux-user/hppa: Simplify init_guest_commpage Richard Henderson
2023-09-01 2:23 ` [PATCH v2 06/33] linux-user/nios2: Remove qemu_host_page_size from init_guest_commpage Richard Henderson
2023-09-01 2:23 ` [PATCH v2 07/33] linux-user/arm: " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 08/33] linux-user: Remove qemu_host_page_{size, mask} from mmap.c Richard Henderson
2023-09-01 2:23 ` [PATCH v2 09/33] linux-user: Remove REAL_HOST_PAGE_ALIGN " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 10/33] linux-user: Remove HOST_PAGE_ALIGN " Richard Henderson
2023-09-01 2:23 ` [PATCH v2 11/33] migration: Remove qemu_host_page_size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 12/33] hw/tpm: Remove HOST_PAGE_ALIGN from tpm_ppi_init Richard Henderson
2023-09-01 2:23 ` [PATCH v2 13/33] softmmu/physmem: Remove qemu_host_page_size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 14/33] softmmu/physmem: Remove HOST_PAGE_ALIGN Richard Henderson
2023-09-01 2:23 ` [PATCH v2 15/33] linux-user: Remove qemu_host_page_size from main Richard Henderson
2023-09-01 2:23 ` [PATCH v2 16/33] linux-user: Split out target_mmap__locked Richard Henderson
2023-09-01 2:23 ` [PATCH v2 17/33] linux-user: Move some mmap checks outside the lock Richard Henderson
2023-09-01 2:23 ` [PATCH v2 18/33] linux-user: Fix sub-host-page mmap Richard Henderson
2023-09-01 2:23 ` Richard Henderson [this message]
2023-09-01 2:23 ` [PATCH v2 20/33] linux-user: Do early mmap placement only for reserved_va Richard Henderson
2023-09-01 2:23 ` [PATCH v2 21/33] linux-user: Split out mmap_h_eq_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 22/33] linux-user: Split out mmap_h_lt_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 23/33] linux-user: Split out mmap_h_gt_g Richard Henderson
2023-09-01 2:23 ` [PATCH v2 24/33] tests/tcg: Remove run-test-mmap-* Richard Henderson
2023-09-01 2:23 ` [PATCH v2 25/33] tests/tcg: Extend file in linux-madvise.c Richard Henderson
2023-09-01 2:23 ` [PATCH v2 26/33] *-user: Deprecate and disable -p pagesize Richard Henderson
2023-09-01 2:26 ` Warner Losh
2023-09-01 2:23 ` [PATCH v2 27/33] cpu: Remove page_size_init Richard Henderson
2023-09-01 2:31 ` Warner Losh
2023-09-01 2:23 ` [PATCH v2 28/33] accel/tcg: Disconnect TargetPageDataNode from page size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 29/33] linux-user: Allow TARGET_PAGE_BITS_VARY Richard Henderson
2023-09-01 2:23 ` [PATCH v2 30/33] target/arm: Enable TARGET_PAGE_BITS_VARY for AArch64 user-only Richard Henderson
2023-09-01 2:23 ` [PATCH v2 31/33] linux-user: Bound mmap_min_addr by host page size Richard Henderson
2023-09-01 2:23 ` [PATCH v2 32/33] target/ppc: Enable TARGET_PAGE_BITS_VARY for user-only Richard Henderson
2023-09-01 2:23 ` [PATCH v2 33/33] target/alpha: " Richard Henderson
2023-09-29 1:05 ` [PATCH v2 00/33] linux-user: Improve host and guest page size handling Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230901022331.115247-20-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=laurent@vivier.eu \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).