[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 28/34] tcg: When allocating for !splitwx, begin with PROT_NONE
From: |
Richard Henderson |
Subject: |
[PULL 28/34] tcg: When allocating for !splitwx, begin with PROT_NONE |
Date: |
Fri, 11 Jun 2021 16:41:38 -0700 |
There's a change in mprotect() behaviour [1] in the latest macOS
on M1 and it's not yet clear if it's going to be fixed by Apple.
In this case, instead of changing permissions of N guard pages,
we change permissions of N rwx regions. The same number of
syscalls are required either way.
[1] https://gist.github.com/hikalium/75ae822466ee4da13cbbe486498a191f
Reviewed-by: Luis Pires <luis.pires@eldorado.org.br>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tcg/region.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/tcg/region.c b/tcg/region.c
index 294cbd8e65..0f6808afdb 100644
--- a/tcg/region.c
+++ b/tcg/region.c
@@ -770,12 +770,15 @@ static int alloc_code_gen_buffer(size_t size, int
splitwx, Error **errp)
error_free_or_abort(errp);
}
- prot = PROT_READ | PROT_WRITE | PROT_EXEC;
+ /*
+ * macOS 11.2 has a bug (Apple Feedback FB8994773) in which mprotect
+ * rejects a permission change from RWX -> NONE when reserving the
+ * guard pages later. We can go the other way with the same number
+ * of syscalls, so always begin with PROT_NONE.
+ */
+ prot = PROT_NONE;
flags = MAP_PRIVATE | MAP_ANONYMOUS;
-#ifdef CONFIG_TCG_INTERPRETER
- /* The tcg interpreter does not need execute permission. */
- prot = PROT_READ | PROT_WRITE;
-#elif defined(CONFIG_DARWIN)
+#ifdef CONFIG_DARWIN
/* Applicable to both iOS and macOS (Apple Silicon). */
if (!splitwx) {
flags |= MAP_JIT;
@@ -906,11 +909,7 @@ void tcg_region_init(size_t tb_size, int splitwx, unsigned
max_cpus)
}
}
if (have_prot != 0) {
- /*
- * macOS 11.2 has a bug (Apple Feedback FB8994773) in which
mprotect
- * rejects a permission change from RWX -> NONE. Guard pages are
- * nice for bug detection but are not essential; ignore any
failure.
- */
+ /* Guard pages are nice for bug detection but are not essential. */
(void)qemu_mprotect_none(end, page_size);
}
}
--
2.25.1
- [PULL 14/34] accel/tcg: Pass down max_cpus to tcg_init, (continued)
- [PULL 14/34] accel/tcg: Pass down max_cpus to tcg_init, Richard Henderson, 2021/06/11
- [PULL 12/34] accel/tcg: Merge tcg_exec_init into tcg_init_machine, Richard Henderson, 2021/06/11
- [PULL 16/34] tcg: Move MAX_CODE_GEN_BUFFER_SIZE to tcg-target.h, Richard Henderson, 2021/06/11
- [PULL 18/34] tcg: Rename region.start to region.after_prologue, Richard Henderson, 2021/06/11
- [PULL 19/34] tcg: Tidy tcg_n_regions, Richard Henderson, 2021/06/11
- [PULL 17/34] tcg: Replace region.end with region.total_size, Richard Henderson, 2021/06/11
- [PULL 21/34] tcg: Move in_code_gen_buffer and tests to region.c, Richard Henderson, 2021/06/11
- [PULL 23/34] tcg: Return the map protection from alloc_code_gen_buffer, Richard Henderson, 2021/06/11
- [PULL 13/34] accel/tcg: Use MiB in tcg_init_machine, Richard Henderson, 2021/06/11
- [PULL 26/34] tcg: Round the tb_size default from qemu_get_host_physmem, Richard Henderson, 2021/06/11
- [PULL 28/34] tcg: When allocating for !splitwx, begin with PROT_NONE,
Richard Henderson <=
- [PULL 31/34] tcg: Fix documentation for tcg_constant_* vs tcg_temp_free_*, Richard Henderson, 2021/06/11
- [PULL 24/34] tcg: Sink qemu_madvise call to common code, Richard Henderson, 2021/06/11
- [PULL 22/34] tcg: Allocate code_gen_buffer into struct tcg_region_state, Richard Henderson, 2021/06/11
- [PULL 20/34] tcg: Tidy split_cross_256mb, Richard Henderson, 2021/06/11
- [PULL 25/34] util/osdep: Add qemu_mprotect_rw, Richard Henderson, 2021/06/11
- [PULL 27/34] tcg: Merge buffer protection and guard page protection, Richard Henderson, 2021/06/11
- [PULL 29/34] tcg: Move tcg_init_ctx and tcg_ctx from accel/tcg/, Richard Henderson, 2021/06/11
- [PULL 32/34] tcg/arm: Fix tcg_out_op function signature, Richard Henderson, 2021/06/11
- [PULL 30/34] tcg: Introduce tcg_remove_ops_after, Richard Henderson, 2021/06/11
- [PULL 33/34] softfloat: Fix tp init in float32_exp2, Richard Henderson, 2021/06/11