The following changes since commit 0e32462630687a18039464511bd0447ada5709c3:

Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging (2021-01-22 10:35:55 +0000)

https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20210123

for you to fetch changes up to 2e34067e9959f149a904cf1255985d3b68b52566:

tcg: Toggle page execution for Apple Silicon (2021-01-22 12:48:01 -1000)

Fix tcg constant segv.

Optimize inline dup_const for MO_64.

Update the cpu running flag in cpu_exec_step_atomic

Some tidy up of tcg vs other accelerators

Douglas Crosher (1):

tcg: update the cpu running flag in cpu_exec_step_atomic

Philippe Mathieu-Daudé (4):

accel/tcg: Make cpu_gen_init() static

accel/tcg: Restrict tb_gen_code() from other accelerators

accel/tcg: Declare missing cpu_loop_exit*() stubs

accel/tcg: Restrict cpu_io_recompile() from other accelerators

Richard Henderson (4):

qemu/compiler: Split out qemu_build_not_reached_always

tcg: Optimize inline dup_const for MO_64

tcg: Increase the static number of temporaries

accel/tcg: Move tb_flush_jmp_cache() to cputlb.c

Roman Bolshakov (1):

tcg: Toggle page execution for Apple Silicon

accel/tcg/internal.h | 20 ++++++++++++++++++++

include/exec/exec-all.h | 11 -----------

include/qemu/compiler.h | 5 +++--

include/qemu/osdep.h | 28 ++++++++++++++++++++++++++++

include/tcg/tcg.h | 5 +++--

accel/stubs/tcg-stub.c | 10 ++++++++++

accel/tcg/cpu-exec.c | 7 +++++++

accel/tcg/cputlb.c | 19 +++++++++++++++++++

accel/tcg/translate-all.c | 23 +++++------------------

tcg/tcg.c | 7 ++++---

10 files changed, 99 insertions(+), 36 deletions(-)

create mode 100644 accel/tcg/internal.h

From: Roman Bolshakov <r.bolshakov@yadro.com>

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.]

include/qemu/osdep.h | 28 ++++++++++++++++++++++++++++

accel/tcg/cpu-exec.c | 2 ++

accel/tcg/translate-all.c | 3 +++

tcg/tcg.c | 1 +

4 files changed, 34 insertions(+)

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h

--- a/include/qemu/osdep.h

+++ b/include/qemu/osdep.h

@@ -XXX,XX +XXX,XX @@ extern int daemon(int, int);

#include "sysemu/os-posix.h"

+#ifdef __APPLE__

+#include <AvailabilityMacros.h>

#include "glib-compat.h"

#include "qemu/typedefs.h"

@@ -XXX,XX +XXX,XX @@ char *qemu_get_host_name(Error **errp);

*/

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

diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c

index XXXXXXX..XXXXXXX 100644

--- a/accel/tcg/cpu-exec.c

+++ b/accel/tcg/cpu-exec.c

@@ -XXX,XX +XXX,XX @@ cpu_tb_exec(CPUState *cpu, TranslationBlock *itb, int *tb_exit)

}

#endif /* DEBUG_DISAS */

+ qemu_thread_jit_execute();

ret = tcg_qemu_tb_exec(env, tb_ptr);

cpu->can_do_io = 1;

@@ -XXX,XX +XXX,XX @@ static inline void tb_add_jump(TranslationBlock *tb, int n,

{

uintptr_t old;

+ qemu_thread_jit_write();

assert(n < ARRAY_SIZE(tb->jmp_list_next));

qemu_spin_lock(&tb_next->jmp_lock);

diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c

index XXXXXXX..XXXXXXX 100644

--- a/accel/tcg/translate-all.c

+++ b/accel/tcg/translate-all.c

@@ -XXX,XX +XXX,XX @@ static void do_tb_phys_invalidate(TranslationBlock *tb, bool rm_from_page_list)

static void tb_phys_invalidate__locked(TranslationBlock *tb)

{

+ qemu_thread_jit_write();

do_tb_phys_invalidate(tb, true);

+ qemu_thread_jit_execute();

}

/* invalidate one TB

@@ -XXX,XX +XXX,XX @@ TranslationBlock *tb_gen_code(CPUState *cpu,

#endif

assert_memory_lock();

+ qemu_thread_jit_write();

phys_pc = get_page_addr_code(env, pc);

diff --git a/tcg/tcg.c b/tcg/tcg.c

index XXXXXXX..XXXXXXX 100644

--- a/tcg/tcg.c

+++ b/tcg/tcg.c

@@ -XXX,XX +XXX,XX @@ void tcg_prologue_init(TCGContext *s)

s->pool_labels = NULL;

#endif

+ qemu_thread_jit_write();

/* Generate the prologue. */

tcg_target_qemu_prologue(s);

2.25.1