cpu: convert queued work to a QSIMPLEQ
RFC v4 1/71 cpu: convert queued work to a QSIMPLEQ
Instead of open-coding it.
While at it, make sure that all accesses to the list are performed while holding the list's lock.
--- include/qom/cpu.h | 6 +++--- cpus-common.c | 25 ++++++++----------------- cpus.c | 14 ++++++++++++-- qom/cpu.c | 1 + 4 files changed, 24 insertions(+), 22 deletions(-)
include/qom/cpu.h +3 -3
@@ -315,8 +315,8 @@ struct qemu_work_item;* @mem_io_pc: Host Program Counter at which the memory was accessed. * @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. -* @work_mutex: Lock to prevent multiple access to queued_work_*. -* @queued_work_first: First asynchronous work pending. +* @work_mutex: Lock to prevent multiple access to @work_list. +* @work_list: List of pending asynchronous work. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate). * @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask).
@@ -357,7 +357,7 @@ struct CPUState {sigjmp_buf jmp_env;QemuMutex work_mutex; -struct qemu_work_item *queued_work_first, *queued_work_last; + QSIMPLEQ_HEAD(, qemu_work_item) work_list;CPUAddressSpace *cpu_ases;int num_ases;
cpus-common.c +8 -17
@@ -107,7 +107,7 @@ void cpu_list_remove(CPUState *cpu) }struct qemu_work_item { -struct qemu_work_item *next; +QSIMPLEQ_ENTRY (qemu_work_item) node;run_on_cpu_func func;run_on_cpu_data data;bool free, exclusive, done;
@@ -116,13 +116,7 @@ struct qemu_work_item {static void queue_work_on_cpu (CPUState *cpu,struct qemu_work_item *wi) {qemu_mutex_lock (&cpu->work_mutex); -if (cpu->queued_work_first ==NULL ) { - cpu->queued_work_first = wi; - }else { - cpu->queued_work_last->next = wi; - } - cpu->queued_work_last = wi; - wi->next =NULL ; +QSIMPLEQ_INSERT_TAIL (&cpu->work_list, wi, node); wi->done = false;qemu_mutex_unlock (&cpu->work_mutex);
@@ -314,17 +308,14 @@ void process_queued_cpu_work(CPUState *cpu) {struct qemu_work_item *wi; -if (cpu->queued_work_first ==NULL ) { +qemu_mutex_lock (&cpu->work_mutex); +if (QSIMPLEQ_EMPTY (&cpu->work_list)) { +qemu_mutex_unlock (&cpu->work_mutex);return ; } - -qemu_mutex_lock (&cpu->work_mutex); -while (cpu->queued_work_first !=NULL ) { - wi = cpu->queued_work_first; - cpu->queued_work_first = wi->next; -if (!cpu->queued_work_first) { - cpu->queued_work_last =NULL ; - } +while (!QSIMPLEQ_EMPTY (&cpu->work_list)) { + wi =QSIMPLEQ_FIRST (&cpu->work_list); +QSIMPLEQ_REMOVE_HEAD (&cpu->work_list, node);qemu_mutex_unlock (&cpu->work_mutex);if (wi->exclusive) {/* Running work items outside the BQL avoids the following deadlock:
cpus.c +12 -2
@@ -88,9 +88,19 @@ bool cpu_is_stopped(CPUState *cpu)return cpu->stopped || !runstate_is_running (); } +static inline bool cpu_work_list_empty (CPUState *cpu) +{ +bool ret; + +qemu_mutex_lock (&cpu->work_mutex); + ret =QSIMPLEQ_EMPTY (&cpu->work_list); +qemu_mutex_unlock (&cpu->work_mutex); +return ret; +} +static bool cpu_thread_is_idle (CPUState *cpu) { -if (cpu->stop || cpu->queued_work_first) { +if (cpu->stop || !cpu_work_list_empty (cpu)) {return false; }if (cpu_is_stopped (cpu)) {
@@ -1509,7 +1519,7 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) cpu = first_cpu; } -while (cpu && !cpu->queued_work_first && !cpu->exit_request) { +while (cpu &&cpu_work_list_empty (cpu) && !cpu->exit_request) {atomic_mb_set (&tcg_current_rr_cpu, cpu); current_cpu = cpu;
qom/cpu.c +1 -0
@@ -373,6 +373,7 @@ static void cpu_common_initfn(Object *obj) cpu->nr_threads =1 ;qemu_mutex_init (&cpu->work_mutex); +QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
Signature · 1 line
2.17.1
RFC v4 2/71 cpu: rename cpu->work_mutex to cpu->lock
This lock will soon protect more fields of the struct. Give it a more appropriate name.
--- include/qom/cpu.h | 5 +++-- cpus-common.c | 14 +++++++------- cpus.c | 4 ++-- qom/cpu.c | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)
include/qom/cpu.h +3 -2
@@ -315,7 +315,7 @@ struct qemu_work_item;* @mem_io_pc: Host Program Counter at which the memory was accessed. * @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. -* @work_mutex: Lock to prevent multiple access to @work_list. +* @lock: Lock to prevent multiple access to per-CPU fields. * @work_list: List of pending asynchronous work. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate).
@@ -356,7 +356,8 @@ struct CPUState {int64_t icount_extra;sigjmp_buf jmp_env; -QemuMutex work_mutex; +QemuMutex lock; +/* fields below protected by @lock */ QSIMPLEQ_HEAD(, qemu_work_item) work_list;CPUAddressSpace *cpu_ases;
cpus-common.c +7 -7
@@ -115,10 +115,10 @@ struct qemu_work_item {static void queue_work_on_cpu (CPUState *cpu,struct qemu_work_item *wi) { -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock);QSIMPLEQ_INSERT_TAIL (&cpu->work_list, wi, node); wi->done = false; -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);qemu_cpu_kick (cpu); }
@@ -308,15 +308,15 @@ void process_queued_cpu_work(CPUState *cpu) {struct qemu_work_item *wi; -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock);if (QSIMPLEQ_EMPTY (&cpu->work_list)) { -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);return ; }while (!QSIMPLEQ_EMPTY (&cpu->work_list)) { wi =QSIMPLEQ_FIRST (&cpu->work_list);QSIMPLEQ_REMOVE_HEAD (&cpu->work_list, node); -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);if (wi->exclusive) {/* Running work items outside the BQL avoids the following deadlock: * 1) start_exclusive() is called with the BQL taken while another
@@ -332,13 +332,13 @@ void process_queued_cpu_work(CPUState *cpu) }else { wi->func (cpu, wi->data); } -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock);if (wi->free) {g_free (wi); }else {atomic_mb_set (&wi->done, true); } } -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);qemu_cond_broadcast (&qemu_work_cond); }
cpus.c +2 -2
@@ -92,9 +92,9 @@ static inline bool cpu_work_list_empty(CPUState *cpu) {bool ret; -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock); ret =QSIMPLEQ_EMPTY (&cpu->work_list); -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);return ret; }
qom/cpu.c +1 -1
@@ -372,7 +372,7 @@ static void cpu_common_initfn(Object *obj) cpu->nr_cores =1 ; cpu->nr_threads =1 ; -qemu_mutex_init (&cpu->work_mutex); +qemu_mutex_init (&cpu->lock);QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 02/71] cpu: rename cpu->work_mutex to cpu->lock
Quoted 5 lines · Emilio G. Cota
This lock will soon protect more fields of the struct. Give it a more appropriate name.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 103 lines
--- include/qom/cpu.h | 5 +++-- cpus-common.c | 14 +++++++------- cpus.c | 4 ++-- qom/cpu.c | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-)include/qom/cpu.h +3
-2@@ -315,7 +315,7 @@ struct qemu_work_item;* @mem_io_pc: Host Program Counter at which the memory was accessed. * @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. -* @work_mutex: Lock to prevent multiple access to @work_list. +* @lock: Lock to prevent multiple access to per-CPU fields. * @work_list: List of pending asynchronous work. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate). @@ -356,7 +356,8 @@ struct CPUState {int64_t icount_extra;sigjmp_buf jmp_env; -QemuMutex work_mutex; +QemuMutex lock; +/* fields below protected by @lock */ QSIMPLEQ_HEAD(, qemu_work_item) work_list;CPUAddressSpace *cpu_ases;cpus-common.c +7
-7@@ -115,10 +115,10 @@ struct qemu_work_item {static void queue_work_on_cpu (CPUState *cpu,struct qemu_work_item *wi) { -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock);QSIMPLEQ_INSERT_TAIL (&cpu->work_list, wi, node); wi->done = false; -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);qemu_cpu_kick (cpu); }@@ -308,15 +308,15 @@ void process_queued_cpu_work(CPUState *cpu) {struct qemu_work_item *wi; -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock);if (QSIMPLEQ_EMPTY (&cpu->work_list)) { -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);return ; }while (!QSIMPLEQ_EMPTY (&cpu->work_list)) { wi =QSIMPLEQ_FIRST (&cpu->work_list);QSIMPLEQ_REMOVE_HEAD (&cpu->work_list, node); -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);if (wi->exclusive) {/* Running work items outside the BQL avoids the following deadlock: * 1) start_exclusive() is called with the BQL taken while another @@ -332,13 +332,13 @@ void process_queued_cpu_work(CPUState *cpu) }else { wi->func (cpu, wi->data); } -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock);if (wi->free) {g_free (wi); }else {atomic_mb_set (&wi->done, true); } } -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);qemu_cond_broadcast (&qemu_work_cond); }cpus.c +2
-2@@ -92,9 +92,9 @@ static inline bool cpu_work_list_empty(CPUState *cpu) {bool ret; -qemu_mutex_lock (&cpu->work_mutex); +qemu_mutex_lock (&cpu->lock); ret =QSIMPLEQ_EMPTY (&cpu->work_list); -qemu_mutex_unlock (&cpu->work_mutex); +qemu_mutex_unlock (&cpu->lock);return ret; }qom/cpu.c +0
-0
qom/cpu.c static void cpu_common_initfn(Object *obj) · line 378
Quoted 8 lines
qom/cpu.c +1
-1@@ -372,7 +372,7 @@ static void cpu_common_initfn(Object *obj) cpu->nr_cores =1 ; cpu->nr_threads =1 ; -qemu_mutex_init (&cpu->work_mutex); +qemu_mutex_init (&cpu->lock);QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
--
Alex Bennée
RFC v4 3/71 cpu: introduce cpu_mutex_lock/unlock
In reply to Emilio G. CotaThe few direct users of &cpu->lock will be converted soon.
--- include/qom/cpu.h | 33 +++++++++++++++++++++++++++++++ cpus.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- stubs/cpu-lock.c | 20 +++++++++++++++++++ stubs/Makefile.objs | 1 + 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 stubs/cpu-lock.c
include/qom/cpu.h +33 -0
@@ -452,6 +452,39 @@ extern struct CPUTailQ cpus;extern __threadCPUState *current_cpu; +/** +* cpu_mutex_lock - lock a CPU's mutex +* @cpu: the CPU whose mutex is to be locked +* +* To avoid deadlock, a CPU's mutex must be acquired after the BQL. +*/ +#define cpu_mutex_lock (cpu) \ + cpu_mutex_lock_impl(cpu, __FILE__, __LINE__) +void cpu_mutex_lock_impl (CPUState *cpu,const char *file,int line); + +/** +* cpu_mutex_unlock - unlock a CPU's mutex +* @cpu: the CPU whose mutex is to be unlocked +*/ +#define cpu_mutex_unlock (cpu) \ + cpu_mutex_unlock_impl(cpu, __FILE__, __LINE__) +void cpu_mutex_unlock_impl (CPUState *cpu,const char *file,int line); + +/** +* cpu_mutex_locked - check whether a CPU's mutex is locked +* @cpu: the CPU of interest +* +* Returns true if the calling thread is currently holding the CPU's mutex. +*/ +bool cpu_mutex_locked (const CPUState *cpu); + +/** +* no_cpu_mutex_locked - check whether any CPU mutex is held +* +* Returns true if the calling thread is not holding any CPU mutex. +*/ +bool no_cpu_mutex_locked (void ); +static inline void cpu_tb_jmp_cache_clear (CPUState *cpu) {unsigned int i;
cpus.c +46 -2
67 lines not on this page · raw message
stubs/cpu-lock.c new file +20 -0
@@ -0,0 +1,20 @@ +#include "qemu/osdep.h" +#include "qom/cpu.h" + +void cpu_mutex_lock_impl (CPUState *cpu,const char *file,int line) +{ +} + +void cpu_mutex_unlock_impl (CPUState *cpu,const char *file,int line) +{ +} + +bool cpu_mutex_locked (const CPUState *cpu) +{ +return true; +} + +bool no_cpu_mutex_locked (void ) +{ +return true; +}
stubs/Makefile.objs +1 -0
@@ -8,6 +8,7 @@ stub-obj-y += blockdev-close-all-bdrv-states.o stub-obj-y += clock-warp.o stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o +stub-obj-y += cpu-lock.o stub-obj-y += dump.o stub-obj-y += error-printf.o stub-obj-y += fdset.o
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 03/71] cpu: introduce cpu_mutex_lock/unlock
Quoted 10 lines · Emilio G. Cota
The few direct users of
&cpu->lockwill be converted soon.Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 33 +++++++++++++++++++++++++++++++ cpus.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- stubs/cpu-lock.c | 20 +++++++++++++++++++ stubs/Makefile.objs | 1 + 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 stubs/cpu-lock.c
r~
Re: [Qemu-devel] [RFC v4 03/71] cpu: introduce cpu_mutex_lock/unlock
In reply to Emilio G. CotaQuoted 160 lines · Emilio G. Cota
The few direct users of
&cpu->lockwill be converted soon.Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 33 +++++++++++++++++++++++++++++++ cpus.c | 48 +++++++++++++++++++++++++++++++++++++++++++-- stubs/cpu-lock.c | 20 +++++++++++++++++++ stubs/Makefile.objs | 1 + 4 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 stubs/cpu-lock.cinclude/qom/cpu.h +33
-0@@ -452,6 +452,39 @@ extern struct CPUTailQ cpus;extern __threadCPUState *current_cpu; +/** +* cpu_mutex_lock - lock a CPU's mutex +* @cpu: the CPU whose mutex is to be locked +* +* To avoid deadlock, a CPU's mutex must be acquired after the BQL. +*/ +#define cpu_mutex_lock (cpu) \ + cpu_mutex_lock_impl(cpu, __FILE__, __LINE__) +void cpu_mutex_lock_impl (CPUState *cpu,const char *file,int line); + +/** +* cpu_mutex_unlock - unlock a CPU's mutex +* @cpu: the CPU whose mutex is to be unlocked +*/ +#define cpu_mutex_unlock (cpu) \ + cpu_mutex_unlock_impl(cpu, __FILE__, __LINE__) +void cpu_mutex_unlock_impl (CPUState *cpu,const char *file,int line); + +/** +* cpu_mutex_locked - check whether a CPU's mutex is locked +* @cpu: the CPU of interest +* +* Returns true if the calling thread is currently holding the CPU's mutex. +*/ +bool cpu_mutex_locked (const CPUState *cpu); + +/** +* no_cpu_mutex_locked - check whether any CPU mutex is held +* +* Returns true if the calling thread is not holding any CPU mutex. +*/ +bool no_cpu_mutex_locked (void ); +static inline void cpu_tb_jmp_cache_clear (CPUState *cpu) {unsigned int i;cpus.c +46
-2@@ -83,6 +83,47 @@ static unsigned int throttle_percentage;#define CPU_THROTTLE_PCT_MAX 99#define CPU_THROTTLE_TIMESLICE_NS 10000000 +/* XXX: is this really the max number of CPUs? */ +#define CPU_LOCK_BITMAP_SIZE 2048 + +/* +* Note: we index the bitmap with cpu->cpu_index + 1 so that the logic +* also works during early CPU initialization, when cpu->cpu_index is set to +* UNASSIGNED_CPU_INDEX == -1. +*/ +static __thread DECLARE_BITMAP(cpu_lock_bitmap, CPU_LOCK_BITMAP_SIZE); + +bool no_cpu_mutex_locked (void ) +{ +return bitmap_empty (cpu_lock_bitmap,CPU_LOCK_BITMAP_SIZE ); +} + +void cpu_mutex_lock_impl (CPUState *cpu,const char *file,int line) +{ +/* coverity gets confused by the indirect function call */ +#ifdef __COVERITY__ +qemu_mutex_lock_impl (&cpu->lock, file, line); +#else +QemuMutexLockFunc f =atomic_read (&qemu_mutex_lock_func); + +g_assert (!cpu_mutex_locked (cpu)); +set_bit (cpu->cpu_index +1 , cpu_lock_bitmap); +f (&cpu->lock, file, line); +#endif +} + +void cpu_mutex_unlock_impl (CPUState *cpu,const char *file,int line) +{ +g_assert (cpu_mutex_locked (cpu)); +qemu_mutex_unlock_impl (&cpu->lock, file, line); +clear_bit (cpu->cpu_index +1 , cpu_lock_bitmap); +} + +bool cpu_mutex_locked (const CPUState *cpu) +{ +return test_bit (cpu->cpu_index +1 , cpu_lock_bitmap); +} +bool cpu_is_stopped (CPUState *cpu) {return cpu->stopped || !runstate_is_running ();@@ -92,9 +133,9 @@ static inline bool cpu_work_list_empty(CPUState *cpu) {bool ret; -qemu_mutex_lock (&cpu->lock); +cpu_mutex_lock (cpu); ret =QSIMPLEQ_EMPTY (&cpu->work_list); -qemu_mutex_unlock (&cpu->lock); +cpu_mutex_unlock (cpu);return ret; }@@ -1843,6 +1884,9 @@ void qemu_mutex_lock_iothread_impl(const char *file, int line) {QemuMutexLockFunc bql_lock =atomic_read (&qemu_bql_mutex_lock_func); +/* prevent deadlock with CPU mutex */ +g_assert (no_cpu_mutex_locked ()); +g_assert (!qemu_mutex_iothread_locked ());bql_lock (&qemu_global_mutex, file, line); iothread_locked = true;stubs/cpu-lock.c new file +20
-0@@ -0,0 +1,20 @@ +#include "qemu/osdep.h" +#include "qom/cpu.h" + +void cpu_mutex_lock_impl (CPUState *cpu,const char *file,int line) +{ +} + +void cpu_mutex_unlock_impl (CPUState *cpu,const char *file,int line) +{ +} + +bool cpu_mutex_locked (const CPUState *cpu) +{ +return true; +} + +bool no_cpu_mutex_locked (void ) +{ +return true; +}stubs/Makefile.objs +0
-0
stubs/Makefile.objs stub-obj-y += blockdev-close-all-bdrv-states.o · line 11
Quoted 4 lines
stubs/Makefile.objs +1
-0@@ -8,6 +8,7 @@ stub-obj-y += blockdev-close-all-bdrv-states.o stub-obj-y += clock-warp.o stub-obj-y += cpu-get-clock.o stub-obj-y += cpu-get-icount.o +stub-obj-y += cpu-lock.o
This is the wrong place because:
c++ -I/usr/include/pixman-1 -Werror -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -fPIE -DPIE -m64 -mcx16 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wall -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -Wexpansion-to-defined -Wendif-labels -Wno-shift-negative-value -Wno-missing-include-dirs -Wempty-body -Wnested-externs -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wold-style-declaration -Wold-style-definition -Wtype-limits
-fstack-protector-strong -I/usr/include/p11-kit-1 -I/usr/include/libpng16 -I/usr/include/spice-server -I/usr/include/spice-1 -I/home/alex.bennee/lsrc/qemu.git/capstone/include -I../linux-headers -iquote .. -iquote /home/alex.bennee/lsrc/qemu.git/target/arm -DNEED_CPU_H -iquote /home/alex.bennee/lsrc/qemu.git/include -I/home/alex.bennee/lsrc/qemu.git/linux-user/aarch64 -I/home/alex.bennee/lsrc/qemu.git/linux-user/host/x86_64 -I/home/alex.bennee/lsrc/qemu.git/linux-user -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -g -Wl,--warn-common -lxenctrl -lxenstore -lxenguest -lxenforeignmemory -lxengnttab -lxenevtchn -lxendevicemodel -Wl,-z,relro -Wl,-z,now -pie -m64 -g -o qemu-aarch64 exec.o tcg/tcg.o tcg/tcg-op.o tcg/tcg-op-vec.o tcg/tcg-op-gvec.o tcg/tcg-common.o tcg/optimize.o fpu/softfloat.o disas.o gdbstub-xml.o gdbstub.o thunk.o accel/stubs/hax-stub.o accel/stubs/hvf-stub.o accel/stubs/whpx-stub.o accel/stubs/kvm-stub.o accel/tcg/tcg-runtime.o accel/tcg/tcg-runtime-gvec.o accel/tcg/cpu-exec.o accel/tcg/cpu-exec-common.o accel/tcg/translate-all.o accel/tcg/translator.o accel/tcg/user-exec.o accel/tcg/user-exec-stub.o linux-user/main.o linux-user/syscall.o linux-user/strace.o linux-user/mmap.o linux-user/signal.o linux-user/elfload.o linux-user/linuxload.o linux-user/uaccess.o linux-user/uname.o linux-user/safe-syscall.o linux-user/aarch64/signal.o linux-user/aarch64/cpu_loop.o linux-user/exit.o linux-user/fd-trans.o linux-user/flatload.o target/arm/arm-semi.o target/arm/kvm-stub.o target/arm/translate.o target/arm/op_helper.o target/arm/helper.o target/arm/cpu.o target/arm/neon_helper.o target/arm/iwmmxt_helper.o target/arm/vec_helper.o target/arm/gdbstub.o target/arm/cpu64.o target/arm/translate-a64.o target/arm/helper-a64.o target/arm/gdbstub64.o target/arm/crypto_helper.o target/arm/translate-sve.o target/arm/sve_helper.o ../cpus-common.o ../disas/arm.o ../disas/arm-a64.o ../disas/i386.o ../disas/libvixl/vixl/utils.o ../disas/libvixl/vixl/compiler-intrinsics.o ../disas/libvixl/vixl/a64/instructions-a64.o ../disas/libvixl/vixl/a64/decoder-a64.o ../disas/libvixl/vixl/a64/disasm-a64.o ../hw/core/qdev.o ../hw/core/qdev-properties.o ../hw/core/bus.o ../hw/core/reset.o ../hw/core/irq.o ../hw/core/hotplug.o ../qom/cpu.o trace/generated-helpers.o trace/control-target.o ../qom/object.o ../qom/container.o ../qom/qom-qobject.o ../qom/object_interfaces.o ../crypto/aes.o ../libqemuutil.a -L/home/alex.bennee/lsrc/qemu.git/capstone -lcapstone -lm -lgthread-2.0 -pthread -lglib-2.0 -lz -lrt
So we end up linking these stubs in linux-user mode - which I think is what breaks start_exclusive for the fork in linux-user:
(gdb) l 232
227 exclusive_work_ongoing = true;
228 qemu_mutex_unlock(&qemu_cpu_list_lock);
229
230 /* Make all other cpus stop executing. */
231 CPU_FOREACH(other_cpu) {
232 cpu_mutex_lock(other_cpu);
233 if (other_cpu->running) {
234 g_assert(!other_cpu->exclusive_waiter);
235 other_cpu->exclusive_waiter = true;
236 qemu_cpu_kick(other_cpu);
(gdb) info line 232
Line 232 of "cpus-common.c" starts at address 0x5555556f4527 <start_exclusive+151> and ends at 0x5555556f4540 <start_exclusive+176>.
(gdb) x/10i 0x5555556f4527
0x5555556f4527 <start_exclusive+151>: lea 0xf0bba(%rip),%rbp # 0x5555557e50e8
0x5555556f452e <start_exclusive+158>: xchg %ax,%ax
0x5555556f4530 <start_exclusive+160>: mov $0xe8,%edx
0x5555556f4535 <start_exclusive+165>: mov %rbp,%rsi
0x5555556f4538 <start_exclusive+168>: mov %rbx,%rdi
0x5555556f453b <start_exclusive+171>: callq 0x555555757b20 <cpu_mutex_lock_impl>
0x5555556f4540 <start_exclusive+176>: cmpb $0x0,0x230(%rbx)
0x5555556f4547 <start_exclusive+183>: je 0x5555556f4587 <start_exclusive+247>
0x5555556f4549 <start_exclusive+185>: cmpb $0x0,0x231(%rbx)
0x5555556f4550 <start_exclusive+192>: je 0x5555556f4578 <start_exclusive+232>
(gdb) x/10i cpu_mutex_lock_impl
0x555555757b20 <cpu_mutex_lock_impl>: repz retq
0x555555757b22: nopl 0x0(%rax)
0x555555757b26: nopw %cs:0x0(%rax,%rax,1)
0x555555757b30 <cpu_mutex_unlock_impl>: repz retq
0x555555757b32: nopl 0x0(%rax)
0x555555757b36: nopw %cs:0x0(%rax,%rax,1)
0x555555757b40 <cpu_mutex_locked>: mov $0x1,%eax
0x555555757b45 <cpu_mutex_locked+5>: retq
0x555555757b46: nopw %cs:0x0(%rax,%rax,1)
0x555555757b50 <no_cpu_mutex_locked>: mov $0x1,%eax--
Alex Bennée
RFC v4 4/71 cpu: make qemu_work_cond per-cpu
In reply to Emilio G. CotaThis eliminates the need to use the BQL to queue CPU work.
While at it, give the per-cpu field a generic name ("cond") since it will soon be used for more than just queueing CPU work.
--- include/qom/cpu.h | 6 ++-- cpus-common.c | 72 ++++++++++++++++++++++++++++++++++++++--------- cpus.c | 2 +- qom/cpu.c | 1 + 4 files changed, 63 insertions(+), 18 deletions(-)
include/qom/cpu.h +3 -3
@@ -316,6 +316,7 @@ struct qemu_work_item;* @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. * @lock: Lock to prevent multiple access to per-CPU fields. +* @cond: Condition variable for per-CPU events. * @work_list: List of pending asynchronous work. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate).
@@ -358,6 +359,7 @@ struct CPUState {QemuMutex lock;/* fields below protected by @lock */ +QemuCond cond; QSIMPLEQ_HEAD(, qemu_work_item) work_list;CPUAddressSpace *cpu_ases;
@@ -769,12 +771,10 @@ bool cpu_is_stopped(CPUState *cpu);* @cpu: The vCPU to run on. * @func: The function to be executed. * @data: Data to pass to the function. -* @mutex: Mutex to release while waiting for @func to run. * * Used internally in the implementation of run_on_cpu. */ -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data, -QemuMutex *mutex); +void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data);/** * run_on_cpu:
cpus-common.c +58 -14
132 lines not on this page · raw message
cpus.c +1 -1
@@ -1236,7 +1236,7 @@ void qemu_init_cpu_loop(void)void run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) { -do_run_on_cpu (cpu, func, data, &qemu_global_mutex); +do_run_on_cpu (cpu, func, data); }static void qemu_kvm_destroy_vcpu (CPUState *cpu)
qom/cpu.c +1 -0
@@ -373,6 +373,7 @@ static void cpu_common_initfn(Object *obj) cpu->nr_threads =1 ;qemu_mutex_init (&cpu->lock); +qemu_cond_init (&cpu->cond);QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 04/71] cpu: make qemu_work_cond per-cpu
Quoted 5 lines · Emilio G. Cota
This eliminates the need to use the BQL to queue CPU work.
While at it, give the per-cpu field a generic name ("cond") since it will soon be used for more than just queueing CPU work.
Quoted 7 lines
Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 6 ++-- cpus-common.c | 72 ++++++++++++++++++++++++++++++++++++++--------- cpus.c | 2 +- qom/cpu.c | 1 + 4 files changed, 63 insertions(+), 18 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 04/71] cpu: make qemu_work_cond per-cpu
In reply to Emilio G. CotaQuoted 6 lines · Emilio G. Cota
This eliminates the need to use the BQL to queue CPU work.
While at it, give the per-cpu field a generic name ("cond") since it will soon be used for more than just queueing CPU work.
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 202 lines
--- include/qom/cpu.h | 6 ++-- cpus-common.c | 72 ++++++++++++++++++++++++++++++++++++++--------- cpus.c | 2 +- qom/cpu.c | 1 + 4 files changed, 63 insertions(+), 18 deletions(-)include/qom/cpu.h +3
-3@@ -316,6 +316,7 @@ struct qemu_work_item;* @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. * @lock: Lock to prevent multiple access to per-CPU fields. +* @cond: Condition variable for per-CPU events. * @work_list: List of pending asynchronous work. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate). @@ -358,6 +359,7 @@ struct CPUState {QemuMutex lock;/* fields below protected by @lock */ +QemuCond cond; QSIMPLEQ_HEAD(, qemu_work_item) work_list;CPUAddressSpace *cpu_ases;@@ -769,12 +771,10 @@ bool cpu_is_stopped(CPUState *cpu);* @cpu: The vCPU to run on. * @func: The function to be executed. * @data: Data to pass to the function. -* @mutex: Mutex to release while waiting for @func to run. * * Used internally in the implementation of run_on_cpu. */ -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data, -QemuMutex *mutex); +void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data);/** * run_on_cpu: cpus-common.c +58
-14@@ -26,7 +26,6 @@static QemuMutex qemu_cpu_list_lock;static QemuCond exclusive_cond;static QemuCond exclusive_resume; -static QemuCond qemu_work_cond;/* >= 1 if a thread is inside start_exclusive/end_exclusive. Written * under qemu_cpu_list_lock, read with atomic operations. @@ -42,7 +41,6 @@ void qemu_init_cpu_list(void)qemu_mutex_init (&qemu_cpu_list_lock);qemu_cond_init (&exclusive_cond);qemu_cond_init (&exclusive_resume); -qemu_cond_init (&qemu_work_cond); }void cpu_list_lock (void )@@ -113,23 +111,37 @@ struct qemu_work_item {bool free, exclusive, done; }; -static void queue_work_on_cpu (CPUState *cpu,struct qemu_work_item *wi) +/* Called with the CPU's lock held */ +static void queue_work_on_cpu_locked (CPUState *cpu,struct qemu_work_item *wi) { -qemu_mutex_lock (&cpu->lock);QSIMPLEQ_INSERT_TAIL (&cpu->work_list, wi, node); wi->done = false; -qemu_mutex_unlock (&cpu->lock);qemu_cpu_kick (cpu); } -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data, -QemuMutex *mutex) +static void queue_work_on_cpu (CPUState *cpu,struct qemu_work_item *wi) +{ +cpu_mutex_lock (cpu); +queue_work_on_cpu_locked (cpu, wi); +cpu_mutex_unlock (cpu); +} + +void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) {struct qemu_work_item wi; +bool has_bql =qemu_mutex_iothread_locked (); + +g_assert (no_cpu_mutex_locked ());if (qemu_cpu_is_self (cpu)) { -func (cpu, data); +if (has_bql) { +func (cpu, data); + }else { +qemu_mutex_lock_iothread (); +func (cpu, data); +qemu_mutex_unlock_iothread (); + }return ; }@@ -139,13 +151,34 @@ void do_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data, wi.free = false; wi.exclusive = false; -queue_work_on_cpu (cpu, &wi); +cpu_mutex_lock (cpu); +queue_work_on_cpu_locked (cpu, &wi); + +/* +* We are going to sleep on the CPU lock, so release the BQL. +* +* During the transition to per-CPU locks, we release the BQL _after_ +* having kicked the destination CPU (from queue_work_on_cpu_locked above). +* This makes sure that the enqueued work will be seen by the CPU +* after being woken up from the kick, since the CPU sleeps on the BQL. +* Once we complete the transition to per-CPU locks, we will release +* the BQL earlier in this function. +*/ +if (has_bql) { +qemu_mutex_unlock_iothread (); + } +while (!atomic_mb_read (&wi.done)) {CPUState *self_cpu = current_cpu; -qemu_cond_wait (&qemu_work_cond, mutex); +qemu_cond_wait (&cpu->cond, &cpu->lock); current_cpu = self_cpu; } +cpu_mutex_unlock (cpu); + +if (has_bql) { +qemu_mutex_lock_iothread (); + } }void async_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data)@@ -307,6 +340,7 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func,void process_queued_cpu_work (CPUState *cpu) {struct qemu_work_item *wi; +bool has_bql =qemu_mutex_iothread_locked ();qemu_mutex_lock (&cpu->lock);if (QSIMPLEQ_EMPTY (&cpu->work_list)) {@@ -324,13 +358,23 @@ void process_queued_cpu_work(CPUState *cpu)* BQL, so it goes to sleep; start_exclusive() is sleeping too, so * neither CPU can proceed. */ -qemu_mutex_unlock_iothread (); +if (has_bql) { +qemu_mutex_unlock_iothread (); + }start_exclusive (); wi->func (cpu, wi->data);end_exclusive (); -qemu_mutex_lock_iothread (); +if (has_bql) { +qemu_mutex_lock_iothread (); + } }else { - wi->func (cpu, wi->data); +if (has_bql) { + wi->func (cpu, wi->data); + }else { +qemu_mutex_lock_iothread (); + wi->func (cpu, wi->data); +qemu_mutex_unlock_iothread (); + } }qemu_mutex_lock (&cpu->lock);if (wi->free) {@@ -340,5 +384,5 @@ void process_queued_cpu_work(CPUState *cpu) } }qemu_mutex_unlock (&cpu->lock); -qemu_cond_broadcast (&qemu_work_cond); +qemu_cond_broadcast (&cpu->cond); }cpus.c +1
-1@@ -1236,7 +1236,7 @@ void qemu_init_cpu_loop(void)void run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) { -do_run_on_cpu (cpu, func, data, &qemu_global_mutex); +do_run_on_cpu (cpu, func, data); }static void qemu_kvm_destroy_vcpu (CPUState *cpu)qom/cpu.c +0
-0
qom/cpu.c static void cpu_common_initfn(Object *obj) · line 379
Quoted 7 lines
qom/cpu.c +1
-0@@ -373,6 +373,7 @@ static void cpu_common_initfn(Object *obj) cpu->nr_threads =1 ;qemu_mutex_init (&cpu->lock); +qemu_cond_init (&cpu->cond);QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
--
Alex Bennée
RFC v4 5/71 cpu: move run_on_cpu to cpus-common
In reply to Emilio G. CotaWe don't pass a pointer to qemu_global_mutex anymore.
--- include/qom/cpu.h | 10 ---------- cpus-common.c | 2 +- cpus.c | 5 ----- 3 files changed, 1 insertion(+), 16 deletions(-)
include/qom/cpu.h +0 -10
@@ -766,16 +766,6 @@ void qemu_cpu_kick(CPUState *cpu);*/ bool cpu_is_stopped (CPUState *cpu); -/** -* do_run_on_cpu: -* @cpu: The vCPU to run on. -* @func: The function to be executed. -* @data: Data to pass to the function. -* -* Used internally in the implementation of run_on_cpu. -*/ -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data); -/** * run_on_cpu: * @cpu: The vCPU to run on.
cpus-common.c +1 -1
@@ -127,7 +127,7 @@ static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi)cpu_mutex_unlock (cpu); } -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) +void run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) {struct qemu_work_item wi;bool has_bql =qemu_mutex_iothread_locked ();
cpus.c +0 -5
@@ -1234,11 +1234,6 @@ void qemu_init_cpu_loop(void)qemu_thread_get_self (&io_thread); } -void run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) -{ -do_run_on_cpu (cpu, func, data); -} -static void qemu_kvm_destroy_vcpu (CPUState *cpu) {if (kvm_destroy_vcpu (cpu) <0 ) {
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 05/71] cpu: move run_on_cpu to cpus-common
Quoted 4 lines · Emilio G. Cota
We don't pass a pointer to
qemu_global_mutexanymore.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
As discussed on IRC I don't fundamentally object to this being in cpus-common given we have the other work queue stuff there. However given it now lives there we should assert we are in system emulation mode so if a user-mode instruction attempts to use one of the _run_on_cpu() functions we break.
Quoted 46 lines
--- include/qom/cpu.h | 10 ---------- cpus-common.c | 2 +- cpus.c | 5 ----- 3 files changed, 1 insertion(+), 16 deletions(-)include/qom/cpu.h +0
-10@@ -766,16 +766,6 @@ void qemu_cpu_kick(CPUState *cpu);*/ bool cpu_is_stopped (CPUState *cpu); -/** -* do_run_on_cpu: -* @cpu: The vCPU to run on. -* @func: The function to be executed. -* @data: Data to pass to the function. -* -* Used internally in the implementation of run_on_cpu. -*/ -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data); -/** * run_on_cpu: * @cpu: The vCPU to run on. cpus-common.c +1
-1@@ -127,7 +127,7 @@ static void queue_work_on_cpu(CPUState *cpu, struct qemu_work_item *wi)cpu_mutex_unlock (cpu); } -void do_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) +void run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) {struct qemu_work_item wi;bool has_bql =qemu_mutex_iothread_locked ();cpus.c +0
-0@@ -1234,11 +1234,6 @@ void qemu_init_cpu_loop(void)qemu_thread_get_self (&io_thread);
cpus.c void qemu_init_cpu_loop(void) · line 1239
Quoted 10 lines
cpus.c +0
-5} -void run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data) -{ -do_run_on_cpu (cpu, func, data); -} -static void qemu_kvm_destroy_vcpu (CPUState *cpu) {if (kvm_destroy_vcpu (cpu) <0 ) {
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 05/71] cpu: move run_on_cpu to cpus-common
Quoted 5 lines · Alex Bennée
Quoted 2 lines · Emilio G. Cota
We don't pass a pointer to
qemu_global_mutexanymore.
Quoted 8 lines
Quoted 2 lines
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>As discussed on IRC I don't fundamentally object to this being in cpus-common given we have the other work queue stuff there. However given it now lives there we should assert we are in system emulation mode so if a user-mode instruction attempts to use one of the
_run_on_cpu()functions we break.
Thanks for looking into this. I fixed up the commit to add stubs for cpu_lock/unlock, since the former cpu->work_mutex has to keep working.
I'm not convinced about adding an "assert(!user-mode)" to run_on_cpu. Given that now it does not depend on the BQL, it could actually work in user-mode if called. If we really wanted to make sure that no user-mode would call it, then a compile-time check would be better than an assert. But again, I fail to see what we'd gain from that.
For context, do_run_on_cpu et al. were moved to cpus-common.c by d148d90ee8 ("cpus-common: move CPU work item management to common code", 2016-09-27). The point was to consolidate the run-on-cpu code in a common (softmmu & user-mode) file, since user-mode needed async_run_on_cpu for exclusive work.
Now we can finally make run_on_cpu generic as well.
Thanks,
Emilio
Re: [Qemu-devel] [RFC v4 05/71] cpu: move run_on_cpu to cpus-common
Quoted 7 lines · Emilio G. Cota
I'm not convinced about adding an "assert(!user-mode)" to
run_on_cpu. Given that now it does not depend on the BQL, it could actually work in user-mode if called. If we really wanted to make sure that no user-mode would call it, then a compile-time check would be better than an assert. But again, I fail to see what we'd gain from that.
Quoted 7 lines
For context,
do_run_on_cpuet al. were moved tocpus-common.cbyd148d90ee8("cpus-common: move CPU work item management to common code", 2016-09-27). The point was to consolidate the run-on-cpu code in a common (softmmu & user-mode) file, since user-mode neededasync_run_on_cpufor exclusive work.Now we can finally make
run_on_cpugeneric as well.
I agree, the run_on_cpu stuff should not be system-specific at all.
Paolo
Re: [Qemu-devel] [RFC v4 05/71] cpu: move run_on_cpu to cpus-common
Quoted 14 lines · Paolo Bonzini
Quoted 13 lines · Emilio G. Cota
I'm not convinced about adding an "assert(!user-mode)" to
run_on_cpu. Given that now it does not depend on the BQL, it could actually work in user-mode if called. If we really wanted to make sure that no user-mode would call it, then a compile-time check would be better than an assert. But again, I fail to see what we'd gain from that.For context,
do_run_on_cpuet al. were moved tocpus-common.cbyd148d90ee8("cpus-common: move CPU work item management to common code", 2016-09-27). The point was to consolidate the run-on-cpu code in a common (softmmu & user-mode) file, since user-mode neededasync_run_on_cpufor exclusive work.
Quoted 3 lines
Quoted 1 line
Now we can finally make
run_on_cpugeneric as well.I agree, the
run_on_cpustuff should not be system-specific at all.
I'm happy to for it to be generic - just not broken ;-)
I'm not sure what sort of use cases it has at the moment given we use start/end_exclusive for both atomics and system call marshalling in linux-user. However have a common toolbox across system and linux-user is a good thing.
Quoted 2 lines
Paolo
--
Alex Bennée
RFC v4 6/71 cpu: introduce process_queued_cpu_work_locked
In reply to Emilio G. CotaThis completes the conversion to cpu_mutex_lock/unlock in the file.
--- cpus-common.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
cpus-common.c +11 -6
@@ -337,20 +337,19 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func,queue_work_on_cpu (cpu, wi); } -void process_queued_cpu_work (CPUState *cpu) +/* Called with the CPU's lock held */ +static void process_queued_cpu_work_locked (CPUState *cpu) {struct qemu_work_item *wi;bool has_bql =qemu_mutex_iothread_locked (); -qemu_mutex_lock (&cpu->lock);if (QSIMPLEQ_EMPTY (&cpu->work_list)) { -qemu_mutex_unlock (&cpu->lock);return ; }while (!QSIMPLEQ_EMPTY (&cpu->work_list)) { wi =QSIMPLEQ_FIRST (&cpu->work_list);QSIMPLEQ_REMOVE_HEAD (&cpu->work_list, node); -qemu_mutex_unlock (&cpu->lock); +cpu_mutex_unlock (cpu);if (wi->exclusive) {/* Running work items outside the BQL avoids the following deadlock: * 1) start_exclusive() is called with the BQL taken while another
@@ -376,13 +375,19 @@ void process_queued_cpu_work(CPUState *cpu)qemu_mutex_unlock_iothread (); } } -qemu_mutex_lock (&cpu->lock); +cpu_mutex_lock (cpu);if (wi->free) {g_free (wi); }else {atomic_mb_set (&wi->done, true); } } -qemu_mutex_unlock (&cpu->lock);qemu_cond_broadcast (&cpu->cond); } + +void process_queued_cpu_work (CPUState *cpu) +{ +cpu_mutex_lock (cpu); +process_queued_cpu_work_locked (cpu); +cpu_mutex_unlock (cpu); +}
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 06/71] cpu: introduce process_queued_cpu_work_locked
Quoted 4 lines · Emilio G. Cota
This completes the conversion to cpu_mutex_lock/unlock in the file.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 44 lines
--- cpus-common.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)cpus-common.c +4
-5@@ -337,20 +337,19 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func,queue_work_on_cpu (cpu, wi); } -void process_queued_cpu_work (CPUState *cpu) +/* Called with the CPU's lock held */ +static void process_queued_cpu_work_locked (CPUState *cpu) {struct qemu_work_item *wi;bool has_bql =qemu_mutex_iothread_locked (); -qemu_mutex_lock (&cpu->lock);if (QSIMPLEQ_EMPTY (&cpu->work_list)) { -qemu_mutex_unlock (&cpu->lock);return ; }while (!QSIMPLEQ_EMPTY (&cpu->work_list)) { wi =QSIMPLEQ_FIRST (&cpu->work_list);QSIMPLEQ_REMOVE_HEAD (&cpu->work_list, node); -qemu_mutex_unlock (&cpu->lock); +cpu_mutex_unlock (cpu);if (wi->exclusive) {/* Running work items outside the BQL avoids the following deadlock: * 1) start_exclusive() is called with the BQL taken while another @@ -376,13 +375,19 @@ void process_queued_cpu_work(CPUState *cpu)qemu_mutex_unlock_iothread (); } } -qemu_mutex_lock (&cpu->lock); +cpu_mutex_lock (cpu);if (wi->free) {g_free (wi); }else {atomic_mb_set (&wi->done, true); } }
cpus-common.c void process_queued_cpu_work(CPUState *cpu) · line 393
Quoted 10 lines
cpus-common.c +7
-1-qemu_mutex_unlock (&cpu->lock);qemu_cond_broadcast (&cpu->cond); } + +void process_queued_cpu_work (CPUState *cpu) +{ +cpu_mutex_lock (cpu); +process_queued_cpu_work_locked (cpu); +cpu_mutex_unlock (cpu); +}
--
Alex Bennée
RFC v4 7/71 tcg-runtime: define helper_cpu_halted_set
In reply to Emilio G. Cota--- accel/tcg/tcg-runtime.h | 2 ++ accel/tcg/tcg-runtime.c | 7 +++++++ 2 files changed, 9 insertions(+)
accel/tcg/tcg-runtime.h +2 -0
@@ -28,6 +28,8 @@ DEF_HELPER_FLAGS_1(lookup_tb_ptr, TCG_CALL_NO_WG_SE, ptr, env) DEF_HELPER_FLAGS_1(exit_atomic, TCG_CALL_NO_WG, noreturn, env) +DEF_HELPER_FLAGS_2(cpu_halted_set, TCG_CALL_NO_RWG, void, env, i32) +#ifdef CONFIG_SOFTMMU DEF_HELPER_FLAGS_5(atomic_cmpxchgb, TCG_CALL_NO_WG,
accel/tcg/tcg-runtime.c +7 -0
@@ -167,3 +167,10 @@ void HELPER(exit_atomic)(CPUArchState *env) {cpu_loop_exit_atomic (ENV_GET_CPU (env),GETPC ()); } + +void HELPER (cpu_halted_set )(CPUArchState *env,uint32_t val) +{ +CPUState *cpu =ENV_GET_CPU (env); + + cpu->halted = val; +}
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 07/71] tcg-runtime: define helper_cpu_halted_set
accel/tcg/tcg-runtime.c void HELPER(exit_atomic)(CPUArchState *env) · line 176
Quoted 6 lines · Emilio G. Cota
accel/tcg/tcg-runtime.c +6
-0+void HELPER (cpu_halted_set )(CPUArchState *env,uint32_t val) +{ +CPUState *cpu =ENV_GET_CPU (env); + + cpu->halted = val; +}
I suppose this is fine as a first step. I'd like to clean up all of the targets to also use a helper like this to also raise EXCP_HALTED. They all perform the same actions, even though this isn't obvious (many of them reuse helpers that also raise target-specific exceptions).
That said,
r~
RFC v4 8/71 ppc: convert to helper_cpu_halted_set
In reply to Emilio G. Cota--- target/ppc/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
target/ppc/translate.c +2 -4
@@ -1609,8 +1609,7 @@ GEN_LOGICAL2(nor, tcg_gen_nor_tl, 0x03, PPC_INTEGER);static void gen_pause (DisasContext *ctx) {TCGv_i32 t0 =tcg_const_i32 (0 ); -tcg_gen_st_i32 (t0, cpu_env, - -offsetof(PowerPCCPU , env) + offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, t0);tcg_temp_free_i32 (t0);/* Stop translation, this gives other CPUs a chance to run */
@@ -3543,8 +3542,7 @@ static void gen_sync(DisasContext *ctx)static void gen_wait (DisasContext *ctx) {TCGv_i32 t0 =tcg_const_i32 (1 ); -tcg_gen_st_i32 (t0, cpu_env, - -offsetof(PowerPCCPU , env) + offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, t0);tcg_temp_free_i32 (t0);/* Stop translation, as the CPU is supposed to sleep from now */ gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 08/71] ppc: convert to helper_cpu_halted_set
Quoted 7 lines · Emilio G. Cota
Cc David Gibson <[email protected]>Cc Alexander Graf <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/ppc/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 08/71] ppc: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 4 lines · Emilio G. Cota
Cc David Gibson <[email protected]>Cc Alexander Graf <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 19 lines
--- target/ppc/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)target/ppc/translate.c +1
-2@@ -1609,8 +1609,7 @@ GEN_LOGICAL2(nor, tcg_gen_nor_tl, 0x03, PPC_INTEGER);static void gen_pause (DisasContext *ctx) {TCGv_i32 t0 =tcg_const_i32 (0 ); -tcg_gen_st_i32 (t0, cpu_env, - -offsetof(PowerPCCPU , env) + offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, t0);tcg_temp_free_i32 (t0);/* Stop translation, this gives other CPUs a chance to run */
target/ppc/translate.c static void gen_sync(DisasContext *ctx) · line 3548
Quoted 9 lines
target/ppc/translate.c +1
-2@@ -3543,8 +3542,7 @@ static void gen_sync(DisasContext *ctx)static void gen_wait (DisasContext *ctx) {TCGv_i32 t0 =tcg_const_i32 (1 ); -tcg_gen_st_i32 (t0, cpu_env, - -offsetof(PowerPCCPU , env) + offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, t0);tcg_temp_free_i32 (t0);/* Stop translation, as the CPU is supposed to sleep from now */ gen_exception_nip (ctx,EXCP_HLT , ctx->base.pc_next);
--
Alex Bennée
RFC v4 9/71 cris: convert to helper_cpu_halted_set
In reply to Emilio G. CotaAnd fix the temp leak along the way.
--- target/cris/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
target/cris/translate.c +3 -2
@@ -2833,8 +2833,9 @@ static int dec_rfe_etc(CPUCRISState *env, DisasContext *dc)cris_cc_mask (dc,0 );if (dc->op2 ==15 ) { -tcg_gen_st_i32 (tcg_const_i32 (1 ), cpu_env, - -offsetof(CRISCPU , env) + offsetof(CPUState , halted)); +TCGv_i32 tmp =tcg_const_i32 (1 ); +gen_helper_cpu_halted_set (cpu_env, tmp); +tcg_temp_free_i32 (tmp);tcg_gen_movi_tl (env_pc, dc->pc +2 );t_gen_raise_exception (EXCP_HLT );return 2 ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 09/71] cris: convert to helper_cpu_halted_set
Quoted 7 lines · Emilio G. Cota
And fix the temp leak along the way.
Cc "Edgar E. Iglesias" <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/cris/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 09/71] cris: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 4 lines · Emilio G. Cota
And fix the temp leak along the way.
Cc "Edgar E. Iglesias" <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 10 lines
--- target/cris/translate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)target/cris/translate.c +0
-0@@ -2833,8 +2833,9 @@ static int dec_rfe_etc(CPUCRISState *env, DisasContext *dc)cris_cc_mask (dc,0 );
target/cris/translate.c static int dec_rfe_etc(CPUCRISState *env, DisasContext *dc) · line 2841
Quoted 10 lines
target/cris/translate.c +3
-2if (dc->op2 ==15 ) { -tcg_gen_st_i32 (tcg_const_i32 (1 ), cpu_env, - -offsetof(CRISCPU , env) + offsetof(CPUState , halted)); +TCGv_i32 tmp =tcg_const_i32 (1 ); +gen_helper_cpu_halted_set (cpu_env, tmp); +tcg_temp_free_i32 (tmp);tcg_gen_movi_tl (env_pc, dc->pc +2 );t_gen_raise_exception (EXCP_HLT );return 2 ;
--
Alex Bennée
RFC v4 10/71 hppa: convert to helper_cpu_halted_set
In reply to Emilio G. Cota--- target/hppa/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
target/hppa/translate.c +1 -2
@@ -2845,8 +2845,7 @@ static DisasJumpType trans_pause(DisasContext *ctx, uint32_t insn,/* Tell the qemu main loop to halt until this cpu has work. */ tmp =tcg_const_i32 (1 ); -tcg_gen_st_i32 (tmp, cpu_env, -offsetof(HPPACPU , env) + - offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp);tcg_temp_free_i32 (tmp);gen_excp_1 (EXCP_HALTED );
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 10/71] hppa: convert to helper_cpu_halted_set
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/hppa/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 10/71] hppa: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 1 line · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/hppa/translate.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)target/hppa/translate.c +0
-0
target/hppa/translate.c static DisasJumpType trans_pause(DisasContext *ctx, uint32_t insn, · line 2850
Quoted 8 lines
target/hppa/translate.c +1
-2@@ -2845,8 +2845,7 @@ static DisasJumpType trans_pause(DisasContext *ctx, uint32_t insn,/* Tell the qemu main loop to halt until this cpu has work. */ tmp =tcg_const_i32 (1 ); -tcg_gen_st_i32 (tmp, cpu_env, -offsetof(HPPACPU , env) + - offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp);tcg_temp_free_i32 (tmp);gen_excp_1 (EXCP_HALTED );
--
Alex Bennée
RFC v4 11/71 m68k: convert to helper_cpu_halted_set
In reply to Emilio G. Cota--- target/m68k/translate.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
target/m68k/translate.c +4 -5
@@ -43,7 +43,6 @@#undef DEFO32#undef DEFO64 -static TCGv_i32 cpu_halted;static TCGv_i32 cpu_exception_index;static char cpu_reg_names[2 *8 *3 +5 *4 ];
@@ -79,9 +78,6 @@ void m68k_tcg_init(void)#undef DEFO32#undef DEFO64 - cpu_halted =tcg_global_mem_new_i32 (cpu_env, - -offsetof(M68kCPU , env) + - offsetof(CPUState , halted),"HALTED" ); cpu_exception_index = tcg_global_mem_new_i32(cpu_env, -offsetof(M68kCPU, env) + offsetof(CPUState, exception_index),
@@ -4637,6 +4633,7 @@ DISAS_INSN(halt)DISAS_INSN (stop) {uint16_t ext; +TCGv_i32 tmp;if (IS_USER (s)) {gen_exception (s, s->base.pc_next,EXCP_PRIVILEGE );
@@ -4646,7 +4643,9 @@ DISAS_INSN(stop) ext =read_im16 (env, s);gen_set_sr_im (s, ext,0 ); -tcg_gen_movi_i32 (cpu_halted,1 ); + tmp =tcg_const_i32 (1 ); +gen_helper_cpu_halted_set (cpu_env, tmp); +tcg_temp_free_i32 (tmp);gen_exception (s, s->pc,EXCP_HLT ); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 11/71] m68k: convert to helper_cpu_halted_set
Quoted 5 lines · Emilio G. Cota
Cc Laurent Vivier <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/m68k/translate.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 11/71] m68k: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 2 lines · Emilio G. Cota
Cc Laurent Vivier <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 35 lines
--- target/m68k/translate.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)target/m68k/translate.c +1
-4@@ -43,7 +43,6 @@#undef DEFO32#undef DEFO64 -static TCGv_i32 cpu_halted;static TCGv_i32 cpu_exception_index;static char cpu_reg_names[2 *8 *3 +5 *4 ];@@ -79,9 +78,6 @@ void m68k_tcg_init(void)#undef DEFO32#undef DEFO64 - cpu_halted =tcg_global_mem_new_i32 (cpu_env, - -offsetof(M68kCPU , env) + - offsetof(CPUState , halted),"HALTED" ); cpu_exception_index = tcg_global_mem_new_i32(cpu_env, -offsetof(M68kCPU, env) + offsetof(CPUState, exception_index),@@ -4637,6 +4633,7 @@ DISAS_INSN(halt)DISAS_INSN (stop) {uint16_t ext; +TCGv_i32 tmp;if (IS_USER (s)) {gen_exception (s, s->base.pc_next,EXCP_PRIVILEGE );
target/m68k/translate.c DISAS_INSN(stop) · line 4650
Quoted 9 lines
target/m68k/translate.c +3
-1@@ -4646,7 +4643,9 @@ DISAS_INSN(stop) ext =read_im16 (env, s);gen_set_sr_im (s, ext,0 ); -tcg_gen_movi_i32 (cpu_halted,1 ); + tmp =tcg_const_i32 (1 ); +gen_helper_cpu_halted_set (cpu_env, tmp); +tcg_temp_free_i32 (tmp);gen_exception (s, s->pc,EXCP_HLT ); }
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 11/71] m68k: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 5 lines · Emilio G. Cota
Cc Laurent Vivier <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/m68k/translate.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
RFC v4 12/71 alpha: convert to helper_cpu_halted_set
In reply to Emilio G. Cota--- target/alpha/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
target/alpha/translate.c +2 -4
@@ -1226,8 +1226,7 @@ static DisasJumpType gen_call_pal(DisasContext *ctx, int palcode)/* WTINT */ {TCGv_i32 tmp =tcg_const_i32 (1 ); -tcg_gen_st_i32 (tmp, cpu_env, -offsetof(AlphaCPU , env) + - offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp);tcg_temp_free_i32 (tmp); }tcg_gen_movi_i64 (ctx->ir[IR_V0 ],0 );
@@ -1382,8 +1381,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)/* WAIT */ {TCGv_i32 tmp =tcg_const_i32 (1 ); -tcg_gen_st_i32 (tmp, cpu_env, -offsetof(AlphaCPU , env) + - offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp);tcg_temp_free_i32 (tmp); }return gen_excp (ctx,EXCP_HALTED ,0 );
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 12/71] alpha: convert to helper_cpu_halted_set
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/alpha/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 12/71] alpha: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 1 line · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 19 lines
--- target/alpha/translate.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)target/alpha/translate.c +1
-2@@ -1226,8 +1226,7 @@ static DisasJumpType gen_call_pal(DisasContext *ctx, int palcode)/* WTINT */ {TCGv_i32 tmp =tcg_const_i32 (1 ); -tcg_gen_st_i32 (tmp, cpu_env, -offsetof(AlphaCPU , env) + - offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp);tcg_temp_free_i32 (tmp); }tcg_gen_movi_i64 (ctx->ir[IR_V0 ],0 );
target/alpha/translate.c static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno) · line 1387
Quoted 9 lines
target/alpha/translate.c +1
-2@@ -1382,8 +1381,7 @@ static DisasJumpType gen_mtpr(DisasContext *ctx, TCGv vb, int regno)/* WAIT */ {TCGv_i32 tmp =tcg_const_i32 (1 ); -tcg_gen_st_i32 (tmp, cpu_env, -offsetof(AlphaCPU , env) + - offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp);tcg_temp_free_i32 (tmp); }return gen_excp (ctx,EXCP_HALTED ,0 );
--
Alex Bennée
RFC v4 13/71 microblaze: convert to helper_cpu_halted_set
In reply to Emilio G. Cota--- target/microblaze/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
target/microblaze/translate.c +1 -3
@@ -1233,9 +1233,7 @@ static void dec_br(DisasContext *dc)LOG_DIS ("sleep\n" );t_sync_flags (dc); -tcg_gen_st_i32 (tmp_1, cpu_env, - -offsetof(MicroBlazeCPU , env) - +offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp_1);tcg_gen_movi_i64 (cpu_SR[SR_PC ], dc->pc +4 );gen_helper_raise_exception (cpu_env, tmp_hlt);tcg_temp_free_i32 (tmp_hlt);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 13/71] microblaze: convert to helper_cpu_halted_set
Quoted 5 lines · Emilio G. Cota
Cc "Edgar E. Iglesias" <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/microblaze/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 13/71] microblaze: convert to helper_cpu_halted_set
In reply to Emilio G. CotaQuoted 2 lines · Emilio G. Cota
Cc "Edgar E. Iglesias" <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/microblaze/translate.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)target/microblaze/translate.c +0
-0
target/microblaze/translate.c static void dec_br(DisasContext *dc) · line 1239
Quoted 10 lines
target/microblaze/translate.c +1
-3@@ -1233,9 +1233,7 @@ static void dec_br(DisasContext *dc)LOG_DIS ("sleep\n" );t_sync_flags (dc); -tcg_gen_st_i32 (tmp_1, cpu_env, - -offsetof(MicroBlazeCPU , env) - +offsetof(CPUState , halted)); +gen_helper_cpu_halted_set (cpu_env, tmp_1);tcg_gen_movi_i64 (cpu_SR[SR_PC ], dc->pc +4 );gen_helper_raise_exception (cpu_env, tmp_hlt);tcg_temp_free_i32 (tmp_hlt);
--
Alex Bennée
RFC v4 14/71 cpu: define cpu_halted helpers
In reply to Emilio G. Cotacpu->halted will soon be protected by cpu->lock. We will use these helpers to ease the transition, since right now cpu->halted has many direct callers.
--- include/qom/cpu.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
include/qom/cpu.h +24 -0
@@ -487,6 +487,30 @@ bool cpu_mutex_locked(const CPUState *cpu);*/ bool no_cpu_mutex_locked (void ); +static inline uint32_t cpu_halted (CPUState *cpu) +{ +uint32_t ret; + +if (cpu_mutex_locked (cpu)) { +return cpu->halted; + } +cpu_mutex_lock (cpu); + ret = cpu->halted; +cpu_mutex_unlock (cpu); +return ret; +} + +static inline void cpu_halted_set (CPUState *cpu,uint32_t val) +{ +if (cpu_mutex_locked (cpu)) { + cpu->halted = val; +return ; + } +cpu_mutex_lock (cpu); + cpu->halted = val; +cpu_mutex_unlock (cpu); +} +static inline void cpu_tb_jmp_cache_clear (CPUState *cpu) {unsigned int i;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 14/71] cpu: define cpu_halted helpers
Quoted 6 lines · Emilio G. Cota
cpu->haltedwill soon be protected bycpu->lock. We will use these helpers to ease the transition, since right nowcpu->haltedhas many direct callers.Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 29 lines
--- include/qom/cpu.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)include/qom/cpu.h +17
-0@@ -487,6 +487,30 @@ bool cpu_mutex_locked(const CPUState *cpu);*/ bool no_cpu_mutex_locked (void ); +static inline uint32_t cpu_halted (CPUState *cpu) +{ +uint32_t ret; + +if (cpu_mutex_locked (cpu)) { +return cpu->halted; + } +cpu_mutex_lock (cpu); + ret = cpu->halted; +cpu_mutex_unlock (cpu); +return ret; +} + +static inline void cpu_halted_set (CPUState *cpu,uint32_t val) +{ +if (cpu_mutex_locked (cpu)) { + cpu->halted = val;
include/qom/cpu.h bool cpu_mutex_locked(const CPUState *cpu); · line 516
Quoted 10 lines
include/qom/cpu.h +7
-0+return ; + } +cpu_mutex_lock (cpu); + cpu->halted = val; +cpu_mutex_unlock (cpu); +} +static inline void cpu_tb_jmp_cache_clear (CPUState *cpu) {unsigned int i;
--
Alex Bennée
RFC v4 15/71 tcg-runtime: convert to cpu_halted_set
In reply to Emilio G. Cota--- accel/tcg/tcg-runtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
accel/tcg/tcg-runtime.c +1 -1
@@ -172,5 +172,5 @@ void HELPER(cpu_halted_set)(CPUArchState *env, uint32_t val) {CPUState *cpu =ENV_GET_CPU (env); - cpu->halted = val; +cpu_halted_set (cpu, val); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 15/71] tcg-runtime: convert to cpu_halted_set
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- accel/tcg/tcg-runtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
r~
Re: [Qemu-devel] [RFC v4 15/71] tcg-runtime: convert to cpu_halted_set
In reply to Emilio G. CotaQuoted 1 line · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- accel/tcg/tcg-runtime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)accel/tcg/tcg-runtime.c +0
-0
accel/tcg/tcg-runtime.c void HELPER(cpu_halted_set)(CPUArchState *env, uint32_t val) · line 176
Quoted 6 lines
accel/tcg/tcg-runtime.c +1
-1@@ -172,5 +172,5 @@ void HELPER(cpu_halted_set)(CPUArchState *env, uint32_t val) {CPUState *cpu =ENV_GET_CPU (env); - cpu->halted = val; +cpu_halted_set (cpu, val); }
--
Alex Bennée
RFC v4 16/71 arm: convert to cpu_halted
In reply to Emilio G. Cota--- hw/arm/omap1.c | 4 ++-- hw/arm/pxa2xx_gpio.c | 2 +- hw/arm/pxa2xx_pic.c | 2 +- target/arm/arm-powerctl.c | 4 ++-- target/arm/cpu.c | 2 +- target/arm/op_helper.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
hw/arm/omap1.c +2 -2
@@ -1769,7 +1769,7 @@ static uint64_t omap_clkdsp_read(void *opaque, hwaddr addr,case 0x18 :/* DSP_SYSST */ cpu =CPU (s->cpu);return (s->clkm.clocking_scheme <<11 ) | s->clkm.cold_start | - (cpu->halted <<6 );/* Quite useless... */ + (cpu_halted (cpu) <<6 );/* Quite useless... */ }OMAP_BAD_REG (addr);
@@ -3790,7 +3790,7 @@ void omap_mpu_wakeup(void *opaque, int irq, int req)struct omap_mpu_state_s *mpu = (struct omap_mpu_state_s *) opaque;CPUState *cpu =CPU (mpu->cpu); -if (cpu->halted) { +if (cpu_halted (cpu)) {cpu_interrupt (cpu,CPU_INTERRUPT_EXITTB ); } }
hw/arm/pxa2xx_gpio.c +1 -1
@@ -128,7 +128,7 @@ static void pxa2xx_gpio_set(void *opaque, int line, int level)pxa2xx_gpio_irq_update (s);/* Wake-up GPIOs */ -if (cpu->halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) { +if (cpu_halted (cpu) && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) {cpu_interrupt (cpu,CPU_INTERRUPT_EXITTB ); } }
hw/arm/pxa2xx_pic.c +1 -1
@@ -58,7 +58,7 @@ static void pxa2xx_pic_update(void *opaque)PXA2xxPICState *s = (PXA2xxPICState *) opaque;CPUState *cpu =CPU (s->cpu); -if (cpu->halted) { +if (cpu_halted (cpu)) { mask[0 ] = s->int_pending[0 ] & (s->int_enabled[0 ] | s->int_idle); mask[1 ] = s->int_pending[1 ] & (s->int_enabled[1 ] | s->int_idle);if (mask[0 ] || mask[1 ]) {
target/arm/arm-powerctl.c +2 -2
@@ -64,7 +64,7 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state,/* Initialize the cpu we are turning on */ cpu_reset (target_cpu_state); - target_cpu_state->halted =0 ; +cpu_halted_set (target_cpu_state,0 ); if (info->target_aa64) { if ((info->target_el < 3) && arm_feature(&target_cpu->env,
@@ -228,7 +228,7 @@ static void arm_set_cpu_off_async_work(CPUState *target_cpu_state,assert (qemu_mutex_iothread_locked ()); target_cpu->power_state =PSCI_OFF ; - target_cpu_state->halted =1 ; +cpu_halted_set (target_cpu_state,1 ); target_cpu_state->exception_index =EXCP_HLT ; }
target/arm/cpu.c +1 -1
@@ -149,7 +149,7 @@ static void arm_cpu_reset(CPUState *s) env->vfp.xregs[ARM_VFP_MVFR2 ] = cpu->mvfr2; cpu->power_state = cpu->start_powered_off ?PSCI_OFF :PSCI_ON ; - s->halted = cpu->start_powered_off; +cpu_halted_set (s, cpu->start_powered_off);if (arm_feature (env,ARM_FEATURE_IWMMXT )) { env->iwmmxt.cregs[ARM_IWMMXT_wCID] =0x69051000 |'Q' ;
target/arm/op_helper.c +1 -1
@@ -465,7 +465,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) } cs->exception_index =EXCP_HLT ; - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_loop_exit (cs); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 16/71] arm: convert to cpu_halted
Quoted 5 lines · Emilio G. Cota
Cc Andrzej Zaborowski <[email protected]>Cc Peter Maydell <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 97 lines
--- hw/arm/omap1.c | 4 ++-- hw/arm/pxa2xx_gpio.c | 2 +- hw/arm/pxa2xx_pic.c | 2 +- target/arm/arm-powerctl.c | 4 ++-- target/arm/cpu.c | 2 +- target/arm/op_helper.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)hw/arm/omap1.c +2
-2@@ -1769,7 +1769,7 @@ static uint64_t omap_clkdsp_read(void *opaque, hwaddr addr,case 0x18 :/* DSP_SYSST */ cpu =CPU (s->cpu);return (s->clkm.clocking_scheme <<11 ) | s->clkm.cold_start | - (cpu->halted <<6 );/* Quite useless... */ + (cpu_halted (cpu) <<6 );/* Quite useless... */ }OMAP_BAD_REG (addr);@@ -3790,7 +3790,7 @@ void omap_mpu_wakeup(void *opaque, int irq, int req)struct omap_mpu_state_s *mpu = (struct omap_mpu_state_s *) opaque;CPUState *cpu =CPU (mpu->cpu); -if (cpu->halted) { +if (cpu_halted (cpu)) {cpu_interrupt (cpu,CPU_INTERRUPT_EXITTB ); } }hw/arm/pxa2xx_gpio.c +1
-1@@ -128,7 +128,7 @@ static void pxa2xx_gpio_set(void *opaque, int line, int level)pxa2xx_gpio_irq_update (s);/* Wake-up GPIOs */ -if (cpu->halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) { +if (cpu_halted (cpu) && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) {cpu_interrupt (cpu,CPU_INTERRUPT_EXITTB ); } }hw/arm/pxa2xx_pic.c +1
-1@@ -58,7 +58,7 @@ static void pxa2xx_pic_update(void *opaque)PXA2xxPICState *s = (PXA2xxPICState *) opaque;CPUState *cpu =CPU (s->cpu); -if (cpu->halted) { +if (cpu_halted (cpu)) { mask[0 ] = s->int_pending[0 ] & (s->int_enabled[0 ] | s->int_idle); mask[1 ] = s->int_pending[1 ] & (s->int_enabled[1 ] | s->int_idle);if (mask[0 ] || mask[1 ]) {target/arm/arm-powerctl.c +2
-2@@ -64,7 +64,7 @@ static void arm_set_cpu_on_async_work(CPUState *target_cpu_state,/* Initialize the cpu we are turning on */ cpu_reset (target_cpu_state); - target_cpu_state->halted =0 ; +cpu_halted_set (target_cpu_state,0 ); if (info->target_aa64) { if ((info->target_el < 3) && arm_feature(&target_cpu->env,@@ -228,7 +228,7 @@ static void arm_set_cpu_off_async_work(CPUState *target_cpu_state,assert (qemu_mutex_iothread_locked ()); target_cpu->power_state =PSCI_OFF ; - target_cpu_state->halted =1 ; +cpu_halted_set (target_cpu_state,1 ); target_cpu_state->exception_index =EXCP_HLT ; }target/arm/cpu.c +1
-1@@ -149,7 +149,7 @@ static void arm_cpu_reset(CPUState *s) env->vfp.xregs[ARM_VFP_MVFR2 ] = cpu->mvfr2; cpu->power_state = cpu->start_powered_off ?PSCI_OFF :PSCI_ON ; - s->halted = cpu->start_powered_off; +cpu_halted_set (s, cpu->start_powered_off);if (arm_feature (env,ARM_FEATURE_IWMMXT )) { env->iwmmxt.cregs[ARM_IWMMXT_wCID] =0x69051000 |'Q' ;target/arm/op_helper.c +0
-0
target/arm/op_helper.c void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) · line 470
Quoted 7 lines
target/arm/op_helper.c +1
-1@@ -465,7 +465,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len) } cs->exception_index =EXCP_HLT ; - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_loop_exit (cs); }
--
Alex Bennée
RFC v4 17/71 ppc: convert to cpu_halted
In reply to Emilio G. CotaIn ppce500_spin.c, acquire the lock just once to update both cpu->halted and cpu->stopped.
In hw/ppc/spapr_hcall.c, acquire the lock just once to update cpu->halted and call cpu_has_work, since later in the series we'll acquire the BQL (if not already held) from cpu_has_work.
--- target/ppc/helper_regs.h | 2 +- hw/ppc/e500.c | 4 ++-- hw/ppc/ppc.c | 10 +++++----- hw/ppc/ppce500_spin.c | 6 ++++-- hw/ppc/spapr_cpu_core.c | 4 ++-- hw/ppc/spapr_hcall.c | 4 +++- hw/ppc/spapr_rtas.c | 6 +++--- target/ppc/excp_helper.c | 4 ++-- target/ppc/kvm.c | 4 ++-- target/ppc/translate_init.inc.c | 6 +++--- 10 files changed, 27 insertions(+), 23 deletions(-)
target/ppc/helper_regs.h +1 -1
@@ -161,7 +161,7 @@ static inline int hreg_store_msr(CPUPPCState *env, target_ulong value,#if !defined(CONFIG_USER_ONLY )if (unlikely (msr_pow ==1 )) {if (!env->pending_interrupts && (*env->check_pow)(env)) { - cs->halted =1 ; +cpu_halted_set (cs,1 ); excp =EXCP_HALTED ; } }
hw/ppc/e500.c +2 -2
@@ -657,7 +657,7 @@ static void ppce500_cpu_reset_sec(void *opaque)/* Secondary CPU starts in halted state for now. Needs to change when implementing non-kernel boot. */ - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; }
@@ -671,7 +671,7 @@ static void ppce500_cpu_reset(void *opaque)cpu_reset (cs);/* Set initial guest state. */ - cs->halted =0 ; +cpu_halted_set (cs,0 ); env->gpr[1 ] = (16 * MiB) -8 ; env->gpr[3 ] = bi->dt_base; env->gpr[4 ] =0 ;
hw/ppc/ppc.c +5 -5
@@ -151,7 +151,7 @@ static void ppc6xx_set_irq(void *opaque, int pin, int level)/* XXX: Note that the only way to restart the CPU is to reset it */ if (level) {LOG_IRQ ("%s: stop the CPU\n" , __func__); - cs->halted =1 ; +cpu_halted_set (cs,1 ); }break ;case PPC6xx_INPUT_HRESET:
@@ -230,10 +230,10 @@ static void ppc970_set_irq(void *opaque, int pin, int level)/* XXX: TODO: relay the signal to CKSTP_OUT pin */ if (level) {LOG_IRQ ("%s: stop the CPU\n" , __func__); - cs->halted =1 ; +cpu_halted_set (cs,1 ); }else {LOG_IRQ ("%s: restart the CPU\n" , __func__); - cs->halted =0 ; +cpu_halted_set (cs,0 );qemu_cpu_kick (cs); }break ;
@@ -361,10 +361,10 @@ static void ppc40x_set_irq(void *opaque, int pin, int level)/* Level sensitive - active low */ if (level) {LOG_IRQ ("%s: stop the CPU\n" , __func__); - cs->halted =1 ; +cpu_halted_set (cs,1 ); }else {LOG_IRQ ("%s: restart the CPU\n" , __func__); - cs->halted =0 ; +cpu_halted_set (cs,0 );qemu_cpu_kick (cs); }break ;
hw/ppc/ppce500_spin.c +4 -2
@@ -107,9 +107,11 @@ static void spin_kick(CPUState *cs, run_on_cpu_data data) map_start =ldq_p (&curspin->addr) & ~(map_size -1 );mmubooke_create_initial_mapping (env,0 , map_start, map_size); - cs->halted =0 ; - cs->exception_index =-1 ; +cpu_mutex_lock (cs); +cpu_halted_set (cs,0 ); cs->stopped = false; +cpu_mutex_unlock (cs); + cs->exception_index =-1 ;qemu_cpu_kick (cs); }
hw/ppc/spapr_cpu_core.c +2 -2
@@ -37,7 +37,7 @@ static void spapr_cpu_reset(void *opaque)/* All CPUs start halted. CPU0 is unhalted from the machine level * reset code and the rest are explicitly started up by the guest * using an RTAS call */ - cs->halted =1 ; +cpu_halted_set (cs,1 );/* Set compatibility mode to match the boot CPU, which was either set * by the machine reset code or by CAS. This should never fail.
@@ -91,7 +91,7 @@ void spapr_cpu_set_entry_state(PowerPCCPU *cpu, target_ulong nip, target_ulong r env->nip = nip; env->gpr[3 ] = r3;kvmppc_set_reg_ppc_online (cpu,1 ); -CPU (cpu)->halted =0 ; +cpu_halted_set (CPU (cpu),0 );/* Enable Power-saving mode Exit Cause exceptions */ ppc_store_lpcr (cpu, env->spr[SPR_LPCR ] | pcc->lpcr_pm); }
hw/ppc/spapr_hcall.c +3 -1
@@ -1088,11 +1088,13 @@ static target_ulong h_cede(PowerPCCPU *cpu, sPAPRMachineState *spapr, env->msr |= (1ULL <<MSR_EE );hreg_compute_hflags (env); +cpu_mutex_lock (cs);if (!cpu_has_work (cs)) { - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; cs->exit_request =1 ; } +cpu_mutex_unlock (cs);return H_SUCCESS ; }
hw/ppc/spapr_rtas.c +3 -3
@@ -109,7 +109,7 @@ static void rtas_query_cpu_stopped_state(PowerPCCPU *cpu_, id =rtas_ld (args,0 ); cpu =spapr_find_cpu (id);if (cpu !=NULL ) { -if (CPU (cpu)->halted) { +if (cpu_halted (CPU (cpu))) {rtas_st (rets,1 ,0 ); }else {rtas_st (rets,1 ,2 );
@@ -153,7 +153,7 @@ static void rtas_start_cpu(PowerPCCPU *callcpu, sPAPRMachineState *spapr, env = &newcpu->env; pcc =POWERPC_CPU_GET_CLASS (newcpu); -if (!CPU (newcpu)->halted) { +if (!cpu_halted (CPU (newcpu))) {rtas_st (rets,0 ,RTAS_OUT_HW_ERROR );return ; }
@@ -207,7 +207,7 @@ static void rtas_stop_self(PowerPCCPU *cpu, sPAPRMachineState *spapr,* This could deliver an interrupt on a dying CPU and crash the * guest */ ppc_store_lpcr (cpu, env->spr[SPR_LPCR ] & ~pcc->lpcr_pm); - cs->halted =1 ; +cpu_halted_set (cs,1 );kvmppc_set_reg_ppc_online (cpu,0 );qemu_cpu_kick (cs); }
target/ppc/excp_helper.c +2 -2
@@ -206,7 +206,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu, int excp_model, int excp)qemu_log ("Machine check while not allowed. " "Entering checkstop state\n" ); } - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_interrupt_exittb (cs); }if (env->msr_mask &MSR_HVB ) {
@@ -954,7 +954,7 @@ void helper_pminsn(CPUPPCState *env, powerpc_pm_insn_t insn)CPUState *cs; cs =CPU (ppc_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 ); env->in_pm_state = true;/* The architecture specifies that HDEC interrupts are
target/ppc/kvm.c +2 -2
@@ -1368,7 +1368,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run)int kvm_arch_process_async_events (CPUState *cs) { -return cs->halted; +return cpu_halted (cs); }static int kvmppc_handle_halt (PowerPCCPU *cpu)
@@ -1377,7 +1377,7 @@ static int kvmppc_handle_halt(PowerPCCPU *cpu)CPUPPCState *env = &cpu->env;if (!(cs->interrupt_request &CPU_INTERRUPT_HARD ) && (msr_ee)) { - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; }
target/ppc/translate_init.inc.c +3 -3
@@ -8445,7 +8445,7 @@ static bool cpu_has_work_POWER7(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; -if (cs->halted) { +if (cpu_halted (cs)) {if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; }
@@ -8599,7 +8599,7 @@ static bool cpu_has_work_POWER8(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; -if (cs->halted) { +if (cpu_halted (cs)) {if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; }
@@ -8791,7 +8791,7 @@ static bool cpu_has_work_POWER9(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; -if (cs->halted) { +if (cpu_halted (cs)) {if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) {return false; }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 17/71] ppc: convert to cpu_halted
Quoted 8 lines · Emilio G. Cota
In
ppce500_spin.c, acquire the lock just once to update bothcpu->haltedandcpu->stopped.In
hw/ppc/spapr_hcall.c, acquire the lock just once to updatecpu->haltedand callcpu_has_work, since later in the series we'll acquire the BQL (if not already held) fromcpu_has_work.
Quoted 5 lines
Cc David Gibson <[email protected]>Cc Alexander Graf <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>---
r~
RFC v4 18/71 sh4: convert to cpu_halted
In reply to Emilio G. Cota--- target/sh4/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/sh4/op_helper.c +1 -1
@@ -105,7 +105,7 @@ void helper_sleep(CPUSH4State *env) {CPUState *cs =CPU (sh_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 ); env->in_sleep =1 ;raise_exception (env,EXCP_HLT ,0 ); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 18/71] sh4: convert to cpu_halted
Quoted 12 lines · Emilio G. Cota
Cc Aurelien Jarno <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/sh4/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/sh4/op_helper.c +0
-0
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 108
Quoted 5 lines
target/sh4/op_helper.c +1
-1@@ -105,7 +105,7 @@ void helper_sleep(CPUSH4State *env) {CPUState *cs =CPU (sh_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 );
Looks good:
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 109
Quoted 1 line
target/sh4/op_helper.c +0
-0env->in_sleep =1 ;
I wonder if you could drop env->in_sleep from CPUSH4State? The test in superh_cpu_do_interrupt:
if (do_irq && !env->in_sleep) {
return; /* masked */
}
}
env->in_sleep = 0;maybe be simplified is we cpu_set_halted(cs, 0) when servicing a delivered irq?
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 111
Quoted 2 lines
target/sh4/op_helper.c +0
-0raise_exception (env,EXCP_HLT ,0 ); }
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 18/71] sh4: convert to cpu_halted
Quoted 18 lines · Alex Bennée
Quoted 15 lines · Emilio G. Cota
Cc Aurelien Jarno <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/sh4/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/sh4/op_helper.c +0
-0@@ -105,7 +105,7 @@ void helper_sleep(CPUSH4State *env) {CPUState *cs =CPU (sh_env_get_cpu (env));
Quoted 6 lines
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 108
Quoted 2 lines
target/sh4/op_helper.c +1
-1- cs->halted =1 ; +cpu_halted_set (cs,1 );Looks good:
Reviewed-by Alex Bennée <[email protected]>
Thanks!
Quoted 5 lines
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 109
Quoted 1 line
target/sh4/op_helper.c +0
-0env->in_sleep =1 ;I wonder if you could drop
env->in_sleepfrom CPUSH4State? The test insuperh_cpu_do_interrupt:
Quoted 8 lines
if (do_irq && !env->in_sleep) { return; /* masked */ } } env->in_sleep = 0;maybe be simplified is we
cpu_set_halted(cs, 0)when servicing a delivered irq?
I don't know this target well, but on a quick look I'd worry about that change interfering with other (generic) setters of cpu->halted, e.g. cpu_common_reset, as well as the CPU loop where cpu->halted is read.
In any case I'd leave additional cleanups out of this series, which is already so long that git rebase is choking a bit every time I add an R-b tag :D
Thanks,
Emilio
Re: [Qemu-devel] [RFC v4 18/71] sh4: convert to cpu_halted
Quoted 42 lines · Emilio G. Cota
Quoted 18 lines · Alex Bennée
Quoted 15 lines · Emilio G. Cota
Cc Aurelien Jarno <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/sh4/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/sh4/op_helper.c +0
-0@@ -105,7 +105,7 @@ void helper_sleep(CPUSH4State *env) {CPUState *cs =CPU (sh_env_get_cpu (env));Quoted 6 lines
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 108
Quoted 2 lines
target/sh4/op_helper.c +1
-1- cs->halted =1 ; +cpu_halted_set (cs,1 );Looks good:
Reviewed-by Alex Bennée <[email protected]>Thanks!
Quoted 5 lines
target/sh4/op_helper.c void helper_sleep(CPUSH4State *env) · line 109
Quoted 1 line
target/sh4/op_helper.c +0
-0env->in_sleep =1 ;I wonder if you could drop
env->in_sleepfrom CPUSH4State? The test insuperh_cpu_do_interrupt:Quoted 8 lines
if (do_irq && !env->in_sleep) { return; /* masked */ } } env->in_sleep = 0;maybe be simplified is we
cpu_set_halted(cs, 0)when servicing a delivered irq?
Quoted 8 lines
I don't know this target well, but on a quick look I'd worry about that change interfering with other (generic) setters of
cpu->halted, e.g.cpu_common_reset, as well as the CPU loop wherecpu->haltedis read.In any case I'd leave additional cleanups out of this series, which is already so long that git rebase is choking a bit every time I add an R-b tag :D
No worries, it was more a general query thrown in the direction of the sh4 maintainers ;-)
--
Alex Bennée
RFC v4 19/71 i386: convert to cpu_halted
In reply to Emilio G. Cota--- target/i386/cpu.h | 2 +- target/i386/cpu.c | 2 +- target/i386/hax-all.c | 4 ++-- target/i386/helper.c | 4 ++-- target/i386/hvf/hvf.c | 8 ++++---- target/i386/hvf/x86hvf.c | 4 ++-- target/i386/kvm.c | 10 +++++----- target/i386/misc_helper.c | 2 +- target/i386/whpx-all.c | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-)
target/i386/cpu.h +1 -1
@@ -1600,7 +1600,7 @@ static inline void cpu_x86_load_seg_cache_sipi(X86CPU *cpu, sipi_vector <<12 , env->segs[R_CS ].limit, env->segs[R_CS].flags); - cs->halted =0 ; +cpu_halted_set (cs,0 ); } int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,
target/i386/cpu.c +1 -1
@@ -4524,7 +4524,7 @@ static void x86_cpu_reset(CPUState *s)/* We hard-wire the BSP to the first CPU. */ apic_designate_bsp (cpu->apic_state, s->cpu_index ==0 ); - s->halted = !cpu_is_bsp (cpu); +cpu_halted_set (s, !cpu_is_bsp (cpu));if (kvm_enabled ()) {kvm_arch_reset_vcpu (cpu);
target/i386/hax-all.c +2 -2
@@ -480,7 +480,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)return 0 ; } - cpu->halted =0 ; +cpu_halted_set (cpu,0 );if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ;
@@ -557,7 +557,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env) !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) {/* hlt instruction with interrupt disabled is shutdown */ env->eflags |=IF_MASK ; - cpu->halted =1 ; +cpu_halted_set (cpu,1 ); cpu->exception_index =EXCP_HLT ; ret =1 ; }
target/i386/helper.c +2 -2
@@ -454,7 +454,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, (env->hflags >>HF_INHIBIT_IRQ_SHIFT ) &1 , (env->a20_mask >>20 ) &1 , (env->hflags >>HF_SMM_SHIFT ) &1 , - cs->halted); + cpu_halted(cs)); } else#endif {
@@ -481,7 +481,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, (env->hflags >>HF_INHIBIT_IRQ_SHIFT ) &1 , (env->a20_mask >>20 ) &1 , (env->hflags >>HF_SMM_SHIFT ) &1 , - cs->halted); + cpu_halted(cs)); }for (i =0 ; i <6 ; i++) {
target/i386/hvf/hvf.c +4 -4
@@ -500,7 +500,7 @@ void hvf_reset_vcpu(CPUState *cpu) { }hv_vm_sync_tsc (0 ); - cpu->halted =0 ; +cpu_halted_set (cpu,0 );hv_vcpu_invalidate_tlb (cpu->hvf_fd);hv_vcpu_flush (cpu->hvf_fd); }
@@ -665,7 +665,7 @@ int hvf_vcpu_exec(CPUState *cpu)int ret =0 ;uint64_t rip =0 ; - cpu->halted =0 ; +cpu_halted_set (cpu,0 );if (hvf_process_events (cpu)) {return EXCP_HLT ;
@@ -683,7 +683,7 @@ int hvf_vcpu_exec(CPUState *cpu)vmx_update_tpr (cpu);qemu_mutex_unlock_iothread (); -if (!cpu_is_bsp (X86_CPU (cpu)) && cpu->halted) { +if (!cpu_is_bsp (X86_CPU (cpu)) &&cpu_halted (cpu)) {qemu_mutex_lock_iothread ();return EXCP_HLT ; }
@@ -717,7 +717,7 @@ int hvf_vcpu_exec(CPUState *cpu) (EFLAGS(env) & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI) && !(idtvec_info & VMCS_IDT_VEC_VALID)) { - cpu->halted =1 ; +cpu_halted_set (cpu,1 ); ret =EXCP_HLT ; } ret =EXCP_INTERRUPT ;
target/i386/hvf/x86hvf.c +2 -2
@@ -446,7 +446,7 @@ int hvf_process_events(CPUState *cpu_state)if (((cpu_state->interrupt_request &CPU_INTERRUPT_HARD ) && (EFLAGS (env) &IF_MASK )) || (cpu_state->interrupt_request &CPU_INTERRUPT_NMI )) { - cpu_state->halted =0 ; +cpu_halted_set (cpu_state,0 ); }if (cpu_state->interrupt_request &CPU_INTERRUPT_SIPI ) {hvf_cpu_synchronize_state (cpu_state);
@@ -458,5 +458,5 @@ int hvf_process_events(CPUState *cpu_state)apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type); } -return cpu_state->halted; +return cpu_halted (cpu); }
target/i386/kvm.c +5 -5
@@ -2650,7 +2650,7 @@ static int kvm_get_mp_state(X86CPU *cpu) } env->mp_state = mp_state.mp_state;if (kvm_irqchip_in_kernel ()) { - cs->halted = (mp_state.mp_state ==KVM_MP_STATE_HALTED ); +cpu_halted_set (cs, mp_state.mp_state ==KVM_MP_STATE_HALTED ); }return 0 ; }
@@ -3136,7 +3136,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->exception_injected =EXCP12_MCHK ; env->has_error_code =0 ; - cs->halted =0 ; +cpu_halted_set (cs,0 );if (kvm_irqchip_in_kernel () && env->mp_state ==KVM_MP_STATE_HALTED ) { env->mp_state =KVM_MP_STATE_RUNNABLE ; }
@@ -3159,7 +3159,7 @@ int kvm_arch_process_async_events(CPUState *cs)if (((cs->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || (cs->interrupt_request &CPU_INTERRUPT_NMI )) { - cs->halted =0 ; +cpu_halted_set (cs,0 ); }if (cs->interrupt_request &CPU_INTERRUPT_SIPI ) {kvm_cpu_synchronize_state (cs);
@@ -3172,7 +3172,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->tpr_access_type); } -return cs->halted; +return cpu_halted (cs); }static int kvm_handle_halt (X86CPU *cpu)
@@ -3183,7 +3183,7 @@ static int kvm_handle_halt(X86CPU *cpu)if (!((cs->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) && !(cs->interrupt_request &CPU_INTERRUPT_NMI )) { - cs->halted =1 ; +cpu_halted_set (cs,1 );return EXCP_HLT ; }
target/i386/misc_helper.c +1 -1
@@ -554,7 +554,7 @@ static void do_hlt(X86CPU *cpu)CPUX86State *env = &cpu->env; env->hflags &= ~HF_INHIBIT_IRQ_MASK ;/* needed if sti is just before */ - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs); }
target/i386/whpx-all.c +3 -3
@@ -697,7 +697,7 @@ static int whpx_handle_halt(CPUState *cpu) (env->eflags & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { cpu->exception_index =EXCP_HLT ; - cpu->halted = true; +cpu_halted_set (cpu, true); ret =1 ; }qemu_mutex_unlock_iothread ();
@@ -857,7 +857,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu)if (((cpu->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || (cpu->interrupt_request &CPU_INTERRUPT_NMI )) { - cpu->halted = false; +cpu_halted_set (cpu, false); }if (cpu->interrupt_request &CPU_INTERRUPT_SIPI ) {
@@ -887,7 +887,7 @@ static int whpx_vcpu_run(CPUState *cpu)int ret;whpx_vcpu_process_async_events (cpu); -if (cpu->halted) { +if (cpu_halted (cpu)) { cpu->exception_index =EXCP_HLT ;atomic_set (&cpu->exit_request, false);return 0 ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 19/71] i386: convert to cpu_halted
Quoted 3 lines · Emilio G. Cota
Cc Eduardo Habkost <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 227 lines
--- target/i386/cpu.h | 2 +- target/i386/cpu.c | 2 +- target/i386/hax-all.c | 4 ++-- target/i386/helper.c | 4 ++-- target/i386/hvf/hvf.c | 8 ++++---- target/i386/hvf/x86hvf.c | 4 ++-- target/i386/kvm.c | 10 +++++----- target/i386/misc_helper.c | 2 +- target/i386/whpx-all.c | 6 +++--- 9 files changed, 21 insertions(+), 21 deletions(-)target/i386/cpu.h +1
-1@@ -1600,7 +1600,7 @@ static inline void cpu_x86_load_seg_cache_sipi(X86CPU *cpu, sipi_vector <<12 , env->segs[R_CS ].limit, env->segs[R_CS].flags); - cs->halted =0 ; +cpu_halted_set (cs,0 ); } int cpu_x86_get_descr_debug(CPUX86State *env, unsigned int selector,target/i386/cpu.c +1
-1@@ -4524,7 +4524,7 @@ static void x86_cpu_reset(CPUState *s)/* We hard-wire the BSP to the first CPU. */ apic_designate_bsp (cpu->apic_state, s->cpu_index ==0 ); - s->halted = !cpu_is_bsp (cpu); +cpu_halted_set (s, !cpu_is_bsp (cpu));if (kvm_enabled ()) {kvm_arch_reset_vcpu (cpu);target/i386/hax-all.c +2
-2@@ -480,7 +480,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)return 0 ; } - cpu->halted =0 ; +cpu_halted_set (cpu,0 );if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ;@@ -557,7 +557,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env) !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) {/* hlt instruction with interrupt disabled is shutdown */ env->eflags |=IF_MASK ; - cpu->halted =1 ; +cpu_halted_set (cpu,1 ); cpu->exception_index =EXCP_HLT ; ret =1 ; }target/i386/helper.c +2
-2@@ -454,7 +454,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, (env->hflags >>HF_INHIBIT_IRQ_SHIFT ) &1 , (env->a20_mask >>20 ) &1 , (env->hflags >>HF_SMM_SHIFT ) &1 , - cs->halted); + cpu_halted(cs)); } else#endif {@@ -481,7 +481,7 @@ void x86_cpu_dump_state(CPUState *cs, FILE *f, fprintf_function cpu_fprintf, (env->hflags >>HF_INHIBIT_IRQ_SHIFT ) &1 , (env->a20_mask >>20 ) &1 , (env->hflags >>HF_SMM_SHIFT ) &1 , - cs->halted); + cpu_halted(cs)); }for (i =0 ; i <6 ; i++) {target/i386/hvf/hvf.c +4
-4@@ -500,7 +500,7 @@ void hvf_reset_vcpu(CPUState *cpu) { }hv_vm_sync_tsc (0 ); - cpu->halted =0 ; +cpu_halted_set (cpu,0 );hv_vcpu_invalidate_tlb (cpu->hvf_fd);hv_vcpu_flush (cpu->hvf_fd); }@@ -665,7 +665,7 @@ int hvf_vcpu_exec(CPUState *cpu)int ret =0 ;uint64_t rip =0 ; - cpu->halted =0 ; +cpu_halted_set (cpu,0 );if (hvf_process_events (cpu)) {return EXCP_HLT ;@@ -683,7 +683,7 @@ int hvf_vcpu_exec(CPUState *cpu)vmx_update_tpr (cpu);qemu_mutex_unlock_iothread (); -if (!cpu_is_bsp (X86_CPU (cpu)) && cpu->halted) { +if (!cpu_is_bsp (X86_CPU (cpu)) &&cpu_halted (cpu)) {qemu_mutex_lock_iothread ();return EXCP_HLT ; }@@ -717,7 +717,7 @@ int hvf_vcpu_exec(CPUState *cpu) (EFLAGS(env) & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI) && !(idtvec_info & VMCS_IDT_VEC_VALID)) { - cpu->halted =1 ; +cpu_halted_set (cpu,1 ); ret =EXCP_HLT ; } ret =EXCP_INTERRUPT ;target/i386/hvf/x86hvf.c +2
-2@@ -446,7 +446,7 @@ int hvf_process_events(CPUState *cpu_state)if (((cpu_state->interrupt_request &CPU_INTERRUPT_HARD ) && (EFLAGS (env) &IF_MASK )) || (cpu_state->interrupt_request &CPU_INTERRUPT_NMI )) { - cpu_state->halted =0 ; +cpu_halted_set (cpu_state,0 ); }if (cpu_state->interrupt_request &CPU_INTERRUPT_SIPI ) {hvf_cpu_synchronize_state (cpu_state);@@ -458,5 +458,5 @@ int hvf_process_events(CPUState *cpu_state)apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type); } -return cpu_state->halted; +return cpu_halted (cpu); }target/i386/kvm.c +5
-5@@ -2650,7 +2650,7 @@ static int kvm_get_mp_state(X86CPU *cpu) } env->mp_state = mp_state.mp_state;if (kvm_irqchip_in_kernel ()) { - cs->halted = (mp_state.mp_state ==KVM_MP_STATE_HALTED ); +cpu_halted_set (cs, mp_state.mp_state ==KVM_MP_STATE_HALTED ); }return 0 ; }@@ -3136,7 +3136,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->exception_injected =EXCP12_MCHK ; env->has_error_code =0 ; - cs->halted =0 ; +cpu_halted_set (cs,0 );if (kvm_irqchip_in_kernel () && env->mp_state ==KVM_MP_STATE_HALTED ) { env->mp_state =KVM_MP_STATE_RUNNABLE ; }@@ -3159,7 +3159,7 @@ int kvm_arch_process_async_events(CPUState *cs)if (((cs->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || (cs->interrupt_request &CPU_INTERRUPT_NMI )) { - cs->halted =0 ; +cpu_halted_set (cs,0 ); }if (cs->interrupt_request &CPU_INTERRUPT_SIPI ) {kvm_cpu_synchronize_state (cs);@@ -3172,7 +3172,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->tpr_access_type); } -return cs->halted; +return cpu_halted (cs); }static int kvm_handle_halt (X86CPU *cpu)@@ -3183,7 +3183,7 @@ static int kvm_handle_halt(X86CPU *cpu)if (!((cs->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) && !(cs->interrupt_request &CPU_INTERRUPT_NMI )) { - cs->halted =1 ; +cpu_halted_set (cs,1 );return EXCP_HLT ; }target/i386/misc_helper.c +1
-1@@ -554,7 +554,7 @@ static void do_hlt(X86CPU *cpu)CPUX86State *env = &cpu->env; env->hflags &= ~HF_INHIBIT_IRQ_MASK ;/* needed if sti is just before */ - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs); }target/i386/whpx-all.c +2
-2@@ -697,7 +697,7 @@ static int whpx_handle_halt(CPUState *cpu) (env->eflags & IF_MASK)) && !(cpu->interrupt_request & CPU_INTERRUPT_NMI)) { cpu->exception_index =EXCP_HLT ; - cpu->halted = true; +cpu_halted_set (cpu, true); ret =1 ; }qemu_mutex_unlock_iothread ();@@ -857,7 +857,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu)if (((cpu->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || (cpu->interrupt_request &CPU_INTERRUPT_NMI )) { - cpu->halted = false; +cpu_halted_set (cpu, false); }if (cpu->interrupt_request &CPU_INTERRUPT_SIPI ) {
target/i386/whpx-all.c static int whpx_vcpu_run(CPUState *cpu) · line 893
Quoted 8 lines
target/i386/whpx-all.c +1
-1@@ -887,7 +887,7 @@ static int whpx_vcpu_run(CPUState *cpu)int ret;whpx_vcpu_process_async_events (cpu); -if (cpu->halted) { +if (cpu_halted (cpu)) { cpu->exception_index =EXCP_HLT ;atomic_set (&cpu->exit_request, false);return 0 ;
--
Alex Bennée
RFC v4 20/71 lm32: convert to cpu_halted
In reply to Emilio G. Cota--- target/lm32/op_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
target/lm32/op_helper.c +2 -2
@@ -31,7 +31,7 @@ void HELPER(hlt)(CPULM32State *env) {CPUState *cs =CPU (lm32_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs); }
@@ -44,7 +44,7 @@ void HELPER(ill)(CPULM32State *env)"Connect a debugger or switch to the monitor console " "to find out more.\n");vm_stop (RUN_STATE_PAUSED ); - cs->halted =1 ; +cpu_halted_set (cs,1 );raise_exception (env,EXCP_HALTED );#endif }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 20/71] lm32: convert to cpu_halted
Quoted 3 lines · Emilio G. Cota
Cc Michael Walle <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 18 lines
--- target/lm32/op_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)target/lm32/op_helper.c +1
-1@@ -31,7 +31,7 @@ void HELPER(hlt)(CPULM32State *env) {CPUState *cs =CPU (lm32_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs); }
target/lm32/op_helper.c void HELPER(ill)(CPULM32State *env) · line 50
Quoted 8 lines
target/lm32/op_helper.c +1
-1@@ -44,7 +44,7 @@ void HELPER(ill)(CPULM32State *env)"Connect a debugger or switch to the monitor console " "to find out more.\n");vm_stop (RUN_STATE_PAUSED ); - cs->halted =1 ; +cpu_halted_set (cs,1 );raise_exception (env,EXCP_HALTED );#endif }
--
Alex Bennée
RFC v4 21/71 m68k: convert to cpu_halted
In reply to Emilio G. Cota--- target/m68k/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/m68k/op_helper.c +1 -1
@@ -237,7 +237,7 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)do_m68k_semihosting (env, env->dregs[0 ]);return ; } - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs);return ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 21/71] m68k: convert to cpu_halted
Quoted 6 lines · Emilio G. Cota
Cc Laurent Vivier <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/m68k/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [Qemu-devel] [RFC v4 21/71] m68k: convert to cpu_halted
In reply to Emilio G. CotaQuoted 3 lines · Emilio G. Cota
Cc Laurent Vivier <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/m68k/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/m68k/op_helper.c +0
-0
target/m68k/op_helper.c static void cf_interrupt_all(CPUM68KState *env, int is_hw) · line 243
Quoted 8 lines
target/m68k/op_helper.c +1
-1@@ -237,7 +237,7 @@ static void cf_interrupt_all(CPUM68KState *env, int is_hw)do_m68k_semihosting (env, env->dregs[0 ]);return ; } - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs);return ;
--
Alex Bennée
RFC v4 22/71 mips: convert to cpu_halted
In reply to Emilio G. Cota--- hw/mips/cps.c | 2 +- hw/misc/mips_itu.c | 4 ++-- target/mips/kvm.c | 2 +- target/mips/op_helper.c | 8 ++++---- target/mips/translate.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)
hw/mips/cps.c +1 -1
@@ -49,7 +49,7 @@ static void main_cpu_reset(void *opaque)cpu_reset (cs);/* All VPs are halted on reset. Leave powering up to CPC. */ - cs->halted =1 ; +cpu_halted_set (cs,1 ); }static bool cpu_mips_itu_supported (CPUMIPSState *env)
hw/misc/mips_itu.c +2 -2
@@ -162,7 +162,7 @@ static void wake_blocked_threads(ITCStorageCell *c) {CPUState *cs;CPU_FOREACH (cs) { -if (cs->halted && (c->blocked_threads & (1ULL << cs->cpu_index))) { +if (cpu_halted (cs) && (c->blocked_threads & (1ULL << cs->cpu_index))) {cpu_interrupt (cs,CPU_INTERRUPT_WAKE ); } }
@@ -172,7 +172,7 @@ static void wake_blocked_threads(ITCStorageCell *c) static void QEMU_NORETURN block_thread_and_exit(ITCStorageCell *c) { c->blocked_threads |=1ULL << current_cpu->cpu_index; - current_cpu->halted =1 ; +cpu_halted_set (current_cpu,1 ); current_cpu->exception_index =EXCP_HLT ;cpu_loop_exit_restore (current_cpu, current_cpu->mem_io_pc); }
target/mips/kvm.c +1 -1
@@ -156,7 +156,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run)int kvm_arch_process_async_events (CPUState *cs) { -return cs->halted; +return cpu_halted (cs); }int kvm_arch_handle_exit (CPUState *cs,struct kvm_run *run)
target/mips/op_helper.c +4 -4
@@ -649,7 +649,7 @@ static bool mips_vpe_is_wfi(MIPSCPU *c)/* If the VPE is halted but otherwise active, it means it's waiting for an interrupt. */ -return cpu->halted &&mips_vpe_active (env); +return cpu_halted (cpu) &&mips_vpe_active (env); }static bool mips_vp_is_wfi (MIPSCPU *c)
@@ -657,7 +657,7 @@ static bool mips_vp_is_wfi(MIPSCPU *c)CPUState *cpu =CPU (c);CPUMIPSState *env = &c->env; -return cpu->halted &&mips_vp_active (env); +return cpu_halted (cpu) &&mips_vp_active (env); }static inline void mips_vpe_wake (MIPSCPU *c)
@@ -674,7 +674,7 @@ static inline void mips_vpe_sleep(MIPSCPU *cpu)/* The VPE was shut off, really go to bed. Reset any old _WAKE requests. */ - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_reset_interrupt (cs,CPU_INTERRUPT_WAKE ); }
@@ -2519,7 +2519,7 @@ void helper_wait(CPUMIPSState *env) {CPUState *cs =CPU (mips_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_reset_interrupt (cs,CPU_INTERRUPT_WAKE );/* Last instruction in the block, PC was updated before - no need to recover PC and icount */
target/mips/translate.c +2 -2
@@ -25753,7 +25753,7 @@ void cpu_state_reset(CPUMIPSState *env) env->tcs[i].CP0_TCHalt =1 ; } env->active_tc.CP0_TCHalt =1 ; - cs->halted =1 ; +cpu_halted_set (cs,1 );if (cs->cpu_index ==0 ) {/* VPE0 starts up enabled. */
@@ -25761,7 +25761,7 @@ void cpu_state_reset(CPUMIPSState *env) env->CP0_VPEConf0 |= (1 <<CP0VPEC0_MVP ) | (1 <<CP0VPEC0_VPA );/* TC0 starts up unhalted. */ - cs->halted =0 ; +cpu_halted_set (cs,0 ); env->active_tc.CP0_TCHalt =0 ; env->tcs[0 ].CP0_TCHalt =0 ;/* With thread 0 active. */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 22/71] mips: convert to cpu_halted
Quoted 5 lines · Emilio G. Cota
Cc Aurelien Jarno <[email protected]>Cc Aleksandar Markovic <[email protected]>Cc James Hogan <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 110 lines
--- hw/mips/cps.c | 2 +- hw/misc/mips_itu.c | 4 ++-- target/mips/kvm.c | 2 +- target/mips/op_helper.c | 8 ++++---- target/mips/translate.c | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-)hw/mips/cps.c +1
-1@@ -49,7 +49,7 @@ static void main_cpu_reset(void *opaque)cpu_reset (cs);/* All VPs are halted on reset. Leave powering up to CPC. */ - cs->halted =1 ; +cpu_halted_set (cs,1 ); }static bool cpu_mips_itu_supported (CPUMIPSState *env)hw/misc/mips_itu.c +2
-2@@ -162,7 +162,7 @@ static void wake_blocked_threads(ITCStorageCell *c) {CPUState *cs;CPU_FOREACH (cs) { -if (cs->halted && (c->blocked_threads & (1ULL << cs->cpu_index))) { +if (cpu_halted (cs) && (c->blocked_threads & (1ULL << cs->cpu_index))) {cpu_interrupt (cs,CPU_INTERRUPT_WAKE ); } }@@ -172,7 +172,7 @@ static void wake_blocked_threads(ITCStorageCell *c) static void QEMU_NORETURN block_thread_and_exit(ITCStorageCell *c) { c->blocked_threads |=1ULL << current_cpu->cpu_index; - current_cpu->halted =1 ; +cpu_halted_set (current_cpu,1 ); current_cpu->exception_index =EXCP_HLT ;cpu_loop_exit_restore (current_cpu, current_cpu->mem_io_pc); }target/mips/kvm.c +1
-1@@ -156,7 +156,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run)int kvm_arch_process_async_events (CPUState *cs) { -return cs->halted; +return cpu_halted (cs); }int kvm_arch_handle_exit (CPUState *cs,struct kvm_run *run)target/mips/op_helper.c +4
-4@@ -649,7 +649,7 @@ static bool mips_vpe_is_wfi(MIPSCPU *c)/* If the VPE is halted but otherwise active, it means it's waiting for an interrupt. */ -return cpu->halted &&mips_vpe_active (env); +return cpu_halted (cpu) &&mips_vpe_active (env); }static bool mips_vp_is_wfi (MIPSCPU *c)@@ -657,7 +657,7 @@ static bool mips_vp_is_wfi(MIPSCPU *c)CPUState *cpu =CPU (c);CPUMIPSState *env = &c->env; -return cpu->halted &&mips_vp_active (env); +return cpu_halted (cpu) &&mips_vp_active (env); }static inline void mips_vpe_wake (MIPSCPU *c)@@ -674,7 +674,7 @@ static inline void mips_vpe_sleep(MIPSCPU *cpu)/* The VPE was shut off, really go to bed. Reset any old _WAKE requests. */ - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_reset_interrupt (cs,CPU_INTERRUPT_WAKE ); }@@ -2519,7 +2519,7 @@ void helper_wait(CPUMIPSState *env) {CPUState *cs =CPU (mips_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 );cpu_reset_interrupt (cs,CPU_INTERRUPT_WAKE );/* Last instruction in the block, PC was updated before - no need to recover PC and icount */ target/mips/translate.c +1
-1@@ -25753,7 +25753,7 @@ void cpu_state_reset(CPUMIPSState *env) env->tcs[i].CP0_TCHalt =1 ; } env->active_tc.CP0_TCHalt =1 ; - cs->halted =1 ; +cpu_halted_set (cs,1 );if (cs->cpu_index ==0 ) {/* VPE0 starts up enabled. */
target/mips/translate.c void cpu_state_reset(CPUMIPSState *env) · line 25767
Quoted 8 lines
target/mips/translate.c +1
-1@@ -25761,7 +25761,7 @@ void cpu_state_reset(CPUMIPSState *env) env->CP0_VPEConf0 |= (1 <<CP0VPEC0_MVP ) | (1 <<CP0VPEC0_VPA );/* TC0 starts up unhalted. */ - cs->halted =0 ; +cpu_halted_set (cs,0 ); env->active_tc.CP0_TCHalt =0 ; env->tcs[0 ].CP0_TCHalt =0 ;/* With thread 0 active. */
--
Alex Bennée
RFC v4 23/71 riscv: convert to cpu_halted
In reply to Emilio G. Cota--- target/riscv/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/op_helper.c +1 -1
@@ -736,7 +736,7 @@ void helper_wfi(CPURISCVState *env) {CPUState *cs =CPU (riscv_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;cpu_loop_exit (cs); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 23/71] riscv: convert to cpu_halted
Quoted 10 lines · Emilio G. Cota
Cc Michael Clark <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Sagar Karandikar <[email protected]>Cc Bastian Koppelmann <[email protected]>Cc Alistair Francis <[email protected]>Reviewed-by Palmer Dabbelt <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/riscv/op_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
r~
RFC v4 24/71 s390x: convert to cpu_halted
In reply to Emilio G. Cota--- hw/intc/s390_flic.c | 2 +- target/s390x/cpu.c | 18 +++++++++++------- target/s390x/excp_helper.c | 2 +- target/s390x/kvm.c | 2 +- target/s390x/sigp.c | 8 ++++---- 5 files changed, 18 insertions(+), 14 deletions(-)
hw/intc/s390_flic.c +1 -1
@@ -198,7 +198,7 @@ static void qemu_s390_flic_notify(uint32_t type) }/* we always kick running CPUs for now, this is tricky */ -if (cs->halted) { +if (cpu_halted (cs)) {/* don't check for subclasses, CPUs double check when waking up */ if (type &FLIC_PENDING_SERVICE ) {if (!(cpu->env.psw.mask &PSW_MASK_EXT )) {
target/s390x/cpu.c +11 -7
@@ -288,7 +288,7 @@ static void s390_cpu_initfn(Object *obj)CPUS390XState *env = &cpu->env; cs->env_ptr = env; - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ;object_property_add (obj,"crash-information" ,"GuestPanicInformation" , s390_cpu_get_crash_info_qom,NULL ,NULL ,NULL ,NULL );
@@ -313,8 +313,8 @@ static void s390_cpu_finalize(Object *obj)#if !defined(CONFIG_USER_ONLY )static bool disabled_wait (CPUState *cpu) { -return cpu->halted && !(S390_CPU (cpu)->env.psw.mask & - (PSW_MASK_IO |PSW_MASK_EXT |PSW_MASK_MCHECK )); +return cpu_halted (cpu) && !(S390_CPU (cpu)->env.psw.mask & + (PSW_MASK_IO |PSW_MASK_EXT |PSW_MASK_MCHECK )); }static unsigned s390_count_running_cpus (void )
@@ -340,10 +340,12 @@ unsigned int s390_cpu_halt(S390CPU *cpu)CPUState *cs =CPU (cpu);trace_cpu_halt (cs->cpu_index); -if (!cs->halted) { - cs->halted =1 ; +cpu_mutex_lock (cs); +if (!cpu_halted (cs)) { +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; } +cpu_mutex_unlock (cs);return s390_count_running_cpus (); }
@@ -353,10 +355,12 @@ void s390_cpu_unhalt(S390CPU *cpu)CPUState *cs =CPU (cpu);trace_cpu_unhalt (cs->cpu_index); -if (cs->halted) { - cs->halted =0 ; +cpu_mutex_lock (cs); +if (cpu_halted (cs)) { +cpu_halted_set (cs,0 ); cs->exception_index =-1 ; } +cpu_mutex_unlock (cs); }unsigned int s390_cpu_set_state (uint8_t cpu_state,S390CPU *cpu)
target/s390x/excp_helper.c +1 -1
@@ -461,7 +461,7 @@ try_deliver:if ((env->psw.mask &PSW_MASK_WAIT ) || stopped) {/* don't trigger a cpu_loop_exit(), use an interrupt instead */ cpu_interrupt (CPU (cpu),CPU_INTERRUPT_HALT ); - }else if (cs->halted) { + }else if (cpu_halted (cs)) {/* unhalt if we had a WAIT PSW somehwere in our injection chain */ s390_cpu_unhalt (cpu); }
target/s390x/kvm.c +1 -1
@@ -1005,7 +1005,7 @@ MemTxAttrs kvm_arch_post_run(CPUState *cs, struct kvm_run *run)int kvm_arch_process_async_events (CPUState *cs) { -return cs->halted; +return cpu_halted (cs); } static int s390_kvm_irq_to_interrupt(struct kvm_s390_irq *irq,
target/s390x/sigp.c +4 -4
@@ -115,7 +115,7 @@ static void sigp_stop(CPUState *cs, run_on_cpu_data arg) }/* disabled wait - sleeping in user space */ -if (cs->halted) { +if (cpu_halted (cs)) {s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); }else {/* execute the stop function */
@@ -131,7 +131,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;/* disabled wait - sleeping in user space */ -if (s390_cpu_get_state (cpu) ==S390_CPU_STATE_OPERATING && cs->halted) { +if (s390_cpu_get_state (cpu) ==S390_CPU_STATE_OPERATING &&cpu_halted (cs)) {s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); }
@@ -313,7 +313,7 @@ static void sigp_cond_emergency(S390CPU *src_cpu, S390CPU *dst_cpu, }/* this looks racy, but these values are only used when STOPPED */ - idle =CPU (dst_cpu)->halted; + idle =cpu_halted (CPU (dst_cpu)); psw_addr = dst_cpu->env.psw.addr; psw_mask = dst_cpu->env.psw.mask; asn = si->param;
@@ -347,7 +347,7 @@ static void sigp_sense_running(S390CPU *dst_cpu, SigpInfo *si) }/* If halted (which includes also STOPPED), it is not running */ -if (CPU (dst_cpu)->halted) { +if (cpu_halted (CPU (dst_cpu))) { si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }else {set_sigp_status (si,SIGP_STAT_NOT_RUNNING );
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 24/71] s390x: convert to cpu_halted
Quoted 8 lines · Emilio G. Cota
Cc Cornelia Huck <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Alexander Graf <[email protected]>Cc David Hildenbrand <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>---
<snip>
Quoted 19 lines
static unsigned
s390_count_running_cpus(void)target/s390x/cpu.c +4
-2@@ -340,10 +340,12 @@ unsigned int s390_cpu_halt(S390CPU *cpu)CPUState *cs =CPU (cpu);trace_cpu_halt (cs->cpu_index); -if (!cs->halted) { - cs->halted =1 ; +cpu_mutex_lock (cs); +if (!cpu_halted (cs)) { +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; } +cpu_mutex_unlock (cs);return s390_count_running_cpus (); }@@ -353,10 +355,12 @@ void s390_cpu_unhalt(S390CPU *cpu)CPUState *cs =CPU (cpu);
target/s390x/cpu.c void s390_cpu_unhalt(S390CPU *cpu) · line 363
Quoted 10 lines
target/s390x/cpu.c +4
-2trace_cpu_unhalt (cs->cpu_index); -if (cs->halted) { - cs->halted =0 ; +cpu_mutex_lock (cs); +if (cpu_halted (cs)) { +cpu_halted_set (cs,0 ); cs->exception_index =-1 ; } +cpu_mutex_unlock (cs);
I think this locking is superfluous as you already added locking when you introduced the helper.
<snip>
Otherwise:
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 24/71] s390x: convert to cpu_halted
Quoted 4 lines · Alex Bennée
Quoted 4 lines
target/s390x/cpu.c +0
-0@@ -353,10 +355,12 @@ void s390_cpu_unhalt(S390CPU *cpu)CPUState *cs =CPU (cpu);trace_cpu_unhalt (cs->cpu_index);
Quoted 11 lines
target/s390x/cpu.c void s390_cpu_unhalt(S390CPU *cpu) · line 363
Quoted 8 lines
target/s390x/cpu.c +4
-2-if (cs->halted) { - cs->halted =0 ; +cpu_mutex_lock (cs); +if (cpu_halted (cs)) { +cpu_halted_set (cs,0 ); cs->exception_index =-1 ; } +cpu_mutex_unlock (cs);I think this locking is superfluous as you already added locking when you introduced the helper.
It gives a small perf gain, since it avoids locking & unlocking twice in a row (cpu_halted and cpu_halted_set both take the lock if needed).
Quoted 3 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>
Thanks!
Emilio
Re: [Qemu-devel] [RFC v4 24/71] s390x: convert to cpu_halted
Quoted 17 lines · Emilio G. Cota
Quoted 4 lines · Alex Bennée
Quoted 4 lines
target/s390x/cpu.c +0
-0@@ -353,10 +355,12 @@ void s390_cpu_unhalt(S390CPU *cpu)CPUState *cs =CPU (cpu);trace_cpu_unhalt (cs->cpu_index);Quoted 11 lines
target/s390x/cpu.c void s390_cpu_unhalt(S390CPU *cpu) · line 363
Quoted 8 lines
target/s390x/cpu.c +4
-2-if (cs->halted) { - cs->halted =0 ; +cpu_mutex_lock (cs); +if (cpu_halted (cs)) { +cpu_halted_set (cs,0 ); cs->exception_index =-1 ; } +cpu_mutex_unlock (cs);I think this locking is superfluous as you already added locking when you introduced the helper.
Quoted 2 lines
It gives a small perf gain, since it avoids locking & unlocking twice in a row (
cpu_haltedandcpu_halted_setboth take the lock if needed).
Maybe a one line comment then above the first lock:
/* lock outside cpu_halted(_set) to avoid bouncing */
Or some such.....
Quoted 8 lines
Quoted 4 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>Thanks!
Emilio
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 24/71] s390x: convert to cpu_halted
Quoted 19 lines · On Wed, 31 Oct 2018 16:56:54 +0000 Alex Bennée <[email protected]> wrote:
Quoted 17 lines · Emilio G. Cota
Quoted 15 lines · Alex Bennée
target/s390x/cpu.c void s390_cpu_unhalt(S390CPU *cpu) · line 363
Quoted 12 lines
target/s390x/cpu.c +4
-2@@ -353,10 +355,12 @@ void s390_cpu_unhalt(S390CPU *cpu)CPUState *cs =CPU (cpu);trace_cpu_unhalt (cs->cpu_index); -if (cs->halted) { - cs->halted =0 ; +cpu_mutex_lock (cs); +if (cpu_halted (cs)) { +cpu_halted_set (cs,0 ); cs->exception_index =-1 ; } +cpu_mutex_unlock (cs);I think this locking is superfluous as you already added locking when you introduced the helper.
Quoted 8 lines
Quoted 2 lines
It gives a small perf gain, since it avoids locking & unlocking twice in a row (
cpu_haltedandcpu_halted_setboth take the lock if needed).Maybe a one line comment then above the first lock:
/* lock outside
cpu_halted(_set)to avoid bouncing */Or some such.....
Yes, please.
Or introduce something like cpu_halted_flip(cs, new_state) where you could convert the above to
if (cpu_halted_flip(cs, 0)) { /* cpu halted before */
cs_exception_index = -1; }
Or is that actually an uncommon pattern?
Quoted 13 lines
Quoted 9 lines
Quoted 5 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>Thanks!
Emilio
--
Alex Bennée
RFC v4 25/71 sparc: convert to cpu_halted
In reply to Emilio G. Cota--- hw/sparc/leon3.c | 2 +- hw/sparc/sun4m.c | 8 ++++---- hw/sparc64/sparc64.c | 4 ++-- target/sparc/helper.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
hw/sparc/leon3.c +1 -1
@@ -61,7 +61,7 @@ static void main_cpu_reset(void *opaque)cpu_reset (cpu); - cpu->halted =0 ; +cpu_halted_set (cpu,0 ); env->pc = s->entry; env->npc = s->entry +4 ; env->regbase[6 ] = s->sp;
hw/sparc/sun4m.c +4 -4
@@ -168,7 +168,7 @@ static void cpu_kick_irq(SPARCCPU *cpu)CPUSPARCState *env = &cpu->env;CPUState *cs =CPU (cpu); - cs->halted =0 ; +cpu_halted_set (cs,0 );cpu_check_irqs (env);qemu_cpu_kick (cs); }
@@ -199,7 +199,7 @@ static void main_cpu_reset(void *opaque)CPUState *cs =CPU (cpu);cpu_reset (cs); - cs->halted =0 ; +cpu_halted_set (cs,0 ); }static void secondary_cpu_reset (void *opaque)
@@ -208,7 +208,7 @@ static void secondary_cpu_reset(void *opaque)CPUState *cs =CPU (cpu);cpu_reset (cs); - cs->halted =1 ; +cpu_halted_set (cs,1 ); }static void cpu_halt_signal (void *opaque,int irq,int level)
@@ -825,7 +825,7 @@ static void cpu_devinit(const char *cpu_type, unsigned int id, }else {qemu_register_reset (secondary_cpu_reset, cpu); cs =CPU (cpu); - cs->halted =1 ; +cpu_halted_set (cs,1 ); } *cpu_irqs =qemu_allocate_irqs (cpu_set_irq, cpu,MAX_PILS ); env->prom_addr = prom_addr;
hw/sparc64/sparc64.c +2 -2
@@ -100,7 +100,7 @@ static void cpu_kick_irq(SPARCCPU *cpu)CPUState *cs =CPU (cpu);CPUSPARCState *env = &cpu->env; - cs->halted =0 ; +cpu_halted_set (cs,0 );cpu_check_irqs (env);qemu_cpu_kick (cs); }
@@ -115,7 +115,7 @@ void sparc64_cpu_set_ivec_irq(void *opaque, int irq, int level)if (!(env->ivec_status &0x20 )) {trace_sparc64_cpu_ivec_raise_irq (irq); cs =CPU (cpu); - cs->halted =0 ; +cpu_halted_set (cs,0 ); env->interrupt_index =TT_IVEC ; env->ivec_status |=0x20 ; env->ivec_data[0 ] = (0x1f <<6 ) | irq;
target/sparc/helper.c +1 -1
@@ -245,7 +245,7 @@ void helper_power_down(CPUSPARCState *env) {CPUState *cs =CPU (sparc_env_get_cpu (env)); - cs->halted =1 ; +cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; env->pc = env->npc; env->npc = env->pc +4 ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 25/71] sparc: convert to cpu_halted
Quoted 5 lines · Emilio G. Cota
Cc Fabien Chouteau <[email protected]>Cc Mark Cave-Ayland <[email protected]>Cc Artyom Tarasenko <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
--
Alex Bennée
RFC v4 26/71 xtensa: convert to cpu_halted
In reply to Emilio G. Cota--- target/xtensa/cpu.c | 2 +- target/xtensa/helper.c | 2 +- target/xtensa/op_helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
target/xtensa/cpu.c +1 -1
@@ -86,7 +86,7 @@ static void xtensa_cpu_reset(CPUState *s)#ifndef CONFIG_USER_ONLY reset_mmu (env); - s->halted = env->runstall; +cpu_halted_set (s, env->runstall);#endif }
target/xtensa/helper.c +1 -1
@@ -807,7 +807,7 @@ void xtensa_runstall(CPUXtensaState *env, bool runstall)CPUState *cpu =CPU (xtensa_env_get_cpu (env)); env->runstall = runstall; - cpu->halted = runstall; +cpu_halted_set (cpu, runstall);if (runstall) {cpu_interrupt (cpu,CPU_INTERRUPT_HALT ); }else {
target/xtensa/op_helper.c +1 -1
@@ -414,7 +414,7 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) } cpu =CPU (xtensa_env_get_cpu (env)); - cpu->halted =1 ; +cpu_halted_set (cpu,1 );HELPER (exception)(env,EXCP_HLT ); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 26/71] xtensa: convert to cpu_halted
Quoted 3 lines · Emilio G. Cota
Cc Max Filippov <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 37 lines
--- target/xtensa/cpu.c | 2 +- target/xtensa/helper.c | 2 +- target/xtensa/op_helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)target/xtensa/cpu.c +1
-1@@ -86,7 +86,7 @@ static void xtensa_cpu_reset(CPUState *s)#ifndef CONFIG_USER_ONLY reset_mmu (env); - s->halted = env->runstall; +cpu_halted_set (s, env->runstall);#endif }target/xtensa/helper.c +1
-1@@ -807,7 +807,7 @@ void xtensa_runstall(CPUXtensaState *env, bool runstall)CPUState *cpu =CPU (xtensa_env_get_cpu (env)); env->runstall = runstall; - cpu->halted = runstall; +cpu_halted_set (cpu, runstall);if (runstall) {cpu_interrupt (cpu,CPU_INTERRUPT_HALT ); }else {target/xtensa/op_helper.c +0
-0
target/xtensa/op_helper.c void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) · line 419
Quoted 7 lines
target/xtensa/op_helper.c +1
-1@@ -414,7 +414,7 @@ void HELPER(waiti)(CPUXtensaState *env, uint32_t pc, uint32_t intlevel) } cpu =CPU (xtensa_env_get_cpu (env)); - cpu->halted =1 ; +cpu_halted_set (cpu,1 );HELPER (exception)(env,EXCP_HLT ); }
--
Alex Bennée
RFC v4 27/71 gdbstub: convert to cpu_halted
In reply to Emilio G. Cota--- gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
gdbstub.c +1 -1
@@ -1305,7 +1305,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)/* memtohex() doubles the required space */ len =snprintf ((char *)mem_buf,sizeof (buf) /2 ,"CPU#%d [%s]" , cpu->cpu_index, - cpu->halted ?"halted " :"running" ); +cpu_halted (cpu) ?"halted " :"running" );trace_gdbstub_op_extra_info ((char *)mem_buf);memtohex (buf, mem_buf, len);put_packet (s, buf);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 27/71] gdbstub: convert to cpu_halted
Quoted 2 lines · Emilio G. Cota
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- gdbstub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)gdbstub.c +0
-0
gdbstub.c static int gdb_handle_packet(GDBState *s, const char *line_buf) · line 1311
Quoted 8 lines
gdbstub.c +1
-1@@ -1305,7 +1305,7 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf)/* memtohex() doubles the required space */ len =snprintf ((char *)mem_buf,sizeof (buf) /2 ,"CPU#%d [%s]" , cpu->cpu_index, - cpu->halted ?"halted " :"running" ); +cpu_halted (cpu) ?"halted " :"running" );trace_gdbstub_op_extra_info ((char *)mem_buf);memtohex (buf, mem_buf, len);put_packet (s, buf);
--
Alex Bennée
RFC v4 28/71 openrisc: convert to cpu_halted
In reply to Emilio G. Cota--- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/openrisc/sys_helper.c +1 -1
@@ -137,7 +137,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)if (env->pmr &PMR_DME || env->pmr &PMR_SME ) {cpu_restore_state (cs,GETPC (), true); env->pc +=4 ; - cs->halted =1 ; +cpu_halted_set (cs,1 );raise_exception (cpu,EXCP_HALTED ); }break ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 28/71] openrisc: convert to cpu_halted
Quoted 3 lines · Emilio G. Cota
Cc Stafford Horne <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/openrisc/sys_helper.c +0
-0
target/openrisc/sys_helper.c void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) · line 143
Quoted 8 lines
target/openrisc/sys_helper.c +1
-1@@ -137,7 +137,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb)if (env->pmr &PMR_DME || env->pmr &PMR_SME ) {cpu_restore_state (cs,GETPC (), true); env->pc +=4 ; - cs->halted =1 ; +cpu_halted_set (cs,1 );raise_exception (cpu,EXCP_HALTED ); }break ;
--
Alex Bennée
RFC v4 29/71 cpu-exec: convert to cpu_halted
In reply to Emilio G. Cota--- accel/tcg/cpu-exec.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
accel/tcg/cpu-exec.c +20 -4
@@ -422,14 +422,20 @@ static inline TranslationBlock *tb_find(CPUState *cpu,return tb; } -static inline bool cpu_handle_halt (CPUState *cpu) +static inline bool cpu_handle_halt_locked (CPUState *cpu) { -if (cpu->halted) { +g_assert (cpu_mutex_locked (cpu)); + +if (cpu_halted (cpu)) {#if defined(TARGET_I386 ) && !defined(CONFIG_USER_ONLY )if ((cpu->interrupt_request &CPU_INTERRUPT_POLL ) &&replay_interrupt ()) {X86CPU *x86_cpu =X86_CPU (cpu); + +cpu_mutex_unlock (cpu);qemu_mutex_lock_iothread (); +cpu_mutex_lock (cpu); +apic_poll_irq (x86_cpu->apic_state);cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );qemu_mutex_unlock_iothread ();
@@ -439,12 +445,22 @@ static inline bool cpu_handle_halt(CPUState *cpu)return true; } - cpu->halted =0 ; +cpu_halted_set (cpu,0 ); }return false; } +static inline bool cpu_handle_halt (CPUState *cpu) +{ +bool ret; + +cpu_mutex_lock (cpu); + ret =cpu_handle_halt_locked (cpu); +cpu_mutex_unlock (cpu); +return ret; +} +static inline void cpu_handle_debug_exception (CPUState *cpu) {CPUClass *cc =CPU_GET_CLASS (cpu);
@@ -543,7 +559,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, }else if (interrupt_request &CPU_INTERRUPT_HALT ) {replay_interrupt (); cpu->interrupt_request &= ~CPU_INTERRUPT_HALT ; - cpu->halted =1 ; +cpu_halted_set (cpu,1 ); cpu->exception_index =EXCP_HLT ;qemu_mutex_unlock_iothread ();return true;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 29/71] cpu-exec: convert to cpu_halted
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- accel/tcg/cpu-exec.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 29/71] cpu-exec: convert to cpu_halted
In reply to Emilio G. CotaQuoted 19 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- accel/tcg/cpu-exec.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-)accel/tcg/cpu-exec.c +3
-2@@ -422,14 +422,20 @@ static inline TranslationBlock *tb_find(CPUState *cpu,return tb; } -static inline bool cpu_handle_halt (CPUState *cpu) +static inline bool cpu_handle_halt_locked (CPUState *cpu) { -if (cpu->halted) { +g_assert (cpu_mutex_locked (cpu)); +
accel/tcg/cpu-exec.c static inline TranslationBlock *tb_find(CPUState *cpu, · line 438
Quoted 10 lines
accel/tcg/cpu-exec.c +5
-0+if (cpu_halted (cpu)) {#if defined(TARGET_I386 ) && !defined(CONFIG_USER_ONLY )if ((cpu->interrupt_request &CPU_INTERRUPT_POLL ) &&replay_interrupt ()) {X86CPU *x86_cpu =X86_CPU (cpu); + +cpu_mutex_unlock (cpu);qemu_mutex_lock_iothread (); +cpu_mutex_lock (cpu); +
I think we need a comment or reference to the locking rules for this case here.
Quoted 28 lines
accel/tcg/cpu-exec.c +11
-1apic_poll_irq (x86_cpu->apic_state);cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );qemu_mutex_unlock_iothread ();@@ -439,12 +445,22 @@ static inline bool cpu_handle_halt(CPUState *cpu)return true; } - cpu->halted =0 ; +cpu_halted_set (cpu,0 ); }return false; } +static inline bool cpu_handle_halt (CPUState *cpu) +{ +bool ret; + +cpu_mutex_lock (cpu); + ret =cpu_handle_halt_locked (cpu); +cpu_mutex_unlock (cpu); +return ret; +} +static inline void cpu_handle_debug_exception (CPUState *cpu) {CPUClass *cc =CPU_GET_CLASS (cpu);
accel/tcg/cpu-exec.c static inline bool cpu_handle_interrupt(CPUState *cpu, · line 565
Quoted 8 lines
accel/tcg/cpu-exec.c +1
-1@@ -543,7 +559,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, }else if (interrupt_request &CPU_INTERRUPT_HALT ) {replay_interrupt (); cpu->interrupt_request &= ~CPU_INTERRUPT_HALT ; - cpu->halted =1 ; +cpu_halted_set (cpu,1 ); cpu->exception_index =EXCP_HLT ;qemu_mutex_unlock_iothread ();return true;
--
Alex Bennée
RFC v4 30/71 cpu: define cpu_interrupt_request helpers
In reply to Emilio G. CotaAdd a comment about how atomic_read works here. The comment refers to a "BQL-less CPU loop", which will materialize toward the end of this series.
Note that the modifications to cpu_reset_interrupt are there to avoid deadlock during the CPU lock transition; once that is complete, cpu_interrupt_request will be simple again.
--- include/qom/cpu.h | 37 +++++++++++++++++++++++++++++++++++++ qom/cpu.c | 27 +++++++++++++++++++++------ 2 files changed, 58 insertions(+), 6 deletions(-)
include/qom/cpu.h +37 -0
@@ -511,6 +511,43 @@ static inline void cpu_halted_set(CPUState *cpu, uint32_t val)cpu_mutex_unlock (cpu); } +/* +* When sending an interrupt, setters OR the appropriate bit and kick the +* destination vCPU. The latter can then read interrupt_request without +* acquiring the CPU lock, because once the kick-induced completes, they'll read +* an up-to-date interrupt_request. +* Setters always acquire the lock, which guarantees that (1) concurrent +* updates from different threads won't result in data races, and (2) the +* BQL-less CPU loop will always see an up-to-date interrupt_request, since the +* loop holds the CPU lock. +*/ +static inline uint32_t cpu_interrupt_request (CPUState *cpu) +{ +return atomic_read (&cpu->interrupt_request); +} + +static inline void cpu_interrupt_request_or (CPUState *cpu,uint32_t mask) +{ +if (cpu_mutex_locked (cpu)) { +atomic_set (&cpu->interrupt_request, cpu->interrupt_request | mask); +return ; + } +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, cpu->interrupt_request | mask); +cpu_mutex_unlock (cpu); +} + +static inline void cpu_interrupt_request_set (CPUState *cpu,uint32_t val) +{ +if (cpu_mutex_locked (cpu)) { +atomic_set (&cpu->interrupt_request, val); +return ; + } +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, val); +cpu_mutex_unlock (cpu); +} +static inline void cpu_tb_jmp_cache_clear (CPUState *cpu) {unsigned int i;
qom/cpu.c +21 -6
@@ -98,14 +98,29 @@ static void cpu_common_get_memory_mapping(CPUState *cpu,* BQL here if we need to. cpu_interrupt assumes it is held.*/ void cpu_reset_interrupt (CPUState *cpu,int mask) { -bool need_lock = !qemu_mutex_iothread_locked (); +bool has_bql =qemu_mutex_iothread_locked (); +bool has_cpu_lock =cpu_mutex_locked (cpu); -if (need_lock) { -qemu_mutex_lock_iothread (); +if (has_bql) { +if (has_cpu_lock) { +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); + }else { +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); +cpu_mutex_unlock (cpu); + } +return ; + } + +if (has_cpu_lock) { +cpu_mutex_unlock (cpu); } - cpu->interrupt_request &= ~mask; -if (need_lock) { -qemu_mutex_unlock_iothread (); +qemu_mutex_lock_iothread (); +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); +qemu_mutex_unlock_iothread (); +if (!has_cpu_lock) { +cpu_mutex_unlock (cpu); } }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 30/71] cpu: define cpu_interrupt_request helpers
Quoted 8 lines · Emilio G. Cota
Add a comment about how
atomic_readworks here. The comment refers to a "BQL-less CPU loop", which will materialize toward the end of this series.Note that the modifications to
cpu_reset_interruptare there to avoid deadlock during the CPU lock transition; once that is complete,cpu_interrupt_requestwill be simple again.
Quoted 5 lines
Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 37 +++++++++++++++++++++++++++++++++++++ qom/cpu.c | 27 +++++++++++++++++++++------ 2 files changed, 58 insertions(+), 6 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 30/71] cpu: define cpu_interrupt_request helpers
In reply to Emilio G. CotaQuoted 8 lines · Emilio G. Cota
Add a comment about how
atomic_readworks here. The comment refers to a "BQL-less CPU loop", which will materialize toward the end of this series.Note that the modifications to
cpu_reset_interruptare there to avoid deadlock during the CPU lock transition; once that is complete,cpu_interrupt_requestwill be simple again.
<snip>
Quoted 27 lines
qom/cpu.c +15
-4@@ -98,14 +98,29 @@ static void cpu_common_get_memory_mapping(CPUState *cpu,* BQL here if we need to. cpu_interrupt assumes it is held.*/ void cpu_reset_interrupt (CPUState *cpu,int mask) { -bool need_lock = !qemu_mutex_iothread_locked (); +bool has_bql =qemu_mutex_iothread_locked (); +bool has_cpu_lock =cpu_mutex_locked (cpu); -if (need_lock) { -qemu_mutex_lock_iothread (); +if (has_bql) { +if (has_cpu_lock) { +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); + }else { +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); +cpu_mutex_unlock (cpu); + } +return ; + } + +if (has_cpu_lock) { +cpu_mutex_unlock (cpu); } - cpu->interrupt_request &= ~mask;
qom/cpu.c static void cpu_common_get_memory_mapping(CPUState *cpu, · line 125
Quoted 10 lines
qom/cpu.c +6
-2-if (need_lock) { -qemu_mutex_unlock_iothread (); +qemu_mutex_lock_iothread (); +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); +qemu_mutex_unlock_iothread (); +if (!has_cpu_lock) { +cpu_mutex_unlock (cpu); } }
Yeah I can see this is pretty ugly but cleaned up by the end of the series. If it's the same sequence as the previous patch I wonder if it's possible to hide the ugliness in a common helper while we transition?
Otherwise:
--
Alex Bennée
RFC v4 31/71 ppc: use cpu_reset_interrupt
In reply to Emilio G. CotaFrom: Paolo Bonzini <[email protected]>
--- target/ppc/excp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/ppc/excp_helper.c +1 -1
@@ -880,7 +880,7 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request)if (interrupt_request &CPU_INTERRUPT_HARD ) {ppc_hw_interrupt (env);if (env->pending_interrupts ==0 ) { - cs->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); }return true; }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 31/71] ppc: use cpu_reset_interrupt
Quoted 10 lines · Emilio G. Cota
From: Paolo Bonzini <[email protected]>
Cc David Gibson <[email protected]>Cc Alexander Graf <[email protected]>Acked-by David Gibson <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/ppc/excp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/ppc/excp_helper.c +0
-0
target/ppc/excp_helper.c bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request) · line 886
Quoted 8 lines
target/ppc/excp_helper.c +1
-1@@ -880,7 +880,7 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request)if (interrupt_request &CPU_INTERRUPT_HARD ) {ppc_hw_interrupt (env);if (env->pending_interrupts ==0 ) { - cs->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); }return true; }
--
Alex Bennée
RFC v4 32/71 exec: use cpu_reset_interrupt
In reply to Emilio G. Cota--- exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
exec.c +1 -1
@@ -776,7 +776,7 @@ static int cpu_common_post_load(void *opaque, int version_id)/* 0x01 was CPU_INTERRUPT_EXIT. This line can be removed when the version_id is increased. */ - cpu->interrupt_request &= ~0x01 ; +cpu_reset_interrupt (cpu,1 );tlb_flush (cpu);/* loadvm has just updated the content of RAM, bypassing the
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 32/71] exec: use cpu_reset_interrupt
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
r~
Re: [Qemu-devel] [RFC v4 32/71] exec: use cpu_reset_interrupt
In reply to Emilio G. CotaQuoted 10 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- exec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)exec.c +0
-0
exec.c static int cpu_common_post_load(void *opaque, int version_id) · line 779
Quoted 5 lines
exec.c +1
-1@@ -776,7 +776,7 @@ static int cpu_common_post_load(void *opaque, int version_id)/* 0x01 was CPU_INTERRUPT_EXIT. This line can be removed when the version_id is increased. */ - cpu->interrupt_request &= ~0x01 ; +cpu_reset_interrupt (cpu,1 );
I mean this does raise a question about why 0x1 doesn't have it's own nice define (along with a description of what it means) but I guess that is lost to the mists of time.
exec.c static int cpu_common_post_load(void *opaque, int version_id) · line 782
Quoted 3 lines
exec.c +0
-0tlb_flush (cpu);/* loadvm has just updated the content of RAM, bypassing the
--
Alex Bennée
RFC v4 33/71 i386: use cpu_reset_interrupt
In reply to Emilio G. CotaFrom: Paolo Bonzini <[email protected]>
--- target/i386/hax-all.c | 4 ++-- target/i386/hvf/x86hvf.c | 8 ++++---- target/i386/kvm.c | 14 +++++++------- target/i386/seg_helper.c | 13 ++++++------- target/i386/svm_helper.c | 2 +- target/i386/whpx-all.c | 10 +++++----- 6 files changed, 25 insertions(+), 26 deletions(-)
target/i386/hax-all.c +2 -2
@@ -433,7 +433,7 @@ static int hax_vcpu_interrupt(CPUArchState *env) irq =cpu_get_pic_interrupt (env);if (irq >=0 ) {hax_inject_interrupt (env, irq); - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); } }
@@ -483,7 +483,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)cpu_halted_set (cpu,0 );if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );apic_poll_irq (x86_cpu->apic_state); }
target/i386/hvf/x86hvf.c +4 -4
@@ -402,7 +402,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state)if (cpu_state->interrupt_request &CPU_INTERRUPT_NMI ) {if (!(env->hflags2 &HF2_NMI_MASK ) && !(info &VMCS_INTR_VALID )) { - cpu_state->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_NMI ); info =VMCS_INTR_VALID |VMCS_INTR_T_NMI |NMI_VEC ;wvmcs (cpu_state->hvf_fd,VMCS_ENTRY_INTR_INFO , info); }else {
@@ -414,7 +414,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state) (cpu_state->interrupt_request & CPU_INTERRUPT_HARD) && (EFLAGS(env) & IF_MASK) && !(info & VMCS_INTR_VALID)) {int line =cpu_get_pic_interrupt (&x86cpu->env); - cpu_state->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_HARD );if (line >=0 ) {wvmcs (cpu_state->hvf_fd,VMCS_ENTRY_INTR_INFO , line |VMCS_INTR_VALID |VMCS_INTR_T_HWINTR );
@@ -440,7 +440,7 @@ int hvf_process_events(CPUState *cpu_state) }if (cpu_state->interrupt_request &CPU_INTERRUPT_POLL ) { - cpu_state->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state); } if (((cpu_state->interrupt_request & CPU_INTERRUPT_HARD) &&
@@ -453,7 +453,7 @@ int hvf_process_events(CPUState *cpu_state)do_cpu_sipi (cpu); }if (cpu_state->interrupt_request &CPU_INTERRUPT_TPR ) { - cpu_state->interrupt_request &= ~CPU_INTERRUPT_TPR ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_TPR );hvf_cpu_synchronize_state (cpu_state);apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type);
target/i386/kvm.c +7 -7
@@ -2709,7 +2709,7 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level)*/ events.smi.pending = cs->interrupt_request &CPU_INTERRUPT_SMI ; events.smi.latched_init = cs->interrupt_request &CPU_INTERRUPT_INIT ; - cs->interrupt_request &= ~(CPU_INTERRUPT_INIT |CPU_INTERRUPT_SMI ); +cpu_reset_interrupt (cs,CPU_INTERRUPT_INIT |CPU_INTERRUPT_SMI ); }else {/* Keep these in cs->interrupt_request. */ events.smi.pending =0 ;
@@ -3005,7 +3005,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)if (cpu->interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) {if (cpu->interrupt_request &CPU_INTERRUPT_NMI ) {qemu_mutex_lock_iothread (); - cpu->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_NMI );qemu_mutex_unlock_iothread ();DPRINTF ("injected NMI\n" ); ret =kvm_vcpu_ioctl (cpu,KVM_NMI );
@@ -3016,7 +3016,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) }if (cpu->interrupt_request &CPU_INTERRUPT_SMI ) {qemu_mutex_lock_iothread (); - cpu->interrupt_request &= ~CPU_INTERRUPT_SMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_SMI );qemu_mutex_unlock_iothread ();DPRINTF ("injected SMI\n" ); ret =kvm_vcpu_ioctl (cpu,KVM_SMI );
@@ -3052,7 +3052,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) (env->eflags & IF_MASK)) {int irq; - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); irq =cpu_get_pic_interrupt (env);if (irq >=0 ) {struct kvm_interrupt intr;
@@ -3123,7 +3123,7 @@ int kvm_arch_process_async_events(CPUState *cs)/* We must not raise CPU_INTERRUPT_MCE if it's not supported. */ assert (env->mcg_cap); - cs->interrupt_request &= ~CPU_INTERRUPT_MCE ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_MCE );kvm_cpu_synchronize_state (cs);
@@ -3153,7 +3153,7 @@ int kvm_arch_process_async_events(CPUState *cs) }if (cs->interrupt_request &CPU_INTERRUPT_POLL ) { - cs->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state); } if (((cs->interrupt_request & CPU_INTERRUPT_HARD) &&
@@ -3166,7 +3166,7 @@ int kvm_arch_process_async_events(CPUState *cs)do_cpu_sipi (cpu); }if (cs->interrupt_request &CPU_INTERRUPT_TPR ) { - cs->interrupt_request &= ~CPU_INTERRUPT_TPR ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_TPR );kvm_cpu_synchronize_state (cs);apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type);
target/i386/seg_helper.c +6 -7
@@ -1332,7 +1332,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)switch (interrupt_request) {#if !defined(CONFIG_USER_ONLY )case CPU_INTERRUPT_POLL : - cs->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state);break ;#endif
@@ -1341,23 +1341,22 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)break ;case CPU_INTERRUPT_SMI :cpu_svm_check_intercept_param (env,SVM_EXIT_SMI ,0 ,0 ); - cs->interrupt_request &= ~CPU_INTERRUPT_SMI ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_SMI );do_smm_enter (cpu);break ;case CPU_INTERRUPT_NMI :cpu_svm_check_intercept_param (env,SVM_EXIT_NMI ,0 ,0 ); - cs->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_NMI ); env->hflags2 |=HF2_NMI_MASK ;do_interrupt_x86_hardirq (env,EXCP02_NMI ,1 );break ;case CPU_INTERRUPT_MCE : - cs->interrupt_request &= ~CPU_INTERRUPT_MCE ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_MCE );do_interrupt_x86_hardirq (env,EXCP12_MCHK ,0 );break ;case CPU_INTERRUPT_HARD :cpu_svm_check_intercept_param (env,SVM_EXIT_INTR ,0 ,0 ); - cs->interrupt_request &= ~(CPU_INTERRUPT_HARD | -CPU_INTERRUPT_VIRQ ); +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_VIRQ ); intno =cpu_get_pic_interrupt (env);qemu_log_mask (CPU_LOG_TB_IN_ASM ,"Servicing hardware INT=0x%02x\n" , intno);
@@ -1372,7 +1371,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)qemu_log_mask (CPU_LOG_TB_IN_ASM ,"Servicing virtual hardware INT=0x%02x\n" , intno);do_interrupt_x86_hardirq (env, intno,1 ); - cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_VIRQ );break ;#endif }
target/i386/svm_helper.c +1 -1
@@ -700,7 +700,7 @@ void do_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1) env->hflags &= ~HF_GUEST_MASK ; env->intercept =0 ; env->intercept_exceptions =0 ; - cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_VIRQ ); env->tsc_offset =0 ; env->gdt.base = x86_ldq_phys(cs, env->vm_hsave + offsetof(struct vmcb,
target/i386/whpx-all.c +5 -5
@@ -728,14 +728,14 @@ static void whpx_vcpu_pre_run(CPUState *cpu)if (!vcpu->interruption_pending && cpu->interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) {if (cpu->interrupt_request &CPU_INTERRUPT_NMI ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_NMI ); vcpu->interruptable = false; new_int.InterruptionType = WHvX64PendingNmi; new_int.InterruptionPending =1 ; new_int.InterruptionVector =2 ; }if (cpu->interrupt_request &CPU_INTERRUPT_SMI ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_SMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_SMI ); } }
@@ -758,7 +758,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) vcpu->interruptable && (env->eflags & IF_MASK)) {assert (!new_int.InterruptionPending);if (cpu->interrupt_request &CPU_INTERRUPT_HARD ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); irq =cpu_get_pic_interrupt (env);if (irq >=0 ) { new_int.InterruptionType = WHvX64PendingInterrupt;
@@ -850,7 +850,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) }if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );apic_poll_irq (x86_cpu->apic_state); }
@@ -868,7 +868,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) }if (cpu->interrupt_request &CPU_INTERRUPT_TPR ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_TPR ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_TPR );if (!cpu->vcpu_dirty) {whpx_get_registers (cpu); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 33/71] i386: use cpu_reset_interrupt
Quoted 5 lines · Emilio G. Cota
From: Paolo Bonzini <[email protected]>
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 241 lines
--- target/i386/hax-all.c | 4 ++-- target/i386/hvf/x86hvf.c | 8 ++++---- target/i386/kvm.c | 14 +++++++------- target/i386/seg_helper.c | 13 ++++++------- target/i386/svm_helper.c | 2 +- target/i386/whpx-all.c | 10 +++++----- 6 files changed, 25 insertions(+), 26 deletions(-)target/i386/hax-all.c +2
-2@@ -433,7 +433,7 @@ static int hax_vcpu_interrupt(CPUArchState *env) irq =cpu_get_pic_interrupt (env);if (irq >=0 ) {hax_inject_interrupt (env, irq); - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); } }@@ -483,7 +483,7 @@ static int hax_vcpu_hax_exec(CPUArchState *env)cpu_halted_set (cpu,0 );if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );apic_poll_irq (x86_cpu->apic_state); }target/i386/hvf/x86hvf.c +4
-4@@ -402,7 +402,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state)if (cpu_state->interrupt_request &CPU_INTERRUPT_NMI ) {if (!(env->hflags2 &HF2_NMI_MASK ) && !(info &VMCS_INTR_VALID )) { - cpu_state->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_NMI ); info =VMCS_INTR_VALID |VMCS_INTR_T_NMI |NMI_VEC ;wvmcs (cpu_state->hvf_fd,VMCS_ENTRY_INTR_INFO , info); }else {@@ -414,7 +414,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state) (cpu_state->interrupt_request & CPU_INTERRUPT_HARD) && (EFLAGS(env) & IF_MASK) && !(info & VMCS_INTR_VALID)) {int line =cpu_get_pic_interrupt (&x86cpu->env); - cpu_state->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_HARD );if (line >=0 ) {wvmcs (cpu_state->hvf_fd,VMCS_ENTRY_INTR_INFO , line |VMCS_INTR_VALID |VMCS_INTR_T_HWINTR );@@ -440,7 +440,7 @@ int hvf_process_events(CPUState *cpu_state) }if (cpu_state->interrupt_request &CPU_INTERRUPT_POLL ) { - cpu_state->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state); } if (((cpu_state->interrupt_request & CPU_INTERRUPT_HARD) &&@@ -453,7 +453,7 @@ int hvf_process_events(CPUState *cpu_state)do_cpu_sipi (cpu); }if (cpu_state->interrupt_request &CPU_INTERRUPT_TPR ) { - cpu_state->interrupt_request &= ~CPU_INTERRUPT_TPR ; +cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_TPR );hvf_cpu_synchronize_state (cpu_state);apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type);target/i386/kvm.c +7
-7@@ -2709,7 +2709,7 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level)*/ events.smi.pending = cs->interrupt_request &CPU_INTERRUPT_SMI ; events.smi.latched_init = cs->interrupt_request &CPU_INTERRUPT_INIT ; - cs->interrupt_request &= ~(CPU_INTERRUPT_INIT |CPU_INTERRUPT_SMI ); +cpu_reset_interrupt (cs,CPU_INTERRUPT_INIT |CPU_INTERRUPT_SMI ); }else {/* Keep these in cs->interrupt_request. */ events.smi.pending =0 ;@@ -3005,7 +3005,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)if (cpu->interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) {if (cpu->interrupt_request &CPU_INTERRUPT_NMI ) {qemu_mutex_lock_iothread (); - cpu->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_NMI );qemu_mutex_unlock_iothread ();DPRINTF ("injected NMI\n" ); ret =kvm_vcpu_ioctl (cpu,KVM_NMI );@@ -3016,7 +3016,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) }if (cpu->interrupt_request &CPU_INTERRUPT_SMI ) {qemu_mutex_lock_iothread (); - cpu->interrupt_request &= ~CPU_INTERRUPT_SMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_SMI );qemu_mutex_unlock_iothread ();DPRINTF ("injected SMI\n" ); ret =kvm_vcpu_ioctl (cpu,KVM_SMI );@@ -3052,7 +3052,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) (env->eflags & IF_MASK)) {int irq; - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); irq =cpu_get_pic_interrupt (env);if (irq >=0 ) {struct kvm_interrupt intr;@@ -3123,7 +3123,7 @@ int kvm_arch_process_async_events(CPUState *cs)/* We must not raise CPU_INTERRUPT_MCE if it's not supported. */ assert (env->mcg_cap); - cs->interrupt_request &= ~CPU_INTERRUPT_MCE ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_MCE );kvm_cpu_synchronize_state (cs);@@ -3153,7 +3153,7 @@ int kvm_arch_process_async_events(CPUState *cs) }if (cs->interrupt_request &CPU_INTERRUPT_POLL ) { - cs->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state); } if (((cs->interrupt_request & CPU_INTERRUPT_HARD) &&@@ -3166,7 +3166,7 @@ int kvm_arch_process_async_events(CPUState *cs)do_cpu_sipi (cpu); }if (cs->interrupt_request &CPU_INTERRUPT_TPR ) { - cs->interrupt_request &= ~CPU_INTERRUPT_TPR ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_TPR );kvm_cpu_synchronize_state (cs);apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type);target/i386/seg_helper.c +6
-7@@ -1332,7 +1332,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)switch (interrupt_request) {#if !defined(CONFIG_USER_ONLY )case CPU_INTERRUPT_POLL : - cs->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state);break ;#endif @@ -1341,23 +1341,22 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)break ;case CPU_INTERRUPT_SMI :cpu_svm_check_intercept_param (env,SVM_EXIT_SMI ,0 ,0 ); - cs->interrupt_request &= ~CPU_INTERRUPT_SMI ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_SMI );do_smm_enter (cpu);break ;case CPU_INTERRUPT_NMI :cpu_svm_check_intercept_param (env,SVM_EXIT_NMI ,0 ,0 ); - cs->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_NMI ); env->hflags2 |=HF2_NMI_MASK ;do_interrupt_x86_hardirq (env,EXCP02_NMI ,1 );break ;case CPU_INTERRUPT_MCE : - cs->interrupt_request &= ~CPU_INTERRUPT_MCE ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_MCE );do_interrupt_x86_hardirq (env,EXCP12_MCHK ,0 );break ;case CPU_INTERRUPT_HARD :cpu_svm_check_intercept_param (env,SVM_EXIT_INTR ,0 ,0 ); - cs->interrupt_request &= ~(CPU_INTERRUPT_HARD | -CPU_INTERRUPT_VIRQ ); +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD |CPU_INTERRUPT_VIRQ ); intno =cpu_get_pic_interrupt (env);qemu_log_mask (CPU_LOG_TB_IN_ASM ,"Servicing hardware INT=0x%02x\n" , intno);@@ -1372,7 +1371,7 @@ bool x86_cpu_exec_interrupt(CPUState *cs, int interrupt_request)qemu_log_mask (CPU_LOG_TB_IN_ASM ,"Servicing virtual hardware INT=0x%02x\n" , intno);do_interrupt_x86_hardirq (env, intno,1 ); - cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_VIRQ );break ;#endif }target/i386/svm_helper.c +1
-1@@ -700,7 +700,7 @@ void do_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1) env->hflags &= ~HF_GUEST_MASK ; env->intercept =0 ; env->intercept_exceptions =0 ; - cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_VIRQ ); env->tsc_offset =0 ; env->gdt.base = x86_ldq_phys(cs, env->vm_hsave + offsetof(struct vmcb,target/i386/whpx-all.c +4
-4@@ -728,14 +728,14 @@ static void whpx_vcpu_pre_run(CPUState *cpu)if (!vcpu->interruption_pending && cpu->interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) {if (cpu->interrupt_request &CPU_INTERRUPT_NMI ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_NMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_NMI ); vcpu->interruptable = false; new_int.InterruptionType = WHvX64PendingNmi; new_int.InterruptionPending =1 ; new_int.InterruptionVector =2 ; }if (cpu->interrupt_request &CPU_INTERRUPT_SMI ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_SMI ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_SMI ); } }@@ -758,7 +758,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu) vcpu->interruptable && (env->eflags & IF_MASK)) {assert (!new_int.InterruptionPending);if (cpu->interrupt_request &CPU_INTERRUPT_HARD ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); irq =cpu_get_pic_interrupt (env);if (irq >=0 ) { new_int.InterruptionType = WHvX64PendingInterrupt;@@ -850,7 +850,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) }if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );apic_poll_irq (x86_cpu->apic_state); }
target/i386/whpx-all.c static void whpx_vcpu_process_async_events(CPUState *cpu) · line 874
Quoted 8 lines
target/i386/whpx-all.c +1
-1@@ -868,7 +868,7 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) }if (cpu->interrupt_request &CPU_INTERRUPT_TPR ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_TPR ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_TPR );if (!cpu->vcpu_dirty) {whpx_get_registers (cpu); }
--
Alex Bennée
RFC v4 34/71 s390x: use cpu_reset_interrupt
In reply to Emilio G. CotaFrom: Paolo Bonzini <[email protected]>
--- target/s390x/excp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/s390x/excp_helper.c +1 -1
@@ -454,7 +454,7 @@ try_deliver:/* we might still have pending interrupts, but not deliverable */ if (!env->pending_int && !qemu_s390_flic_has_any (flic)) { - cs->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); }/* WAIT PSW during interrupt injection or STOP interrupt */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 34/71] s390x: use cpu_reset_interrupt
Quoted 11 lines · Emilio G. Cota
From: Paolo Bonzini <[email protected]>
Cc Cornelia Huck <[email protected]>Cc Alexander Graf <[email protected]>Cc David Hildenbrand <[email protected]>Reviewed-by David Hildenbrand <[email protected]>Reviewed-by Richard Henderson <[email protected]>Reviewed-by Cornelia Huck <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/s390x/excp_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/s390x/excp_helper.c +0
-0
target/s390x/excp_helper.c try_deliver: · line 460
Quoted 8 lines
target/s390x/excp_helper.c +1
-1@@ -454,7 +454,7 @@ try_deliver:/* we might still have pending interrupts, but not deliverable */ if (!env->pending_int && !qemu_s390_flic_has_any (flic)) { - cs->interrupt_request &= ~CPU_INTERRUPT_HARD ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD ); }/* WAIT PSW during interrupt injection or STOP interrupt */
--
Alex Bennée
RFC v4 35/71 openrisc: use cpu_reset_interrupt
In reply to Emilio G. CotaFrom: Paolo Bonzini <[email protected]>
--- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/openrisc/sys_helper.c +1 -1
@@ -170,7 +170,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) env->ttmr = (rb & ~TTMR_IP ) | ip; }else {/* Clear IP bit. */ env->ttmr = rb & ~TTMR_IP ; - cs->interrupt_request &= ~CPU_INTERRUPT_TIMER ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_TIMER ); }cpu_openrisc_timer_update (cpu);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 35/71] openrisc: use cpu_reset_interrupt
Quoted 7 lines · Emilio G. Cota
From: Paolo Bonzini <[email protected]>
Cc Stafford Horne <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Paolo Bonzini <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/openrisc/sys_helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/openrisc/sys_helper.c +0
-0
target/openrisc/sys_helper.c void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) · line 176
Quoted 8 lines
target/openrisc/sys_helper.c +1
-1@@ -170,7 +170,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, target_ulong spr, target_ulong rb) env->ttmr = (rb & ~TTMR_IP ) | ip; }else {/* Clear IP bit. */ env->ttmr = rb & ~TTMR_IP ; - cs->interrupt_request &= ~CPU_INTERRUPT_TIMER ; +cpu_reset_interrupt (cs,CPU_INTERRUPT_TIMER ); }cpu_openrisc_timer_update (cpu);
--
Alex Bennée
RFC v4 36/71 arm: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/arm/cpu.c | 2 +- target/arm/helper.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
target/arm/cpu.c +1 -1
@@ -49,7 +49,7 @@ static bool arm_cpu_has_work(CPUState *cs)ARMCPU *cpu =ARM_CPU (cs);return (cpu->power_state !=PSCI_OFF ) - && cs->interrupt_request & + &&cpu_interrupt_request (cs) & (CPU_INTERRUPT_FIQ |CPU_INTERRUPT_HARD |CPU_INTERRUPT_VFIQ |CPU_INTERRUPT_VIRQ |CPU_INTERRUPT_EXITTB );
target/arm/helper.c +5 -7
@@ -1294,11 +1294,12 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) {CPUState *cs =ENV_GET_CPU (env);uint64_t ret =0 ; +uint32_t interrupt_request =cpu_interrupt_request (cs); -if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { +if (interrupt_request &CPU_INTERRUPT_HARD ) { ret |=CPSR_I ; } -if (cs->interrupt_request &CPU_INTERRUPT_FIQ ) { +if (interrupt_request &CPU_INTERRUPT_FIQ ) { ret |=CPSR_F ; }/* External aborts are not possible in QEMU so A bit is always clear */
@@ -8579,10 +8580,7 @@ void arm_cpu_do_interrupt(CPUState *cs)return ; } -/* Hooks may change global state so BQL should be held, also the -* BQL needs to be held for any modification of -* cs->interrupt_request. -*/ +/* Hooks may change global state so BQL should be held */ g_assert (qemu_mutex_iothread_locked ());arm_call_pre_el_change_hook (cpu);
@@ -8597,7 +8595,7 @@ void arm_cpu_do_interrupt(CPUState *cs)arm_call_el_change_hook (cpu);if (!kvm_enabled ()) { - cs->interrupt_request |=CPU_INTERRUPT_EXITTB ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_EXITTB ); } }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 36/71] arm: convert to cpu_interrupt_request
Quoted 1 line · Emilio G. Cota
Cc Peter Maydell <[email protected]>
This will need to catch-up in the next re-base as there is a merge conflict.
Quoted 53 lines
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/arm/cpu.c | 2 +- target/arm/helper.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-)target/arm/cpu.c +1
-1@@ -49,7 +49,7 @@ static bool arm_cpu_has_work(CPUState *cs)ARMCPU *cpu =ARM_CPU (cs);return (cpu->power_state !=PSCI_OFF ) - && cs->interrupt_request & + &&cpu_interrupt_request (cs) & (CPU_INTERRUPT_FIQ |CPU_INTERRUPT_HARD |CPU_INTERRUPT_VFIQ |CPU_INTERRUPT_VIRQ |CPU_INTERRUPT_EXITTB );target/arm/helper.c +4
-6@@ -1294,11 +1294,12 @@ static uint64_t isr_read(CPUARMState *env, const ARMCPRegInfo *ri) {CPUState *cs =ENV_GET_CPU (env);uint64_t ret =0 ; +uint32_t interrupt_request =cpu_interrupt_request (cs); -if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { +if (interrupt_request &CPU_INTERRUPT_HARD ) { ret |=CPSR_I ; } -if (cs->interrupt_request &CPU_INTERRUPT_FIQ ) { +if (interrupt_request &CPU_INTERRUPT_FIQ ) { ret |=CPSR_F ; }/* External aborts are not possible in QEMU so A bit is always clear */ @@ -8579,10 +8580,7 @@ void arm_cpu_do_interrupt(CPUState *cs)return ; } -/* Hooks may change global state so BQL should be held, also the -* BQL needs to be held for any modification of -* cs->interrupt_request. -*/ +/* Hooks may change global state so BQL should be held */ g_assert (qemu_mutex_iothread_locked ());arm_call_pre_el_change_hook (cpu);
target/arm/helper.c void arm_cpu_do_interrupt(CPUState *cs) · line 8600
Quoted 7 lines
target/arm/helper.c +1
-1@@ -8597,7 +8595,7 @@ void arm_cpu_do_interrupt(CPUState *cs)arm_call_el_change_hook (cpu);if (!kvm_enabled ()) { - cs->interrupt_request |=CPU_INTERRUPT_EXITTB ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_EXITTB ); } }
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 36/71] arm: convert to cpu_interrupt_request
Quoted 6 lines · Alex Bennée
Quoted 1 line · Emilio G. Cota
Cc Peter Maydell <[email protected]>This will need to catch-up in the next re-base as there is a merge conflict.
Yep, this series is so long that I decided to keep the same baseline as in v3, so that I could just git diff the two branches to track the delta.
I'll rebase on master in the next iteration.
Thanks,
Emilio
RFC v4 37/71 i386: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/i386/cpu.c | 2 +- target/i386/helper.c | 4 ++-- target/i386/svm_helper.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
target/i386/cpu.c +1 -1
@@ -5473,7 +5473,7 @@ int x86_cpu_pending_interrupt(CPUState *cs, int interrupt_request)static bool x86_cpu_has_work (CPUState *cs) { -return x86_cpu_pending_interrupt (cs, cs->interrupt_request) !=0 ; +return x86_cpu_pending_interrupt (cs,cpu_interrupt_request (cs)) !=0 ; }static void x86_disas_set_info (CPUState *cs,disassemble_info *info)
target/i386/helper.c +2 -2
@@ -1035,12 +1035,12 @@ void do_cpu_init(X86CPU *cpu)CPUState *cs =CPU (cpu);CPUX86State *env = &cpu->env;CPUX86State *save =g_new (CPUX86State,1 ); -int sipi = cs->interrupt_request &CPU_INTERRUPT_SIPI ; +int sipi =cpu_interrupt_request (cs) &CPU_INTERRUPT_SIPI ; *save = *env;cpu_reset (cs); - cs->interrupt_request = sipi; +cpu_interrupt_request_set (cs, sipi);memcpy (&env->start_init_save, &save->start_init_save, offsetof(CPUX86State , end_init_save) - offsetof(CPUX86State , start_init_save));
target/i386/svm_helper.c +2 -2
@@ -316,7 +316,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)if (int_ctl &V_IRQ_MASK ) {CPUState *cs =CPU (x86_env_get_cpu (env)); - cs->interrupt_request |=CPU_INTERRUPT_VIRQ ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_VIRQ ); }/* maybe we need to inject an event */
@@ -674,7 +674,7 @@ void do_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1) env->vm_vmcb + offsetof(struct vmcb, control.int_ctl)); int_ctl &= ~(V_TPR_MASK |V_IRQ_MASK ); int_ctl |= env->v_tpr &V_TPR_MASK ; -if (cs->interrupt_request &CPU_INTERRUPT_VIRQ ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_VIRQ ) { int_ctl |=V_IRQ_MASK ; } x86_stl_phys(cs,
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 37/71] i386: convert to cpu_interrupt_request
Quoted 6 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/cpu.c | 2 +- target/i386/helper.c | 4 ++-- target/i386/svm_helper.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
r~
RFC v4 38/71 i386/kvm: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/i386/kvm.c | 54 +++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 23 deletions(-)
target/i386/kvm.c +31 -23
@@ -2704,11 +2704,14 @@ static int kvm_put_vcpu_events(X86CPU *cpu, int level) events.smi.smm = !!(env->hflags &HF_SMM_MASK ); events.smi.smm_inside_nmi = !!(env->hflags2 &HF2_SMM_INSIDE_NMI_MASK );if (kvm_irqchip_in_kernel ()) { +uint32_t interrupt_request; +/* As soon as these are moved to the kernel, remove them * from cs->interrupt_request. */ - events.smi.pending = cs->interrupt_request &CPU_INTERRUPT_SMI ; - events.smi.latched_init = cs->interrupt_request &CPU_INTERRUPT_INIT ; + interrupt_request =cpu_interrupt_request (cs); + events.smi.pending = interrupt_request &CPU_INTERRUPT_SMI ; + events.smi.latched_init = interrupt_request &CPU_INTERRUPT_INIT ;cpu_reset_interrupt (cs,CPU_INTERRUPT_INIT |CPU_INTERRUPT_SMI ); }else {/* Keep these in cs->interrupt_request. */
@@ -2999,14 +3002,14 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) {X86CPU *x86_cpu =X86_CPU (cpu);CPUX86State *env = &x86_cpu->env; +uint32_t interrupt_request;int ret; + interrupt_request =cpu_interrupt_request (cpu);/* Inject NMI */ -if (cpu->interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) { -if (cpu->interrupt_request &CPU_INTERRUPT_NMI ) { -qemu_mutex_lock_iothread (); +if (interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) { +if (interrupt_request &CPU_INTERRUPT_NMI ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_NMI ); -qemu_mutex_unlock_iothread ();DPRINTF ("injected NMI\n" ); ret =kvm_vcpu_ioctl (cpu,KVM_NMI );if (ret <0 ) {
@@ -3014,10 +3017,8 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) strerror(-ret)); } } -if (cpu->interrupt_request &CPU_INTERRUPT_SMI ) { -qemu_mutex_lock_iothread (); +if (interrupt_request &CPU_INTERRUPT_SMI ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_SMI ); -qemu_mutex_unlock_iothread ();DPRINTF ("injected SMI\n" ); ret =kvm_vcpu_ioctl (cpu,KVM_SMI );if (ret <0 ) {
@@ -3031,16 +3032,18 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)qemu_mutex_lock_iothread (); } + interrupt_request =cpu_interrupt_request (cpu); +/* Force the VCPU out of its inner loop to process any INIT requests * or (for userspace APIC, but it is cheap to combine the checks here) * pending TPR access reports. */ -if (cpu->interrupt_request & (CPU_INTERRUPT_INIT |CPU_INTERRUPT_TPR )) { -if ((cpu->interrupt_request &CPU_INTERRUPT_INIT ) && +if (interrupt_request & (CPU_INTERRUPT_INIT |CPU_INTERRUPT_TPR )) { +if ((interrupt_request &CPU_INTERRUPT_INIT ) && !(env->hflags &HF_SMM_MASK )) { cpu->exit_request =1 ; } -if (cpu->interrupt_request &CPU_INTERRUPT_TPR ) { +if (interrupt_request &CPU_INTERRUPT_TPR ) { cpu->exit_request =1 ; } }
@@ -3048,7 +3051,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)if (!kvm_pic_in_kernel ()) {/* Try to inject an interrupt if the guest can accept it */ if (run->ready_for_interrupt_injection && - (cpu->interrupt_request &CPU_INTERRUPT_HARD ) && + (interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) {int irq;
@@ -3072,7 +3075,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run)* interrupt, request an interrupt window exit. This will * cause a return to userspace as soon as the guest is ready to * receive interrupts. */ -if ((cpu->interrupt_request &CPU_INTERRUPT_HARD )) { +if ((cpu_interrupt_request (cpu) &CPU_INTERRUPT_HARD )) { run->request_interrupt_window =1 ; }else { run->request_interrupt_window =0 ;
@@ -3118,8 +3121,9 @@ int kvm_arch_process_async_events(CPUState *cs) {X86CPU *cpu =X86_CPU (cs);CPUX86State *env = &cpu->env; +uint32_t interrupt_request; -if (cs->interrupt_request &CPU_INTERRUPT_MCE ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_MCE ) {/* We must not raise CPU_INTERRUPT_MCE if it's not supported. */ assert (env->mcg_cap);
@@ -3142,7 +3146,7 @@ int kvm_arch_process_async_events(CPUState *cs) } } -if ((cs->interrupt_request &CPU_INTERRUPT_INIT ) && +if ((cpu_interrupt_request (cs) &CPU_INTERRUPT_INIT ) && !(env->hflags &HF_SMM_MASK )) {kvm_cpu_synchronize_state (cs);do_cpu_init (cpu);
@@ -3152,20 +3156,21 @@ int kvm_arch_process_async_events(CPUState *cs)return 0 ; } -if (cs->interrupt_request &CPU_INTERRUPT_POLL ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_POLL ) {cpu_reset_interrupt (cs,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state); } -if (((cs->interrupt_request &CPU_INTERRUPT_HARD ) && + interrupt_request =cpu_interrupt_request (cs); +if (((interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || - (cs->interrupt_request &CPU_INTERRUPT_NMI )) { + (interrupt_request &CPU_INTERRUPT_NMI )) {cpu_halted_set (cs,0 ); } -if (cs->interrupt_request &CPU_INTERRUPT_SIPI ) { +if (interrupt_request &CPU_INTERRUPT_SIPI ) {kvm_cpu_synchronize_state (cs);do_cpu_sipi (cpu); } -if (cs->interrupt_request &CPU_INTERRUPT_TPR ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_TPR ) {cpu_reset_interrupt (cs,CPU_INTERRUPT_TPR );kvm_cpu_synchronize_state (cs); apic_handle_tpr_access_report(cpu->apic_state, env->eip,
@@ -3179,10 +3184,13 @@ static int kvm_handle_halt(X86CPU *cpu) {CPUState *cs =CPU (cpu);CPUX86State *env = &cpu->env; +uint32_t interrupt_request; + + interrupt_request =cpu_interrupt_request (cs); -if (!((cs->interrupt_request &CPU_INTERRUPT_HARD ) && +if (!((interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) && - !(cs->interrupt_request &CPU_INTERRUPT_NMI )) { + !(interrupt_request &CPU_INTERRUPT_NMI )) {cpu_halted_set (cs,1 );return EXCP_HLT ; }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 38/71] i386/kvm: convert to cpu_interrupt_request
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/kvm.c | 54 +++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 23 deletions(-)
r~
RFC v4 39/71 i386/hax-all: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/i386/hax-all.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
target/i386/hax-all.c +17 -13
@@ -293,7 +293,7 @@ int hax_vm_destroy(struct hax_vm *vm)static void hax_handle_interrupt (CPUState *cpu,int mask) { - cpu->interrupt_request |= mask; +cpu_interrupt_request_or (cpu, mask);if (!qemu_cpu_is_self (cpu)) {qemu_cpu_kick (cpu);
@@ -427,7 +427,7 @@ static int hax_vcpu_interrupt(CPUArchState *env)* Unlike KVM, HAX kernel check for the eflags, instead of qemu */ if (ht->ready_for_interrupt_injection && - (cpu->interrupt_request &CPU_INTERRUPT_HARD )) { + (cpu_interrupt_request (cpu) &CPU_INTERRUPT_HARD )) {int irq; irq =cpu_get_pic_interrupt (env);
@@ -441,7 +441,7 @@ static int hax_vcpu_interrupt(CPUArchState *env)* interrupt, request an interrupt window exit. This will * cause a return to userspace as soon as the guest is ready to * receive interrupts. */ -if ((cpu->interrupt_request &CPU_INTERRUPT_HARD )) { +if ((cpu_interrupt_request (cpu) &CPU_INTERRUPT_HARD )) { ht->request_interrupt_window =1 ; }else { ht->request_interrupt_window =0 ;
@@ -482,19 +482,19 @@ static int hax_vcpu_hax_exec(CPUArchState *env)cpu_halted_set (cpu,0 ); -if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { +if (cpu_interrupt_request (cpu) &CPU_INTERRUPT_POLL ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );apic_poll_irq (x86_cpu->apic_state); } -if (cpu->interrupt_request &CPU_INTERRUPT_INIT ) { +if (cpu_interrupt_request (cpu) &CPU_INTERRUPT_INIT ) {DPRINTF ("\nhax_vcpu_hax_exec: handling INIT for %d\n" , cpu->cpu_index);do_cpu_init (x86_cpu);hax_vcpu_sync_state (env,1 ); } -if (cpu->interrupt_request &CPU_INTERRUPT_SIPI ) { +if (cpu_interrupt_request (cpu) &CPU_INTERRUPT_SIPI ) {DPRINTF ("hax_vcpu_hax_exec: handling SIPI for %d\n" , cpu->cpu_index);hax_vcpu_sync_state (env,0 );
@@ -553,13 +553,17 @@ static int hax_vcpu_hax_exec(CPUArchState *env) ret =-1 ;break ;case HAX_EXIT_HLT : -if (!(cpu->interrupt_request &CPU_INTERRUPT_HARD ) && - !(cpu->interrupt_request &CPU_INTERRUPT_NMI )) { -/* hlt instruction with interrupt disabled is shutdown */ - env->eflags |=IF_MASK ; -cpu_halted_set (cpu,1 ); - cpu->exception_index =EXCP_HLT ; - ret =1 ; + { +uint32_t interrupt_request =cpu_interrupt_request (cpu); + +if (!(interrupt_request &CPU_INTERRUPT_HARD ) && + !(interrupt_request &CPU_INTERRUPT_NMI )) { +/* hlt instruction with interrupt disabled is shutdown */ + env->eflags |=IF_MASK ; +cpu_halted_set (cpu,1 ); + cpu->exception_index =EXCP_HLT ; + ret =1 ; + } }break ;/* these situations will continue to hax module */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 39/71] i386/hax-all: convert to cpu_interrupt_request
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/hax-all.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-)
r~
RFC v4 40/71 i386/whpx-all: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/i386/whpx-all.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-)
target/i386/whpx-all.c +24 -17
@@ -690,12 +690,14 @@ static int whpx_handle_portio(CPUState *cpu,static int whpx_handle_halt (CPUState *cpu) {struct CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +uint32_t interrupt_request;int ret =0 ;qemu_mutex_lock_iothread (); -if (!((cpu->interrupt_request &CPU_INTERRUPT_HARD ) && + interrupt_request =cpu_interrupt_request (cpu); +if (!((interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) && - !(cpu->interrupt_request &CPU_INTERRUPT_NMI )) { + !(interrupt_request &CPU_INTERRUPT_NMI )) { cpu->exception_index =EXCP_HLT ;cpu_halted_set (cpu, true); ret =1 ;
@@ -713,6 +715,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)struct CPUX86State *env = (CPUArchState *)(cpu->env_ptr);X86CPU *x86_cpu =X86_CPU (cpu);int irq; +uint32_t interrupt_request;uint8_t tpr;WHV_X64_PENDING_INTERRUPTION_REGISTER new_int;UINT32 reg_count =0 ;
@@ -724,17 +727,19 @@ static void whpx_vcpu_pre_run(CPUState *cpu)qemu_mutex_lock_iothread (); + interrupt_request =cpu_interrupt_request (cpu); +/* Inject NMI */ if (!vcpu->interruption_pending && - cpu->interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) { -if (cpu->interrupt_request &CPU_INTERRUPT_NMI ) { + interrupt_request & (CPU_INTERRUPT_NMI |CPU_INTERRUPT_SMI )) { +if (interrupt_request &CPU_INTERRUPT_NMI ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_NMI ); vcpu->interruptable = false; new_int.InterruptionType = WHvX64PendingNmi; new_int.InterruptionPending =1 ; new_int.InterruptionVector =2 ; } -if (cpu->interrupt_request &CPU_INTERRUPT_SMI ) { +if (interrupt_request &CPU_INTERRUPT_SMI ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_SMI ); } }
@@ -743,12 +748,12 @@ static void whpx_vcpu_pre_run(CPUState *cpu)* Force the VCPU out of its inner loop to process any INIT requests or * commit pending TPR access. */ -if (cpu->interrupt_request & (CPU_INTERRUPT_INIT |CPU_INTERRUPT_TPR )) { -if ((cpu->interrupt_request &CPU_INTERRUPT_INIT ) && +if (interrupt_request & (CPU_INTERRUPT_INIT |CPU_INTERRUPT_TPR )) { +if ((interrupt_request &CPU_INTERRUPT_INIT ) && !(env->hflags &HF_SMM_MASK )) { cpu->exit_request =1 ; } -if (cpu->interrupt_request &CPU_INTERRUPT_TPR ) { +if (interrupt_request &CPU_INTERRUPT_TPR ) { cpu->exit_request =1 ; } }
@@ -757,7 +762,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)if (!vcpu->interruption_pending && vcpu->interruptable && (env->eflags &IF_MASK )) {assert (!new_int.InterruptionPending); -if (cpu->interrupt_request &CPU_INTERRUPT_HARD ) { +if (interrupt_request &CPU_INTERRUPT_HARD ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_HARD ); irq =cpu_get_pic_interrupt (env);if (irq >=0 ) {
@@ -787,7 +792,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)/* Update the state of the interrupt delivery notification */ if (!vcpu->window_registered && - cpu->interrupt_request &CPU_INTERRUPT_HARD ) { +cpu_interrupt_request (cpu) &CPU_INTERRUPT_HARD ) { reg_values[reg_count].DeliverabilityNotifications.InterruptNotification =1 ; vcpu->window_registered =1 ;
@@ -840,8 +845,9 @@ static void whpx_vcpu_process_async_events(CPUState *cpu)struct CPUX86State *env = (CPUArchState *)(cpu->env_ptr);X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); +uint32_t interrupt_request; -if ((cpu->interrupt_request &CPU_INTERRUPT_INIT ) && +if ((cpu_interrupt_request (cpu) &CPU_INTERRUPT_INIT ) && !(env->hflags &HF_SMM_MASK )) {do_cpu_init (x86_cpu);
@@ -849,25 +855,26 @@ static void whpx_vcpu_process_async_events(CPUState *cpu) vcpu->interruptable = true; } -if (cpu->interrupt_request &CPU_INTERRUPT_POLL ) { +if (cpu_interrupt_request (cpu) &CPU_INTERRUPT_POLL ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_POLL );apic_poll_irq (x86_cpu->apic_state); } -if (((cpu->interrupt_request &CPU_INTERRUPT_HARD ) && + interrupt_request =cpu_interrupt_request (cpu); +if (((interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || - (cpu->interrupt_request &CPU_INTERRUPT_NMI )) { + (interrupt_request &CPU_INTERRUPT_NMI )) {cpu_halted_set (cpu, false); } -if (cpu->interrupt_request &CPU_INTERRUPT_SIPI ) { +if (interrupt_request &CPU_INTERRUPT_SIPI ) {if (!cpu->vcpu_dirty) {whpx_get_registers (cpu); }do_cpu_sipi (x86_cpu); } -if (cpu->interrupt_request &CPU_INTERRUPT_TPR ) { +if (cpu_interrupt_request (cpu) &CPU_INTERRUPT_TPR ) {cpu_reset_interrupt (cpu,CPU_INTERRUPT_TPR );if (!cpu->vcpu_dirty) {whpx_get_registers (cpu);
@@ -1350,7 +1357,7 @@ static void whpx_memory_init(void)static void whpx_handle_interrupt (CPUState *cpu,int mask) { - cpu->interrupt_request |= mask; +cpu_interrupt_request_or (cpu, mask);if (!qemu_cpu_is_self (cpu)) {qemu_cpu_kick (cpu);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 40/71] i386/whpx-all: convert to cpu_interrupt_request
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/whpx-all.c | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-)
r~
RFC v4 41/71 i386/hvf: convert to cpu_request_interrupt
In reply to Emilio G. Cota--- target/i386/hvf/hvf.c | 8 +++++--- target/i386/hvf/x86hvf.c | 26 +++++++++++++++----------- 2 files changed, 20 insertions(+), 14 deletions(-)
target/i386/hvf/hvf.c +5 -3
@@ -250,7 +250,7 @@ void update_apic_tpr(CPUState *cpu)static void hvf_handle_interrupt (CPUState * cpu,int mask) { - cpu->interrupt_request |= mask; +cpu_interrupt_request_or (cpu, mask);if (!qemu_cpu_is_self (cpu)) {qemu_cpu_kick (cpu); }
@@ -712,10 +712,12 @@ int hvf_vcpu_exec(CPUState *cpu) ret =0 ;switch (exit_reason) {case EXIT_REASON_HLT : { +uint32_t interrupt_request =cpu_interrupt_request (cpu); +macvm_set_rip (cpu, rip + ins_len); -if (!((cpu->interrupt_request &CPU_INTERRUPT_HARD ) && +if (!((interrupt_request &CPU_INTERRUPT_HARD ) && (EFLAGS (env) &IF_MASK )) - && !(cpu->interrupt_request &CPU_INTERRUPT_NMI ) && + && !(interrupt_request &CPU_INTERRUPT_NMI ) && !(idtvec_info &VMCS_IDT_VEC_VALID )) {cpu_halted_set (cpu,1 ); ret =EXCP_HLT ;
target/i386/hvf/x86hvf.c +15 -11
@@ -358,6 +358,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state)uint8_t vector;uint64_t intr_type; +uint32_t interrupt_request;bool have_event = true;if (env->interrupt_injected !=-1 ) { vector = env->interrupt_injected;
@@ -400,7 +401,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state) }; } -if (cpu_state->interrupt_request &CPU_INTERRUPT_NMI ) { +if (cpu_interrupt_request (cpu_state) &CPU_INTERRUPT_NMI ) {if (!(env->hflags2 &HF2_NMI_MASK ) && !(info &VMCS_INTR_VALID )) {cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_NMI ); info =VMCS_INTR_VALID |VMCS_INTR_T_NMI |NMI_VEC ;
@@ -411,7 +412,7 @@ bool hvf_inject_interrupts(CPUState *cpu_state) }if (!(env->hflags &HF_INHIBIT_IRQ_MASK ) && - (cpu_state->interrupt_request &CPU_INTERRUPT_HARD ) && + (cpu_interrupt_request (cpu_state) &CPU_INTERRUPT_HARD ) && (EFLAGS (env) &IF_MASK ) && !(info &VMCS_INTR_VALID )) {int line =cpu_get_pic_interrupt (&x86cpu->env);cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_HARD );
@@ -420,39 +421,42 @@ bool hvf_inject_interrupts(CPUState *cpu_state) VMCS_INTR_VALID | VMCS_INTR_T_HWINTR); } } -if (cpu_state->interrupt_request &CPU_INTERRUPT_HARD ) { +if (cpu_interrupt_request (cpu_state) &CPU_INTERRUPT_HARD ) {vmx_set_int_window_exiting (cpu_state); } -return (cpu_state->interrupt_request - & (CPU_INTERRUPT_INIT |CPU_INTERRUPT_TPR )); +return cpu_interrupt_request (cpu_state) & (CPU_INTERRUPT_INIT | +CPU_INTERRUPT_TPR ); }int hvf_process_events (CPUState *cpu_state) {X86CPU *cpu =X86_CPU (cpu_state);CPUX86State *env = &cpu->env; +uint32_t interrupt_request;EFLAGS (env) =rreg (cpu_state->hvf_fd,HV_X86_RFLAGS ); -if (cpu_state->interrupt_request &CPU_INTERRUPT_INIT ) { +if (cpu_interrupt_request (cpu_state) &CPU_INTERRUPT_INIT ) {hvf_cpu_synchronize_state (cpu_state);do_cpu_init (cpu); } -if (cpu_state->interrupt_request &CPU_INTERRUPT_POLL ) { +if (cpu_interrupt_request (cpu_state) &CPU_INTERRUPT_POLL ) {cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_POLL );apic_poll_irq (cpu->apic_state); } -if (((cpu_state->interrupt_request &CPU_INTERRUPT_HARD ) && + + interrupt_request =cpu_interrupt_request (cpu_state); +if (((interrupt_request &CPU_INTERRUPT_HARD ) && (EFLAGS (env) &IF_MASK )) || - (cpu_state->interrupt_request &CPU_INTERRUPT_NMI )) { + (interrupt_request &CPU_INTERRUPT_NMI )) {cpu_halted_set (cpu_state,0 ); } -if (cpu_state->interrupt_request &CPU_INTERRUPT_SIPI ) { +if (interrupt_request &CPU_INTERRUPT_SIPI ) {hvf_cpu_synchronize_state (cpu_state);do_cpu_sipi (cpu); } -if (cpu_state->interrupt_request &CPU_INTERRUPT_TPR ) { +if (cpu_interrupt_request (cpu_state) &CPU_INTERRUPT_TPR ) {cpu_reset_interrupt (cpu_state,CPU_INTERRUPT_TPR );hvf_cpu_synchronize_state (cpu_state); apic_handle_tpr_access_report(cpu->apic_state, env->eip,
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 41/71] i386/hvf: convert to cpu_request_interrupt
Quoted 5 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- target/i386/hvf/hvf.c | 8 +++++--- target/i386/hvf/x86hvf.c | 26 +++++++++++++++----------- 2 files changed, 20 insertions(+), 14 deletions(-)
r~
RFC v4 42/71 ppc: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- hw/ppc/ppc.c | 2 +- target/ppc/excp_helper.c | 2 +- target/ppc/kvm.c | 4 ++-- target/ppc/translate_init.inc.c | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-)
hw/ppc/ppc.c +1 -1
@@ -91,7 +91,7 @@ void ppc_set_irq(PowerPCCPU *cpu, int n_IRQ, int level)LOG_IRQ ("%s: %p n_IRQ %d level %d => pending %08" PRIx32"req %08x\n" , __func__, env, n_IRQ, level, - env->pending_interrupts,CPU (cpu)->interrupt_request); + env->pending_interrupts,cpu_interrupt_request (CPU (cpu)));if (locked) {qemu_mutex_unlock_iothread ();
target/ppc/excp_helper.c +1 -1
@@ -753,7 +753,7 @@ static void ppc_hw_interrupt(CPUPPCState *env)qemu_log_mask (CPU_LOG_INT ,"%s: %p pending %08x req %08x me %d ee %d\n" , __func__, env, env->pending_interrupts, - cs->interrupt_request, (int )msr_me, (int )msr_ee); +cpu_interrupt_request (cs), (int )msr_me, (int )msr_ee);#endif /* External reset */ if (env->pending_interrupts & (1 <<PPC_INTERRUPT_RESET )) {
target/ppc/kvm.c +2 -2
@@ -1334,7 +1334,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)* interrupt, reset, etc) in PPC-specific env->irq_input_state. */ if (!cap_interrupt_level && run->ready_for_interrupt_injection && - (cs->interrupt_request &CPU_INTERRUPT_HARD ) && + (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) && (env->irq_input_state & (1 <<PPC_INPUT_INT ))) {/* For now KVM disregards the 'irq' argument. However, in the
@@ -1376,7 +1376,7 @@ static int kvmppc_handle_halt(PowerPCCPU *cpu)CPUState *cs =CPU (cpu);CPUPPCState *env = &cpu->env; -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD ) && (msr_ee)) { +if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) && (msr_ee)) {cpu_halted_set (cs,1 ); cs->exception_index =EXCP_HLT ; }
target/ppc/translate_init.inc.c +7 -7
@@ -8446,7 +8446,7 @@ static bool cpu_has_work_POWER7(CPUState *cs)CPUPPCState *env = &cpu->env;if (cpu_halted (cs)) { -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { +if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false; } if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) &&
@@ -8470,7 +8470,7 @@ static bool cpu_has_work_POWER7(CPUState *cs) }return false; }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); +return msr_ee && (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ); } }
@@ -8600,7 +8600,7 @@ static bool cpu_has_work_POWER8(CPUState *cs)CPUPPCState *env = &cpu->env;if (cpu_halted (cs)) { -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { +if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false; } if ((env->pending_interrupts & (1u << PPC_INTERRUPT_EXT)) &&
@@ -8632,7 +8632,7 @@ static bool cpu_has_work_POWER8(CPUState *cs) }return false; }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); +return msr_ee && (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ); } }
@@ -8792,7 +8792,7 @@ static bool cpu_has_work_POWER9(CPUState *cs)CPUPPCState *env = &cpu->env;if (cpu_halted (cs)) { -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { +if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false; }/* External Exception */
@@ -8825,7 +8825,7 @@ static bool cpu_has_work_POWER9(CPUState *cs) }return false; }else { -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); +return msr_ee && (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ); } }
@@ -10236,7 +10236,7 @@ static bool ppc_cpu_has_work(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; -return msr_ee && (cs->interrupt_request &CPU_INTERRUPT_HARD ); +return msr_ee && (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ); }/* CPUClass::reset() */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 42/71] ppc: convert to cpu_interrupt_request
Quoted 10 lines · Emilio G. Cota
Cc David Gibson <[email protected]>Cc Alexander Graf <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- hw/ppc/ppc.c | 2 +- target/ppc/excp_helper.c | 2 +- target/ppc/kvm.c | 4 ++-- target/ppc/translate_init.inc.c | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-)
r~
RFC v4 43/71 sh4: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/sh4/cpu.c | 2 +- target/sh4/helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
target/sh4/cpu.c +1 -1
@@ -45,7 +45,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)static bool superh_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }/* CPUClass::reset() */
target/sh4/helper.c +1 -1
@@ -83,7 +83,7 @@ void superh_cpu_do_interrupt(CPUState *cs) {SuperHCPU *cpu =SUPERH_CPU (cs);CPUSH4State *env = &cpu->env; -int do_irq = cs->interrupt_request &CPU_INTERRUPT_HARD ; +int do_irq =cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ;int do_exp, irq_vector = cs->exception_index;/* prioritize exceptions over interrupts */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 43/71] sh4: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc Aurelien Jarno <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 23 lines
--- target/sh4/cpu.c | 2 +- target/sh4/helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)target/sh4/cpu.c +1
-1@@ -45,7 +45,7 @@ static void superh_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)static bool superh_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }/* CPUClass::reset() */ target/sh4/helper.c +0
-0
target/sh4/helper.c void superh_cpu_do_interrupt(CPUState *cs) · line 89
Quoted 8 lines
target/sh4/helper.c +1
-1@@ -83,7 +83,7 @@ void superh_cpu_do_interrupt(CPUState *cs) {SuperHCPU *cpu =SUPERH_CPU (cs);CPUSH4State *env = &cpu->env; -int do_irq = cs->interrupt_request &CPU_INTERRUPT_HARD ; +int do_irq =cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ;int do_exp, irq_vector = cs->exception_index;/* prioritize exceptions over interrupts */
--
Alex Bennée
RFC v4 44/71 cris: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/cris/cpu.c | 2 +- target/cris/helper.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
target/cris/cpu.c +1 -1
@@ -37,7 +37,7 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value)static bool cris_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }/* CPUClass::reset() */
target/cris/helper.c +3 -3
@@ -116,7 +116,7 @@ int cris_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw,if (r >0 ) {qemu_log_mask (CPU_LOG_MMU ,"%s returns %d irqreq=%x addr=%" VADDR_PRIx" phy=%x vec=%x" -" pc=%x\n" , __func__, r, cs->interrupt_request, address, +" pc=%x\n" , __func__, r,cpu_interrupt_request (cs), address, res.phy, res.bf_vec, env->pc); }return r;
@@ -130,7 +130,7 @@ void crisv10_cpu_do_interrupt(CPUState *cs)D_LOG ("exception index=%d interrupt_req=%d\n" , cs->exception_index, - cs->interrupt_request); +cpu_interrupt_request (cs));if (env->dslot) {/* CRISv10 never takes interrupts while in a delay-slot. */
@@ -192,7 +192,7 @@ void cris_cpu_do_interrupt(CPUState *cs)D_LOG ("exception index=%d interrupt_req=%d\n" , cs->exception_index, - cs->interrupt_request); +cpu_interrupt_request (cs));switch (cs->exception_index) {case EXCP_BREAK :
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 44/71] cris: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc "Edgar E. Iglesias" <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 41 lines
--- target/cris/cpu.c | 2 +- target/cris/helper.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)target/cris/cpu.c +1
-1@@ -37,7 +37,7 @@ static void cris_cpu_set_pc(CPUState *cs, vaddr value)static bool cris_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }/* CPUClass::reset() */ target/cris/helper.c +2
-2@@ -116,7 +116,7 @@ int cris_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw,if (r >0 ) {qemu_log_mask (CPU_LOG_MMU ,"%s returns %d irqreq=%x addr=%" VADDR_PRIx" phy=%x vec=%x" -" pc=%x\n" , __func__, r, cs->interrupt_request, address, +" pc=%x\n" , __func__, r,cpu_interrupt_request (cs), address, res.phy, res.bf_vec, env->pc); }return r;@@ -130,7 +130,7 @@ void crisv10_cpu_do_interrupt(CPUState *cs)D_LOG ("exception index=%d interrupt_req=%d\n" , cs->exception_index, - cs->interrupt_request); +cpu_interrupt_request (cs));if (env->dslot) {/* CRISv10 never takes interrupts while in a delay-slot. */
target/cris/helper.c void cris_cpu_do_interrupt(CPUState *cs) · line 198
Quoted 8 lines
target/cris/helper.c +1
-1@@ -192,7 +192,7 @@ void cris_cpu_do_interrupt(CPUState *cs)D_LOG ("exception index=%d interrupt_req=%d\n" , cs->exception_index, - cs->interrupt_request); +cpu_interrupt_request (cs));switch (cs->exception_index) {case EXCP_BREAK :
--
Alex Bennée
RFC v4 45/71 hppa: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/hppa/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/hppa/cpu.c +1 -1
@@ -60,7 +60,7 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)static bool hppa_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }static void hppa_cpu_disas_set_info (CPUState *cs,disassemble_info *info)
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 45/71] hppa: convert to cpu_interrupt_request
Quoted 2 lines · Emilio G. Cota
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/hppa/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/hppa/cpu.c +0
-0
target/hppa/cpu.c static void hppa_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb) · line 66
Quoted 8 lines
target/hppa/cpu.c +1
-1@@ -60,7 +60,7 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs, TranslationBlock *tb)static bool hppa_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }static void hppa_cpu_disas_set_info (CPUState *cs,disassemble_info *info)
--
Alex Bennée
RFC v4 46/71 lm32: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/lm32/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/lm32/cpu.c +1 -1
@@ -101,7 +101,7 @@ static void lm32_cpu_init_cfg_reg(LM32CPU *cpu)static bool lm32_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }/* CPUClass::reset() */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 46/71] lm32: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc Michael Walle <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/lm32/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/lm32/cpu.c +0
-0
target/lm32/cpu.c static void lm32_cpu_init_cfg_reg(LM32CPU *cpu) · line 107
Quoted 8 lines
target/lm32/cpu.c +1
-1@@ -101,7 +101,7 @@ static void lm32_cpu_init_cfg_reg(LM32CPU *cpu)static bool lm32_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }/* CPUClass::reset() */
--
Alex Bennée
RFC v4 47/71 m68k: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/m68k/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/m68k/cpu.c +1 -1
@@ -34,7 +34,7 @@ static void m68k_cpu_set_pc(CPUState *cs, vaddr value)static bool m68k_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }static void m68k_set_feature (CPUM68KState *env,int feature)
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 47/71] m68k: convert to cpu_interrupt_request
Quoted 7 lines · Emilio G. Cota
Cc Laurent Vivier <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/m68k/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
RFC v4 48/71 mips: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/mips/cpu.c | 7 ++++--- target/mips/kvm.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
target/mips/cpu.c +4 -3
@@ -56,11 +56,12 @@ static bool mips_cpu_has_work(CPUState *cs)MIPSCPU *cpu =MIPS_CPU (cs);CPUMIPSState *env = &cpu->env;bool has_work = false; +uint32_t interrupt_request =cpu_interrupt_request (cs);/* Prior to MIPS Release 6 it is implementation dependent if non-enabled interrupts wake-up the CPU, however most of the implementations only check for interrupts that can be taken. */ -if ((cs->interrupt_request &CPU_INTERRUPT_HARD ) && +if ((interrupt_request &CPU_INTERRUPT_HARD ) &&cpu_mips_hw_interrupts_pending (env)) {if (cpu_mips_hw_interrupts_enabled (env) || (env->insn_flags &ISA_MIPS32R6 )) {
@@ -72,7 +73,7 @@ static bool mips_cpu_has_work(CPUState *cs)if (env->CP0_Config3 & (1 <<CP0C3_MT )) {/* The QEMU model will issue an _WAKE request whenever the CPUs should be woken up. */ -if (cs->interrupt_request &CPU_INTERRUPT_WAKE ) { +if (interrupt_request &CPU_INTERRUPT_WAKE ) { has_work = true; }
@@ -82,7 +83,7 @@ static bool mips_cpu_has_work(CPUState *cs) }/* MIPS Release 6 has the ability to halt the CPU. */ if (env->CP0_Config5 & (1 <<CP0C5_VP )) { -if (cs->interrupt_request &CPU_INTERRUPT_WAKE ) { +if (interrupt_request &CPU_INTERRUPT_WAKE ) { has_work = true; }if (!mips_vp_active (env)) {
target/mips/kvm.c +1 -1
@@ -135,7 +135,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run)qemu_mutex_lock_iothread (); -if ((cs->interrupt_request &CPU_INTERRUPT_HARD ) && +if ((cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) &&cpu_mips_io_interrupts_pending (cpu)) { intr.cpu =-1 ; intr.irq =2 ;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 48/71] mips: convert to cpu_interrupt_request
Quoted 8 lines · Emilio G. Cota
Cc Aurelien Jarno <[email protected]>Cc Aleksandar Markovic <[email protected]>Cc James Hogan <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/mips/cpu.c | 7 ++++--- target/mips/kvm.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
r~
RFC v4 49/71 nios: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/nios2/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/nios2/cpu.c +1 -1
@@ -36,7 +36,7 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value)static bool nios2_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }/* CPUClass::reset() */
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 49/71] nios: convert to cpu_interrupt_request
Quoted 4 lines · Emilio G. Cota
Cc Chris Wulff <[email protected]>Cc Marek Vasut <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/nios2/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/nios2/cpu.c +0
-0
target/nios2/cpu.c static void nios2_cpu_set_pc(CPUState *cs, vaddr value) · line 42
Quoted 8 lines
target/nios2/cpu.c +1
-1@@ -36,7 +36,7 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value)static bool nios2_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }/* CPUClass::reset() */
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 49/71] nios: convert to cpu_interrupt_request
In reply to Emilio G. CotaQuoted 4 lines · Emilio G. Cota
Cc Chris Wulff <[email protected]>Cc Marek Vasut <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/nios2/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/nios2/cpu.c +0
-0
target/nios2/cpu.c static void nios2_cpu_set_pc(CPUState *cs, vaddr value) · line 42
Quoted 8 lines
target/nios2/cpu.c +1
-1@@ -36,7 +36,7 @@ static void nios2_cpu_set_pc(CPUState *cs, vaddr value)static bool nios2_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }/* CPUClass::reset() */
--
Alex Bennée
RFC v4 50/71 s390x: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- hw/intc/s390_flic.c | 2 +- target/s390x/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
hw/intc/s390_flic.c +1 -1
@@ -189,7 +189,7 @@ static void qemu_s390_flic_notify(uint32_t type)CPU_FOREACH (cs) {S390CPU *cpu =S390_CPU (cs); - cs->interrupt_request |=CPU_INTERRUPT_HARD ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_HARD );/* ignore CPUs that are not sleeping */ if (s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING &&
target/s390x/cpu.c +1 -1
@@ -65,7 +65,7 @@ static bool s390_cpu_has_work(CPUState *cs)return false; } -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { +if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false; }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 50/71] s390x: convert to cpu_interrupt_request
Quoted 7 lines · Emilio G. Cota
Cc Cornelia Huck <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Alexander Graf <[email protected]>Cc David Hildenbrand <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 23 lines
--- hw/intc/s390_flic.c | 2 +- target/s390x/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)hw/intc/s390_flic.c +1
-1@@ -189,7 +189,7 @@ static void qemu_s390_flic_notify(uint32_t type)CPU_FOREACH (cs) {S390CPU *cpu =S390_CPU (cs); - cs->interrupt_request |=CPU_INTERRUPT_HARD ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_HARD );/* ignore CPUs that are not sleeping */ if (s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING &&target/s390x/cpu.c +0
-0
target/s390x/cpu.c static bool s390_cpu_has_work(CPUState *cs) · line 70
Quoted 7 lines
target/s390x/cpu.c +1
-1@@ -65,7 +65,7 @@ static bool s390_cpu_has_work(CPUState *cs)return false; } -if (!(cs->interrupt_request &CPU_INTERRUPT_HARD )) { +if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false; }
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 50/71] s390x: convert to cpu_interrupt_request
In reply to Emilio G. CotaQuoted 11 lines · On Thu, 25 Oct 2018 10:46:23 -0400 "Emilio G. Cota" <[email protected]> wrote:
Cc Cornelia Huck <[email protected]>Cc Christian Borntraeger <[email protected]>Cc Alexander Graf <[email protected]>Cc David Hildenbrand <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- hw/intc/s390_flic.c | 2 +- target/s390x/cpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
RFC v4 51/71 alpha: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/alpha/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
target/alpha/cpu.c +4 -4
@@ -42,10 +42,10 @@ static bool alpha_cpu_has_work(CPUState *cs)assume that if a CPU really wants to stay asleep, it will mask interrupts at the chipset level, which will prevent these bits from being set in the first place. */ -return cs->interrupt_request & (CPU_INTERRUPT_HARD - |CPU_INTERRUPT_TIMER - |CPU_INTERRUPT_SMP - |CPU_INTERRUPT_MCHK ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD + |CPU_INTERRUPT_TIMER + |CPU_INTERRUPT_SMP + |CPU_INTERRUPT_MCHK ); }static void alpha_cpu_disas_set_info (CPUState *cpu,disassemble_info *info)
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 51/71] alpha: convert to cpu_interrupt_request
Quoted 2 lines · Emilio G. Cota
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 13 lines
--- target/alpha/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)target/alpha/cpu.c +0
-1@@ -42,10 +42,10 @@ static bool alpha_cpu_has_work(CPUState *cs)assume that if a CPU really wants to stay asleep, it will mask interrupts at the chipset level, which will prevent these bits from being set in the first place. */ - return cs->interrupt_request & (CPU_INTERRUPT_HARD
target/alpha/cpu.c static bool alpha_cpu_has_work(CPUState *cs) · line 51
Quoted 10 lines
target/alpha/cpu.c +4
-3- | CPU_INTERRUPT_TIMER - |CPU_INTERRUPT_SMP - | CPU_INTERRUPT_MCHK); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD + |CPU_INTERRUPT_TIMER + |CPU_INTERRUPT_SMP + |CPU_INTERRUPT_MCHK ); }static void alpha_cpu_disas_set_info (CPUState *cpu,disassemble_info *info)
--
Alex Bennée
RFC v4 52/71 moxie: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/moxie/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/moxie/cpu.c +1 -1
@@ -33,7 +33,7 @@ static void moxie_cpu_set_pc(CPUState *cs, vaddr value)static bool moxie_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }static void moxie_cpu_reset (CPUState *s)
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 52/71] moxie: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc Anthony Green <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/moxie/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/moxie/cpu.c +0
-0
target/moxie/cpu.c static void moxie_cpu_set_pc(CPUState *cs, vaddr value) · line 39
Quoted 8 lines
target/moxie/cpu.c +1
-1@@ -33,7 +33,7 @@ static void moxie_cpu_set_pc(CPUState *cs, vaddr value)static bool moxie_cpu_has_work (CPUState *cs) { -return cs->interrupt_request &CPU_INTERRUPT_HARD ; +return cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ; }static void moxie_cpu_reset (CPUState *s)
--
Alex Bennée
RFC v4 53/71 sparc: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- hw/sparc64/sparc64.c | 4 ++-- target/sparc/cpu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
hw/sparc64/sparc64.c +2 -2
@@ -56,7 +56,7 @@ void cpu_check_irqs(CPUSPARCState *env)/* The bit corresponding to psrpil is (1<< psrpil), the next bit is (2 << psrpil). */ if (pil < (2 << env->psrpil)) { -if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) {trace_sparc64_cpu_check_irqs_reset_irq (env->interrupt_index); env->interrupt_index =0 ;cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD );
@@ -87,7 +87,7 @@ void cpu_check_irqs(CPUSPARCState *env)break ; } } - }else if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { + }else if (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) {trace_sparc64_cpu_check_irqs_disabled (pil, env->pil_in, env->softint, env->interrupt_index); env->interrupt_index =0 ;
target/sparc/cpu.c +1 -1
@@ -709,7 +709,7 @@ static bool sparc_cpu_has_work(CPUState *cs)SPARCCPU *cpu =SPARC_CPU (cs);CPUSPARCState *env = &cpu->env; -return (cs->interrupt_request &CPU_INTERRUPT_HARD ) && +return (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) &&cpu_interrupts_enabled (env); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 53/71] sparc: convert to cpu_interrupt_request
Quoted 4 lines · Emilio G. Cota
Cc Mark Cave-Ayland <[email protected]>Cc Artyom Tarasenko <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 32 lines
--- hw/sparc64/sparc64.c | 4 ++-- target/sparc/cpu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)hw/sparc64/sparc64.c +2
-2@@ -56,7 +56,7 @@ void cpu_check_irqs(CPUSPARCState *env)/* The bit corresponding to psrpil is (1<< psrpil), the next bit is (2 << psrpil). */ if (pil < (2 << env->psrpil)) { -if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) {trace_sparc64_cpu_check_irqs_reset_irq (env->interrupt_index); env->interrupt_index =0 ;cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD );@@ -87,7 +87,7 @@ void cpu_check_irqs(CPUSPARCState *env)break ; } } - }else if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { + }else if (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) {trace_sparc64_cpu_check_irqs_disabled (pil, env->pil_in, env->softint, env->interrupt_index); env->interrupt_index =0 ;target/sparc/cpu.c +0
-0
target/sparc/cpu.c static bool sparc_cpu_has_work(CPUState *cs) · line 714
Quoted 7 lines
target/sparc/cpu.c +1
-1@@ -709,7 +709,7 @@ static bool sparc_cpu_has_work(CPUState *cs)SPARCCPU *cpu =SPARC_CPU (cs);CPUSPARCState *env = &cpu->env; -return (cs->interrupt_request &CPU_INTERRUPT_HARD ) && +return (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) &&cpu_interrupts_enabled (env); }
--
Alex Bennée
Re: [Qemu-devel] [RFC v4 53/71] sparc: convert to cpu_interrupt_request
In reply to Emilio G. CotaQuoted 4 lines · Emilio G. Cota
Cc Mark Cave-Ayland <[email protected]>Cc Artyom Tarasenko <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 32 lines
--- hw/sparc64/sparc64.c | 4 ++-- target/sparc/cpu.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)hw/sparc64/sparc64.c +2
-2@@ -56,7 +56,7 @@ void cpu_check_irqs(CPUSPARCState *env)/* The bit corresponding to psrpil is (1<< psrpil), the next bit is (2 << psrpil). */ if (pil < (2 << env->psrpil)) { -if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { +if (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) {trace_sparc64_cpu_check_irqs_reset_irq (env->interrupt_index); env->interrupt_index =0 ;cpu_reset_interrupt (cs,CPU_INTERRUPT_HARD );@@ -87,7 +87,7 @@ void cpu_check_irqs(CPUSPARCState *env)break ; } } - }else if (cs->interrupt_request &CPU_INTERRUPT_HARD ) { + }else if (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) {trace_sparc64_cpu_check_irqs_disabled (pil, env->pil_in, env->softint, env->interrupt_index); env->interrupt_index =0 ;target/sparc/cpu.c +0
-0
target/sparc/cpu.c static bool sparc_cpu_has_work(CPUState *cs) · line 714
Quoted 7 lines
target/sparc/cpu.c +1
-1@@ -709,7 +709,7 @@ static bool sparc_cpu_has_work(CPUState *cs)SPARCCPU *cpu =SPARC_CPU (cs);CPUSPARCState *env = &cpu->env; -return (cs->interrupt_request &CPU_INTERRUPT_HARD ) && +return (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) &&cpu_interrupts_enabled (env); }
--
Alex Bennée
RFC v4 54/71 openrisc: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- hw/openrisc/cputimer.c | 2 +- target/openrisc/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
hw/openrisc/cputimer.c +1 -1
@@ -102,7 +102,7 @@ static void openrisc_timer_cb(void *opaque)CPUState *cs =CPU (cpu); cpu->env.ttmr |=TTMR_IP ; - cs->interrupt_request |=CPU_INTERRUPT_TIMER ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_TIMER ); }switch (cpu->env.ttmr &TTMR_M ) {
target/openrisc/cpu.c +2 -2
@@ -32,8 +32,8 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value)static bool openrisc_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD | -CPU_INTERRUPT_TIMER ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD | +CPU_INTERRUPT_TIMER ); }static void openrisc_disas_set_info (CPUState *cpu,disassemble_info *info)
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 54/71] openrisc: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc Stafford Horne <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 23 lines
--- hw/openrisc/cputimer.c | 2 +- target/openrisc/cpu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)hw/openrisc/cputimer.c +1
-1@@ -102,7 +102,7 @@ static void openrisc_timer_cb(void *opaque)CPUState *cs =CPU (cpu); cpu->env.ttmr |=TTMR_IP ; - cs->interrupt_request |=CPU_INTERRUPT_TIMER ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_TIMER ); }switch (cpu->env.ttmr &TTMR_M ) {target/openrisc/cpu.c +0
-0
target/openrisc/cpu.c static void openrisc_cpu_set_pc(CPUState *cs, vaddr value) · line 39
Quoted 10 lines
target/openrisc/cpu.c +2
-2@@ -32,8 +32,8 @@ static void openrisc_cpu_set_pc(CPUState *cs, vaddr value)static bool openrisc_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD | -CPU_INTERRUPT_TIMER ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD | +CPU_INTERRUPT_TIMER ); }static void openrisc_disas_set_info (CPUState *cpu,disassemble_info *info)
--
Alex Bennée
RFC v4 55/71 unicore32: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/unicore32/cpu.c | 2 +- target/unicore32/softmmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
target/unicore32/cpu.c +1 -1
@@ -29,7 +29,7 @@ static void uc32_cpu_set_pc(CPUState *cs, vaddr value)static bool uc32_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_EXITTB ); }
target/unicore32/softmmu.c +1 -1
@@ -119,7 +119,7 @@ void uc32_cpu_do_interrupt(CPUState *cs)/* The PC already points to the proper instruction. */ env->regs[30 ] = env->regs[31 ]; env->regs[31 ] = addr; - cs->interrupt_request |=CPU_INTERRUPT_EXITTB ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_EXITTB ); } static int get_phys_addr_ucv2(CPUUniCore32State *env, uint32_t address,
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 55/71] unicore32: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc Guan Xuetao <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 23 lines
--- target/unicore32/cpu.c | 2 +- target/unicore32/softmmu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)target/unicore32/cpu.c +1
-1@@ -29,7 +29,7 @@ static void uc32_cpu_set_pc(CPUState *cs, vaddr value)static bool uc32_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_EXITTB ); }target/unicore32/softmmu.c +0
-0
target/unicore32/softmmu.c void uc32_cpu_do_interrupt(CPUState *cs) · line 125
Quoted 8 lines
target/unicore32/softmmu.c +1
-1@@ -119,7 +119,7 @@ void uc32_cpu_do_interrupt(CPUState *cs)/* The PC already points to the proper instruction. */ env->regs[30 ] = env->regs[31 ]; env->regs[31 ] = addr; - cs->interrupt_request |=CPU_INTERRUPT_EXITTB ; +cpu_interrupt_request_or (cs,CPU_INTERRUPT_EXITTB ); } static int get_phys_addr_ucv2(CPUUniCore32State *env, uint32_t address,
--
Alex Bennée
RFC v4 56/71 microblaze: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- target/microblaze/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/microblaze/cpu.c +1 -1
@@ -84,7 +84,7 @@ static void mb_cpu_set_pc(CPUState *cs, vaddr value)static bool mb_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }#ifndef CONFIG_USER_ONLY
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 56/71] microblaze: convert to cpu_interrupt_request
Quoted 3 lines · Emilio G. Cota
Cc "Edgar E. Iglesias" <[email protected]>Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>
Quoted 9 lines
--- target/microblaze/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/microblaze/cpu.c +0
-0
target/microblaze/cpu.c static void mb_cpu_set_pc(CPUState *cs, vaddr value) · line 90
Quoted 8 lines
target/microblaze/cpu.c +1
-1@@ -84,7 +84,7 @@ static void mb_cpu_set_pc(CPUState *cs, vaddr value)static bool mb_cpu_has_work (CPUState *cs) { -return cs->interrupt_request & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); +return cpu_interrupt_request (cs) & (CPU_INTERRUPT_HARD |CPU_INTERRUPT_NMI ); }#ifndef CONFIG_USER_ONLY
--
Alex Bennée
RFC v4 57/71 accel/tcg: convert to cpu_interrupt_request
In reply to Emilio G. Cota--- accel/tcg/cpu-exec.c | 15 ++++++++------- accel/tcg/tcg-all.c | 12 +++++++++--- accel/tcg/translate-all.c | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-)
accel/tcg/cpu-exec.c +8 -7
@@ -428,7 +428,7 @@ static inline bool cpu_handle_halt_locked(CPUState *cpu)if (cpu_halted (cpu)) {#if defined(TARGET_I386 ) && !defined(CONFIG_USER_ONLY ) -if ((cpu->interrupt_request &CPU_INTERRUPT_POLL ) +if ((cpu_interrupt_request (cpu) &CPU_INTERRUPT_POLL ) &&replay_interrupt ()) {X86CPU *x86_cpu =X86_CPU (cpu);
@@ -540,16 +540,17 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,*/ atomic_mb_set (&cpu->icount_decr.u16.high,0 ); -if (unlikely (atomic_read (&cpu->interrupt_request))) { +if (unlikely (cpu_interrupt_request (cpu))) {int interrupt_request; +qemu_mutex_lock_iothread (); - interrupt_request = cpu->interrupt_request; + interrupt_request =cpu_interrupt_request (cpu);if (unlikely (cpu->singlestep_enabled &SSTEP_NOIRQ )) {/* Mask out external interrupts for this step. */ interrupt_request &= ~CPU_INTERRUPT_SSTEP_MASK ; }if (interrupt_request &CPU_INTERRUPT_DEBUG ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_DEBUG ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_DEBUG ); cpu->exception_index =EXCP_DEBUG ;qemu_mutex_unlock_iothread ();return true;
@@ -558,7 +559,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,/* Do nothing */ }else if (interrupt_request &CPU_INTERRUPT_HALT ) {replay_interrupt (); - cpu->interrupt_request &= ~CPU_INTERRUPT_HALT ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HALT );cpu_halted_set (cpu,1 ); cpu->exception_index =EXCP_HLT ;qemu_mutex_unlock_iothread ();
@@ -595,10 +596,10 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, }/* The target hook may have updated the 'cpu->interrupt_request'; * reload the 'interrupt_request' value */ - interrupt_request = cpu->interrupt_request; + interrupt_request =cpu_interrupt_request (cpu); }if (interrupt_request &CPU_INTERRUPT_EXITTB ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_EXITTB );/* ensure that no TB jump will be modified as the program flow was changed */ *last_tb =NULL ;
accel/tcg/tcg-all.c +9 -3
@@ -39,10 +39,16 @@ unsigned long tcg_tb_size;static void tcg_handle_interrupt (CPUState *cpu,int mask) {int old_mask; -g_assert (qemu_mutex_iothread_locked ()); - old_mask = cpu->interrupt_request; - cpu->interrupt_request |= mask; +if (!cpu_mutex_locked (cpu)) { +cpu_mutex_lock (cpu); + old_mask =cpu_interrupt_request (cpu); +cpu_interrupt_request_or (cpu, mask); +cpu_mutex_unlock (cpu); + }else { + old_mask =cpu_interrupt_request (cpu); +cpu_interrupt_request_or (cpu, mask); + }/* * If called from iothread context, wake the target cpu in
accel/tcg/translate-all.c +1 -1
@@ -2340,7 +2340,7 @@ void dump_opcount_info(FILE *f, fprintf_function cpu_fprintf)void cpu_interrupt (CPUState *cpu,int mask) {g_assert (qemu_mutex_iothread_locked ()); - cpu->interrupt_request |= mask; +cpu_interrupt_request_or (cpu, mask);atomic_set (&cpu->icount_decr.u16.high,-1 ); }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 57/71] accel/tcg: convert to cpu_interrupt_request
Quoted 6 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- accel/tcg/cpu-exec.c | 15 ++++++++------- accel/tcg/tcg-all.c | 12 +++++++++--- accel/tcg/translate-all.c | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 57/71] accel/tcg: convert to cpu_interrupt_request
In reply to Emilio G. CotaQuoted 1 line · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 91 lines
--- accel/tcg/cpu-exec.c | 15 ++++++++------- accel/tcg/tcg-all.c | 12 +++++++++--- accel/tcg/translate-all.c | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-)accel/tcg/cpu-exec.c +8
-7@@ -428,7 +428,7 @@ static inline bool cpu_handle_halt_locked(CPUState *cpu)if (cpu_halted (cpu)) {#if defined(TARGET_I386 ) && !defined(CONFIG_USER_ONLY ) -if ((cpu->interrupt_request &CPU_INTERRUPT_POLL ) +if ((cpu_interrupt_request (cpu) &CPU_INTERRUPT_POLL ) &&replay_interrupt ()) {X86CPU *x86_cpu =X86_CPU (cpu);@@ -540,16 +540,17 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,*/ atomic_mb_set (&cpu->icount_decr.u16.high,0 ); -if (unlikely (atomic_read (&cpu->interrupt_request))) { +if (unlikely (cpu_interrupt_request (cpu))) {int interrupt_request; +qemu_mutex_lock_iothread (); - interrupt_request = cpu->interrupt_request; + interrupt_request =cpu_interrupt_request (cpu);if (unlikely (cpu->singlestep_enabled &SSTEP_NOIRQ )) {/* Mask out external interrupts for this step. */ interrupt_request &= ~CPU_INTERRUPT_SSTEP_MASK ; }if (interrupt_request &CPU_INTERRUPT_DEBUG ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_DEBUG ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_DEBUG ); cpu->exception_index =EXCP_DEBUG ;qemu_mutex_unlock_iothread ();return true;@@ -558,7 +559,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,/* Do nothing */ }else if (interrupt_request &CPU_INTERRUPT_HALT ) {replay_interrupt (); - cpu->interrupt_request &= ~CPU_INTERRUPT_HALT ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_HALT );cpu_halted_set (cpu,1 ); cpu->exception_index =EXCP_HLT ;qemu_mutex_unlock_iothread ();@@ -595,10 +596,10 @@ static inline bool cpu_handle_interrupt(CPUState *cpu, }/* The target hook may have updated the 'cpu->interrupt_request'; * reload the 'interrupt_request' value */ - interrupt_request = cpu->interrupt_request; + interrupt_request =cpu_interrupt_request (cpu); }if (interrupt_request &CPU_INTERRUPT_EXITTB ) { - cpu->interrupt_request &= ~CPU_INTERRUPT_EXITTB ; +cpu_reset_interrupt (cpu,CPU_INTERRUPT_EXITTB );/* ensure that no TB jump will be modified as the program flow was changed */ *last_tb =NULL ;accel/tcg/tcg-all.c +9
-3@@ -39,10 +39,16 @@ unsigned long tcg_tb_size;static void tcg_handle_interrupt (CPUState *cpu,int mask) {int old_mask; -g_assert (qemu_mutex_iothread_locked ()); - old_mask = cpu->interrupt_request; - cpu->interrupt_request |= mask; +if (!cpu_mutex_locked (cpu)) { +cpu_mutex_lock (cpu); + old_mask =cpu_interrupt_request (cpu); +cpu_interrupt_request_or (cpu, mask); +cpu_mutex_unlock (cpu); + }else { + old_mask =cpu_interrupt_request (cpu); +cpu_interrupt_request_or (cpu, mask); + }/* * If called from iothread context, wake the target cpu in accel/tcg/translate-all.c +0
-0
accel/tcg/translate-all.c void dump_opcount_info(FILE *f, fprintf_function cpu_fprintf) · line 2345
Quoted 7 lines
accel/tcg/translate-all.c +1
-1@@ -2340,7 +2340,7 @@ void dump_opcount_info(FILE *f, fprintf_function cpu_fprintf)void cpu_interrupt (CPUState *cpu,int mask) {g_assert (qemu_mutex_iothread_locked ()); - cpu->interrupt_request |= mask; +cpu_interrupt_request_or (cpu, mask);atomic_set (&cpu->icount_decr.u16.high,-1 ); }
--
Alex Bennée
RFC v4 58/71 cpu: call .cpu_has_work with the CPU lock held
In reply to Emilio G. Cota--- include/qom/cpu.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
include/qom/cpu.h +10 -2
@@ -84,7 +84,8 @@ struct TranslationBlock;* @parse_features: Callback to parse command line arguments. * @reset: Callback to reset the #CPUState to its initial state. * @reset_dump_flags: #CPUDumpFlags to use for reset logging. -* @has_work: Callback for checking if there is work to do. +* @has_work: Callback for checking if there is work to do. Called with the +* CPU lock held. * @do_interrupt: Callback for interrupt handling. * @do_unassigned_access: Callback for unassigned access handling. * (this is deprecated: new targets should use do_transaction_failed instead)
@@ -793,9 +794,16 @@ const char *parse_cpu_model(const char *cpu_model);static inline bool cpu_has_work (CPUState *cpu) {CPUClass *cc =CPU_GET_CLASS (cpu); +bool ret;g_assert (cc->has_work); -return cc->has_work (cpu); +if (cpu_mutex_locked (cpu)) { +return cc->has_work (cpu); + } +cpu_mutex_lock (cpu); + ret = cc->has_work (cpu); +cpu_mutex_unlock (cpu); +return ret; }/**
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 58/71] cpu: call .cpu_has_work with the CPU lock held
Quoted 4 lines · Emilio G. Cota
Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
r~
RFC v4 59/71 cpu: introduce cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaIt will gain some users soon.
--- include/qom/cpu.h | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-)
include/qom/cpu.h +33 -3
@@ -26,6 +26,7 @@#include "exec/memattrs.h" #include "qapi/qapi-types-run-state.h" #include "qemu/bitmap.h" +#include "qemu/main-loop.h" #include "qemu/rcu_queue.h" #include "qemu/queue.h" #include "qemu/thread.h"
@@ -86,6 +87,8 @@ struct TranslationBlock;* @reset_dump_flags: #CPUDumpFlags to use for reset logging. * @has_work: Callback for checking if there is work to do. Called with the * CPU lock held. +* @has_work_with_iothread_lock: Callback for checking if there is work to do. +* Called with both the BQL and the CPU lock held. * @do_interrupt: Callback for interrupt handling. * @do_unassigned_access: Callback for unassigned access handling. * (this is deprecated: new targets should use do_transaction_failed instead)
@@ -157,6 +160,7 @@ typedef struct CPUClass {void (*reset)(CPUState *cpu);int reset_dump_flags;bool (*has_work)(CPUState *cpu); +bool (*has_work_with_iothread_lock)(CPUState *cpu);void (*do_interrupt)(CPUState *cpu);CPUUnassignedAccess do_unassigned_access; void (*do_unaligned_access)(CPUState *cpu, vaddr addr,
@@ -794,14 +798,40 @@ const char *parse_cpu_model(const char *cpu_model);static inline bool cpu_has_work (CPUState *cpu) {CPUClass *cc =CPU_GET_CLASS (cpu); +bool has_cpu_lock =cpu_mutex_locked (cpu); +bool (*func)(CPUState *cpu);bool ret; +if (cc->has_work_with_iothread_lock) { +if (qemu_mutex_iothread_locked ()) { + func = cc->has_work_with_iothread_lock; + goto call_func; + } + +if (has_cpu_lock) { +/* avoid deadlock by acquiring the locks in order */ +cpu_mutex_unlock (cpu); + } +qemu_mutex_lock_iothread (); +cpu_mutex_lock (cpu); + + ret = cc->has_work_with_iothread_lock (cpu); + +qemu_mutex_unlock_iothread (); +if (!has_cpu_lock) { +cpu_mutex_unlock (cpu); + } +return ret; + } +g_assert (cc->has_work); -if (cpu_mutex_locked (cpu)) { -return cc->has_work (cpu); + func = cc->has_work; + call_func: +if (has_cpu_lock) { +return func (cpu); }cpu_mutex_lock (cpu); - ret = cc->has_work (cpu); + ret =func (cpu);cpu_mutex_unlock (cpu);return ret; }
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 59/71] cpu: introduce cpu_has_work_with_iothread_lock
Quoted 7 lines · Emilio G. Cota
It will gain some users soon.
Suggested-by Paolo Bonzini <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-)
r~
RFC v4 60/71 ppc: convert to cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaSoon we will call cpu_has_work without the BQL.
--- target/ppc/translate_init.inc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
target/ppc/translate_init.inc.c +12 -4
@@ -8445,6 +8445,8 @@ static bool cpu_has_work_POWER7(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +g_assert (qemu_mutex_iothread_locked ()); +if (cpu_halted (cs)) {if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false;
@@ -8488,7 +8490,7 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data) pcc->pcr_supported =PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER7; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER7; + cc->has_work_with_iothread_lock = cpu_has_work_POWER7; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -8599,6 +8601,8 @@ static bool cpu_has_work_POWER8(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +g_assert (qemu_mutex_iothread_locked ()); +if (cpu_halted (cs)) {if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false;
@@ -8650,7 +8654,7 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) pcc->pcr_supported =PCR_COMPAT_2_07 |PCR_COMPAT_2_06 |PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER8; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER8; + cc->has_work_with_iothread_lock = cpu_has_work_POWER8; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -8791,6 +8795,8 @@ static bool cpu_has_work_POWER9(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +g_assert (qemu_mutex_iothread_locked ()); +if (cpu_halted (cs)) {if (!(cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD )) {return false;
@@ -8844,7 +8850,7 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)PCR_COMPAT_2_05 ; pcc->init_proc = init_proc_POWER9; pcc->check_pow = check_pow_nocheck; - cc->has_work = cpu_has_work_POWER9; + cc->has_work_with_iothread_lock = cpu_has_work_POWER9; pcc->insns_flags =PPC_INSNS_BASE |PPC_ISEL |PPC_STRING |PPC_MFTB |PPC_FLOAT |PPC_FLOAT_FSEL |PPC_FLOAT_FRES | PPC_FLOAT_FSQRT | PPC_FLOAT_FRSQRTE |
@@ -10236,6 +10242,8 @@ static bool ppc_cpu_has_work(CPUState *cs)PowerPCCPU *cpu =POWERPC_CPU (cs);CPUPPCState *env = &cpu->env; +g_assert (qemu_mutex_iothread_locked ()); +return msr_ee && (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ); }
@@ -10435,7 +10443,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = ppc_cpu_class_by_name; pcc->parent_parse_features = cc->parse_features; cc->parse_features = ppc_cpu_parse_featurestr; - cc->has_work = ppc_cpu_has_work; + cc->has_work_with_iothread_lock = ppc_cpu_has_work; cc->do_interrupt = ppc_cpu_do_interrupt; cc->cpu_exec_interrupt = ppc_cpu_exec_interrupt; cc->dump_state = ppc_cpu_dump_state;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 60/71] ppc: convert to cpu_has_work_with_iothread_lock
Quoted 9 lines · Emilio G. Cota
Soon we will call
cpu_has_workwithout the BQL.Cc David Gibson <[email protected]>Cc Alexander Graf <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/ppc/translate_init.inc.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
r~
RFC v4 61/71 mips: convert to cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaSoon we will call cpu_has_work without the BQL.
--- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/mips/cpu.c +3 -1
@@ -58,6 +58,8 @@ static bool mips_cpu_has_work(CPUState *cs)bool has_work = false;uint32_t interrupt_request =cpu_interrupt_request (cs); +g_assert (qemu_mutex_iothread_locked ()); +/* Prior to MIPS Release 6 it is implementation dependent if non-enabled interrupts wake-up the CPU, however most of the implementations only check for interrupts that can be taken. */
@@ -181,7 +183,7 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) cc->reset = mips_cpu_reset; cc->class_by_name = mips_cpu_class_by_name; - cc->has_work = mips_cpu_has_work; + cc->has_work_with_iothread_lock = mips_cpu_has_work; cc->do_interrupt = mips_cpu_do_interrupt; cc->cpu_exec_interrupt = mips_cpu_exec_interrupt; cc->dump_state = mips_cpu_dump_state;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 61/71] mips: convert to cpu_has_work_with_iothread_lock
Quoted 8 lines · Emilio G. Cota
Soon we will call
cpu_has_workwithout the BQL.Cc Aurelien Jarno <[email protected]>Cc Aleksandar Markovic <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/mips/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
RFC v4 62/71 s390x: convert to cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaSoon we will call cpu_has_work without the BQL.
--- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/s390x/cpu.c +3 -1
@@ -59,6 +59,8 @@ static bool s390_cpu_has_work(CPUState *cs) {S390CPU *cpu =S390_CPU (cs); +g_assert (qemu_mutex_iothread_locked ()); +/* STOPPED cpus can never wake up */ if (s390_cpu_get_state (cpu) !=S390_CPU_STATE_LOAD &&s390_cpu_get_state (cpu) !=S390_CPU_STATE_OPERATING ) {
@@ -469,7 +471,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) scc->initial_cpu_reset = s390_cpu_initial_reset; cc->reset = s390_cpu_full_reset; cc->class_by_name = s390_cpu_class_by_name, - cc->has_work = s390_cpu_has_work; + cc->has_work_with_iothread_lock = s390_cpu_has_work;#ifdef CONFIG_TCG cc->do_interrupt = s390_cpu_do_interrupt;#endif
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 62/71] s390x: convert to cpu_has_work_with_iothread_lock
Quoted 10 lines · Emilio G. Cota
Soon we will call
cpu_has_workwithout the BQL.Cc Cornelia Huck <[email protected]>Cc Alexander Graf <[email protected]>Cc David Hildenbrand <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/s390x/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
RFC v4 63/71 riscv: convert to cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaSoon we will call cpu_has_work without the BQL.
--- target/riscv/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
target/riscv/cpu.c +4 -1
@@ -249,6 +249,9 @@ static bool riscv_cpu_has_work(CPUState *cs)#ifndef CONFIG_USER_ONLY RISCVCPU *cpu =RISCV_CPU (cs);CPURISCVState *env = &cpu->env; + +g_assert (qemu_mutex_iothread_locked ()); +/* * Definition of the WFI instruction requires it to ignore the privilege * mode and delegation registers, but respect individual enables
@@ -335,7 +338,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->reset = riscv_cpu_reset; cc->class_by_name = riscv_cpu_class_by_name; - cc->has_work = riscv_cpu_has_work; + cc->has_work_with_iothread_lock = riscv_cpu_has_work; cc->do_interrupt = riscv_cpu_do_interrupt; cc->cpu_exec_interrupt = riscv_cpu_exec_interrupt; cc->dump_state = riscv_cpu_dump_state;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 63/71] riscv: convert to cpu_has_work_with_iothread_lock
Quoted 11 lines · Emilio G. Cota
Soon we will call
cpu_has_workwithout the BQL.Cc Michael Clark <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Sagar Karandikar <[email protected]>Cc Bastian Koppelmann <[email protected]>Reviewed-by Palmer Dabbelt <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/riscv/cpu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
r~
RFC v4 64/71 sparc: convert to cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaSoon we will call cpu_has_work without the BQL.
--- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/sparc/cpu.c +3 -1
@@ -709,6 +709,8 @@ static bool sparc_cpu_has_work(CPUState *cs)SPARCCPU *cpu =SPARC_CPU (cs);CPUSPARCState *env = &cpu->env; +g_assert (qemu_mutex_iothread_locked ()); +return (cpu_interrupt_request (cs) &CPU_INTERRUPT_HARD ) &&cpu_interrupts_enabled (env); }
@@ -870,7 +872,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->class_by_name = sparc_cpu_class_by_name; cc->parse_features = sparc_cpu_parse_features; - cc->has_work = sparc_cpu_has_work; + cc->has_work_with_iothread_lock = sparc_cpu_has_work; cc->do_interrupt = sparc_cpu_do_interrupt; cc->cpu_exec_interrupt = sparc_cpu_exec_interrupt; cc->dump_state = sparc_cpu_dump_state;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 64/71] sparc: convert to cpu_has_work_with_iothread_lock
Quoted 8 lines · Emilio G. Cota
Soon we will call
cpu_has_workwithout the BQL.Cc Mark Cave-Ayland <[email protected]>Cc Artyom Tarasenko <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/sparc/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
RFC v4 65/71 xtensa: convert to cpu_has_work_with_iothread_lock
In reply to Emilio G. CotaSoon we will call cpu_has_work without the BQL.
--- target/xtensa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
target/xtensa/cpu.c +3 -1
@@ -47,6 +47,8 @@ static bool xtensa_cpu_has_work(CPUState *cs)#ifndef CONFIG_USER_ONLY XtensaCPU *cpu =XTENSA_CPU (cs); +g_assert (qemu_mutex_iothread_locked ()); +return !cpu->env.runstall && cpu->env.pending_irq_level;#else return true;
@@ -173,7 +175,7 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data) cc->reset = xtensa_cpu_reset; cc->class_by_name = xtensa_cpu_class_by_name; - cc->has_work = xtensa_cpu_has_work; + cc->has_work_with_iothread_lock = xtensa_cpu_has_work; cc->do_interrupt = xtensa_cpu_do_interrupt; cc->cpu_exec_interrupt = xtensa_cpu_exec_interrupt; cc->dump_state = xtensa_cpu_dump_state;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 65/71] xtensa: convert to cpu_has_work_with_iothread_lock
Quoted 7 lines · Emilio G. Cota
Soon we will call
cpu_has_workwithout the BQL.Cc Max Filippov <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- target/xtensa/cpu.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
r~
RFC v4 66/71 cpu: protect most CPU state with cpu->lock
In reply to Emilio G. CotaInstead of taking the BQL every time we exit the exec loop, have a per-CPU lock to serialize accesses the the CPU's state.
Differently from the BQL, this lock is uncontended so acquiring it is cheap.
--- include/qom/cpu.h | 20 ++-- cpus.c | 300 ++++++++++++++++++++++++++++++++-------------- qom/cpu.c | 36 ++---- 3 files changed, 226 insertions(+), 130 deletions(-)
include/qom/cpu.h +10 -10
@@ -291,10 +291,6 @@ struct qemu_work_item;* valid under cpu_list_lock. * @created: Indicates whether the CPU thread has been successfully created. * @interrupt_request: Indicates a pending interrupt request. -* @halted: Nonzero if the CPU is in suspended state. -* @stop: Indicates a pending stop request. -* @stopped: Indicates the CPU has been artificially stopped. -* @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.
@@ -323,6 +319,10 @@ struct qemu_work_item;* @lock: Lock to prevent multiple access to per-CPU fields. * @cond: Condition variable for per-CPU events. * @work_list: List of pending asynchronous work. +* @halted: Nonzero if the CPU is in suspended state. +* @stop: Indicates a pending stop request. +* @stopped: Indicates the CPU has been artificially stopped. +* @unplug: Indicates a pending CPU unplug request. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate). * @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask).
@@ -346,12 +346,7 @@ struct CPUState {#endif int thread_id;bool running, has_waiter; -struct QemuCond *halt_cond;bool thread_kicked; -bool created; -bool stop; -bool stopped; -bool unplug;bool crash_occurred;bool exit_request;uint32_t cflags_next_tb;
@@ -365,7 +360,13 @@ struct CPUState {QemuMutex lock;/* fields below protected by @lock */ QemuCond cond; +QemuCond halt_cond; QSIMPLEQ_HEAD(, qemu_work_item) work_list; +uint32_t halted; +bool created; +bool stop; +bool stopped; +bool unplug;CPUAddressSpace *cpu_ases;int num_ases;
@@ -412,7 +413,6 @@ struct CPUState {/* TODO Move common fields from CPUArchState here. */ int cpu_index; -uint32_t halted;uint32_t can_do_io;int32_t exception_index;
cpus.c +207 -93
741 lines not on this page · raw message
qom/cpu.c +9 -27
@@ -94,32 +94,13 @@ static void cpu_common_get_memory_mapping(CPUState *cpu,error_setg (errp,"Obtaining memory mappings is unsupported on this CPU." ); } -/* Resetting the IRQ comes from across the code base so we take the -* BQL here if we need to. cpu_interrupt assumes it is held.*/ void cpu_reset_interrupt (CPUState *cpu,int mask) { -bool has_bql =qemu_mutex_iothread_locked (); -bool has_cpu_lock =cpu_mutex_locked (cpu); - -if (has_bql) { -if (has_cpu_lock) { -atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); - }else { -cpu_mutex_lock (cpu); -atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); -cpu_mutex_unlock (cpu); - } -return ; - } - -if (has_cpu_lock) { -cpu_mutex_unlock (cpu); - } -qemu_mutex_lock_iothread (); -cpu_mutex_lock (cpu); -atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); -qemu_mutex_unlock_iothread (); -if (!has_cpu_lock) { +if (cpu_mutex_locked (cpu)) { +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask); + }else { +cpu_mutex_lock (cpu); +atomic_set (&cpu->interrupt_request, cpu->interrupt_request & ~mask);cpu_mutex_unlock (cpu); } }
@@ -276,8 +257,8 @@ static void cpu_common_reset(CPUState *cpu)log_cpu_state (cpu, cc->reset_dump_flags); } - cpu->interrupt_request =0 ; - cpu->halted =0 ; +cpu_interrupt_request_set (cpu,0 ); +cpu_halted_set (cpu,0 ); cpu->mem_io_pc =0 ; cpu->mem_io_vaddr =0 ; cpu->icount_extra =0 ;
@@ -389,6 +370,7 @@ static void cpu_common_initfn(Object *obj)qemu_mutex_init (&cpu->lock);qemu_cond_init (&cpu->cond); +qemu_cond_init (&cpu->halt_cond);QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
@@ -412,7 +394,7 @@ static vaddr cpu_adjust_watchpoint_address(CPUState *cpu, vaddr addr, int len)static void generic_handle_interrupt (CPUState *cpu,int mask) { - cpu->interrupt_request |= mask; +cpu_interrupt_request_or (cpu, mask);if (!qemu_cpu_is_self (cpu)) {qemu_cpu_kick (cpu);
Signature · 1 line
2.17.1
RFC v4 67/71 cpus-common: release BQL earlier in run_on_cpu
In reply to Emilio G. CotaAfter completing the conversion to per-CPU locks, there is no need to release the BQL after having called cpu_kick.
--- cpus-common.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
cpus-common.c +5 -15
@@ -145,6 +145,11 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data)return ; } +/* We are going to sleep on the CPU lock, so release the BQL */ +if (has_bql) { +qemu_mutex_unlock_iothread (); + } + wi.func = func; wi.data = data; wi.done = false;
@@ -153,21 +158,6 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data)cpu_mutex_lock (cpu);queue_work_on_cpu_locked (cpu, &wi); - -/* -* We are going to sleep on the CPU lock, so release the BQL. -* -* During the transition to per-CPU locks, we release the BQL _after_ -* having kicked the destination CPU (from queue_work_on_cpu_locked above). -* This makes sure that the enqueued work will be seen by the CPU -* after being woken up from the kick, since the CPU sleeps on the BQL. -* Once we complete the transition to per-CPU locks, we will release -* the BQL earlier in this function. -*/ -if (has_bql) { -qemu_mutex_unlock_iothread (); - } -while (!atomic_mb_read (&wi.done)) {CPUState *self_cpu = current_cpu;
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 67/71] cpus-common: release BQL earlier in run_on_cpu
Quoted 7 lines · Emilio G. Cota
After completing the conversion to per-CPU locks, there is no need to release the BQL after having called
cpu_kick.Signed-off-by Emilio G. Cota <[email protected]>--- cpus-common.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
r~
RFC v4 68/71 cpu: add async_run_on_cpu_no_bql
In reply to Emilio G. CotaSome async jobs do not need the BQL.
--- include/qom/cpu.h | 14 ++++++++++++++ cpus-common.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-)
include/qom/cpu.h +14 -0
@@ -882,9 +882,23 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data);* @data: Data to pass to the function. * * Schedules the function @func for execution on the vCPU @cpu asynchronously. +* See also: async_run_on_cpu_no_bql() */ void async_run_on_cpu (CPUState *cpu,run_on_cpu_func func,run_on_cpu_data data); +/** +* async_run_on_cpu_no_bql: +* @cpu: The vCPU to run on. +* @func: The function to be executed. +* @data: Data to pass to the function. +* +* Schedules the function @func for execution on the vCPU @cpu asynchronously. +* This function is run outside the BQL. +* See also: async_run_on_cpu() +*/ +void async_run_on_cpu_no_bql (CPUState *cpu,run_on_cpu_func func, +run_on_cpu_data data); +/** * async_safe_run_on_cpu: * @cpu: The vCPU to run on.
cpus-common.c +34 -5
@@ -109,6 +109,7 @@ struct qemu_work_item {run_on_cpu_func func;run_on_cpu_data data;bool free, exclusive, done; +bool bql; };/* Called with the CPU's lock held */
@@ -155,6 +156,7 @@ void run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) wi.done = false; wi.free = false; wi.exclusive = false; + wi.bql = true;cpu_mutex_lock (cpu);queue_work_on_cpu_locked (cpu, &wi);
@@ -179,6 +181,21 @@ void async_run_on_cpu(CPUState *cpu, run_on_cpu_func func, run_on_cpu_data data) wi->func = func; wi->data = data; wi->free = true; + wi->bql = true; + +queue_work_on_cpu (cpu, wi); +} + +void async_run_on_cpu_no_bql (CPUState *cpu,run_on_cpu_func func, +run_on_cpu_data data) +{ +struct qemu_work_item *wi; + + wi =g_malloc0 (sizeof (struct qemu_work_item )); + wi->func = func; + wi->data = data; + wi->free = true; +/* wi->bql initialized to false */ queue_work_on_cpu (cpu, wi); }
@@ -323,6 +340,7 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func, wi->data = data; wi->free = true; wi->exclusive = true; +/* wi->bql initialized to false */ queue_work_on_cpu (cpu, wi); }
@@ -347,6 +365,7 @@ static void process_queued_cpu_work_locked(CPUState *cpu)* BQL, so it goes to sleep; start_exclusive() is sleeping too, so * neither CPU can proceed. */ +g_assert (!wi->bql);if (has_bql) {qemu_mutex_unlock_iothread (); }
@@ -357,12 +376,22 @@ static void process_queued_cpu_work_locked(CPUState *cpu)qemu_mutex_lock_iothread (); } }else { -if (has_bql) { - wi->func (cpu, wi->data); +if (wi->bql) { +if (has_bql) { + wi->func (cpu, wi->data); + }else { +qemu_mutex_lock_iothread (); + wi->func (cpu, wi->data); +qemu_mutex_unlock_iothread (); + } }else { -qemu_mutex_lock_iothread (); - wi->func (cpu, wi->data); -qemu_mutex_unlock_iothread (); +if (has_bql) { +qemu_mutex_unlock_iothread (); + wi->func (cpu, wi->data); +qemu_mutex_lock_iothread (); + }else { + wi->func (cpu, wi->data); + } } }cpu_mutex_lock (cpu);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 68/71] cpu: add async_run_on_cpu_no_bql
Quoted 7 lines · Emilio G. Cota
Some async jobs do not need the BQL.
Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 14 ++++++++++++++ cpus-common.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-)
r~
RFC v4 69/71 cputlb: queue async flush jobs without the BQL
In reply to Emilio G. CotaThis yields sizable scalability improvements, as the below results show.
Host: Two Intel E5-2683 v3 14-core CPUs at 2.00 GHz (Haswell)
Workload: Ubuntu 18.04 ppc64 compiling the linux kernel with "make -j N", where N is the number of cores in the guest.
Speedup vs a single thread (higher is better):
14 +---------------------------------------------------------------+
| + + + + + + $$$$$$ + |
| $$$$$ |
| $$$$$$ |
12 |-+ $A$$ +-|
| $$ |
| $$$ |
10 |-+ $$ ##D#####################D +-|
| $$$ #####**B**************** |
| $$####***** ***** |
| A$#***** B |
8 |-+ $$B** +-|
| $$** |
| $** |
6 |-+ $$* +-|
| A** |
| $B |
| $ |
4 |-+ $* +-|
| $ |
| $ |
2 |-+ $ +-|
| $ +cputlb-no-bql $$A$$ |
| A +per-cpu-lock ##D## |
| + + + + + + baseline **B** |
0 +---------------------------------------------------------------+
1 4 8 12 16 20 24 28
Guest vCPUs
png: https://imgur.com/zZRvS7q
Some notes:
- baseline corresponds to the commit before this series
- per-cpu-lock is the commit that converts the CPU loop to per-cpu locks.
- cputlb-no-bql is this commit.
- I'm using taskset to assign cores to threads, favouring locality whenever possible but not using SMT. When N=1, I'm using a single host core, which leads to superlinear speedups (since with more cores the I/O thread can execute while vCPU threads sleep). In the future I might use N+1 host cores for N guest cores to avoid this, or perhaps pin guest threads to cores one-by-one.
- Scalability is not good at 64 cores, where the BQL for handling interrupts dominates. I got this from another machine (a 64-core one), that unfortunately is much slower than this 28-core one, so I don't have the numbers for 1-16 cores. The plot is normalized at 16-core baseline performance, and therefore very ugly :-) https://imgur.com/XyKGkAw
See below for an example of the *huge* amount of waiting on the BQL:
(qemu) info sync-profile
Type Object Call site Wait Time (s) Count Average (us)
----------------------------------------------------------------------------------------------------------
BQL mutex 0x55ba286c9800 accel/tcg/cpu-exec.c:545 2868.85676 14872596 192.90 BQL mutex 0x55ba286c9800 hw/ppc/ppc.c:70 539.58924 3666820 147.15 BQL mutex 0x55ba286c9800 target/ppc/helper_regs.h:105 323.49283 2544959 127.11 mutex [ 2] util/qemu-timer.c:426 181.38420 3666839 49.47 condvar [ 61] cpus.c:1327 136.50872 15379 8876.31 BQL mutex 0x55ba286c9800 accel/tcg/cpu-exec.c:516 86.14785 946301 91.04 condvar 0x55ba286eb6a0 cpus-common.c:196 78.41010 126 622302.35 BQL mutex 0x55ba286c9800 util/main-loop.c:236 28.14795 272940 103.13 mutex [ 64] include/qom/cpu.h:514 17.87662 75139413 0.24 BQL mutex 0x55ba286c9800 target/ppc/translate_init.inc.c:8665 7.04738 36528 192.93
----------------------------------------------------------------------------------------------------------
Single-threaded performance is affected very lightly. Results below for debian aarch64 bootup+test for the entire series on an Intel(R) Core(TM) i7-6700K CPU @ 4.00GHz host:
- Before:
Performance counter stats for 'taskset -c 0 ../img/aarch64/die.sh' (10 runs):
7269.033478 task-clock (msec) # 0.998 CPUs utilized ( +- 0.06% )
30,659,870,302 cycles # 4.218 GHz ( +- 0.06% )
54,790,540,051 instructions # 1.79 insns per cycle ( +- 0.05% )
9,796,441,380 branches # 1347.695 M/sec ( +- 0.05% )
165,132,201 branch-misses # 1.69% of all branches ( +- 0.12% )7.287011656 seconds time elapsed ( +- 0.10% )
- After:
7375.924053 task-clock (msec) # 0.998 CPUs utilized ( +- 0.13% )
31,107,548,846 cycles # 4.217 GHz ( +- 0.12% )
55,355,668,947 instructions # 1.78 insns per cycle ( +- 0.05% )
9,929,917,664 branches # 1346.261 M/sec ( +- 0.04% )
166,547,442 branch-misses # 1.68% of all branches ( +- 0.09% )7.389068145 seconds time elapsed ( +- 0.13% )
That is, a 1.37% slowdown.
--- accel/tcg/cputlb.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-)
accel/tcg/cputlb.c +10 -9
@@ -212,7 +212,7 @@ static void flush_all_helper(CPUState *src, run_on_cpu_func fn,CPU_FOREACH (cpu) {if (cpu != src) { -async_run_on_cpu (cpu, fn, d); +async_run_on_cpu_no_bql (cpu, fn, d); } } }
@@ -280,8 +280,8 @@ void tlb_flush(CPUState *cpu)if (cpu->created && !qemu_cpu_is_self (cpu)) {if (atomic_mb_read (&cpu->pending_tlb_flush) !=ALL_MMUIDX_BITS ) {atomic_mb_set (&cpu->pending_tlb_flush,ALL_MMUIDX_BITS ); -async_run_on_cpu (cpu, tlb_flush_global_async_work, -RUN_ON_CPU_NULL ); +async_run_on_cpu_no_bql (cpu, tlb_flush_global_async_work, +RUN_ON_CPU_NULL ); } }else {tlb_flush_nocheck (cpu);
@@ -341,8 +341,8 @@ void tlb_flush_by_mmuidx(CPUState *cpu, uint16_t idxmap)tlb_debug ("reduced mmu_idx: 0x%" PRIx16"\n" , pending_flushes);atomic_or (&cpu->pending_tlb_flush, pending_flushes); -async_run_on_cpu (cpu, tlb_flush_by_mmuidx_async_work, -RUN_ON_CPU_HOST_INT (pending_flushes)); +async_run_on_cpu_no_bql (cpu, tlb_flush_by_mmuidx_async_work, +RUN_ON_CPU_HOST_INT (pending_flushes)); } }else { tlb_flush_by_mmuidx_async_work(cpu,
@@ -442,8 +442,8 @@ void tlb_flush_page(CPUState *cpu, target_ulong addr)tlb_debug ("page :" TARGET_FMT_lx"\n" , addr);if (!qemu_cpu_is_self (cpu)) { -async_run_on_cpu (cpu, tlb_flush_page_async_work, -RUN_ON_CPU_TARGET_PTR (addr)); +async_run_on_cpu_no_bql (cpu, tlb_flush_page_async_work, +RUN_ON_CPU_TARGET_PTR (addr)); }else {tlb_flush_page_async_work (cpu,RUN_ON_CPU_TARGET_PTR (addr)); }
@@ -514,8 +514,9 @@ void tlb_flush_page_by_mmuidx(CPUState *cpu, target_ulong addr, uint16_t idxmap) addr_and_mmu_idx |= idxmap;if (!qemu_cpu_is_self (cpu)) { -async_run_on_cpu (cpu, tlb_check_page_and_flush_by_mmuidx_async_work, -RUN_ON_CPU_TARGET_PTR (addr_and_mmu_idx)); +async_run_on_cpu_no_bql (cpu, + tlb_check_page_and_flush_by_mmuidx_async_work, +RUN_ON_CPU_TARGET_PTR (addr_and_mmu_idx)); }else {tlb_check_page_and_flush_by_mmuidx_async_work ( cpu,RUN_ON_CPU_TARGET_PTR (addr_and_mmu_idx));
Signature · 1 line
2.17.1
RFC v4 70/71 cpus-common: move exclusive_idle higher in the file
In reply to Emilio G. CotaThis will simplify the following commit's diff.
--- cpus-common.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
cpus-common.c +9 -9
@@ -73,6 +73,15 @@ static void finish_safe_work(CPUState *cpu)cpu_exec_end (cpu); } +/* Wait for pending exclusive operations to complete. The CPU list lock +must be held. */ +static inline void exclusive_idle (void ) +{ +while (pending_cpus) { +qemu_cond_wait (&exclusive_resume, &qemu_cpu_list_lock); + } +} +void cpu_list_add (CPUState *cpu) {qemu_mutex_lock (&qemu_cpu_list_lock);
@@ -200,15 +209,6 @@ void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func,queue_work_on_cpu (cpu, wi); } -/* Wait for pending exclusive operations to complete. The CPU list lock -must be held. */ -static inline void exclusive_idle (void ) -{ -while (pending_cpus) { -qemu_cond_wait (&exclusive_resume, &qemu_cpu_list_lock); - } -} -/* Start an exclusive operation. Must only be called from outside cpu_exec. */ void start_exclusive (void )
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 70/71] cpus-common: move exclusive_idle higher in the file
Quoted 6 lines · Emilio G. Cota
This will simplify the following commit's diff.
Signed-off-by Emilio G. Cota <[email protected]>--- cpus-common.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
r~
Re: [Qemu-devel] [RFC v4 70/71] cpus-common: move exclusive_idle higher in the file
In reply to Emilio G. CotaQuoted 3 lines · Emilio G. Cota
This will simplify the following commit's diff.
Signed-off-by Emilio G. Cota <[email protected]>
Quoted 30 lines
--- cpus-common.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)cpus-common.c +9
-2@@ -73,6 +73,15 @@ static void finish_safe_work(CPUState *cpu)cpu_exec_end (cpu); } +/* Wait for pending exclusive operations to complete. The CPU list lock +must be held. */ +static inline void exclusive_idle (void ) +{ +while (pending_cpus) { +qemu_cond_wait (&exclusive_resume, &qemu_cpu_list_lock); + } +} +void cpu_list_add (CPUState *cpu) {qemu_mutex_lock (&qemu_cpu_list_lock);@@ -200,15 +209,6 @@ void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func,queue_work_on_cpu (cpu, wi); } -/* Wait for pending exclusive operations to complete. The CPU list lock -must be held. */
cpus-common.c void async_run_on_cpu_no_bql(CPUState *cpu, run_on_cpu_func func, · line 214
Quoted 10 lines
cpus-common.c +0
-7-static inline void exclusive_idle (void ) -{ -while (pending_cpus) { -qemu_cond_wait (&exclusive_resume, &qemu_cpu_list_lock); - } -} -/* Start an exclusive operation. Must only be called from outside cpu_exec. */ void start_exclusive (void )
--
Alex Bennée
RFC v4 71/71 cpus-common: wait on the CPU lock for exclusive work completion
In reply to Emilio G. CotaThe current implementation of exclusive work can suffer from high contention when the number of guest CPUs is large (> 16 or so). The reason is that all CPUs end up waiting on the same condvar/mutex pair, which unnecessarily slows them down to wake up.
Fix it by having them wait on their "local" cpu->lock. This shifts the burden of waking up threads to the exclusive thread, but this is preferable to the existing solution because it induces a lot less contention.
Some perf numbers when compiling a linux kernel with `make tinyconfig' in an aarch64 guest:
- Host: 32-core Intel(R) Xeon(R) Gold 6142 CPU @ 2.60GHz
- Workload: Linux kernel compilation with `make -j $n' in a VM with $n vCPUs
[ Y axis: speedup over $n=1 ]
8 +----------------------------------------------------------------+
| + + + + #D############+ + + |
| ##*B********* D#############D |
7 |-+ ##**XXXXXXXXXX *** +-|
| ##**X B********** |
| ##** *** |
6 |-+ X##* B +-|
| X##* |
| XD* |
5 |-+ X# +-|
| X# |
| *# |
4 |-+ *# +-|
| *# |
| XB# |
| XD |
3 |-+ X# +-|
| ## |
| ## |
2 |-+ # +-|
| # |
| # |
1 |-+ D +-|
| after ##D## |
| + + + + + + + before **B** |
0 +----------------------------------------------------------------+
1 4 8 12 16 20 24 28 32
Guest vCPUs
png: https://imgur.com/jskOcxR
With this change we can't obtain an additional speedup, although we mitigate the performance collapse. This is due to the heavy-duty nature of async safe work, and the frequency at which it is run.
A proper fix would reduce the overhead of safe async work.
--- include/qom/cpu.h | 4 +- cpus-common.c | 146 ++++++++++++++++++---------------------------- 2 files changed, 61 insertions(+), 89 deletions(-)
include/qom/cpu.h +3 -1
@@ -345,7 +345,6 @@ struct CPUState {HANDLE hThread;#endif int thread_id; -bool running, has_waiter;bool thread_kicked;bool crash_occurred;bool exit_request;
@@ -367,6 +366,9 @@ struct CPUState {bool stop;bool stopped;bool unplug; +bool running; +bool exclusive_waiter; +bool exclusive_ongoing;CPUAddressSpace *cpu_ases;int num_ases;
cpus-common.c +58 -88
219 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [Qemu-devel] [RFC v4 71/71] cpus-common: wait on the CPU lock for exclusive work completion
Quoted 4 lines · Emilio G. Cota
The current implementation of exclusive work can suffer from high contention when the number of guest CPUs is large (> 16 or so). The reason is that all CPUs end up waiting on the same condvar/mutex pair, which unnecessarily slows them down to wake up.
<snip>
FWIW this is the commit that breaks the linux-test code. I get the following:
(gdb) thread apply all bt
Thread 2 (Thread 0x7ffff64d3700 (LWP 33607)):
#0 syscall () at ../sysdeps/unix/sysv/linux/x86_64/syscall.S:38 #1 0x000055555574d6db in qemu_futex_wait (val=<optimized out>, f=<optimized out>) at /home/alex.bennee/lsrc/qemu.git/include/qemu/futex.h:29 #2 qemu_event_wait (ev=ev@entry=0x555557c4f428 <rcu_call_ready_event>) at util/qemu-thread-posix.c:442 #3 0x0000555555754158 in call_rcu_thread (opaque=<optimized out>) at util/rcu.c:261 #4 0x00007ffff6b3e6db in start_thread (arg=0x7ffff64d3700) at pthread_create.c:463 #5 0x00007ffff686788f in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
Thread 1 (Thread 0x7ffff7fda500 (LWP 33603)):
#0 safe_syscall_base () at /home/alex.bennee/lsrc/qemu.git/linux-user/host/x86_64/safe-syscall.inc.S:75 #1 0x000055555563793a in safe_wait4 (rusage=0x0, options=<optimized out>, status=0x7fffffffc350, pid=1472725552) at /home/alex.bennee/lsrc/qemu.git/linux-user/syscall.c:730 #2 do_syscall1 (cpu_env=cpu_env@entry=0x555557c88550, num=num@entry=260, arg1=arg1@entry=33608, arg2=arg2@entry=274886295360, arg3=<optimized out>, arg4=0, arg5=4743376, arg6=4743168, arg8=0, arg7=0) at /home/alex.bennee/lsrc/qemu.git/linux-user/syscall.c:8784 #3 0x000055555564225a in do_syscall (cpu_env=cpu_env@entry=0x555557c88550, num=260, arg1=33608, arg2=274886295360, arg3=<optimized out>, arg4=<optimized out>, arg5=4743376, arg6=4743168, arg7=0, arg8=0) at /home/alex.bennee/lsrc/qemu.git/linux-user/syscall.c:11432 #4 0x000055555564bc8a in cpu_loop (env=0x555557c88550) at /home/alex.bennee/lsrc/qemu.git/linux-user/aarch64/cpu_loop.c:88 #5 0x00005555555e581c in main (argc=<optimized out>, argv=0x7fffffffe038, envp=<optimized out>) at /home/alex.bennee/lsrc/qemu.git/linux-user/main.c:819
I don't seem to be able to step through it but it looks like the newly spawned thread is blocked on the futex and the safe_wait4 never progresses.
--
Alex Bennée
v4 cover per-CPU locks
In reply to Emilio G. Cota[I forgot to add the cover letter to git send-email; here it is]
v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg04179.html
"Why is this an RFC?" See v3 link above. Also, see comment at the bottom of this message regarding the last patch of this series.
Changes since v3:
- Add R-b's -- rth: thanks for all the reviews!
- Partially bring back the approach in the v1 series, that is, do not acquire the CPU mutex in cpu_interrupt_request; use atomic_read instead. The lock is not needed because of the OR+kick sequence; note that when we do not have the BQL (i.e. in MTTCG's CPU loop), we do have the lock while reading cpu_interrupt_request, so no writes can be missed there. This simplifies the calling code quite a bit, since we do not hold cpu_mutex across large portions of code (this is a very bad idea, e.g. could lead to deadlock for instance if we tried to queue work on another CPU).
Setters still acquire the lock, since it's the cost is very similar to that of a locked atomic, and makes the code simpler.
- Use an intermediate interrupt_request variable wherever this is trivial to do. Whenever there's a chance that cpu->interrupt_request might have been updated between reads, just use cpu_interrupt_request to perform a load via atomic_read.
- Drop the BQL assert in run_on_cpu. Keep the guarantee that the queued work holds the BQL, though.
- Add a no_cpu_mutex_lock_held assert to run_on_cpu; note that acquiring CPU locks can only be done in CPU_FOREACH order, otherwise we might deadlock.
- Remove qemu_cpu_cond leftovers; it's superseded by cpu->cond.
- Export no_cpu_mutex_lock_held.
- Do not export process_queued_work_locked from cpus-common.c; at some point we need to drop cpu_mutex for other vCPUs to queue work on the current vCPU, and process_queued_work is a good place to do that. Add comment about this.
- Add helper_cpu_halted_set helper to tcg-runtime. Convert the TCG targets that were setting cpu->halted directly.
- Fix cpu_reset_interrupt in cpu_common_post_load, as reported by Richard.
- Fix a hang after making qemu_work_cond per-cpu. The hang can only happen between that commit and the commit that completes the transition to per-CPU locks. This would break bisect, so fix it. In addition, add a comment about it, and add a tiny patch to undo the fix once the transition is complete and the fix isn't needed any more.
- Fix a possible deadlock (acquiring the BQL *after* having acquired the CPU mutex) in cpu_reset_interrupt. This would break bisection until the transition to per-CPU locks, so fix it and add a comment about it to the commit log of the "cpu: define cpu_interrupt_request helpers" patch.
- Add cc->has_work_with_iothread_lock, as suggested by Paolo, and convert the targets that need it.
- Add a patch to reduce contention when doing exclusive work. In my tests I've only found aarch64 to benefit (very minimally) from this; for other targets this patch is perf-neutral. In aarch64, the problem is that frequent global TLB invalidations require frequent exclusive work; sync-profile points to unnecessary contention on cpu_list_lock, which all waiters wait on while the exclusive work completes. To fix this, make the waiters wait on their CPU lock, so that their wakeup is uncontended. The perf impact is that the scalability collapse due to exclusive work is mitigated, but not fixed.
So I'm including this patch to raise awareness about the issue, but I don't feel strongly at all about merging it.
The series is checkpatch-clean (single warning about __COVERITY__).
You can fetch it from:
https://github.com/cota/qemu/tree/cpu-lock-v4
Thanks,
Emilio
Re: [Qemu-arm] [RFC v4 00/71] per-CPU locks
Quoted 6 lines · Emilio G. Cota
[I forgot to add the cover letter to git send-email; here it is]
v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg04179.html
"Why is this an RFC?" See v3 link above. Also, see comment at the bottom of this message regarding the last patch of this series.
I'm also seeing his hang on check-tcg, specifically qemu-aarch64 ./tests/linux-test
<snip>
--
Alex Bennée
Re: [Qemu-arm] [RFC v4 00/71] per-CPU locks
Quoted 11 lines · Alex Bennée
Quoted 6 lines · Emilio G. Cota
[I forgot to add the cover letter to git send-email; here it is]
v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg04179.html
"Why is this an RFC?" See v3 link above. Also, see comment at the bottom of this message regarding the last patch of this series.
I'm also seeing his hang on check-tcg, specifically qemu-aarch64 ./tests/linux-test
Thanks for reporting. The last patch in the series is the one that causes the hang. I didn't test that patch much, since I did not intend to get it merged.
Over the weekend I had a bit of time to think about an actual fix, i.e. how to reduce safe work calls for TLB invalidations. The idea is to check whether the remote invalidation is necessary at all; we can take the remote tlb's lock, and check whether the address we want to invalidate has been read by the remote CPU since its latest flush. On some quick tests booting an aarch64 system I measured that only up to ~2% of remote invalidations are actually necessary.
I just did a search on google scholar and found a similar approach to reduce remote TLB shootdowns on ARM, this time for hardware. This paper
"TLB Shootdown Mitigation for Low-Power Many-Core Servers with L1 Virtual Caches"
https://dl.acm.org/citation.cfm?id=3202975
addresses the issue by employing bloom filters in hardware to determine whether an address has been accessed by a TLB before performing an invalidation (and the corresponding icache flush).
In software, using a per-TLB hash table might be enough. I'll try to have something ready for v5.
Thanks,
Emilio
Re: [Qemu-arm] [RFC v4 00/71] per-CPU locks
Quoted 8 lines · Emilio G. Cota
Quoted 7 lines · Alex Bennée
Quoted 4 lines · Emilio G. Cota
[I forgot to add the cover letter to git send-email; here it is]
v3: https://lists.gnu.org/archive/html/qemu-devel/2018-10/msg04179.html
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
"Why is this an RFC?" See v3 link above. Also, see comment at the bottom of this message regarding the last patch of this series.
I'm also seeing his hang on check-tcg, specifically qemu-aarch64 ./tests/linux-test
Thanks for reporting. The last patch in the series is the one that causes the hang. I didn't test that patch much, since I did not intend to get it merged.
See patch 3, I think it's just because the per-cpu locks aren't available in linux-user, breaking the exclusive mechanism.
Quoted 18 lines
Over the weekend I had a bit of time to think about an actual fix, i.e. how to reduce safe work calls for TLB invalidations. The idea is to check whether the remote invalidation is necessary at all; we can take the remote tlb's lock, and check whether the address we want to invalidate has been read by the remote CPU since its latest flush. On some quick tests booting an aarch64 system I measured that only up to ~2% of remote invalidations are actually necessary.
I just did a search on google scholar and found a similar approach to reduce remote TLB shootdowns on ARM, this time for hardware. This paper
"TLB Shootdown Mitigation for Low-Power Many-Core Servers with L1 Virtual Caches"
https://dl.acm.org/citation.cfm?id=3202975
addresses the issue by employing bloom filters in hardware to determine whether an address has been accessed by a TLB before performing an invalidation (and the corresponding icache flush).
Quoted 2 lines
In software, using a per-TLB hash table might be enough. I'll try to have something ready for v5.
OK.
--
Alex Bennée
Quoted 30 lines · Emilio G. Cota
Instead of open-coding it.
While at it, make sure that all accesses to the list are performed while holding the list's lock.
Reviewed-by Richard Henderson <[email protected]>Signed-off-by Emilio G. Cota <[email protected]>--- include/qom/cpu.h | 6 +++--- cpus-common.c | 25 ++++++++----------------- cpus.c | 14 ++++++++++++-- qom/cpu.c | 1 + 4 files changed, 24 insertions(+), 22 deletions(-)include/qom/cpu.h +2
-2@@ -315,8 +315,8 @@ struct qemu_work_item;* @mem_io_pc: Host Program Counter at which the memory was accessed. * @mem_io_vaddr: Target virtual address at which the memory was accessed. * @kvm_fd: vCPU file descriptor for KVM. -* @work_mutex: Lock to prevent multiple access to queued_work_*. -* @queued_work_first: First asynchronous work pending. +* @work_mutex: Lock to prevent multiple access to @work_list. +* @work_list: List of pending asynchronous work. * @trace_dstate_delayed: Delayed changes to trace_dstate (includes all changes * to @trace_dstate). * @trace_dstate: Dynamic tracing state of events for this vCPU (bitmask).
include/qom/cpu.h struct CPUState { · line 360
Quoted 5 lines
include/qom/cpu.h +1
-1@@ -357,7 +357,7 @@ struct CPUState {sigjmp_buf jmp_env;QemuMutex work_mutex; -struct qemu_work_item *queued_work_first, *queued_work_last; + QSIMPLEQ_HEAD(, qemu_work_item) work_list;
Would:
QSIMPLEQ_HEAD(work_list, qemu_work_item);
be neater?
Quoted 61 lines
include/qom/cpu.h +0
-0CPUAddressSpace *cpu_ases;int num_ases;cpus-common.c +8
-17@@ -107,7 +107,7 @@ void cpu_list_remove(CPUState *cpu) }struct qemu_work_item { -struct qemu_work_item *next; +QSIMPLEQ_ENTRY (qemu_work_item) node;run_on_cpu_func func;run_on_cpu_data data;bool free, exclusive, done;@@ -116,13 +116,7 @@ struct qemu_work_item {static void queue_work_on_cpu (CPUState *cpu,struct qemu_work_item *wi) {qemu_mutex_lock (&cpu->work_mutex); -if (cpu->queued_work_first ==NULL ) { - cpu->queued_work_first = wi; - }else { - cpu->queued_work_last->next = wi; - } - cpu->queued_work_last = wi; - wi->next =NULL ; +QSIMPLEQ_INSERT_TAIL (&cpu->work_list, wi, node); wi->done = false;qemu_mutex_unlock (&cpu->work_mutex);@@ -314,17 +308,14 @@ void process_queued_cpu_work(CPUState *cpu) {struct qemu_work_item *wi; -if (cpu->queued_work_first ==NULL ) { +qemu_mutex_lock (&cpu->work_mutex); +if (QSIMPLEQ_EMPTY (&cpu->work_list)) { +qemu_mutex_unlock (&cpu->work_mutex);return ; } - -qemu_mutex_lock (&cpu->work_mutex); -while (cpu->queued_work_first !=NULL ) { - wi = cpu->queued_work_first; - cpu->queued_work_first = wi->next; -if (!cpu->queued_work_first) { - cpu->queued_work_last =NULL ; - } +while (!QSIMPLEQ_EMPTY (&cpu->work_list)) { + wi =QSIMPLEQ_FIRST (&cpu->work_list); +QSIMPLEQ_REMOVE_HEAD (&cpu->work_list, node);qemu_mutex_unlock (&cpu->work_mutex);if (wi->exclusive) {/* Running work items outside the BQL avoids the following deadlock: cpus.c +0
-0@@ -88,9 +88,19 @@ bool cpu_is_stopped(CPUState *cpu)return cpu->stopped || !runstate_is_running ();
cpus.c bool cpu_is_stopped(CPUState *cpu) · line 98
Quoted 10 lines
cpus.c +8
-0} +static inline bool cpu_work_list_empty (CPUState *cpu) +{ +bool ret; + +qemu_mutex_lock (&cpu->work_mutex); + ret =QSIMPLEQ_EMPTY (&cpu->work_list); +qemu_mutex_unlock (&cpu->work_mutex); +return ret;
This could just be:
return QSIMPLEQ_EMPTY_ATOMIC(&cpu->work_list)
Quoted 23 lines
cpus.c +4
-2+} +static bool cpu_thread_is_idle (CPUState *cpu) { -if (cpu->stop || cpu->queued_work_first) { +if (cpu->stop || !cpu_work_list_empty (cpu)) {return false; }if (cpu_is_stopped (cpu)) {@@ -1509,7 +1519,7 @@ static void *qemu_tcg_rr_cpu_thread_fn(void *arg) cpu = first_cpu; } -while (cpu && !cpu->queued_work_first && !cpu->exit_request) { +while (cpu &&cpu_work_list_empty (cpu) && !cpu->exit_request) {atomic_mb_set (&tcg_current_rr_cpu, cpu); current_cpu = cpu;qom/cpu.c +0
-0
qom/cpu.c static void cpu_common_initfn(Object *obj) · line 378
Quoted 6 lines
qom/cpu.c +1
-0@@ -373,6 +373,7 @@ static void cpu_common_initfn(Object *obj) cpu->nr_threads =1 ;qemu_mutex_init (&cpu->work_mutex); +QSIMPLEQ_INIT (&cpu->work_list);QTAILQ_INIT (&cpu->breakpoints);QTAILQ_INIT (&cpu->watchpoints);
Otherwise:
--
Alex Bennée
Quoted 2 lines · Alex Bennée
Emilio G. Cota <[email protected]> writes:
(snip)
Quoted 9 lines
include/qom/cpu.h struct CPUState { · line 360
Quoted 6 lines
include/qom/cpu.h +1
-1@@ -357,7 +357,7 @@ struct CPUState {sigjmp_buf jmp_env;QemuMutex work_mutex; -struct qemu_work_item *queued_work_first, *queued_work_last; + QSIMPLEQ_HEAD(, qemu_work_item) work_list;Would:
Quoted 3 lines
QSIMPLEQ_HEAD(work_list, qemu_work_item);be neater?
That would expand to
struct CPUState {
...
struct work_list {
struct qemu_work_item *sqh_first;
struct qemu_work_item **sqh_last;
}; // <-- missing field name
...
};, which doesn't declare an actual field in the struct.
Quoted 11 lines
cpus.c bool cpu_is_stopped(CPUState *cpu) · line 98
Quoted 8 lines
cpus.c +8
-0+static inline bool cpu_work_list_empty (CPUState *cpu) +{ +bool ret; + +qemu_mutex_lock (&cpu->work_mutex); + ret =QSIMPLEQ_EMPTY (&cpu->work_list); +qemu_mutex_unlock (&cpu->work_mutex); +return ret;This could just be:
Quoted 1 line
return
QSIMPLEQ_EMPTY_ATOMIC(&cpu->work_list)
Not quite; (1) the non-RCU version of the list does not set pointers with atomic_set, so an atomic_read here would not be enough, and (2) using the lock ensures that the read is up-to-date. These two points are not a big deal though, since later in the series ("cpu: protect most CPU state with cpu->lock") we hold the CPU lock when calling this.
Quoted 3 lines
Otherwise:
Reviewed-by Alex Bennée <[email protected]>
Thanks!
Emilio