mirror of https://github.com/xemu-project/xemu.git
tcg: Toggle page execution for Apple Silicon
Pages can't be both write and executable at the same time on Apple Silicon. macOS provides public API to switch write protection [1] for JIT applications, like TCG. 1. https://developer.apple.com/documentation/apple_silicon/porting_just-in-time_compilers_to_apple_silicon Tested-by: Alexander Graf <agraf@csgraf.de> Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com> Message-Id: <20210113032806.18220-1-r.bolshakov@yadro.com> [rth: Inline the qemu_thread_jit_* functions; drop the MAP_JIT change for a follow-on patch.] Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
6526919224
commit
653b87eb36
|
@ -186,6 +186,7 @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)
|
||||||
}
|
}
|
||||||
#endif /* DEBUG_DISAS */
|
#endif /* DEBUG_DISAS */
|
||||||
|
|
||||||
|
qemu_thread_jit_execute();
|
||||||
ret = tcg_qemu_tb_exec(env, tb_ptr);
|
ret = tcg_qemu_tb_exec(env, tb_ptr);
|
||||||
cpu->can_do_io = 1;
|
cpu->can_do_io = 1;
|
||||||
/*
|
/*
|
||||||
|
@ -410,6 +411,7 @@ static inline void tb_add_jump(TranslationBlock *tb, int n,
|
||||||
{
|
{
|
||||||
uintptr_t old;
|
uintptr_t old;
|
||||||
|
|
||||||
|
qemu_thread_jit_write();
|
||||||
assert(n < ARRAY_SIZE(tb->jmp_list_next));
|
assert(n < ARRAY_SIZE(tb->jmp_list_next));
|
||||||
qemu_spin_lock(&tb_next->jmp_lock);
|
qemu_spin_lock(&tb_next->jmp_lock);
|
||||||
|
|
||||||
|
|
|
@ -1670,7 +1670,9 @@ static void do_tb_phys_invalidate(TranslationBlock *tb, bool rm_from_page_list)
|
||||||
|
|
||||||
static void tb_phys_invalidate__locked(TranslationBlock *tb)
|
static void tb_phys_invalidate__locked(TranslationBlock *tb)
|
||||||
{
|
{
|
||||||
|
qemu_thread_jit_write();
|
||||||
do_tb_phys_invalidate(tb, true);
|
do_tb_phys_invalidate(tb, true);
|
||||||
|
qemu_thread_jit_execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
/* invalidate one TB
|
/* invalidate one TB
|
||||||
|
@ -1872,6 +1874,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
assert_memory_lock();
|
assert_memory_lock();
|
||||||
|
qemu_thread_jit_write();
|
||||||
|
|
||||||
phys_pc = get_page_addr_code(env, pc);
|
phys_pc = get_page_addr_code(env, pc);
|
||||||
|
|
||||||
|
|
|
@ -119,6 +119,10 @@ extern int daemon(int, int);
|
||||||
#include "sysemu/os-posix.h"
|
#include "sysemu/os-posix.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef __APPLE__
|
||||||
|
#include <AvailabilityMacros.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "glib-compat.h"
|
#include "glib-compat.h"
|
||||||
#include "qemu/typedefs.h"
|
#include "qemu/typedefs.h"
|
||||||
|
|
||||||
|
@ -682,4 +686,28 @@ char *qemu_get_host_name(Error **errp);
|
||||||
*/
|
*/
|
||||||
size_t qemu_get_host_physmem(void);
|
size_t qemu_get_host_physmem(void);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Toggle write/execute on the pages marked MAP_JIT
|
||||||
|
* for the current thread.
|
||||||
|
*/
|
||||||
|
#if defined(MAC_OS_VERSION_11_0) && \
|
||||||
|
MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_VERSION_11_0
|
||||||
|
static inline void qemu_thread_jit_execute(void)
|
||||||
|
{
|
||||||
|
if (__builtin_available(macOS 11.0, *)) {
|
||||||
|
pthread_jit_write_protect_np(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void qemu_thread_jit_write(void)
|
||||||
|
{
|
||||||
|
if (__builtin_available(macOS 11.0, *)) {
|
||||||
|
pthread_jit_write_protect_np(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
static inline void qemu_thread_jit_write(void) {}
|
||||||
|
static inline void qemu_thread_jit_execute(void) {}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue