exec: Rework around CPUState user fields (part 2)
v3 cover exec: Rework around CPUState user fields (part 2)
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)
Since v2:
- Move cpu_loop_exit_requested() to "exec/cpu-loop.h"
- Added R-b tags
Since v1:
- First 13 patches queued
- Restrict qemu_plugin_vcpu_exit_hook() to (TCG) plugins
- Restrict cpu_plugin_mem_cbs_enabled() to TCG (plugins)
- Addressed Richard review comments on the others:
- Move cpu_plugin_mem_cbs_enabled()
- Do not move mem_io_pc, waiting for [*]
- Mention can_do_io restricted
Finish extracting TCG fields from CPUState:
- Extract tcg_cpu_exit() from cpu_exit()
- Introduce AccelOpsClass::exit_vcpu_thread()
- cpu_exit() calls exit_vcpu_thread=tcg_cpu_exit for TCG
- Forward declare TaskState and more uses of get_task_state()
- Introduce TCG AccelCPUState
- Move TCG specific fields from CPUState to AccelCPUState
- Restrict "exec/tlb-common.h" to TCG
- Restrict iommu_notifiers, icount to system emulation
[*] https://lore.kernel.org/qemu-devel/[email protected]/
Based-on: https://gitlab.com/philmd/qemu/-/commits/accel-next
Philippe Mathieu-Daudé (13):
accel/tcg: Restrict qemu_plugin_vcpu_exit_hook() to TCG plugins accel/tcg: Restrict cpu_plugin_mem_cbs_enabled() to TCG accel/tcg: Move @plugin_mem_cbs from CPUState to
CPUNegativeOffsetState
accel/tcg: Move @plugin_state from CPUState to TCG AccelCPUState accel/tcg: Restrict cpu_loop_exit_requested() to TCG accel/tcg: Restrict IcountDecr / can_do_io / CPUTLB to TCG accel/tcg: Move @jmp_env from CPUState to TCG AccelCPUState accel/tcg: Move @cflags_next_tb from CPUState to TCG AccelCPUState accel/tcg: Move @iommu_notifiers from CPUState to TCG AccelCPUState accel/tcg: Move @tcg_cflags from CPUState to TCG AccelCPUState accel/tcg: Restrict icount to system emulation accel/tcg: Move icount fields from CPUState to TCG AccelCPUState accel/tcg: Move @tb_jmp_cache from CPUState to TCG AccelCPUState
accel/tcg/internal-common.h | 18 ++++++++++ accel/tcg/tb-jmp-cache.h | 4 +-- accel/tcg/tcg-accel-ops.h | 1 + accel/tcg/vcpu-state.h | 20 +++++++++++ include/exec/cpu-loop.h | 35 +++++++++++++++++++ include/exec/exec-all.h | 17 ---------- include/exec/tlb-common.h | 4 +++ include/hw/core/cpu.h | 58 ++++++++------------------------ include/qemu/plugin.h | 2 +- include/qemu/typedefs.h | 1 - accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 52 +++++++++++++++------------- accel/tcg/cputlb.c | 2 +- accel/tcg/icount-common.c | 7 ++-- accel/tcg/plugin-gen.c | 9 +++-- accel/tcg/tb-maint.c | 6 ++-- accel/tcg/tcg-accel-ops-icount.c | 14 ++++---- accel/tcg/tcg-accel-ops.c | 2 ++ accel/tcg/translate-all.c | 9 ++--- accel/tcg/watchpoint.c | 5 +-- hw/core/cpu-common.c | 9 +++-- linux-user/main.c | 2 +- plugins/core.c | 9 ++--- system/physmem.c | 37 +++++++++++++++----- target/arm/tcg/helper-a64.c | 1 + target/s390x/tcg/mem_helper.c | 1 + 26 files changed, 195 insertions(+), 132 deletions(-) create mode 100644 include/exec/cpu-loop.h
Signature · 1 line
2.41.0
PATCH v3 1/13 accel/tcg: Restrict qemu_plugin_vcpu_exit_hook() to TCG plugins
qemu_plugin_vcpu_exit_hook() is specific to TCG plugins, so must be restricted to it in cpu_common_unrealizefn(), similarly to how qemu_plugin_create_vcpu_state() is restricted in the cpu_common_realizefn() counterpart.
Message-Id: <[email protected]>
--- hw/core/cpu-common.c | 4 ++++ 1 file changed, 4 insertions(+)
hw/core/cpu-common.c +4 -0
@@ -30,7 +30,9 @@#include "hw/boards.h" #include "hw/qdev-properties.h" #include "trace.h" +#ifdef CONFIG_PLUGIN #include "qemu/plugin.h" +#endif CPUState *cpu_by_arch_id (int64_t id) {
@@ -226,9 +228,11 @@ static void cpu_common_unrealizefn(DeviceState *dev)CPUState *cpu =CPU (dev);/* Call the plugin hook before clearing the cpu is fully unrealized */ +#ifdef CONFIG_PLUGIN if (tcg_enabled ()) {qemu_plugin_vcpu_exit_hook (cpu); } +#endif /* NOTE: latest generic point before the cpu is fully unrealized */ cpu_exec_unrealizefn (cpu);
Signature · 1 line
2.41.0
PATCH v3 2/13 accel/tcg: Restrict cpu_plugin_mem_cbs_enabled() to TCG
In reply to Philippe Mathieu-DaudéSo far cpu_plugin_mem_cbs_enabled() is only called from TCG, so reduce it to accel/tcg/.
Message-Id: <[email protected]>
--- accel/tcg/internal-common.h | 17 +++++++++++++++++ include/hw/core/cpu.h | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-)
accel/tcg/internal-common.h +17 -0
@@ -24,6 +24,23 @@ static inline bool cpu_in_serial_context(CPUState *cs) return !tcg_cflags_has(cs, CF_PARALLEL) || cpu_in_exclusive_context(cs); } +/** +* cpu_plugin_mem_cbs_enabled() - are plugin memory callbacks enabled? +* @cs: CPUState pointer +* +* The memory callbacks are installed if a plugin has instrumented an +* instruction for memory. This can be useful to know if you want to +* force a slow path for a series of memory accesses. +*/ +static inline bool cpu_plugin_mem_cbs_enabled (const CPUState *cpu) +{ +#ifdef CONFIG_PLUGIN +return !!cpu->plugin_mem_cbs; +#else +return false; +#endif +} +void tcg_cpu_exit (CPUState *cpu);#endif
include/hw/core/cpu.h +0 -17
@@ -1109,23 +1109,6 @@ void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint);void cpu_watchpoint_remove_all (CPUState *cpu,int mask);#endif -/** -* cpu_plugin_mem_cbs_enabled() - are plugin memory callbacks enabled? -* @cs: CPUState pointer -* -* The memory callbacks are installed if a plugin has instrumented an -* instruction for memory. This can be useful to know if you want to -* force a slow path for a series of memory accesses. -*/ -static inline bool cpu_plugin_mem_cbs_enabled (const CPUState *cpu) -{ -#ifdef CONFIG_PLUGIN -return !!cpu->plugin_mem_cbs; -#else -return false; -#endif -} -/** * cpu_get_address_space: * @cpu: CPU to get address space from
Signature · 1 line
2.41.0
PATCH v3 3/13 accel/tcg: Move @plugin_mem_cbs from CPUState to CPUNegativeOffsetState
In reply to Philippe Mathieu-Daudé@plugin_mem_cbs is accessed by tcg generated code, move it to CPUNegativeOffsetState.
Message-Id: <[email protected]>
--- accel/tcg/internal-common.h | 2 +- include/hw/core/cpu.h | 13 +++++++------ include/qemu/plugin.h | 2 +- accel/tcg/plugin-gen.c | 5 +++-- plugins/core.c | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-)
accel/tcg/internal-common.h +1 -1
@@ -35,7 +35,7 @@ static inline bool cpu_in_serial_context(CPUState *cs)static inline bool cpu_plugin_mem_cbs_enabled (const CPUState *cpu) {#ifdef CONFIG_PLUGIN -return !!cpu->plugin_mem_cbs; +return !!cpu->neg.plugin_mem_cbs;#else return false;#endif
include/hw/core/cpu.h +7 -6
@@ -342,9 +342,16 @@ typedef union IcountDecr {* CPUNegativeOffsetState: Elements of CPUState most efficiently accessed * from CPUArchState, via small negative offsets. * @can_do_io: True if memory-mapped IO is allowed. +* @plugin_mem_cbs: active plugin memory callbacks */ typedef struct CPUNegativeOffsetState {CPUTLB tlb; +#ifdef CONFIG_PLUGIN +/* +* The callback pointer are accessed via TCG (see gen_empty_mem_helper). +*/ +GArray *plugin_mem_cbs; +#endif IcountDecr icount_decr;bool can_do_io; }CPUNegativeOffsetState ;
@@ -416,7 +423,6 @@ struct qemu_work_item;* @kvm_fd: vCPU file descriptor for KVM. * @work_mutex: Lock to prevent multiple access to @work_list. * @work_list: List of pending asynchronous work. -* @plugin_mem_cbs: active plugin memory callbacks * @plugin_state: per-CPU plugin state * @ignore_memory_transaction_failures: Cached copy of the MachineState * flag of the same name: allows the board to suppress calling of the
@@ -509,11 +515,6 @@ struct CPUState {QemuLockCnt in_ioctl_lock;#ifdef CONFIG_PLUGIN -/* -* The callback pointer stays in the main CPUState as it is -* accessed via TCG (see gen_empty_mem_helper). -*/ -GArray *plugin_mem_cbs;CPUPluginState *plugin_state;#endif
include/qemu/plugin.h +1 -1
@@ -229,7 +229,7 @@ void qemu_plugin_add_dyn_cb_arr(GArray *arr);static inline void qemu_plugin_disable_mem_helpers (CPUState *cpu) { - cpu->plugin_mem_cbs =NULL ; + cpu->neg.plugin_mem_cbs =NULL ; }/**
accel/tcg/plugin-gen.c +3 -2
@@ -178,7 +178,7 @@ static void gen_empty_mem_helper(void)TCGv_ptr ptr =tcg_temp_ebb_new_ptr ();tcg_gen_movi_ptr (ptr,0 ); -tcg_gen_st_ptr (ptr, tcg_env, offsetof(CPUState , plugin_mem_cbs) - + tcg_gen_st_ptr(ptr, tcg_env, offsetof(CPUState, neg.plugin_mem_cbs) - offsetof(ArchCPU , env));tcg_temp_free_ptr (ptr); }
@@ -634,7 +634,8 @@ void plugin_gen_disable_mem_helpers(void)return ; }tcg_gen_st_ptr (tcg_constant_ptr (NULL ), tcg_env, - offsetof(CPUState , plugin_mem_cbs) - offsetof(ArchCPU , env)); + offsetof(CPUState, neg.plugin_mem_cbs) - + offsetof(ArchCPU , env)); } static void plugin_gen_tb_udata(const struct qemu_plugin_tb *ptb,
plugins/core.c +1 -1
@@ -496,7 +496,7 @@ void exec_inline_op(struct qemu_plugin_dyn_cb *cb, int cpu_index)void qemu_plugin_vcpu_mem_cb (CPUState *cpu,uint64_t vaddr,MemOpIdx oi,enum qemu_plugin_mem_rw rw) { -GArray *arr = cpu->plugin_mem_cbs; +GArray *arr = cpu->neg.plugin_mem_cbs;size_t i;if (arr ==NULL ) {
Signature · 1 line
2.41.0
PATCH v3 4/13 accel/tcg: Move @plugin_state from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-Daudé@plugin_state is specific to TCG accelerator, move it to its AccelCPUState.
Message-Id: <[email protected]>
--- accel/tcg/vcpu-state.h | 5 +++++ include/hw/core/cpu.h | 5 ----- accel/tcg/plugin-gen.c | 4 +++- hw/core/cpu-common.c | 3 ++- plugins/core.c | 7 ++++--- 5 files changed, 14 insertions(+), 10 deletions(-)
accel/tcg/vcpu-state.h +5 -0
@@ -10,11 +10,16 @@/** * AccelCPUState: vCPU fields specific to TCG accelerator +* @plugin_state: per-CPU plugin state */ struct AccelCPUState {#ifdef CONFIG_USER_ONLY TaskState *ts;#endif /* !CONFIG_USER_ONLY */ + +#ifdef CONFIG_PLUGIN +CPUPluginState *plugin_state; +#endif /* CONFIG_PLUGIN */ };#ifdef CONFIG_USER_ONLY
include/hw/core/cpu.h +0 -5
@@ -423,7 +423,6 @@ struct qemu_work_item;* @kvm_fd: vCPU file descriptor for KVM. * @work_mutex: Lock to prevent multiple access to @work_list. * @work_list: List of pending asynchronous work. -* @plugin_state: per-CPU plugin state * @ignore_memory_transaction_failures: Cached copy of the MachineState * flag of the same name: allows the board to suppress calling of the * CPU do_transaction_failed hook function.
@@ -514,10 +513,6 @@ struct CPUState {/* Use by accel-block: CPU is executing an ioctl() */ QemuLockCnt in_ioctl_lock; -#ifdef CONFIG_PLUGIN -CPUPluginState *plugin_state; -#endif -/* TODO Move common fields from CPUArchState here. */ int cpu_index;int cluster_index;
accel/tcg/plugin-gen.c +3 -1
@@ -52,6 +52,7 @@#include "exec/plugin-gen.h" #include "exec/translator.h" #include "exec/helper-proto-common.h" +#include "accel/tcg/vcpu-state.h" #define HELPER_H "accel/tcg/plugin-helpers.h"#include "exec/helper-info.c.inc"
@@ -872,7 +873,8 @@ bool plugin_gen_tb_start(CPUState *cpu, const DisasContextBase *db, {bool ret = false; -if (test_bit (QEMU_PLUGIN_EV_VCPU_TB_TRANS , cpu->plugin_state->event_mask)) { +if (test_bit (QEMU_PLUGIN_EV_VCPU_TB_TRANS , + cpu->accel->plugin_state->event_mask)) {struct qemu_plugin_tb *ptb = tcg_ctx->plugin_tb;int i;
hw/core/cpu-common.c +2 -1
@@ -31,6 +31,7 @@#include "hw/qdev-properties.h" #include "trace.h" #ifdef CONFIG_PLUGIN +#include "accel/tcg/vcpu-state.h" #include "qemu/plugin.h" #endif
@@ -215,7 +216,7 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp)/* Plugin initialization must wait until the cpu start executing code */ #ifdef CONFIG_PLUGIN if (tcg_enabled ()) { - cpu->plugin_state =qemu_plugin_create_vcpu_state (); + cpu->accel->plugin_state =qemu_plugin_create_vcpu_state ();async_run_on_cpu (cpu, qemu_plugin_vcpu_init__async,RUN_ON_CPU_NULL ); }#endif
plugins/core.c +4 -3
@@ -28,6 +28,7 @@#include "exec/tb-flush.h" #include "tcg/tcg.h" #include "tcg/tcg-op.h" +#include "accel/tcg/vcpu-state.h" #include "plugin.h" struct qemu_plugin_cb {
@@ -55,7 +56,7 @@ struct qemu_plugin_ctx *plugin_id_to_ctx_locked(qemu_plugin_id_t id)static void plugin_cpu_update__async (CPUState *cpu,run_on_cpu_data data) { -bitmap_copy (cpu->plugin_state->event_mask, +bitmap_copy (cpu->accel->plugin_state->event_mask, &data.host_ulong,QEMU_PLUGIN_EV_MAX );tcg_flush_jmp_cache (cpu); }
@@ -396,7 +397,7 @@ qemu_plugin_vcpu_syscall(CPUState *cpu, int64_t num, uint64_t a1, uint64_t a2,struct qemu_plugin_cb *cb, *next;enum qemu_plugin_event ev =QEMU_PLUGIN_EV_VCPU_SYSCALL ; -if (!test_bit (ev, cpu->plugin_state->event_mask)) { +if (!test_bit (ev, cpu->accel->plugin_state->event_mask)) {return ; }
@@ -418,7 +419,7 @@ void qemu_plugin_vcpu_syscall_ret(CPUState *cpu, int64_t num, int64_t ret)struct qemu_plugin_cb *cb, *next;enum qemu_plugin_event ev =QEMU_PLUGIN_EV_VCPU_SYSCALL_RET ; -if (!test_bit (ev, cpu->plugin_state->event_mask)) { +if (!test_bit (ev, cpu->accel->plugin_state->event_mask)) {return ; }
Signature · 1 line
2.41.0
PATCH v3 5/13 accel/tcg: Restrict cpu_loop_exit_requested() to TCG
In reply to Philippe Mathieu-DaudéNext commit will restrict IcountDecr to TCG, so the inlined cpu_loop_exit_requested(), which is specific to TCG, won't compile when TCG is disabled. Move it to the new "exec/cpu-loop.h" header.
Message-Id: <[email protected]>
--- include/exec/cpu-loop.h | 35 +++++++++++++++++++++++++++++++++++ include/exec/exec-all.h | 17 ----------------- accel/tcg/cpu-exec.c | 1 + target/arm/tcg/helper-a64.c | 1 + target/s390x/tcg/mem_helper.c | 1 + 5 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 include/exec/cpu-loop.h
include/exec/cpu-loop.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* Translation CPU loop (target agnostic) +* +* Copyright (c) 2003 Fabrice Bellard +* +* SPDX-License-Identifier: LGPL-2.1-or-later +*/ +#ifndef TRANSLATION_CPU_LOOP_H +#define TRANSLATION_CPU_LOOP_H + +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif + +#include "qemu/atomic.h" +#include "hw/core/cpu.h" + +/** +* cpu_loop_exit_requested: +* @cpu: The CPU state to be tested +* +* Indicate if somebody asked for a return of the CPU to the main loop +* (e.g., via cpu_exit() or cpu_interrupt()). +* +* This is helpful for architectures that support interruptible +* instructions. After writing back all state to registers/memory, this +* call can be used to check if it makes sense to return to the main loop +* or to continue executing the interruptible instruction. +*/ +static inline bool cpu_loop_exit_requested (CPUState *cpu) +{ +return (int32_t )qatomic_read (&cpu->neg.icount_decr.u32) <0 ; +} + +#endif
include/exec/exec-all.h +0 -17
@@ -29,23 +29,6 @@#include "exec/translation-block.h" #include "qemu/clang-tsa.h" -/** -* cpu_loop_exit_requested: -* @cpu: The CPU state to be tested -* -* Indicate if somebody asked for a return of the CPU to the main loop -* (e.g., via cpu_exit() or cpu_interrupt()). -* -* This is helpful for architectures that support interruptible -* instructions. After writing back all state to registers/memory, this -* call can be used to check if it makes sense to return to the main loop -* or to continue executing the interruptible instruction. -*/ -static inline bool cpu_loop_exit_requested (CPUState *cpu) -{ -return (int32_t )qatomic_read (&cpu->neg.icount_decr.u32) <0 ; -} -#if !defined(CONFIG_USER_ONLY ) && defined(CONFIG_TCG )/* cputlb.c */ /**
accel/tcg/cpu-exec.c +1 -0
@@ -32,6 +32,7 @@#include "qemu/main-loop.h" #include "sysemu/cpus.h" #include "exec/cpu-all.h" +#include "exec/cpu-loop.h" #include "sysemu/cpu-timers.h" #include "exec/replay-core.h" #include "sysemu/tcg.h"
target/arm/tcg/helper-a64.c +1 -0
@@ -29,6 +29,7 @@#include "internals.h" #include "qemu/crc32c.h" #include "exec/exec-all.h" +#include "exec/cpu-loop.h" #include "exec/cpu_ldst.h" #include "qemu/int128.h" #include "qemu/atomic128.h"
target/s390x/tcg/mem_helper.c +1 -0
@@ -26,6 +26,7 @@#include "exec/helper-proto.h" #include "exec/exec-all.h" #include "exec/page-protection.h" +#include "exec/cpu-loop.h" #include "exec/cpu_ldst.h" #include "hw/core/tcg-cpu-ops.h" #include "qemu/int128.h"
Signature · 1 line
2.41.0
PATCH v3 6/13 accel/tcg: Restrict IcountDecr / can_do_io / CPUTLB to TCG
In reply to Philippe Mathieu-DaudéIcountDecr union, the can_do_io field, the CPUTLB* structures and the "exec/tlb-common.h" header are only required for TCG.
Message-Id: <[email protected]>
--- include/exec/tlb-common.h | 4 ++++ include/hw/core/cpu.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)
include/exec/tlb-common.h +4 -0
@@ -19,6 +19,10 @@#ifndef EXEC_TLB_COMMON_H #define EXEC_TLB_COMMON_H 1 +#ifndef CONFIG_TCG +#error Can only include this header with TCG +#endif +#define CPU_TLB_ENTRY_BITS 5/* Minimalized TLB entry for use by TCG fast path. */
include/hw/core/cpu.h +6 -3
@@ -27,7 +27,6 @@#include "exec/vaddr.h" #include "exec/memattrs.h" #include "exec/mmu-access-type.h" -#include "exec/tlb-common.h" #include "qapi/qapi-types-run-state.h" #include "qemu/bitmap.h" #include "qemu/rcu_queue.h"
@@ -256,6 +255,9 @@ typedef struct CPUTLBEntryFull { } extra; } CPUTLBEntryFull; +#ifdef CONFIG_TCG +#include "exec/tlb-common.h" +/* * Data elements that are per MMU mode, minus the bits accessed by * the TCG fast path.
@@ -311,11 +313,9 @@ typedef struct CPUTLBCommon {* negative offsets are at the end of the struct. */ typedef struct CPUTLB { -#ifdef CONFIG_TCG CPUTLBCommon c;CPUTLBDesc d[NB_MMU_MODES ];CPUTLBDescFast f[NB_MMU_MODES ]; -#endif }CPUTLB ;/*
@@ -337,6 +337,7 @@ typedef union IcountDecr { #endif } u16; } IcountDecr; +#endif /** * CPUNegativeOffsetState: Elements of CPUState most efficiently accessed
@@ -345,6 +346,7 @@ typedef union IcountDecr {* @plugin_mem_cbs: active plugin memory callbacks */ typedef struct CPUNegativeOffsetState { +#ifdef CONFIG_TCG CPUTLB tlb; #ifdef CONFIG_PLUGIN /*
@@ -354,6 +356,7 @@ typedef struct CPUNegativeOffsetState {#endif IcountDecr icount_decr;bool can_do_io; +#endif } CPUNegativeOffsetState;struct KVMState ;
Signature · 1 line
2.41.0
PATCH v3 7/13 accel/tcg: Move @jmp_env from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-Daudé@jmp_env is specific to TCG accelerator, move it to its AccelCPUState.
Message-Id: <[email protected]>
--- accel/tcg/internal-common.h | 1 + accel/tcg/tcg-accel-ops.h | 1 + accel/tcg/vcpu-state.h | 2 ++ include/hw/core/cpu.h | 1 - accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 6 +++--- 6 files changed, 8 insertions(+), 5 deletions(-)
accel/tcg/internal-common.h +1 -0
@@ -11,6 +11,7 @@#include "exec/cpu-common.h" #include "exec/translation-block.h" +#include "accel/tcg/vcpu-state.h" extern int64_t max_delay;extern int64_t max_advance;
accel/tcg/tcg-accel-ops.h +1 -0
@@ -13,6 +13,7 @@#define TCG_ACCEL_OPS_H #include "sysemu/cpus.h" +#include "accel/tcg/vcpu-state.h" void tcg_cpu_destroy (CPUState *cpu);int tcg_cpu_exec (CPUState *cpu);
accel/tcg/vcpu-state.h +2 -0
@@ -13,6 +13,8 @@* @plugin_state: per-CPU plugin state */ struct AccelCPUState { +sigjmp_buf jmp_env; +#ifdef CONFIG_USER_ONLY TaskState *ts;#endif /* !CONFIG_USER_ONLY */
include/hw/core/cpu.h +0 -1
@@ -475,7 +475,6 @@ struct CPUState {int64_t icount_budget;int64_t icount_extra;uint64_t random_seed; -sigjmp_buf jmp_env;QemuMutex work_mutex; QSIMPLEQ_HEAD(, qemu_work_item) work_list;
accel/tcg/cpu-exec-common.c +1 -1
@@ -38,7 +38,7 @@ void cpu_loop_exit(CPUState *cpu) cpu->neg.can_do_io = true;/* Undo any setting in generated code. */ qemu_plugin_disable_mem_helpers (cpu); -siglongjmp (cpu->jmp_env,1 ); +siglongjmp (cpu->accel->jmp_env,1 ); }void cpu_loop_exit_restore (CPUState *cpu,uintptr_t pc)
accel/tcg/cpu-exec.c +3 -3
@@ -554,7 +554,7 @@ static void cpu_exec_longjmp_cleanup(CPUState *cpu)* support such a thing. We'd have to properly register unwind info * for the JIT for EH, rather that just for GDB. * -* Alternative 2: Set and restore cpu->jmp_env in tb_gen_code to +* Alternative 2: Set and restore cpu->accel->jmp_env in tb_gen_code to * capture the cpu_loop_exit longjmp, perform the cleanup, and * jump again to arrive here. */
@@ -578,7 +578,7 @@ void cpu_exec_step_atomic(CPUState *cpu)uint32_t flags, cflags;int tb_exit; -if (sigsetjmp (cpu->jmp_env,0 ) ==0 ) { +if (sigsetjmp (cpu->accel->jmp_env,0 ) ==0 ) {start_exclusive ();g_assert (cpu == current_cpu);g_assert (!cpu->running);
@@ -1039,7 +1039,7 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)static int cpu_exec_setjmp (CPUState *cpu,SyncClocks *sc) {/* Prepare setjmp context for exception handling. */ -if (unlikely (sigsetjmp (cpu->jmp_env,0 ) !=0 )) { +if (unlikely (sigsetjmp (cpu->accel->jmp_env,0 ) !=0 )) {cpu_exec_longjmp_cleanup (cpu); }
Signature · 1 line
2.41.0
PATCH v3 8/13 accel/tcg: Move @cflags_next_tb from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-Daudé@cflags_next_tb is specific to TCG accelerator, move it to its AccelCPUState.
Message-Id: <[email protected]>
--- accel/tcg/vcpu-state.h | 2 ++ include/hw/core/cpu.h | 1 - accel/tcg/cpu-exec.c | 12 ++++++------ accel/tcg/tb-maint.c | 4 ++-- accel/tcg/tcg-accel-ops.c | 1 + accel/tcg/translate-all.c | 2 +- accel/tcg/watchpoint.c | 5 +++-- hw/core/cpu-common.c | 1 - 8 files changed, 15 insertions(+), 13 deletions(-)
accel/tcg/vcpu-state.h +2 -0
@@ -13,6 +13,8 @@* @plugin_state: per-CPU plugin state */ struct AccelCPUState { +uint32_t cflags_next_tb; +sigjmp_buf jmp_env;#ifdef CONFIG_USER_ONLY
include/hw/core/cpu.h +0 -1
@@ -468,7 +468,6 @@ struct CPUState {bool crash_occurred;bool exit_request;int exclusive_context_count; -uint32_t cflags_next_tb;/* updates protected by BQL */ uint32_t interrupt_request;int singlestep_enabled;
accel/tcg/cpu-exec.c +6 -6
@@ -721,7 +721,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)if (replay_has_exception () && cpu->neg.icount_decr.u16.low + cpu->icount_extra ==0 ) {/* Execute just one insn to trigger exception pending in the log */ - cpu->cflags_next_tb = (curr_cflags (cpu) & ~CF_USE_ICOUNT ) + cpu->accel->cflags_next_tb = (curr_cflags (cpu) & ~CF_USE_ICOUNT ) |CF_NOIRQ |1 ; }#endif
@@ -784,7 +784,7 @@ static inline bool icount_exit_request(CPUState *cpu)if (!icount_enabled ()) {return false; } -if (cpu->cflags_next_tb !=-1 && !(cpu->cflags_next_tb &CF_USE_ICOUNT )) { +if (!(cpu->accel->cflags_next_tb ==-1 || cpu->accel->cflags_next_tb &CF_USE_ICOUNT )) {return false; }return cpu->neg.icount_decr.u16.low + cpu->icount_extra ==0 ;
@@ -798,7 +798,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,* skip checking here. Any pending interrupts will get picked up * by the next TB we execute under normal cflags. */ -if (cpu->cflags_next_tb !=-1 && cpu->cflags_next_tb &CF_NOIRQ ) { +if (cpu->accel->cflags_next_tb !=-1 && cpu->accel->cflags_next_tb &CF_NOIRQ ) {return false; }
@@ -948,7 +948,7 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb,if (insns_left >0 && insns_left < tb->icount) {assert (insns_left <=CF_COUNT_MASK );assert (cpu->icount_extra ==0 ); - cpu->cflags_next_tb = (tb->cflags & ~CF_COUNT_MASK ) | insns_left; + cpu->accel->cflags_next_tb = (tb->cflags & ~CF_COUNT_MASK ) | insns_left; }#endif }
@@ -980,11 +980,11 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)* have CF_INVALID set, -1 is a convenient invalid value that * does not require tcg headers for cpu_common_reset. */ - cflags = cpu->cflags_next_tb; + cflags = cpu->accel->cflags_next_tb;if (cflags ==-1 ) { cflags =curr_cflags (cpu); }else { - cpu->cflags_next_tb =-1 ; + cpu->accel->cflags_next_tb =-1 ; }if (check_for_breakpoints (cpu, pc, &cflags)) {
accel/tcg/tb-maint.c +2 -2
@@ -1084,7 +1084,7 @@ bool tb_invalidate_phys_page_unwind(tb_page_addr_t addr, uintptr_t pc)if (current_tb_modified) {/* Force execution of one insn next time. */ CPUState *cpu = current_cpu; - cpu->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (current_cpu); + cpu->accel->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (current_cpu);return true; }return false;
@@ -1154,7 +1154,7 @@ tb_invalidate_phys_page_range__locked(struct page_collection *pages,if (current_tb_modified) {page_collection_unlock (pages);/* Force execution of one insn next time. */ - current_cpu->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (current_cpu); + current_cpu->accel->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (current_cpu);mmap_unlock ();cpu_loop_exit_noexc (current_cpu); }
accel/tcg/tcg-accel-ops.c +1 -0
@@ -89,6 +89,7 @@ static void tcg_cpu_reset_hold(CPUState *cpu)qatomic_set (&cpu->neg.icount_decr.u32,0 ); cpu->neg.can_do_io = true; + cpu->accel->cflags_next_tb =-1 ; }/* mask must never be zero, except for A20 change call */
accel/tcg/translate-all.c +1 -1
@@ -631,7 +631,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)* operations only (which execute after completion) so we don't * double instrument the instruction. */ - cpu->cflags_next_tb =curr_cflags (cpu) |CF_MEMI_ONLY | n; + cpu->accel->cflags_next_tb =curr_cflags (cpu) |CF_MEMI_ONLY | n;if (qemu_loglevel_mask (CPU_LOG_EXEC )) {vaddr pc = cpu->cc->get_pc (cpu);
accel/tcg/watchpoint.c +3 -2
@@ -26,6 +26,7 @@#include "sysemu/replay.h" #include "hw/core/tcg-cpu-ops.h" #include "hw/core/cpu.h" +#include "accel/tcg/vcpu-state.h" /* * Return true if this watchpoint address matches the specified
@@ -100,7 +101,7 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len,*/ if (!cpu->neg.can_do_io) {/* Force execution of one insn next time. */ - cpu->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (cpu); + cpu->accel->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (cpu);cpu_loop_exit_restore (cpu, ra); }/*
@@ -132,7 +133,7 @@ void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len,cpu_loop_exit (cpu); }else {/* Force execution of one insn next time. */ - cpu->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (cpu); + cpu->accel->cflags_next_tb =1 |CF_NOIRQ |curr_cflags (cpu);mmap_unlock ();cpu_loop_exit_noexc (cpu); }
hw/core/cpu-common.c +0 -1
@@ -124,7 +124,6 @@ static void cpu_common_reset_hold(Object *obj, ResetType type) cpu->icount_extra =0 ; cpu->exception_index =-1 ; cpu->crash_occurred = false; - cpu->cflags_next_tb =-1 ;cpu_exec_reset_hold (cpu); }
Signature · 1 line
2.41.0
PATCH v3 9/13 accel/tcg: Move @iommu_notifiers from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-Daudé@iommu_notifiers is specific to TCG system emulation, move it to AccelCPUState.
Restrict TCG specific code in system/physmem.c, adding an empty stub for tcg_register_iommu_notifier().
Message-Id: <[email protected]>
--- accel/tcg/vcpu-state.h | 3 +++ include/hw/core/cpu.h | 3 --- system/physmem.c | 37 ++++++++++++++++++++++++++++--------- 3 files changed, 31 insertions(+), 12 deletions(-)
accel/tcg/vcpu-state.h +3 -0
@@ -19,6 +19,9 @@ struct AccelCPUState {#ifdef CONFIG_USER_ONLY TaskState *ts; +#else +/* track IOMMUs whose translations we've cached in the TCG TLB */ +GArray *iommu_notifiers;#endif /* !CONFIG_USER_ONLY */ #ifdef CONFIG_PLUGIN
include/hw/core/cpu.h +0 -3
@@ -539,9 +539,6 @@ struct CPUState {/* Used for user-only emulation of prctl(PR_SET_UNALIGN). */ bool prctl_unalign_sigbus; -/* track IOMMUs whose translations we've cached in the TCG TLB */ -GArray *iommu_notifiers; -/* * MUST BE LAST in order to minimize the displacement to CPUArchState. */
system/physmem.c +28 -9
@@ -27,6 +27,8 @@#include "qemu/madvise.h" #ifdef CONFIG_TCG +#include "exec/translate-all.h" +#include "accel/tcg/vcpu-state.h" #include "hw/core/tcg-cpu-ops.h" #endif /* CONFIG_TCG */
@@ -578,6 +580,8 @@ MemoryRegion *flatview_translate(FlatView *fv, hwaddr addr, hwaddr *xlat,return mr; } +#ifdef CONFIG_TCG + typedef struct TCGIOMMUNotifier { IOMMUNotifier n; MemoryRegion *mr;
@@ -614,17 +618,20 @@ static void tcg_register_iommu_notifier(CPUState *cpu,TCGIOMMUNotifier *notifier =NULL ;int i; -for (i =0 ; i < cpu->iommu_notifiers->len; i++) { - notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i); +for (i =0 ; i < cpu->accel->iommu_notifiers->len; i++) { + notifier =g_array_index (cpu->accel->iommu_notifiers, + TCGIOMMUNotifier *, i);if (notifier->mr == mr && notifier->iommu_idx == iommu_idx) {break ; } } -if (i == cpu->iommu_notifiers->len) { +if (i == cpu->accel->iommu_notifiers->len) {/* Not found, add a new entry at the end of the array */ - cpu->iommu_notifiers =g_array_set_size (cpu->iommu_notifiers, i +1 ); + cpu->accel->iommu_notifiers =g_array_set_size (cpu->accel->iommu_notifiers, + i +1 ); notifier =g_new0 (TCGIOMMUNotifier,1 ); - g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i) = notifier; +g_array_index (cpu->accel->iommu_notifiers, + TCGIOMMUNotifier *, i) = notifier; notifier->mr = mr; notifier->iommu_idx = iommu_idx;
@@ -656,19 +663,31 @@ void tcg_iommu_free_notifier_list(CPUState *cpu)int i;TCGIOMMUNotifier *notifier; -for (i =0 ; i < cpu->iommu_notifiers->len; i++) { - notifier = g_array_index(cpu->iommu_notifiers, TCGIOMMUNotifier *, i); +for (i =0 ; i < cpu->accel->iommu_notifiers->len; i++) { + notifier =g_array_index (cpu->accel->iommu_notifiers, + TCGIOMMUNotifier *, i);memory_region_unregister_iommu_notifier (notifier->mr, ¬ifier->n);g_free (notifier); } -g_array_free (cpu->iommu_notifiers, true); +g_array_free (cpu->accel->iommu_notifiers, true); }void tcg_iommu_init_notifier_list (CPUState *cpu) { - cpu->iommu_notifiers =g_array_new (false, true,sizeof (TCGIOMMUNotifier *)); + cpu->accel->iommu_notifiers =g_array_new (false, true, +sizeof (TCGIOMMUNotifier *)); } +#else + +static void tcg_register_iommu_notifier (CPUState *cpu, +IOMMUMemoryRegion *iommu_mr, +int iommu_idx) +{ +} + +#endif +/* Called from RCU critical section */ MemoryRegionSection * address_space_translate_for_iotlb(CPUState *cpu, int asidx, hwaddr orig_addr,
Signature · 1 line
2.41.0
PATCH v3 10/13 accel/tcg: Move @tcg_cflags from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-Daudé@tcg_cflags is specific to TCG accelerator, move it to its AccelCPUState.
Message-Id: <[email protected]>
--- accel/tcg/vcpu-state.h | 2 ++ include/hw/core/cpu.h | 4 +--- accel/tcg/cpu-exec.c | 6 +++--- linux-user/main.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
accel/tcg/vcpu-state.h +2 -0
@@ -10,9 +10,11 @@/** * AccelCPUState: vCPU fields specific to TCG accelerator +* @cflags: Pre-computed cflags for this cpu. * @plugin_state: per-CPU plugin state */ struct AccelCPUState { +uint32_t cflags;uint32_t cflags_next_tb;sigjmp_buf jmp_env;
include/hw/core/cpu.h +1 -3
@@ -394,9 +394,8 @@ struct qemu_work_item;* to a cluster this will be UNASSIGNED_CLUSTER_INDEX; otherwise it will * be the same as the cluster-id property of the CPU object's TYPE_CPU_CLUSTER * QOM parent. -* Under TCG this value is propagated to @tcg_cflags. +* Under TCG this value is propagated to @accel->cflags. * See TranslationBlock::TCG CF_CLUSTER_MASK. -* @tcg_cflags: Pre-computed cflags for this cpu. * @nr_cores: Number of cores within this CPU package. * @nr_threads: Number of threads within this CPU core. * @running: #true if CPU is currently running (lockless).
@@ -517,7 +516,6 @@ struct CPUState {/* TODO Move common fields from CPUArchState here. */ int cpu_index;int cluster_index; -uint32_t tcg_cflags;uint32_t halted;int32_t exception_index;
accel/tcg/cpu-exec.c +3 -3
@@ -150,17 +150,17 @@ static void init_delay_params(SyncClocks *sc, const CPUState *cpu)bool tcg_cflags_has (CPUState *cpu,uint32_t flags) { -return cpu->tcg_cflags & flags; +return cpu->accel->cflags & flags; }void tcg_cflags_set (CPUState *cpu,uint32_t flags) { - cpu->tcg_cflags |= flags; + cpu->accel->cflags |= flags; }uint32_t curr_cflags (CPUState *cpu) { -uint32_t cflags = cpu->tcg_cflags; +uint32_t cflags = cpu->accel->cflags;/* * Record gdb single-step. We should be exiting the TB by raising
linux-user/main.c +1 -1
@@ -241,7 +241,7 @@ CPUArchState *cpu_copy(CPUArchState *env)/* Reset non arch specific state */ cpu_reset (new_cpu); - new_cpu->tcg_cflags = cpu->tcg_cflags; + new_cpu->accel->cflags = cpu->accel->cflags;memcpy (new_env, env,sizeof (CPUArchState));#if defined(TARGET_I386 ) || defined(TARGET_X86_64 ) new_env->gdt.base = target_mmap(0, sizeof(uint64_t) * TARGET_GDT_ENTRIES,
Signature · 1 line
2.41.0
PATCH v3 11/13 accel/tcg: Restrict icount to system emulation
In reply to Philippe Mathieu-DaudéSo far we don't support icount on user emulation.
Message-Id: <[email protected]>
--- accel/tcg/cpu-exec.c | 6 ++++++ 1 file changed, 6 insertions(+)
accel/tcg/cpu-exec.c +6 -0
@@ -781,6 +781,9 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)static inline bool icount_exit_request (CPUState *cpu) { +#if defined(CONFIG_USER_ONLY ) +return false; +#else if (!icount_enabled ()) {return false; }
@@ -788,6 +791,7 @@ static inline bool icount_exit_request(CPUState *cpu)return false; }return cpu->neg.icount_decr.u16.low + cpu->icount_extra ==0 ; +#endif } static inline bool cpu_handle_interrupt(CPUState *cpu,
@@ -802,12 +806,14 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,return false; } +#if !defined(CONFIG_USER_ONLY )/* Clear the interrupt flag now since we're processing * cpu->interrupt_request and cpu->exit_request. * Ensure zeroing happens before reading cpu->exit_request or * cpu->interrupt_request (see also smp_wmb in cpu_exit()) */ qatomic_set_mb (&cpu->neg.icount_decr.u16.high,0 ); +#endif /* !CONFIG_USER_ONLY */ if (unlikely (qatomic_read (&cpu->interrupt_request))) {int interrupt_request;
Signature · 1 line
2.41.0
PATCH v3 12/13 accel/tcg: Move icount fields from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-DaudéBoth @icount_budget and @icount_extra fields are specific to TCG accelerator, move them to its AccelCPUState.
Message-Id: <[email protected]>
--- accel/tcg/vcpu-state.h | 4 ++++ include/hw/core/cpu.h | 3 --- accel/tcg/cpu-exec.c | 14 +++++++------- accel/tcg/icount-common.c | 7 ++++--- accel/tcg/tcg-accel-ops-icount.c | 14 +++++++------- accel/tcg/tcg-accel-ops.c | 1 + hw/core/cpu-common.c | 1 - 7 files changed, 23 insertions(+), 21 deletions(-)
accel/tcg/vcpu-state.h +4 -0
@@ -11,6 +11,7 @@/** * AccelCPUState: vCPU fields specific to TCG accelerator * @cflags: Pre-computed cflags for this cpu. +* @icount_extra: Instructions until next timer event. * @plugin_state: per-CPU plugin state */ struct AccelCPUState {
@@ -22,6 +23,9 @@ struct AccelCPUState {#ifdef CONFIG_USER_ONLY TaskState *ts;#else +int64_t icount_budget; +int64_t icount_extra; +/* track IOMMUs whose translations we've cached in the TCG TLB */ GArray *iommu_notifiers;#endif /* !CONFIG_USER_ONLY */
include/hw/core/cpu.h +0 -3
@@ -409,7 +409,6 @@ struct qemu_work_item;* @unplug: Indicates a pending CPU unplug request. * @crash_occurred: Indicates the OS reported a crash (panic) for this CPU * @singlestep_enabled: Flags for single-stepping. -* @icount_extra: Instructions until next timer event. * @cpu_ases: Pointer to array of CPUAddressSpaces (which define the * AddressSpaces this CPU has) * @num_ases: number of CPUAddressSpaces in @cpu_ases
@@ -470,8 +469,6 @@ struct CPUState {/* updates protected by BQL */ uint32_t interrupt_request;int singlestep_enabled; -int64_t icount_budget; -int64_t icount_extra;uint64_t random_seed;QemuMutex work_mutex;
accel/tcg/cpu-exec.c +7 -7
@@ -75,7 +75,7 @@ static void align_clocks(SyncClocks *sc, CPUState *cpu)return ; } - cpu_icount = cpu->icount_extra + cpu->neg.icount_decr.u16.low; + cpu_icount = cpu->accel->icount_extra + cpu->neg.icount_decr.u16.low; sc->diff_clk +=icount_to_ns (sc->last_cpu_icount - cpu_icount); sc->last_cpu_icount = cpu_icount;
@@ -126,7 +126,7 @@ static void init_delay_params(SyncClocks *sc, CPUState *cpu) sc->realtime_clock =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL_RT ); sc->diff_clk =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) - sc->realtime_clock; sc->last_cpu_icount - = cpu->icount_extra + cpu->neg.icount_decr.u16.low; + = cpu->accel->icount_extra + cpu->neg.icount_decr.u16.low;if (sc->diff_clk < max_delay) { max_delay = sc->diff_clk; }
@@ -719,7 +719,7 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)if (cpu->exception_index <0 ) {#ifndef CONFIG_USER_ONLY if (replay_has_exception () - && cpu->neg.icount_decr.u16.low + cpu->icount_extra ==0 ) { + && cpu->neg.icount_decr.u16.low + cpu->accel->icount_extra ==0 ) {/* Execute just one insn to trigger exception pending in the log */ cpu->accel->cflags_next_tb = (curr_cflags (cpu) & ~CF_USE_ICOUNT ) |CF_NOIRQ |1 ;
@@ -790,7 +790,7 @@ static inline bool icount_exit_request(CPUState *cpu)if (!(cpu->accel->cflags_next_tb ==-1 || cpu->accel->cflags_next_tb &CF_USE_ICOUNT )) {return false; } -return cpu->neg.icount_decr.u16.low + cpu->icount_extra ==0 ; +return cpu->neg.icount_decr.u16.low + cpu->accel->icount_extra ==0 ;#endif }
@@ -942,9 +942,9 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb,/* Ensure global icount has gone forward */ icount_update (cpu);/* Refill decrementer and continue execution. */ -int32_t insns_left =MIN (0xffff , cpu->icount_budget); +int32_t insns_left =MIN (0xffff , cpu->accel->icount_budget); cpu->neg.icount_decr.u16.low = insns_left; - cpu->icount_extra = cpu->icount_budget - insns_left; + cpu->accel->icount_extra = cpu->accel->icount_budget - insns_left;/* * If the next tb has more instructions than we have left to
@@ -953,7 +953,7 @@ static inline void cpu_loop_exec_tb(CPUState *cpu, TranslationBlock *tb,*/ if (insns_left >0 && insns_left < tb->icount) {assert (insns_left <=CF_COUNT_MASK ); -assert (cpu->icount_extra ==0 ); +assert (cpu->accel->icount_extra ==0 ); cpu->accel->cflags_next_tb = (tb->cflags & ~CF_COUNT_MASK ) | insns_left; }#endif
accel/tcg/icount-common.c +4 -3
@@ -38,6 +38,7 @@#include "sysemu/cpu-timers.h" #include "sysemu/cpu-throttle.h" #include "sysemu/cpu-timers-internal.h" +#include "accel/tcg/vcpu-state.h" /* * ICOUNT: Instruction Counter
@@ -71,8 +72,8 @@ static void icount_enable_adaptive(void)*/ static int64_t icount_get_executed (CPUState *cpu) { -return (cpu->icount_budget - - (cpu->neg.icount_decr.u16.low + cpu->icount_extra)); +return (cpu->accel->icount_budget - + (cpu->neg.icount_decr.u16.low + cpu->accel->icount_extra)); }/*
@@ -83,7 +84,7 @@ static int64_t icount_get_executed(CPUState *cpu)static void icount_update_locked (CPUState *cpu) {int64_t executed =icount_get_executed (cpu); - cpu->icount_budget -= executed; + cpu->accel->icount_budget -= executed;qatomic_set_i64 (&timers_state.qemu_icount, timers_state.qemu_icount + executed);
accel/tcg/tcg-accel-ops-icount.c +7 -7
@@ -112,16 +112,16 @@ void icount_prepare_for_run(CPUState *cpu, int64_t cpu_budget)* asynchronously by cpu_exit/cpu_interrupt/tcg_handle_interrupt */ g_assert (cpu->neg.icount_decr.u16.low ==0 ); -g_assert (cpu->icount_extra ==0 ); +g_assert (cpu->accel->icount_extra ==0 );replay_mutex_lock (); - cpu->icount_budget =MIN (icount_get_limit (), cpu_budget); - insns_left =MIN (0xffff , cpu->icount_budget); + cpu->accel->icount_budget =MIN (icount_get_limit (), cpu_budget); + insns_left =MIN (0xffff , cpu->accel->icount_budget); cpu->neg.icount_decr.u16.low = insns_left; - cpu->icount_extra = cpu->icount_budget - insns_left; + cpu->accel->icount_extra = cpu->accel->icount_budget - insns_left; -if (cpu->icount_budget ==0 ) { +if (cpu->accel->icount_budget ==0 ) {/* * We're called without the BQL, so must take it while * we're calling timer handlers.
@@ -139,8 +139,8 @@ void icount_process_data(CPUState *cpu)/* Reset the counters */ cpu->neg.icount_decr.u16.low =0 ; - cpu->icount_extra =0 ; - cpu->icount_budget =0 ; + cpu->accel->icount_extra =0 ; + cpu->accel->icount_budget =0 ;replay_account_executed_instructions ();
accel/tcg/tcg-accel-ops.c +1 -0
@@ -89,6 +89,7 @@ static void tcg_cpu_reset_hold(CPUState *cpu)qatomic_set (&cpu->neg.icount_decr.u32,0 ); cpu->neg.can_do_io = true; + cpu->accel->icount_extra =0 ; cpu->accel->cflags_next_tb =-1 ; }
hw/core/cpu-common.c +0 -1
@@ -121,7 +121,6 @@ static void cpu_common_reset_hold(Object *obj, ResetType type) cpu->interrupt_request =0 ; cpu->halted = cpu->start_powered_off; cpu->mem_io_pc =0 ; - cpu->icount_extra =0 ; cpu->exception_index =-1 ; cpu->crash_occurred = false;
Signature · 1 line
2.41.0
PATCH v3 13/13 accel/tcg: Move @tb_jmp_cache from CPUState to TCG AccelCPUState
In reply to Philippe Mathieu-Daudé@tb_jmp_cache is specific to TCG accelerator, move it to its AccelCPUState. Remove the NULL check in tcg_flush_jmp_cache().
Message-Id: <[email protected]>
--- accel/tcg/tb-jmp-cache.h | 4 ++-- accel/tcg/vcpu-state.h | 2 ++ include/hw/core/cpu.h | 2 -- include/qemu/typedefs.h | 1 - accel/tcg/cpu-exec.c | 7 +++---- accel/tcg/cputlb.c | 2 +- accel/tcg/tb-maint.c | 2 +- accel/tcg/translate-all.c | 7 +------ 8 files changed, 10 insertions(+), 17 deletions(-)
accel/tcg/tb-jmp-cache.h +2 -2
@@ -22,12 +22,12 @@* non-NULL value of 'tb'. Strictly speaking pc is only needed for * CF_PCREL, but it's used always for simplicity. */ -struct CPUJumpCache { +typedef struct CPUJumpCache {struct rcu_head rcu;struct {TranslationBlock *tb;vaddr pc; } array[TB_JMP_CACHE_SIZE ]; -}; +}CPUJumpCache ;#endif /* ACCEL_TCG_TB_JMP_CACHE_H */
accel/tcg/vcpu-state.h +2 -0
@@ -7,6 +7,7 @@#define ACCEL_TCG_VCPU_STATE_H #include "hw/core/cpu.h" +#include "tb-jmp-cache.h" /** * AccelCPUState: vCPU fields specific to TCG accelerator
@@ -19,6 +20,7 @@ struct AccelCPUState {uint32_t cflags_next_tb;sigjmp_buf jmp_env; +CPUJumpCache tb_jmp_cache;#ifdef CONFIG_USER_ONLY TaskState *ts;
include/hw/core/cpu.h +0 -2
@@ -479,8 +479,6 @@ struct CPUState {AddressSpace *as;MemoryRegion *memory; -CPUJumpCache *tb_jmp_cache; -GArray *gdb_regs;int gdb_num_regs;int gdb_num_g_regs;
include/qemu/typedefs.h +0 -1
@@ -44,7 +44,6 @@ typedef struct CPUAddressSpace CPUAddressSpace;typedef struct CPUArchState CPUArchState ;typedef struct CPUPluginState CPUPluginState ;typedef struct CpuInfoFast CpuInfoFast ; -typedef struct CPUJumpCache CPUJumpCache ;typedef struct CPUState CPUState ;typedef struct CPUTLBEntryFull CPUTLBEntryFull ;typedef struct DeviceListener DeviceListener ;
accel/tcg/cpu-exec.c +3 -4
@@ -262,7 +262,7 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu, vaddr pc,tcg_debug_assert (!(cflags &CF_INVALID )); hash =tb_jmp_cache_hash_func (pc); - jc = cpu->tb_jmp_cache; + jc = &cpu->accel->tb_jmp_cache; tb =qatomic_read (&jc->array[hash].tb); if (likely(tb &&
@@ -1011,7 +1011,7 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)* for the fast lookup */ h =tb_jmp_cache_hash_func (pc); - jc = cpu->tb_jmp_cache; + jc = &cpu->accel->tb_jmp_cache; jc->array[h].pc = pc;qatomic_set (&jc->array[h].tb, tb); }
@@ -1090,7 +1090,6 @@ bool tcg_exec_realizefn(CPUState *cpu, Error **errp) tcg_target_initialized = true; } - cpu->tb_jmp_cache =g_new0 (CPUJumpCache,1 );tlb_init (cpu);#ifndef CONFIG_USER_ONLY tcg_iommu_init_notifier_list (cpu);
@@ -1108,5 +1107,5 @@ void tcg_exec_unrealizefn(CPUState *cpu)#endif /* !CONFIG_USER_ONLY */ tlb_destroy (cpu); -g_free_rcu (cpu->tb_jmp_cache, rcu); +g_free_rcu (&cpu->accel->tb_jmp_cache, rcu); }
accel/tcg/cputlb.c +1 -1
@@ -156,7 +156,7 @@ static void tlb_window_reset(CPUTLBDesc *desc, int64_t ns,static void tb_jmp_cache_clear_page (CPUState *cpu,vaddr page_addr) { -CPUJumpCache *jc = cpu->tb_jmp_cache; +CPUJumpCache *jc = &cpu->accel->tb_jmp_cache;int i, i0;if (unlikely (!jc)) {
accel/tcg/tb-maint.c +1 -1
@@ -888,7 +888,7 @@ static void tb_jmp_cache_inval_tb(TranslationBlock *tb)uint32_t h =tb_jmp_cache_hash_func (tb->pc);CPU_FOREACH (cpu) { -CPUJumpCache *jc = cpu->tb_jmp_cache; +CPUJumpCache *jc = &cpu->accel->tb_jmp_cache;if (qatomic_read (&jc->array[h].tb) == tb) {qatomic_set (&jc->array[h].tb,NULL );
accel/tcg/translate-all.c +1 -6
@@ -652,12 +652,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)*/ void tcg_flush_jmp_cache (CPUState *cpu) { -CPUJumpCache *jc = cpu->tb_jmp_cache; - -/* During early initialization, the cache may not yet be allocated. */ -if (unlikely (jc ==NULL )) { -return ; - } +CPUJumpCache *jc = &cpu->accel->tb_jmp_cache;for (int i =0 ; i <TB_JMP_CACHE_SIZE ; i++) {qatomic_set (&jc->array[i].tb,NULL );
Signature · 1 line
2.41.0
Quoted 2 lines · Philippe Mathieu-Daudé
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)
Hmm, it dies very early now:
# gdb --args ./qemu-s390x -L /usr/s390x-linux-gnu /build/wasmtime/target/s390x-unknown-linux-gnu/debug/deps/component_fuzz_util-d10a3a6b4ad8af47
Thread 1 "qemu-s390x" received signal SIGSEGV, Segmentation fault.
0x000055555559b718 in cpu_common_realizefn (dev=0x5555557c28c0, errp=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
217 cpu->accel->plugin_state = qemu_plugin_create_vcpu_state();
(gdb) bt
#0 0x000055555559b718 in cpu_common_realizefn (dev=0x5555557c28c0, errp=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
#1 0x000055555559f59a in s390_cpu_realizefn (dev=0x5555557c28c0, errp=0x7fffffffe1a0) at ../home/iii/myrepos/qemu/target/s390x/cpu.c:284
#2 0x000055555563f76b in device_set_realized (obj=<optimized out>, value=<optimized out>, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:510
#3 0x000055555564363d in property_set_bool (obj=0x5555557c28c0, v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:2362
#4 0x0000555555646b9b in object_property_set (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/object.c:1471
#5 0x000055555564a43f in object_property_set_qobject (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/qom-qobject.c:28
#6 0x0000555555647204 in object_property_set_bool (obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/object.c:1541
#7 0x000055555564025c in qdev_realize (dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:291
#8 0x000055555559bbb4 in cpu_create (typename=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:61
#9 0x000055555559a467 in main (argc=4, argv=0x7fffffffeaa8, envp=<optimized out>) at ../home/iii/myrepos/qemu/linux-user/main.c:811 (gdb) p cpu
$1 = (CPUState *) 0x5555557c28c0
(gdb) p cpu->accel
$2 = (AccelCPUState *) 0x0
Configured with: '/home/iii/myrepos/qemu/configure' '--target-list=s390x-linux-user' '--disable-tools' '--disable-slirp' '--disable-fdt' '--disable-capstone' '--disable-docs'
If you don't see what can be wrong here right away, I can debug this.
Quoted 75 lines
Since v2:
- Movecpu_loop_exit_requested()to "exec/cpu-loop.h"
- Added R-b tagsSince v1:
- First 13 patches queued
- Restrictqemu_plugin_vcpu_exit_hook()to (TCG) plugins
- Restrictcpu_plugin_mem_cbs_enabled()to TCG (plugins)
- Addressed Richard review comments on the others:
- Movecpu_plugin_mem_cbs_enabled()
- Do not movemem_io_pc, waiting for [*]
- Mentioncan_do_iorestrictedFinish extracting TCG fields from CPUState:
- Extracttcg_cpu_exit()fromcpu_exit()
- IntroduceAccelOpsClass::exit_vcpu_thread()
-cpu_exit()calls exit_vcpu_thread=tcg_cpu_exit for TCG
- Forward declare TaskState and more uses ofget_task_state()
- Introduce TCG AccelCPUState
- Move TCG specific fields from CPUState to AccelCPUState
- Restrict "exec/tlb-common.h" to TCG
- Restrictiommu_notifiers, icount to system emulation[*] https://lore.kernel.org/qemu-devel/[email protected]/
Based-on: https://gitlab.com/philmd/qemu/-/commits/accel-next
Philippe Mathieu-Daudé (13):
accel/tcg: Restrictqemu_plugin_vcpu_exit_hook()to TCG plugins accel/tcg: Restrictcpu_plugin_mem_cbs_enabled()to TCG accel/tcg: Move @plugin_mem_cbs from CPUState to
CPUNegativeOffsetState
accel/tcg: Move @plugin_state from CPUState to TCG AccelCPUState accel/tcg: Restrictcpu_loop_exit_requested()to TCG accel/tcg: Restrict IcountDecr /can_do_io/ CPUTLB to TCG accel/tcg: Move @jmp_env from CPUState to TCG AccelCPUState accel/tcg: Move @cflags_next_tb from CPUState to TCG AccelCPUState accel/tcg: Move @iommu_notifiers from CPUState to TCG AccelCPUState accel/tcg: Move @tcg_cflags from CPUState to TCG AccelCPUState accel/tcg: Restrict icount to system emulation accel/tcg: Move icount fields from CPUState to TCG AccelCPUState accel/tcg: Move @tb_jmp_cache from CPUState to TCG AccelCPUStateaccel/tcg/internal-common.h | 18 ++++++++++ accel/tcg/tb-jmp-cache.h | 4 +-- accel/tcg/tcg-accel-ops.h | 1 + accel/tcg/vcpu-state.h | 20 +++++++++++ include/exec/cpu-loop.h | 35 +++++++++++++++++++ include/exec/exec-all.h | 17 ---------- include/exec/tlb-common.h | 4 +++ include/hw/core/cpu.h | 58 ++++++++------------------------ include/qemu/plugin.h | 2 +- include/qemu/typedefs.h | 1 - accel/tcg/cpu-exec-common.c | 2 +- accel/tcg/cpu-exec.c | 52 +++++++++++++++------------- accel/tcg/cputlb.c | 2 +- accel/tcg/icount-common.c | 7 ++-- accel/tcg/plugin-gen.c | 9 +++-- accel/tcg/tb-maint.c | 6 ++-- accel/tcg/tcg-accel-ops-icount.c | 14 ++++---- accel/tcg/tcg-accel-ops.c | 2 ++ accel/tcg/translate-all.c | 9 ++--- accel/tcg/watchpoint.c | 5 +-- hw/core/cpu-common.c | 9 +++-- linux-user/main.c | 2 +- plugins/core.c | 9 ++--- system/physmem.c | 37 +++++++++++++++----- target/arm/tcg/helper-a64.c | 1 + target/s390x/tcg/mem_helper.c | 1 + 26 files changed, 195 insertions(+), 132 deletions(-) create mode 100644 include/exec/cpu-loop.hSignature · 1 line
2.41.0
Hi Ilya,
Quoted 32 lines · Ilya Leoshkevich
Quoted 2 lines · Philippe Mathieu-Daudé
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)Hmm, it dies very early now:
# gdb --args ./qemu-s390x -L /usr/s390x-linux-gnu /build/wasmtime/target/s390x-unknown-linux-gnu/debug/deps/component_fuzz_util-d10a3a6b4ad8af47Thread 1 "qemu-s390x" received signal SIGSEGV, Segmentation fault. 0x000055555559b718 in cpu_common_realizefn (dev=0x5555557c28c0, errp=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:217 217 cpu->accel->plugin_state = qemu_plugin_create_vcpu_state(); (gdb) bt #0 0x000055555559b718 in cpu_common_realizefn (dev=0x5555557c28c0, errp=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:217 #1 0x000055555559f59a in s390_cpu_realizefn (dev=0x5555557c28c0, errp=0x7fffffffe1a0) at ../home/iii/myrepos/qemu/target/s390x/cpu.c:284 #2 0x000055555563f76b in device_set_realized (obj=<optimized out>, value=<optimized out>, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:510 #3 0x000055555564363d in property_set_bool (obj=0x5555557c28c0, v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:2362 #4 0x0000555555646b9b in object_property_set (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:1471 #5 0x000055555564a43f in object_property_set_qobject (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/qom-qobject.c:28 #6 0x0000555555647204 in object_property_set_bool (obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:1541 #7 0x000055555564025c in qdev_realize (dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:291 #8 0x000055555559bbb4 in cpu_create (typename=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:61 #9 0x000055555559a467 in main (argc=4, argv=0x7fffffffeaa8, envp=<optimized out>) at ../home/iii/myrepos/qemu/linux-user/main.c:811 (gdb) p cpu $1 = (CPUState *) 0x5555557c28c0 (gdb) p cpu->accel $2 = (AccelCPUState *) 0x0
Quoted 3 lines
Configured with: '
/home/iii/myrepos/qemu/configure' '--target-list=s390x-linux-user' '--disable-tools' '--disable-slirp' '--disable-fdt' '--disable-capstone' '--disable-docs'If you don't see what can be wrong here right away, I can debug this.
Useful enough I guess, but I'll ask you to test again later.
Does it work without the last patch?
Is it possible to share component_fuzz_util-d10a3a6b4ad8af47?
Thanks for the testing,
Phil.
Quoted 38 lines · Philippe Mathieu-Daudé
Hi Ilya,
Quoted 35 lines · Ilya Leoshkevich
Quoted 2 lines · Philippe Mathieu-Daudé
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)Hmm, it dies very early now:
# gdb --args ./qemu-s390x -L /usr/s390x-linux-gnu /build/wasmtime/target/s390x-unknown-linux-gnu/debug/deps/component_fuzz_util-d10a3a6b4ad8af47Thread 1 "qemu-s390x" received signal SIGSEGV, Segmentation fault.
0x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217217cpu->accel->plugin_state=qemu_plugin_create_vcpu_state();(gdb) bt
#00x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
#10x000055555559f59ains390_cpu_realizefn(dev=0x5555557c28c0, errp=0x7fffffffe1a0) at../home/iii/myrepos/qemu/target/s390x/cpu.c:284
#20x000055555563f76bindevice_set_realized(obj=<optimized out>, value=<optimized out>, errp=0x7fffffffe2e0) at../home/iii/myrepos/qemu/hw/core/qdev.c:510
#30x000055555564363dinproperty_set_bool(obj=0x5555557c28c0, v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/object.c:2362#40x0000555555646b9binobject_property_set(obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/object.c:1471
#50x000055555564a43finobject_property_set_qobject(obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/qom-qobject.c:28
#60x0000555555647204inobject_property_set_bool(obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/object.c:1541
#70x000055555564025cinqdev_realize(dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at../home/iii/myrepos/qemu/hw/core/qdev.c:291
#80x000055555559bbb4incpu_create(typename=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:61
#90x000055555559a467in main (argc=4, argv=0x7fffffffeaa8, envp=<optimized out>) at../home/iii/myrepos/qemu/linux-user/main.c:811(gdb) p cpu
$1 = (CPUState *)0x5555557c28c0
(gdb) pcpu->accel
$2 = (AccelCPUState *)0x0Configured with: '
/home/iii/myrepos/qemu/configure' '--target-list=s390x-linux-user' '--disable-tools' '--disable-slirp' '--disable-fdt' '--disable-capstone' '--disable-docs'If you don't see what can be wrong here right away, I can debug this.
I added this commit in the same branch:
-- >8 --
Author: Philippe Mathieu-Daudé <[email protected]> Date: Tue Apr 30 20:57:15 2024 +0200
accel/tcg: Initialize TCG plugins in cpu-target.c
cpu-target.c +27 -0
@@ -46,6 +46,10 @@#include "hw/core/accel-cpu.h" #include "trace/trace-root.h" #include "qemu/accel.h" +#ifdef CONFIG_PLUGIN +#include "accel/tcg/vcpu-state.h" +#include "qemu/plugin.h" +#endif #ifndef CONFIG_USER_ONLY static int cpu_common_post_load (void *opaque,int version_id)
@@ -131,6 +135,13 @@ const VMStateDescription vmstate_cpu_common = { };#endif +#ifdef CONFIG_PLUGIN +static void qemu_plugin_vcpu_init__async (CPUState *cpu,run_on_cpu_data unused) +{ +qemu_plugin_vcpu_init_hook (cpu); +} +#endif +bool cpu_exec_realizefn (CPUState *cpu,Error **errp) {/* cache the cpu class for the hotpath */
@@ -143,6 +154,15 @@ bool cpu_exec_realizefn(CPUState *cpu, Error **errp)/* Wait until cpu initialization complete before exposing cpu. */ cpu_list_add (cpu); +#ifdef CONFIG_PLUGIN +assert (cpu->accel); +/* Plugin initialization must wait until the cpu start executing code */ +if (tcg_enabled ()) { + cpu->accel->plugin_state =qemu_plugin_create_vcpu_state (); +async_run_on_cpu (cpu, qemu_plugin_vcpu_init__async,RUN_ON_CPU_NULL ); + } +#endif +#ifdef CONFIG_USER_ONLY assert (qdev_get_vmsd (DEVICE (cpu)) ==NULL ||qdev_get_vmsd (DEVICE (cpu))->unmigratable);
@@ -171,6 +191,13 @@ void cpu_exec_unrealizefn(CPUState *cpu) }#endif +#ifdef CONFIG_PLUGIN +/* Call the plugin hook before clearing the cpu is fully unrealized */ +if (tcg_enabled ()) { +qemu_plugin_vcpu_exit_hook (cpu); + } +#endif +cpu_list_remove (cpu);/* * Now that the vCPU has been removed from the RCU list, we can call
hw/core/cpu-common.c +0 -26
@@ -30,10 +30,6 @@#include "hw/boards.h" #include "hw/qdev-properties.h" #include "trace.h" -#ifdef CONFIG_PLUGIN -#include "accel/tcg/vcpu-state.h" -#include "qemu/plugin.h" -#endif CPUState *cpu_by_arch_id (int64_t id) {
@@ -181,13 +177,6 @@ static void cpu_common_parse_features(const char *typename, char *features, } } -#ifdef CONFIG_PLUGIN -static void qemu_plugin_vcpu_init__async (CPUState *cpu,run_on_cpu_data unused) -{ -qemu_plugin_vcpu_init_hook (cpu); -} -#endif -static void cpu_common_realizefn (DeviceState *dev,Error **errp) {CPUState *cpu =CPU (dev);
@@ -211,14 +200,6 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp)cpu_resume (cpu); } -/* Plugin initialization must wait until the cpu start executing code */ -#ifdef CONFIG_PLUGIN -if (tcg_enabled ()) { - cpu->accel->plugin_state =qemu_plugin_create_vcpu_state (); -async_run_on_cpu (cpu, qemu_plugin_vcpu_init__async,RUN_ON_CPU_NULL ); - } -#endif -/* NOTE: latest generic point where the cpu is fully realized */ }
@@ -226,13 +207,6 @@ static void cpu_common_unrealizefn(DeviceState *dev) {CPUState *cpu =CPU (dev); -/* Call the plugin hook before clearing the cpu is fully unrealized */ -#ifdef CONFIG_PLUGIN -if (tcg_enabled ()) { -qemu_plugin_vcpu_exit_hook (cpu); - } -#endif -/* NOTE: latest generic point before the cpu is fully unrealized */ cpu_exec_unrealizefn (cpu); }
---
Totally untested here because it is late (only built...).
Quoted 203 lines · Philippe Mathieu-Daudé
Quoted 64 lines · Philippe Mathieu-Daudé
Hi Ilya,
Quoted 61 lines · Ilya Leoshkevich
Quoted 2 lines · Philippe Mathieu-Daudé
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)Hmm, it dies very early now:
# gdb --args ./qemu-s390x -L /usr/s390x-linux-gnu /build/wasmtime/target/s390x-unknown-linux-gnu/debug/deps/component_fuzz_util-d10a3a6b4ad8af47Thread 1 "qemu-s390x" received signal SIGSEGV, Segmentation fault.
0x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
217cpu->accel->plugin_state=qemu_plugin_create_vcpu_state();(gdb) bt
#00x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
#10x000055555559f59ains390_cpu_realizefn(dev=0x5555557c28c0, errp=0x7fffffffe1a0) at../home/iii/myrepos/qemu/target/s390x/cpu.c:284
#20x000055555563f76bindevice_set_realized(obj=<optimized out>, value=<optimized out>, errp=0x7fffffffe2e0) at../home/iii/myrepos/qemu/hw/core/qdev.c:510
#30x000055555564363dinproperty_set_bool(obj=0x5555557c28c0, v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/object.c:2362#40x0000555555646b9binobject_property_set(obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0)
at../home/iii/myrepos/qemu/qom/object.c:1471
#50x000055555564a43finobject_property_set_qobject(obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0)
at../home/iii/myrepos/qemu/qom/qom-qobject.c:28#60x0000555555647204inobject_property_set_bool(obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/object.c:1541
#70x000055555564025cinqdev_realize(dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at../home/iii/myrepos/qemu/hw/core/qdev.c:291
#80x000055555559bbb4incpu_create(typename=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:61
#90x000055555559a467in main (argc=4, argv=0x7fffffffeaa8, envp=<optimized out>) at../home/iii/myrepos/qemu/linux-user/main.c:811(gdb) p cpu
$1 = (CPUState *)0x5555557c28c0
(gdb) pcpu->accel
$2 = (AccelCPUState *)0x0Configured with: '
/home/iii/myrepos/qemu/configure' '--target-list=s390x-linux-user' '--disable-tools' '--disable-slirp' '--disable-fdt' '--disable-capstone' '--disable-docs'If you don't see what can be wrong here right away, I can debug this.
I added this commit in the same branch:
-- >8 --
Author: Philippe Mathieu-Daudé <[email protected]> Date: Tue Apr 30 20:57:15 2024 +0200accel/tcg: Initialize TCG plugins in
cpu-target.cSigned-off-by Philippe Mathieu-Daudé <[email protected]>cpu-target.c +11
-0@@ -46,6 +46,10 @@#include "hw/core/accel-cpu.h" #include "trace/trace-root.h" #include "qemu/accel.h" +#ifdef CONFIG_PLUGIN +#include "accel/tcg/vcpu-state.h" +#include "qemu/plugin.h" +#endif #ifndef CONFIG_USER_ONLY static int cpu_common_post_load (void *opaque,int version_id)@@ -131,6 +135,13 @@ const VMStateDescription vmstate_cpu_common = { };#endif +#ifdef CONFIG_PLUGIN +static void qemu_plugin_vcpu_init__async (CPUState *cpu,run_on_cpu_data unused) +{ +qemu_plugin_vcpu_init_hook (cpu); +} +#endif +bool cpu_exec_realizefn (CPUState *cpu,Error **errp) {/* cache the cpu class for the hotpath */cpu-target.c +9
-0@@ -143,6 +154,15 @@ bool cpu_exec_realizefn(CPUState *cpu, Error **errp)/* Wait until cpu initialization complete before exposing cpu. */ cpu_list_add (cpu); +#ifdef CONFIG_PLUGIN +assert (cpu->accel); +/* Plugin initialization must wait until the cpu start executing code */ +if (tcg_enabled ()) { + cpu->accel->plugin_state =qemu_plugin_create_vcpu_state (); +async_run_on_cpu (cpu, qemu_plugin_vcpu_init__async,RUN_ON_CPU_NULL ); + } +#endif +#ifdef CONFIG_USER_ONLY assert(qdev_get_vmsd(DEVICE(cpu)) == NULL || qdev_get_vmsd(DEVICE(cpu))->unmigratable);cpu-target.c +7
-0@@ -171,6 +191,13 @@ void cpu_exec_unrealizefn(CPUState *cpu) }#endif +#ifdef CONFIG_PLUGIN +/* Call the plugin hook before clearing the cpu is fully unrealized */ +if (tcg_enabled ()) { +qemu_plugin_vcpu_exit_hook (cpu); + } +#endif +cpu_list_remove (cpu);/* * Now that the vCPU has been removed from the RCU list, we can call hw/core/cpu-common.c +0
-11@@ -30,10 +30,6 @@#include "hw/boards.h" #include "hw/qdev-properties.h" #include "trace.h" -#ifdef CONFIG_PLUGIN -#include "accel/tcg/vcpu-state.h" -#include "qemu/plugin.h" -#endif CPUState *cpu_by_arch_id (int64_t id) {@@ -181,13 +177,6 @@ static void cpu_common_parse_features(const char *typename, char *features, } } -#ifdef CONFIG_PLUGIN -static void qemu_plugin_vcpu_init__async (CPUState *cpu,run_on_cpu_data unused) -{ -qemu_plugin_vcpu_init_hook (cpu); -} -#endif -static void cpu_common_realizefn (DeviceState *dev,Error **errp){ CPUState *cpu = CPU(dev);hw/core/cpu-common.c +0
-8@@ -211,14 +200,6 @@ static void cpu_common_realizefn(DeviceState *dev,Error **errp) cpu_resume(cpu); } -/* Plugin initialization must wait until the cpu start executing code */ -#ifdef CONFIG_PLUGIN -if (tcg_enabled ()) { - cpu->accel->plugin_state =qemu_plugin_create_vcpu_state (); -async_run_on_cpu (cpu, qemu_plugin_vcpu_init__async, RUN_ON_CPU_NULL); - } -#endif -/* NOTE: latest generic point where the cpu is fully realized */}
hw/core/cpu-common.c +0
-8@@ -226,13 +207,6 @@ static void cpu_common_unrealizefn(DeviceState *dev) {CPUState *cpu =CPU (dev); -/* Call the plugin hook before clearing the cpu is fully unrealized */ -#ifdef CONFIG_PLUGIN -if (tcg_enabled ()) { -qemu_plugin_vcpu_exit_hook (cpu); - } -#endif -/* NOTE: latest generic point before the cpu is fully unrealized */ cpu_exec_unrealizefn (cpu); } ---
Quoted 1 line
Totally untested here because it is late (only built...).
Now I get:
Thread 1 "qemu-s390x" received signal SIGABRT, Aborted.
__pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44
44 ./nptl/pthread_kill.c: No such file or directory.
(gdb) bt
#0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44
#1 0x00007ffff7c41e8f in __pthread_kill_internal (signo=6, threadid=<optimized out>) at ./nptl/pthread_kill.c:78
#2 0x00007ffff7bf2fb2 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26
#3 0x00007ffff7bdd472 in __GI_abort () at ./stdlib/abort.c:79
#4 0x00007ffff7bdd395 in __assert_fail_base (fmt=0x7ffff7d51a90 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x5555556d71b8 "cpu->accel",
file=file@entry=0x5555556d70e0 "../home/iii/myrepos/qemu/cpu-target.c", line=line@entry=158, function=function@entry=0x5555556d7260 <__PRETTY_FUNCTION__.3> "cpu_exec_realizefn") at ./assert/assert.c:92
#5 0x00007ffff7bebeb2 in __GI___assert_fail (assertion=assertion@entry=0x5555556d71b8 "cpu->accel", file=file@entry=0x5555556d70e0 "../home/iii/myrepos/qemu/cpu-target.c", line=line@entry=158,
function=function@entry=0x5555556d7260 <__PRETTY_FUNCTION__.3> "cpu_exec_realizefn") at ./assert/assert.c:101
#6 0x00005555555d44ca in cpu_exec_realizefn (cpu=cpu@entry=0x5555557c28c0, errp=errp@entry=0x7fffffffe140) at ../home/iii/myrepos/qemu/cpu-target.c:158
#7 0x000055555559f50b in s390_cpu_realizefn (dev=0x5555557c28c0, errp=0x7fffffffe1a0) at ../home/iii/myrepos/qemu/target/s390x/cpu.c:261
#8 0x000055555563f78b in device_set_realized (obj=<optimized out>, value=<optimized out>, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:510
#9 0x000055555564365d in property_set_bool (obj=0x5555557c28c0, v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:2362
#10 0x0000555555646bbb in object_property_set (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/object.c:1471
#11 0x000055555564a45f in object_property_set_qobject (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/qom-qobject.c:28
#12 0x0000555555647224 in object_property_set_bool (obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/object.c:1541
#13 0x000055555564027c in qdev_realize (dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:291
#14 0x000055555559bb54 in cpu_create (typename=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:57
#15 0x000055555559a467 in main (argc=4, argv=0x7fffffffeaa8, envp=<optimized out>) at ../home/iii/myrepos/qemu/linux-user/main.c:811Here is the executable file: http://0x0.st/XXHp.gz
sha256sum: 58eb8d2a90c08f772ae94e20a7a8c7567bd886fe022a6b9e117912cc13acbd82
Best regards,
Ilya
Quoted 86 lines · Ilya Leoshkevich
Quoted 60 lines · Philippe Mathieu-Daudé
Quoted 59 lines · Philippe Mathieu-Daudé
Hi Ilya,
Quoted 56 lines · Ilya Leoshkevich
Quoted 2 lines · Philippe Mathieu-Daudé
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)Hmm, it dies very early now:
# gdb --args ./qemu-s390x -L /usr/s390x-linux-gnu /build/wasmtime/target/s390x-unknown-linux-gnu/debug/deps/component_fuzz_util-d10a3a6b4ad8af47Thread 1 "qemu-s390x" received signal SIGSEGV, Segmentation fault.
0x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0,
errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
217cpu->accel->plugin_state=qemu_plugin_create_vcpu_state();(gdb) bt
#00x000055555559b718incpu_common_realizefn
(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
#10x000055555559f59ains390_cpu_realizefn(dev=0x5555557c28c0,
errp=0x7fffffffe1a0) at../home/iii/myrepos/qemu/target/s390x/cpu.c:284
#20x000055555563f76bindevice_set_realized(obj=<optimized
out>, value=<optimized out>, errp=0x7fffffffe2e0) at../home/iii/myrepos/qemu/hw/core/qdev.c:510
#30x000055555564363dinproperty_set_bool(obj=0x5555557c28c0,
v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at../home/iii/myrepos/qemu/qom/object.c:2362
#40x0000555555646b9binobject_property_set
(obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0)at ../home/iii/myrepos/qemu/qom/object.c:1471 #5 0x000055555564a43f in object_property_set_qobject (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/qom-qobject.c:28 #6 0x0000555555647204 in object_property_set_bool (obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:1541 #7 0x000055555564025c in qdev_realize (dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:291 #8 0x000055555559bbb4 in cpu_create (typename=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:61 #9 0x000055555559a467 in main (argc=4, argv=0x7fffffffeaa8,envp=<optimized out>) at
../home/iii/myrepos/qemu/linux-user/main.c:811(gdb) p cpu
$1 = (CPUState *)0x5555557c28c0
(gdb) pcpu->accel
$2 = (AccelCPUState *)0x0Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Configured with: '
/home/iii/myrepos/qemu/configure' '--target-list=s390x-linux-user' '--disable-tools' '--disable-slirp' '--disable-fdt' '--disable-capstone' '--disable-docs'Now I get:
Thread 1 "qemu-s390x" received signal SIGABRT, Aborted. __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44 44 ./nptl/pthread_kill.c: No such file or directory. (gdb) bt #0 __pthread_kill_implementation (threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at ./nptl/pthread_kill.c:44 #1 0x00007ffff7c41e8f in __pthread_kill_internal (signo=6, threadid=<optimized out>) at ./nptl/pthread_kill.c:78 #2 0x00007ffff7bf2fb2 in __GI_raise (sig=sig@entry=6) at ../sysdeps/posix/raise.c:26 #3 0x00007ffff7bdd472 in __GI_abort () at ./stdlib/abort.c:79 #4 0x00007ffff7bdd395 in __assert_fail_base (fmt=0x7ffff7d51a90 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x5555556d71b8 "cpu->accel", file=file@entry=0x5555556d70e0 "../home/iii/myrepos/qemu/cpu-target.c", line=line@entry=158, function=function@entry=0x5555556d7260 <__PRETTY_FUNCTION__.3> "cpu_exec_realizefn") at ./assert/assert.c:92 #5 0x00007ffff7bebeb2 in __GI___assert_fail (assertion=assertion@entry=0x5555556d71b8 "cpu->accel", file=file@entry=0x5555556d70e0 "../home/iii/myrepos/qemu/cpu-target.c", line=line@entry=158, function=function@entry=0x5555556d7260 <__PRETTY_FUNCTION__.3> "cpu_exec_realizefn") at ./assert/assert.c:101 #6 0x00005555555d44ca in cpu_exec_realizefn (cpu=cpu@entry=0x5555557c28c0, errp=errp@entry=0x7fffffffe140) at ../home/iii/myrepos/qemu/cpu-target.c:158 #7 0x000055555559f50b in s390_cpu_realizefn (dev=0x5555557c28c0, errp=0x7fffffffe1a0) at ../home/iii/myrepos/qemu/target/s390x/cpu.c:261 #8 0x000055555563f78b in device_set_realized (obj=<optimized out>, value=<optimized out>, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:510 #9 0x000055555564365d in property_set_bool (obj=0x5555557c28c0, v=<optimized out>, name=<optimized out>, opaque=0x5555557a9140, errp=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/qom/object.c:2362 #10 0x0000555555646bbb in object_property_set (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", v=v@entry=0x5555557c6650, errp=errp@entry=0x7fffffffe2e0)
Quoted 8 lines
at ../home/iii/myrepos/qemu/qom/object.c:1471
#11 0x000055555564a45f in object_property_set_qobject (obj=obj@entry=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=0x5555557a7a90, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/qom-qobject.c:28
#12 0x0000555555647224 in object_property_set_bool (obj=0x5555557c28c0, name=name@entry=0x5555556e8ae2 "realized", value=value@entry=true, errp=errp@entry=0x7fffffffe2e0)
at ../home/iii/myrepos/qemu/qom/object.c:1541
#13 0x000055555564027c in qdev_realize (dev=<optimized out>, bus=bus@entry=0x0, errp=errp@entry=0x7fffffffe2e0) at ../home/iii/myrepos/qemu/hw/core/qdev.c:291
#14 0x000055555559bb54 in cpu_create (typename=<optimized out>) at ../home/iii/myrepos/qemu/hw/core/cpu-common.c:57
#15 0x000055555559a467 in main (argc=4, argv=0x7fffffffeaa8, envp=<optimized out>) at ../home/iii/myrepos/qemu/linux-user/main.c:811From code review I think the problem is my commit bb6cf6f016 ("accel/tcg: Factor tcg_cpu_reset_hold() out") which wanted to restrict tlb_flush() to system emulation, but inadvertently also restricted tcg_flush_jmp_cache(), which was before called via Realize -> Reset -> cpu_common_reset_hold(). Apparently now this code can't happen on user emulation.
Quoted 57 lines · Philippe Mathieu-Daudé
Quoted 41 lines · Ilya Leoshkevich
Quoted 32 lines · Philippe Mathieu-Daudé
Quoted 31 lines · Philippe Mathieu-Daudé
Hi Ilya,
Quoted 28 lines · Ilya Leoshkevich
Quoted 2 lines · Philippe Mathieu-Daudé
Missing WASM testing by Ilya (branch available at
https://gitlab.com/philmd/qemu/-/commits/tcg_flush_jmp_cache)Hmm, it dies very early now:
# gdb --args ./qemu-s390x -L /usr/s390x-linux-gnu /build/wasmtime/target/s390x-unknown-linux-gnu/debug/deps/component_fuzz_util-d10a3a6b4ad8af47Thread 1 "qemu-s390x" received signal SIGSEGV, Segmentation fault.
0x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
217cpu->accel->plugin_state=qemu_plugin_create_vcpu_state();(gdb) bt
#00x000055555559b718incpu_common_realizefn(dev=0x5555557c28c0, errp=<optimized out>) at../home/iii/myrepos/qemu/hw/core/cpu-common.c:217
#10x000055555559f59ains390_cpu_realizefn(dev=0x5555557c28c0, errp=0x7fffffffe1a0) at(gdb) p cpu
$1 = (CPUState *)0x5555557c28c0
(gdb) pcpu->accel
$2 = (AccelCPUState *)0x0Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Configured with: '
/home/iii/myrepos/qemu/configure' '--target-list=s390x-linux-user' '--disable-tools' '--disable-slirp' '--disable-fdt' '--disable-capstone' '--disable-docs'Now I get:
Quoted 14 lines
Thread 1 "qemu-s390x" received signal SIGABRT, Aborted.
__pthread_kill_implementation(threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at./nptl/pthread_kill.c:44
44./nptl/pthread_kill.c: No such file or directory.
(gdb) bt
#0__pthread_kill_implementation(threadid=<optimized out>, signo=signo@entry=6, no_tid=no_tid@entry=0) at./nptl/pthread_kill.c:44
#10x00007ffff7c41e8fin__pthread_kill_internal(signo=6, threadid=<optimized out>) at./nptl/pthread_kill.c:78
#20x00007ffff7bf2fb2in__GI_raise(sig=sig@entry=6) at../sysdeps/posix/raise.c:26
#30x00007ffff7bdd472in__GI_abort() at./stdlib/abort.c:79
#40x00007ffff7bdd395in__assert_fail_base(fmt=0x7ffff7d51a90 "%s%s%s:%u: %s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x5555556d71b8 "cpu->accel", file=file@entry=0x5555556d70e0 "../home/iii/myrepos/qemu/cpu-target.c", line=line@entry=158, function=function@entry=0x5555556d7260 <__PRETTY_FUNCTION__.3> "cpu_exec_realizefn") at./assert/assert.c:92#50x00007ffff7bebeb2in__GI___assert_fail(assertion=assertion@entry=0x5555556d71b8 "cpu->accel", file=file@entry=0x5555556d70e0 "../home/iii/myrepos/qemu/cpu-target.c", line=line@entry=158, function=function@entry=0x5555556d7260 <__PRETTY_FUNCTION__.3> "cpu_exec_realizefn") at./assert/assert.c:101
#60x00005555555d44caincpu_exec_realizefn(cpu=cpu@entry=0x5555557c28c0, errp=errp@entry=0x7fffffffe140) at../home/iii/myrepos/qemu/cpu-target.c:158
#70x000055555559f50bins390_cpu_realizefn(dev=0x5555557c28c0, errp=0x7fffffffe1a0) at../home/iii/myrepos/qemu/target/s390x/cpu.c:261
Quoted 6 lines
From code review I think the problem is my commit
bb6cf6f016
("accel/tcg: Factortcg_cpu_reset_hold()out") which wanted to restricttlb_flush()to system emulation, but inadvertently also restrictedtcg_flush_jmp_cache(), which was before called via Realize -> Reset ->cpu_common_reset_hold(). Apparently now this code can't happen on user emulation.
This is indeed the root cause, I'll post a series fixing it.