accel: Fix vCPU memory leaks
v4 cover accel: Fix vCPU memory leaks
From: Philippe Mathieu-Daudé <[email protected]>
Hi,
This is a respin of Mark 'vCPU hotunplug related memory leaks' v3:
https://lore.kernel.org/qemu-devel/[email protected]/
Instead I refactored to extract the common common_vcpu_thread_create() from all accelerators (except TCG/RR, which requires a special-casing).
Not well tested...
Mark Kanda (3):
cpu: Free cpu->cpu_ases in cpu_address_space_destroy() softmmu/cpus: Free cpu->thread in generic_destroy_vcpu_thread() softmmu/cpus: Free cpu->halt_cond in generic_destroy_vcpu_thread()
Philippe Mathieu-Daudé (10):
target/i386/kvm: Free xsave_buf when destroying vCPU target/i386/hvf: Free resources when vCPU is destroyed accel/hvf: Remove pointless assertion
accel/tcg: Init TCG cflags in vCPU thread handler accel/tcg: Reorganize tcg_accel_ops_init()
accel-ops: Introduce create_vcpu_thread_precheck / postcheck handlers accel/tcg: Extract rr_create_vcpu_thread_precheck() accel/all: Extract common_vcpu_thread_create()
accel-ops: Introduce common_vcpu_thread_destroy() and .precheck
handler
accel/tcg: Add rr_destroy_vcpu_thread_precheck()
accel/accel-softmmu.c | 2 +- accel/dummy-cpus.c | 15 +---------- accel/hvf/hvf-accel-ops.c | 24 +++-------------- accel/kvm/kvm-accel-ops.c | 17 +++--------- accel/qtest/qtest.c | 3 ++- accel/tcg/tcg-accel-ops-mttcg.c | 27 +++---------------- accel/tcg/tcg-accel-ops-mttcg.h | 3 +-- accel/tcg/tcg-accel-ops-rr.c | 44 +++++++++++++++---------------- accel/tcg/tcg-accel-ops-rr.h | 7 +++-- accel/tcg/tcg-accel-ops.c | 22 +++++++++------- accel/xen/xen-all.c | 2 +- cpu.c | 1 + include/exec/cpu-common.h | 7 +++++ include/sysemu/accel-ops.h | 9 ++++++- include/sysemu/cpus.h | 4 +-- softmmu/cpus.c | 40 +++++++++++++++++++++++++--- softmmu/physmem.c | 5 ++++ target/i386/hax/hax-accel-ops.c | 20 ++------------ target/i386/hvf/hvf.c | 2 ++ target/i386/kvm/kvm.c | 2 ++ target/i386/nvmm/nvmm-accel-ops.c | 17 +++--------- target/i386/whpx/whpx-accel-ops.c | 20 +++----------- 22 files changed, 127 insertions(+), 166 deletions(-)
Signature · 1 line
2.35.1
PATCH v4 1/13 cpu: Free cpu->cpu_ases in cpu_address_space_destroy()
From: Mark Kanda <[email protected]>
Create cpu_address_space_destroy() to free a CPU's cpu_ases list.
vCPU hotunplug related leak reported by Valgrind:
==132362== 216 bytes in 1 blocks are definitely lost in loss record 7,119 of 8,549
==132362== at 0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==132362== by 0x69EE4CD: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.5600.4) ==132362== by 0x7E34AF: cpu_address_space_init (physmem.c:751) ==132362== by 0x45053E: qemu_init_vcpu (cpus.c:635) ==132362== by 0x76B4A7: x86_cpu_realizefn (cpu.c:6520) ==132362== by 0x9343ED: device_set_realized (qdev.c:531) ==132362== by 0x93E26F: property_set_bool (object.c:2273) ==132362== by 0x93C23E: object_property_set (object.c:1408) ==132362== by 0x9406DC: object_property_set_qobject (qom-qobject.c:28) ==132362== by 0x93C5A9: object_property_set_bool (object.c:1477) ==132362== by 0x933C81: qdev_realize (qdev.c:333) ==132362== by 0x455E9A: qdev_device_add_from_qdict (qdev-monitor.c:713)
Message-Id: <[email protected]>
--- cpu.c | 1 + include/exec/cpu-common.h | 7 +++++++ softmmu/physmem.c | 5 +++++ 3 files changed, 13 insertions(+)
cpu.c +1 -0
@@ -174,6 +174,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)tcg_exec_unrealizefn (cpu); } +cpu_address_space_destroy (cpu);cpu_list_remove (cpu); }
include/exec/cpu-common.h +7 -0
@@ -111,6 +111,13 @@ size_t qemu_ram_pagesize_largest(void);*/ void cpu_address_space_init (CPUState *cpu,int asidx,const char *prefix,MemoryRegion *mr); +/** +* cpu_address_space_destroy: +* @cpu: CPU for this address space +* +* Cleanup CPU's cpu_ases list. +*/ +void cpu_address_space_destroy (CPUState *cpu);void cpu_physical_memory_rw (hwaddr addr,void *buf,hwaddr len,bool is_write);
softmmu/physmem.c +5 -0
@@ -762,6 +762,11 @@ void cpu_address_space_init(CPUState *cpu, int asidx, } } +void cpu_address_space_destroy (CPUState *cpu) +{ +g_free (cpu->cpu_ases); +} +AddressSpace *cpu_get_address_space (CPUState *cpu,int asidx) {/* Return the AddressSpace corresponding to the specified index */
Signature · 1 line
2.35.1
Re: [PATCH v4 01/13] cpu: Free cpu->cpu_ases in cpu_address_space_destroy()
Quoted 3 lines · Philippe Mathieu-Daudé
From: Mark Kanda <[email protected]>
Create
cpu_address_space_destroy()to free a CPU'scpu_aseslist.
This seems incorrect...
Quoted 43 lines
vCPU hotunplug related leak reported by Valgrind:
==132362== 216 bytes in 1 blocks are definitely lost in loss record 7,119 of 8,549
==132362== at 0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==132362== by 0x69EE4CD: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.5600.4) ==132362== by 0x7E34AF: cpu_address_space_init (physmem.c:751) ==132362== by 0x45053E: qemu_init_vcpu (cpus.c:635) ==132362== by 0x76B4A7: x86_cpu_realizefn (cpu.c:6520) ==132362== by 0x9343ED: device_set_realized (qdev.c:531) ==132362== by 0x93E26F: property_set_bool (object.c:2273) ==132362== by 0x93C23E: object_property_set (object.c:1408) ==132362== by 0x9406DC: object_property_set_qobject (qom-qobject.c:28) ==132362== by 0x93C5A9: object_property_set_bool (object.c:1477) ==132362== by 0x933C81: qdev_realize (qdev.c:333) ==132362== by 0x455E9A: qdev_device_add_from_qdict (qdev-monitor.c:713)Signed-off-by Mark Kanda <[email protected]>Message-Id: <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- cpu.c | 1 + include/exec/cpu-common.h | 7 +++++++ softmmu/physmem.c | 5 +++++ 3 files changed, 13 insertions(+)cpu.c +1
-0@@ -174,6 +174,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)tcg_exec_unrealizefn (cpu); } +cpu_address_space_destroy (cpu);cpu_list_remove (cpu); }include/exec/cpu-common.h +0
-0
include/exec/cpu-common.h size_t qemu_ram_pagesize_largest(void); · line 113
Quoted 3 lines
include/exec/cpu-common.h +0
-0@@ -111,6 +111,13 @@ size_t qemu_ram_pagesize_largest(void);*/ void cpu_address_space_init (CPUState *cpu,int asidx,const char *prefix,MemoryRegion *mr);
... cpu_address_space_init() creates a single AS, ...
Quoted 15 lines
include/exec/cpu-common.h +7
-0+/** +* cpu_address_space_destroy: +* @cpu: CPU for this address space +* +* Cleanup CPU's cpu_ases list. +*/ +void cpu_address_space_destroy (CPUState *cpu);void cpu_physical_memory_rw (hwaddr addr,void *buf,hwaddr len,bool is_write);softmmu/physmem.c +0
-0
softmmu/physmem.c void cpu_address_space_init(CPUState *cpu, int asidx, · line 767
Quoted 6 lines
softmmu/physmem.c +3
-0@@ -762,6 +762,11 @@ void cpu_address_space_init(CPUState *cpu, int asidx, } } +void cpu_address_space_destroy (CPUState *cpu) +{ +g_free (cpu->cpu_ases);
... but here you destroy all the ASes.
Quoted 5 lines
softmmu/physmem.c +2
-0+} +AddressSpace *cpu_get_address_space (CPUState *cpu,int asidx) {/* Return the AddressSpace corresponding to the specified index */
Re: [PATCH v4 01/13] cpu: Free cpu->cpu_ases in cpu_address_space_destroy()
Quoted 67 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Philippe Mathieu-Daudé
From: Mark Kanda <[email protected]>
Create
cpu_address_space_destroy()to free a CPU'scpu_aseslist.This seems incorrect...
Quoted 41 lines
vCPU hotunplug related leak reported by Valgrind:
==132362== 216 bytes in 1 blocks are definitely lost in loss record 7,119 of 8,549 ==132362== at
0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==132362== by0x69EE4CD:g_malloc0(in/usr/lib64/libglib-2.0.so.0.5600.4) ==132362== by0x7E34AF:cpu_address_space_init(physmem.c:751) ==132362== by0x45053E:qemu_init_vcpu(cpus.c:635)
==132362== by0x76B4A7:x86_cpu_realizefn(cpu.c:6520)
==132362== by0x9343ED:device_set_realized(qdev.c:531) ==132362== by0x93E26F:property_set_bool(object.c:2273) ==132362== by0x93C23E:object_property_set(object.c:1408) ==132362== by0x9406DC:object_property_set_qobject(qom-qobject.c:28) ==132362== by0x93C5A9:object_property_set_bool(object.c:1477) ==132362== by0x933C81:qdev_realize(qdev.c:333)
==132362== by0x455E9A:qdev_device_add_from_qdict(qdev-monitor.c:713)Signed-off-by Mark Kanda <[email protected]>Message-Id: <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
cpu.c | 1 +
include/exec/cpu-common.h| 7 +++++++
softmmu/physmem.c | 5 +++++3 files changed, 13 insertions(+)cpu.c +0
-0@@ -174,6 +174,7 @@ void cpu_exec_unrealizefn(CPUState *cpu) tcg_exec_unrealizefn(cpu); } + cpu_address_space_destroy(cpu); cpu_list_remove(cpu); }diff --git
a/include/exec/cpu-common.hb/include/exec/cpu-common.hindex50a7d2912e..b17ad61ae4100644include/exec/cpu-common.h size_t qemu_ram_pagesize_largest(void); · line 113
Quoted 3 lines
include/exec/cpu-common.h +0
-0@@ -111,6 +111,13 @@ size_t qemu_ram_pagesize_largest(void);*/ void cpu_address_space_init(CPUState *cpu, int asidx, const char *prefix, MemoryRegion *mr);...
cpu_address_space_init()creates a single AS, ...Quoted 13 lines
include/exec/cpu-common.h +7
-0+/** +* cpu_address_space_destroy: +* @cpu: CPU for this address space +* +* Cleanup CPU's cpu_ases list. +*/ +void cpu_address_space_destroy (CPUState *cpu); void cpu_physical_memory_rw(hwaddr addr, void *buf, hwaddr len, bool is_write);softmmu/physmem.c +0
-0
Quoted 8 lines
softmmu/physmem.c void cpu_address_space_init(CPUState *cpu, int asidx, · line 766
Quoted 6 lines
softmmu/physmem.c +2
-0@@ -762,6 +762,11 @@ void cpu_address_space_init(CPUState *cpu, int asidx, } } +void cpu_address_space_destroy(CPUState *cpu) +{ + g_free(cpu->cpu_ases);... but here you destroy all the ASes.
I was thinking the whole ASes list should be freed because the CPU is going away...
Thanks/regards,
-Mark
PATCH v4 2/13 target/i386/kvm: Free xsave_buf when destroying vCPU
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Fix vCPU hot-unplug related leak reported by Valgrind:
==132362== 4,096 bytes in 1 blocks are definitely lost in loss record 8,440 of 8,549
==132362== at 0x4C3B15F: memalign (vg_replace_malloc.c:1265) ==132362== by 0x4C3B288: posix_memalign (vg_replace_malloc.c:1429) ==132362== by 0xB41195: qemu_try_memalign (memalign.c:53) ==132362== by 0xB41204: qemu_memalign (memalign.c:73) ==132362== by 0x7131CB: kvm_init_xsave (kvm.c:1601) ==132362== by 0x7148ED: kvm_arch_init_vcpu (kvm.c:2031) ==132362== by 0x91D224: kvm_init_vcpu (kvm-all.c:516) ==132362== by 0x9242C9: kvm_vcpu_thread_fn (kvm-accel-ops.c:40) ==132362== by 0xB2EB26: qemu_thread_start (qemu-thread-posix.c:556) ==132362== by 0x7EB2159: start_thread (in /usr/lib64/libpthread-2.28.so) ==132362== by 0x9D45DD2: clone (in /usr/lib64/libc-2.28.so)
--- target/i386/kvm/kvm.c | 2 ++ 1 file changed, 2 insertions(+)
target/i386/kvm/kvm.c +2 -0
@@ -2072,6 +2072,8 @@ int kvm_arch_destroy_vcpu(CPUState *cs)X86CPU *cpu =X86_CPU (cs);CPUX86State *env = &cpu->env; +g_free (env->xsave_buf); +if (cpu->kvm_msr_buf) {g_free (cpu->kvm_msr_buf); cpu->kvm_msr_buf =NULL ;
Signature · 1 line
2.35.1
Re: [PATCH v4 02/13] target/i386/kvm: Free xsave_buf when destroying vCPU
Quoted 17 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé<[email protected]>
Fix vCPU hot-unplug related leak reported by Valgrind:
==132362== 4,096 bytes in 1 blocks are definitely lost in loss record 8,440 of 8,549 ==132362== at 0x4C3B15F: memalign (vg_replace_malloc.c:1265) ==132362== by 0x4C3B288: posix_memalign (vg_replace_malloc.c:1429) ==132362== by 0xB41195: qemu_try_memalign (memalign.c:53) ==132362== by 0xB41204: qemu_memalign (memalign.c:73) ==132362== by 0x7131CB: kvm_init_xsave (kvm.c:1601) ==132362== by 0x7148ED: kvm_arch_init_vcpu (kvm.c:2031) ==132362== by 0x91D224: kvm_init_vcpu (kvm-all.c:516) ==132362== by 0x9242C9: kvm_vcpu_thread_fn (kvm-accel-ops.c:40) ==132362== by 0xB2EB26: qemu_thread_start (qemu-thread-posix.c:556) ==132362== by 0x7EB2159: start_thread (in /usr/lib64/libpthread-2.28.so) ==132362== by 0x9D45DD2: clone (in /usr/lib64/libc-2.28.so)
Quoted 6 lines
Reported-by Mark Kanda<[email protected]>Tested-by Mark Kanda<[email protected]>Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/i386/kvm/kvm.c | 2 ++ 1 file changed, 2 insertions(+)
r~
PATCH v4 3/13 target/i386/hvf: Free resources when vCPU is destroyed
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Both xsave_buf and hvf_caps are allocated in hvf_arch_init_vcpu(), free them in hvf_arch_vcpu_destroy().
--- target/i386/hvf/hvf.c | 2 ++ 1 file changed, 2 insertions(+)
target/i386/hvf/hvf.c +2 -0
@@ -163,7 +163,9 @@ void hvf_arch_vcpu_destroy(CPUState *cpu)X86CPU *x86_cpu =X86_CPU (cpu);CPUX86State *env = &x86_cpu->env; +g_free (env->xsave_buf);g_free (env->hvf_mmio_buf); +g_free (hvf_state->hvf_caps); }static void init_tsc_freq (CPUX86State *env)
Signature · 1 line
2.35.1
Re: [PATCH v4 03/13] target/i386/hvf: Free resources when vCPU is destroyed
Quoted 11 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé<[email protected]>
Both
xsave_bufandhvf_capsare allocated inhvf_arch_init_vcpu(), free them inhvf_arch_vcpu_destroy().Reported-by Mark Kanda<[email protected]>Suggested-by Igor Mammedov<[email protected]>Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- target/i386/hvf/hvf.c | 2 ++ 1 file changed, 2 insertions(+)
r~
PATCH v4 4/13 accel/hvf: Remove pointless assertion
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Both the comment and the hvf_enabled() check are duplicated at the beginning of hvf_cpu_thread_fn(), which is the thread callback created by hvf_start_vcpu_thread(). Remove.
--- accel/hvf/hvf-accel-ops.c | 6 ------ 1 file changed, 6 deletions(-)
accel/hvf/hvf-accel-ops.c +0 -6
@@ -446,12 +446,6 @@ static void hvf_start_vcpu_thread(CPUState *cpu) {char thread_name[VCPU_THREAD_NAME_SIZE ]; -/* -* HVF currently does not support TCG, and only runs in -* unrestricted-guest mode. -*/ -assert (hvf_enabled ()); - cpu->thread =g_malloc0 (sizeof (QemuThread)); cpu->halt_cond =g_malloc0 (sizeof (QemuCond));qemu_cond_init (cpu->halt_cond);
Signature · 1 line
2.35.1
PATCH v4 5/13 accel/tcg: Init TCG cflags in vCPU thread handler
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Move TCG cflags initialization to thread handler.
Remove the duplicated assert checks.
--- accel/tcg/tcg-accel-ops-mttcg.c | 5 ++--- accel/tcg/tcg-accel-ops-rr.c | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-)
accel/tcg/tcg-accel-ops-mttcg.c +2 -3
@@ -71,6 +71,8 @@ static void *mttcg_cpu_thread_fn(void *arg)assert (tcg_enabled ());g_assert (!icount_enabled ()); +tcg_cpu_init_cflags (cpu, current_machine->smp.max_cpus >1 ); +rcu_register_thread (); force_rcu.notifier.notify = mttcg_force_rcu; force_rcu.cpu = cpu;
@@ -140,9 +142,6 @@ void mttcg_start_vcpu_thread(CPUState *cpu) {char thread_name[VCPU_THREAD_NAME_SIZE ]; -g_assert (tcg_enabled ()); -tcg_cpu_init_cflags (cpu, current_machine->smp.max_cpus >1 ); - cpu->thread =g_new0 (QemuThread,1 ); cpu->halt_cond =g_malloc0 (sizeof (QemuCond));qemu_cond_init (cpu->halt_cond);
accel/tcg/tcg-accel-ops-rr.c +3 -4
@@ -153,7 +153,9 @@ static void *rr_cpu_thread_fn(void *arg)Notifier force_rcu;CPUState *cpu = arg; -assert (tcg_enabled ()); +g_assert (tcg_enabled ()); +tcg_cpu_init_cflags (cpu, false); +rcu_register_thread (); force_rcu.notify = rr_force_rcu;rcu_add_force_rcu_notifier (&force_rcu);
@@ -276,9 +278,6 @@ void rr_start_vcpu_thread(CPUState *cpu)static QemuCond *single_tcg_halt_cond;static QemuThread *single_tcg_cpu_thread; -g_assert (tcg_enabled ()); -tcg_cpu_init_cflags (cpu, false); -if (!single_tcg_cpu_thread) { cpu->thread =g_new0 (QemuThread,1 ); cpu->halt_cond =g_new0 (QemuCond,1 );
Signature · 1 line
2.35.1
Re: [PATCH v4 05/13] accel/tcg: Init TCG cflags in vCPU thread handler
Quoted 10 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé<[email protected]>
Move TCG cflags initialization to thread handler.
Remove the duplicated assert checks.Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- accel/tcg/tcg-accel-ops-mttcg.c | 5 ++--- accel/tcg/tcg-accel-ops-rr.c | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-)
Why move into the thread handler? Seems fine where it is. I agree with the removal of duplicate asserts, but I'd have removed them the other way around...
r~
Richard Henderson
AppliedRe: [PATCH v4 05/13] accel/tcg: Init TCG cflags in vCPU thread handler
In reply to Philippe Mathieu-DaudéQuoted 10 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Move TCG cflags initialization to thread handler.
Remove the duplicated assert checks.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- accel/tcg/tcg-accel-ops-mttcg.c | 5 ++--- accel/tcg/tcg-accel-ops-rr.c | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-)
Queued to tcg-next.
r~
PATCH v4 6/13 accel/tcg: Reorganize tcg_accel_ops_init()
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Reorg TCG AccelOpsClass initialization to emphasis icount mode share more code with single-threaded TCG.
--- accel/tcg/tcg-accel-ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
accel/tcg/tcg-accel-ops.c +8 -7
@@ -98,16 +98,17 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->create_vcpu_thread = mttcg_start_vcpu_thread; ops->kick_vcpu_thread = mttcg_kick_vcpu_thread; ops->handle_interrupt = tcg_handle_interrupt; - }else if (icount_enabled ()) { - ops->create_vcpu_thread = rr_start_vcpu_thread; - ops->kick_vcpu_thread = rr_kick_vcpu_thread; - ops->handle_interrupt = icount_handle_interrupt; - ops->get_virtual_clock = icount_get; - ops->get_elapsed_ticks = icount_get; }else { ops->create_vcpu_thread = rr_start_vcpu_thread; ops->kick_vcpu_thread = rr_kick_vcpu_thread; - ops->handle_interrupt = tcg_handle_interrupt; + +if (icount_enabled ()) { + ops->handle_interrupt = icount_handle_interrupt; + ops->get_virtual_clock = icount_get; + ops->get_elapsed_ticks = icount_get; + }else { + ops->handle_interrupt = tcg_handle_interrupt; + } } }
Signature · 1 line
2.35.1
Re: [PATCH v4 06/13] accel/tcg: Reorganize tcg_accel_ops_init()
Quoted 9 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé<[email protected]>
Reorg TCG AccelOpsClass initialization to emphasis icount mode share more code with single-threaded TCG.
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- accel/tcg/tcg-accel-ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
r~
Richard Henderson
AppliedRe: [PATCH v4 06/13] accel/tcg: Reorganize tcg_accel_ops_init()
In reply to Philippe Mathieu-DaudéQuoted 9 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Reorg TCG AccelOpsClass initialization to emphasis icount mode share more code with single-threaded TCG.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- accel/tcg/tcg-accel-ops.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
Queued to tcg-next.
r~
PATCH v4 7/13 accel-ops: Introduce create_vcpu_thread_precheck / postcheck handlers
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Introduce precheck/postcheck handlers which will help to refactor code common to the various create_vcpu_thread() implementations.
--- include/sysemu/accel-ops.h | 4 ++++ softmmu/cpus.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)
include/sysemu/accel-ops.h +4 -0
@@ -31,6 +31,10 @@ struct AccelOpsClass {bool (*cpus_are_resettable)(void );void (*create_vcpu_thread)(CPUState *cpu);/* MANDATORY NON-NULL */ +/* If non-NULL, return whether common vCPU thread must be created */ +bool (*create_vcpu_thread_precheck)(CPUState *cpu); +void (*create_vcpu_thread_postcheck)(CPUState *cpu); +void (*kick_vcpu_thread)(CPUState *cpu);bool (*cpu_thread_is_idle)(CPUState *cpu);
softmmu/cpus.c +7 -1
@@ -637,7 +637,13 @@ void qemu_init_vcpu(CPUState *cpu)/* accelerators all implement the AccelOpsClass */ g_assert (cpus_accel !=NULL && cpus_accel->create_vcpu_thread !=NULL ); - cpus_accel->create_vcpu_thread (cpu); +if (cpus_accel->create_vcpu_thread_precheck ==NULL + || cpus_accel->create_vcpu_thread_precheck (cpu)) { + cpus_accel->create_vcpu_thread (cpu); + } +if (cpus_accel->create_vcpu_thread_postcheck) { + cpus_accel->create_vcpu_thread_postcheck (cpu); + }while (!cpu->created) {qemu_cond_wait (&qemu_cpu_cond, &qemu_global_mutex);
Signature · 1 line
2.35.1
Re: [PATCH v4 07/13] accel-ops: Introduce create_vcpu_thread_precheck / postcheck handlers
Quoted 17 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Introduce precheck/postcheck handlers which will help to refactor code common to the various
create_vcpu_thread()implementations.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/sysemu/accel-ops.h | 4 ++++ softmmu/cpus.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)include/sysemu/accel-ops.h +0
-0
include/sysemu/accel-ops.h struct AccelOpsClass { · line 36
Quoted 6 lines
include/sysemu/accel-ops.h +3
-0@@ -31,6 +31,10 @@ struct AccelOpsClass {bool (*cpus_are_resettable)(void );void (*create_vcpu_thread)(CPUState *cpu);/* MANDATORY NON-NULL */ +/* If non-NULL, return whether common vCPU thread must be created */ +bool (*create_vcpu_thread_precheck)(CPUState *cpu); +void (*create_vcpu_thread_postcheck)(CPUState *cpu);
I don't think this is the correct trade-off.
These new hooks are only used by rr, and at least in this patch set, incorrectly.
I think you should keep the single create_vcpu_thread hook, and if null, use your new common_vcpu_thread_create. Leave rr to be the single accel setting the hook, and then it's easier not to break rr during the reorg as well.
r~
PATCH v4 8/13 accel/tcg: Extract rr_create_vcpu_thread_precheck()
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
We are going to extract common pattern from rr_start_vcpu_thread(). First extract the rr_create_vcpu_thread_precheck() helper.
--- accel/tcg/tcg-accel-ops-rr.c | 7 +++++++ accel/tcg/tcg-accel-ops-rr.h | 1 + 2 files changed, 8 insertions(+)
accel/tcg/tcg-accel-ops-rr.c +7 -0
@@ -272,6 +272,13 @@ static void *rr_cpu_thread_fn(void *arg)return NULL ; } +static QemuThread *single_tcg_cpu_thread; + +bool rr_create_vcpu_thread_precheck (CPUState *cpu) +{ +return !single_tcg_cpu_thread; +} +void rr_start_vcpu_thread (CPUState *cpu) {char thread_name[VCPU_THREAD_NAME_SIZE ];
accel/tcg/tcg-accel-ops-rr.h +1 -0
@@ -15,6 +15,7 @@/* Kick all RR vCPUs. */ void rr_kick_vcpu_thread (CPUState *unused); +bool rr_create_vcpu_thread_precheck (CPUState *cpu);/* start the round robin vcpu thread */ void rr_start_vcpu_thread (CPUState *cpu);
Signature · 1 line
2.35.1
PATCH v4 9/13 accel/all: Extract common_vcpu_thread_create()
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
All accelerators implement a very similar create_vcpu_thread() handler. Extract the common part as common_vcpu_thread_create(), which only requires the AccelOpsClass::vcpu_thread_fn() routine and the accelerator AccelOpsClass::thread_name for debugging purpose.
The single exception is TCG/RR which re-use a single vCPU. Have it use the same logic by using the .precheck/.postcheck handlers.
--- accel/accel-softmmu.c | 2 +- accel/dummy-cpus.c | 15 +-------------- accel/hvf/hvf-accel-ops.c | 18 +++--------------- accel/kvm/kvm-accel-ops.c | 17 +++-------------- accel/qtest/qtest.c | 3 ++- accel/tcg/tcg-accel-ops-mttcg.c | 22 +--------------------- accel/tcg/tcg-accel-ops-mttcg.h | 3 +-- accel/tcg/tcg-accel-ops-rr.c | 21 +++------------------ accel/tcg/tcg-accel-ops-rr.h | 6 ++++-- accel/tcg/tcg-accel-ops.c | 6 ++++-- accel/xen/xen-all.c | 2 +- include/sysemu/accel-ops.h | 3 ++- include/sysemu/cpus.h | 4 ++-- softmmu/cpus.c | 23 ++++++++++++++++++++--- target/i386/hax/hax-accel-ops.c | 20 ++------------------ target/i386/nvmm/nvmm-accel-ops.c | 17 +++-------------- target/i386/whpx/whpx-accel-ops.c | 20 +++----------------- 17 files changed, 56 insertions(+), 146 deletions(-)
accel/accel-softmmu.c +1 -1
@@ -77,7 +77,7 @@ void accel_init_ops_interfaces(AccelClass *ac)/* * all accelerators need to define ops, providing at least a mandatory -* non-NULL create_vcpu_thread operation. +* non-NULL vcpu_thread_fn operation. */ g_assert (ops !=NULL );if (ops->ops_init) {
accel/dummy-cpus.c +1 -14
@@ -18,7 +18,7 @@#include "qemu/main-loop.h" #include "hw/core/cpu.h" -static void *dummy_cpu_thread_fn (void *arg) +void *dummy_vcpu_thread_fn (void *arg) {CPUState *cpu = arg;sigset_t waitset;
@@ -57,16 +57,3 @@ static void *dummy_cpu_thread_fn(void *arg)rcu_unregister_thread ();return NULL ; } - -void dummy_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_malloc0 (sizeof (QemuThread)); - cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); -qemu_cond_init (cpu->halt_cond); -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/DUMMY" , - cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, dummy_cpu_thread_fn, cpu, -QEMU_THREAD_JOINABLE ); -}
accel/hvf/hvf-accel-ops.c +3 -15
@@ -442,25 +442,13 @@ static void *hvf_cpu_thread_fn(void *arg)return NULL ; } -static void hvf_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_malloc0 (sizeof (QemuThread)); - cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); -qemu_cond_init (cpu->halt_cond); - -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/HVF" , - cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, hvf_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); -} -static void hvf_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = hvf_start_vcpu_thread; + ops->thread_name ="HVF" ; + ops->vcpu_thread_fn = hvf_cpu_thread_fn; + ops->kick_vcpu_thread = hvf_kick_vcpu_thread; ops->synchronize_post_reset = hvf_cpu_synchronize_post_reset;
accel/kvm/kvm-accel-ops.c +3 -14
@@ -61,19 +61,6 @@ static void *kvm_vcpu_thread_fn(void *arg)return NULL ; } -static void kvm_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_malloc0 (sizeof (QemuThread)); - cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); -qemu_cond_init (cpu->halt_cond); -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/KVM" , - cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, kvm_vcpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); -} -static bool kvm_vcpu_thread_is_idle (CPUState *cpu) {return !kvm_halt_in_kernel ();
@@ -88,7 +75,9 @@ static void kvm_accel_ops_class_init(ObjectClass *oc, void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = kvm_start_vcpu_thread; + ops->thread_name ="KVM" ; + ops->vcpu_thread_fn = kvm_vcpu_thread_fn; + ops->cpu_thread_is_idle = kvm_vcpu_thread_is_idle; ops->cpus_are_resettable = kvm_cpus_are_resettable; ops->synchronize_post_reset = kvm_cpu_synchronize_post_reset;
accel/qtest/qtest.c +2 -1
@@ -50,7 +50,8 @@ static void qtest_accel_ops_class_init(ObjectClass *oc, void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = dummy_start_vcpu_thread; + ops->vcpu_thread_fn = dummy_vcpu_thread_fn; + ops->get_virtual_clock = qtest_get_virtual_clock; };
accel/tcg/tcg-accel-ops-mttcg.c +1 -21
@@ -63,7 +63,7 @@ static void mttcg_force_rcu(Notifier *notify, void *data)* current CPUState for a given thread. */ -static void *mttcg_cpu_thread_fn (void *arg) +void *mttcg_vcpu_thread_fn (void *arg) {MttcgForceRcuNotifier force_rcu;CPUState *cpu = arg;
@@ -137,23 +137,3 @@ void mttcg_kick_vcpu_thread(CPUState *cpu) {cpu_exit (cpu); } - -void mttcg_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_new0 (QemuThread,1 ); - cpu->halt_cond =g_malloc0 (sizeof (QemuCond)); -qemu_cond_init (cpu->halt_cond); - -/* create a thread per vCPU with TCG (MTTCG) */ -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/TCG" , - cpu->cpu_index); - -qemu_thread_create (cpu->thread, thread_name, mttcg_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); - -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif -}
accel/tcg/tcg-accel-ops-mttcg.h +1 -2
@@ -13,7 +13,6 @@/* kick MTTCG vCPU thread */ void mttcg_kick_vcpu_thread (CPUState *cpu); -/* start an mttcg vCPU thread */ -void mttcg_start_vcpu_thread (CPUState *cpu); +void *mttcg_vcpu_thread_fn (void *arg);#endif /* TCG_CPUS_MTTCG_H */
accel/tcg/tcg-accel-ops-rr.c +3 -18
@@ -148,7 +148,7 @@ static void rr_force_rcu(Notifier *notify, void *data)* elsewhere. */ -static void *rr_cpu_thread_fn (void *arg) +void *rr_vcpu_thread_fn (void *arg) {Notifier force_rcu;CPUState *cpu = arg;
@@ -279,28 +279,13 @@ bool rr_create_vcpu_thread_precheck(CPUState *cpu)return !single_tcg_cpu_thread; } -void rr_start_vcpu_thread (CPUState *cpu) +void rr_create_vcpu_thread_postcheck (CPUState *cpu) { -char thread_name[VCPU_THREAD_NAME_SIZE ];static QemuCond *single_tcg_halt_cond; -static QemuThread *single_tcg_cpu_thread; - -if (!single_tcg_cpu_thread) { - cpu->thread =g_new0 (QemuThread,1 ); - cpu->halt_cond =g_new0 (QemuCond,1 ); -qemu_cond_init (cpu->halt_cond); - -/* share a single thread for all cpus with TCG */ -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"ALL CPUs/TCG" ); -qemu_thread_create (cpu->thread, thread_name, - rr_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); +if (! single_tcg_cpu_thread) { single_tcg_halt_cond = cpu->halt_cond; single_tcg_cpu_thread = cpu->thread; -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif }else {/* we share the thread */ cpu->thread = single_tcg_cpu_thread;
accel/tcg/tcg-accel-ops-rr.h +4 -2
@@ -16,7 +16,9 @@void rr_kick_vcpu_thread (CPUState *unused);bool rr_create_vcpu_thread_precheck (CPUState *cpu); -/* start the round robin vcpu thread */ -void rr_start_vcpu_thread (CPUState *cpu); +void rr_create_vcpu_thread_postcheck (CPUState *cpu); +bool rr_destroy_vcpu_thread_precheck (CPUState *cpu); + +void *rr_vcpu_thread_fn (void *arg);#endif /* TCG_CPUS_RR_H */
accel/tcg/tcg-accel-ops.c +4 -2
@@ -95,11 +95,13 @@ void tcg_handle_interrupt(CPUState *cpu, int mask)static void tcg_accel_ops_init (AccelOpsClass *ops) {if (qemu_tcg_mttcg_enabled ()) { - ops->create_vcpu_thread = mttcg_start_vcpu_thread; + ops->vcpu_thread_fn = mttcg_vcpu_thread_fn; ops->kick_vcpu_thread = mttcg_kick_vcpu_thread; ops->handle_interrupt = tcg_handle_interrupt; }else { - ops->create_vcpu_thread = rr_start_vcpu_thread; + ops->vcpu_thread_fn = rr_vcpu_thread_fn; + ops->create_vcpu_thread_precheck = rr_create_vcpu_thread_precheck; + ops->create_vcpu_thread_postcheck = rr_create_vcpu_thread_postcheck; ops->kick_vcpu_thread = rr_kick_vcpu_thread;if (icount_enabled ()) {
accel/xen/xen-all.c +1 -1
@@ -219,7 +219,7 @@ static void xen_accel_ops_class_init(ObjectClass *oc, void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = dummy_start_vcpu_thread; + ops->vcpu_thread_fn = dummy_vcpu_thread_fn; }static const TypeInfo xen_accel_ops_type = {
include/sysemu/accel-ops.h +2 -1
@@ -30,7 +30,8 @@ struct AccelOpsClass {bool (*cpus_are_resettable)(void ); -void (*create_vcpu_thread)(CPUState *cpu);/* MANDATORY NON-NULL */ +const char *thread_name; +void *(*vcpu_thread_fn)(void *arg);/* MANDATORY NON-NULL */ /* If non-NULL, return whether common vCPU thread must be created */ bool (*create_vcpu_thread_precheck)(CPUState *cpu);void (*create_vcpu_thread_postcheck)(CPUState *cpu);
include/sysemu/cpus.h +2 -2
@@ -9,8 +9,8 @@ void cpus_register_accel(const AccelOpsClass *i);/* accel/dummy-cpus.c */ -/* Create a dummy vcpu for AccelOpsClass->create_vcpu_thread */ -void dummy_start_vcpu_thread (CPUState *); +/* Create a dummy vcpu for AccelOpsClass->vcpu_thread_fn */ +void *dummy_vcpu_thread_fn (void *arg);/* interface available for cpus accelerator threads */
softmmu/cpus.c +20 -3
@@ -601,6 +601,22 @@ void resume_all_vcpus(void) } } +static void common_vcpu_thread_create (CPUState *cpu) +{ +char thread_name[VCPU_THREAD_NAME_SIZE ]; + + cpu->thread =g_new0 (QemuThread,1 ); + cpu->halt_cond =g_new0 (QemuCond,1 ); +qemu_cond_init (cpu->halt_cond); +snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/%s" , + cpu->cpu_index, cpus_accel->thread_name ?:"DUMMY" ); +qemu_thread_create (cpu->thread, thread_name, cpus_accel->vcpu_thread_fn, + cpu,QEMU_THREAD_JOINABLE ); +#ifdef _WIN32 + cpu->hThread =qemu_thread_get_handle (cpu->thread); +#endif +} +void cpu_remove_sync (CPUState *cpu) { cpu->stop = true;
@@ -614,7 +630,7 @@ void cpu_remove_sync(CPUState *cpu)void cpus_register_accel (const AccelOpsClass *ops) {assert (ops !=NULL ); -assert (ops->create_vcpu_thread !=NULL );/* mandatory */ +assert (ops->vcpu_thread_fn !=NULL );/* mandatory */ cpus_accel = ops; }
@@ -636,10 +652,11 @@ void qemu_init_vcpu(CPUState *cpu) }/* accelerators all implement the AccelOpsClass */ -g_assert (cpus_accel !=NULL && cpus_accel->create_vcpu_thread !=NULL ); +g_assert (cpus_accel !=NULL && cpus_accel->vcpu_thread_fn !=NULL ); +if (cpus_accel->create_vcpu_thread_precheck ==NULL || cpus_accel->create_vcpu_thread_precheck (cpu)) { - cpus_accel->create_vcpu_thread (cpu); +common_vcpu_thread_create (cpu); }if (cpus_accel->create_vcpu_thread_postcheck) { cpus_accel->create_vcpu_thread_postcheck (cpu);
target/i386/hax/hax-accel-ops.c +2 -18
@@ -57,28 +57,12 @@ static void *hax_cpu_thread_fn(void *arg)return NULL ; } -static void hax_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_new0 (QemuThread,1 ); - cpu->halt_cond =g_new0 (QemuCond,1 ); -qemu_cond_init (cpu->halt_cond); - -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/HAX" , - cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, hax_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif -} -static void hax_accel_ops_class_init (ObjectClass *oc,void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = hax_start_vcpu_thread; + ops->thread_name ="HAX" ; + ops->vcpu_thread_fn = hax_cpu_thread_fn; ops->kick_vcpu_thread = hax_kick_vcpu_thread; ops->synchronize_post_reset = hax_cpu_synchronize_post_reset;
target/i386/nvmm/nvmm-accel-ops.c +3 -14
@@ -60,19 +60,6 @@ static void *qemu_nvmm_cpu_thread_fn(void *arg)return NULL ; } -static void nvmm_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_new0 (QemuThread,1 ); - cpu->halt_cond =g_new0 (QemuCond,1 ); -qemu_cond_init (cpu->halt_cond); -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/NVMM" , - cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, qemu_nvmm_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); -} -/* * Abort the call to run the virtual processor by another thread, and to * return the control to that thread.
@@ -87,7 +74,9 @@ static void nvmm_accel_ops_class_init(ObjectClass *oc, void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = nvmm_start_vcpu_thread; + ops->thread_name ="NVMM" ; + ops->vcpu_thread_fn = qemu_nvmm_cpu_thread_fn; + ops->kick_vcpu_thread = nvmm_kick_vcpu_thread; ops->synchronize_post_reset = nvmm_cpu_synchronize_post_reset;
target/i386/whpx/whpx-accel-ops.c +3 -17
@@ -60,22 +60,6 @@ static void *whpx_cpu_thread_fn(void *arg)return NULL ; } -static void whpx_start_vcpu_thread (CPUState *cpu) -{ -char thread_name[VCPU_THREAD_NAME_SIZE ]; - - cpu->thread =g_new0 (QemuThread,1 ); - cpu->halt_cond =g_new0 (QemuCond,1 ); -qemu_cond_init (cpu->halt_cond); -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/WHPX" , - cpu->cpu_index); -qemu_thread_create (cpu->thread, thread_name, whpx_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE ); -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif -} -static void whpx_kick_vcpu_thread (CPUState *cpu) {if (!qemu_cpu_is_self (cpu)) {
@@ -92,7 +76,9 @@ static void whpx_accel_ops_class_init(ObjectClass *oc, void *data) {AccelOpsClass *ops =ACCEL_OPS_CLASS (oc); - ops->create_vcpu_thread = whpx_start_vcpu_thread; + ops->thread_name ="WHPX" ; + ops->vcpu_thread_fn = whpx_cpu_thread_fn; + ops->kick_vcpu_thread = whpx_kick_vcpu_thread; ops->cpu_thread_is_idle = whpx_vcpu_thread_is_idle;
Signature · 1 line
2.35.1
Re: [PATCH v4 09/13] accel/all: Extract common_vcpu_thread_create()
Quoted 8 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
All accelerators implement a very similar
create_vcpu_thread()handler. Extract the common part ascommon_vcpu_thread_create(), which only requires theAccelOpsClass::vcpu_thread_fn()routine and the acceleratorAccelOpsClass::thread_namefor debugging purpose.
Quoted 4 lines
The single exception is TCG/RR which re-use a single vCPU. Have it use the same logic by using the .precheck/.postcheck handlers.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Too much all at once.
But I see now why you moved code in the direction you did in patch 5.
accel/tcg/tcg-accel-ops-rr.c bool rr_create_vcpu_thread_precheck(CPUState *cpu) · line 286
Quoted 10 lines
accel/tcg/tcg-accel-ops-rr.c +1
-3@@ -279,28 +279,13 @@ bool rr_create_vcpu_thread_precheck(CPUState *cpu)return !single_tcg_cpu_thread; } -void rr_start_vcpu_thread (CPUState *cpu) +void rr_create_vcpu_thread_postcheck (CPUState *cpu) { -char thread_name[VCPU_THREAD_NAME_SIZE ];static QemuCond *single_tcg_halt_cond; -static QemuThread *single_tcg_cpu_thread;
Patch 8 is not really standalone, since you didn't move this variable. I think it's probably a mistake to split out precheck and postcheck separately.
accel/tcg/tcg-accel-ops-rr.c bool rr_create_vcpu_thread_precheck(CPUState *cpu) · line 286
Quoted 3 lines
accel/tcg/tcg-accel-ops-rr.c +1
-2- -if (!single_tcg_cpu_thread) { +if (! single_tcg_cpu_thread) {
Extraneous whitespace.
include/sysemu/accel-ops.h struct AccelOpsClass { · line 33
Quoted 6 lines
include/sysemu/accel-ops.h +1
-1@@ -30,7 +30,8 @@ struct AccelOpsClass {bool (*cpus_are_resettable)(void ); -void (*create_vcpu_thread)(CPUState *cpu);/* MANDATORY NON-NULL */ +const char *thread_name;
Why don't we just get this name from the AccelClass?
softmmu/cpus.c void resume_all_vcpus(void) · line 612
Quoted 9 lines
softmmu/cpus.c +9
-0+static void common_vcpu_thread_create (CPUState *cpu) +{ +char thread_name[VCPU_THREAD_NAME_SIZE ]; + + cpu->thread =g_new0 (QemuThread,1 ); + cpu->halt_cond =g_new0 (QemuCond,1 ); +qemu_cond_init (cpu->halt_cond); +snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"CPU %d/%s" , + cpu->cpu_index, cpus_accel->thread_name ?:"DUMMY" );
Surely g_strdup_printf is better than the static size buffer.
r~
Re: [PATCH v4 09/13] accel/all: Extract common_vcpu_thread_create()
In reply to Philippe Mathieu-DaudéQuoted 16 lines · Philippe Mathieu-Daudé
accel/tcg/tcg-accel-ops-rr.c +1
-13+void rr_create_vcpu_thread_postcheck (CPUState *cpu) { -char thread_name[VCPU_THREAD_NAME_SIZE ];static QemuCond *single_tcg_halt_cond; -static QemuThread *single_tcg_cpu_thread; - -if (!single_tcg_cpu_thread) { - cpu->thread =g_new0 (QemuThread,1 ); - cpu->halt_cond =g_new0 (QemuCond,1 ); -qemu_cond_init (cpu->halt_cond); - -/* share a single thread for all cpus with TCG */ -snprintf (thread_name,VCPU_THREAD_NAME_SIZE ,"ALL CPUs/TCG" ); -qemu_thread_create (cpu->thread, thread_name, - rr_cpu_thread_fn, - cpu,QEMU_THREAD_JOINABLE );
accel/tcg/tcg-accel-ops-rr.c bool rr_create_vcpu_thread_precheck(CPUState *cpu) · line 291
Quoted 10 lines
accel/tcg/tcg-accel-ops-rr.c +1
-3+if (! single_tcg_cpu_thread) { single_tcg_halt_cond = cpu->halt_cond; single_tcg_cpu_thread = cpu->thread; -#ifdef _WIN32 - cpu->hThread =qemu_thread_get_handle (cpu->thread); -#endif }else {/* we share the thread */ cpu->thread = single_tcg_cpu_thread;
This doesn't treat cpu->halt_cond correctly for other than the first cpu.
r~
PATCH v4 10/13 accel-ops: Introduce common_vcpu_thread_destroy() and .precheck handler
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Introduce an empty common_vcpu_thread_destroy() function, and provide a AccelOpsClass::destroy_vcpu_thread_precheck() callback so accelerators can choose whether to call common_vcpu_thread_destroy.
--- include/sysemu/accel-ops.h | 2 ++ softmmu/cpus.c | 9 +++++++++ 2 files changed, 11 insertions(+)
include/sysemu/accel-ops.h +2 -0
@@ -35,6 +35,8 @@ struct AccelOpsClass {/* If non-NULL, return whether common vCPU thread must be created */ bool (*create_vcpu_thread_precheck)(CPUState *cpu);void (*create_vcpu_thread_postcheck)(CPUState *cpu); +/* If non-NULL, return whether common vCPU thread must be destroyed */ +bool (*destroy_vcpu_thread_precheck)(CPUState *cpu);void (*kick_vcpu_thread)(CPUState *cpu);bool (*cpu_thread_is_idle)(CPUState *cpu);
softmmu/cpus.c +9 -0
@@ -617,6 +617,10 @@ static void common_vcpu_thread_create(CPUState *cpu)#endif } +static void common_vcpu_thread_destroy (CPUState *cpu) +{ +} +void cpu_remove_sync (CPUState *cpu) { cpu->stop = true;
@@ -625,6 +629,11 @@ void cpu_remove_sync(CPUState *cpu)qemu_mutex_unlock_iothread ();qemu_thread_join (cpu->thread);qemu_mutex_lock_iothread (); + +if (cpus_accel->destroy_vcpu_thread_precheck ==NULL + || cpus_accel->destroy_vcpu_thread_precheck (cpu)) { +common_vcpu_thread_destroy (cpu); + } }void cpus_register_accel (const AccelOpsClass *ops)
Signature · 1 line
2.35.1
Re: [PATCH v4 10/13] accel-ops: Introduce common_vcpu_thread_destroy() and .precheck handler
Quoted 11 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Introduce an empty
common_vcpu_thread_destroy()function, and provide aAccelOpsClass::destroy_vcpu_thread_precheck()callback so accelerators can choose whether to callcommon_vcpu_thread_destroy.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/sysemu/accel-ops.h | 2 ++ softmmu/cpus.c | 9 +++++++++ 2 files changed, 11 insertions(+)
My comments here are similar to the create precheck hook.
Do not add a "precheck" hook, but simply a hook to perform the whole job.
r~
PATCH v4 11/13 accel/tcg: Add rr_destroy_vcpu_thread_precheck()
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
TCG/RR is special and creates a single vCPU. It only have to release its resources once. Implement the .precheck() for that purpose.
--- accel/tcg/tcg-accel-ops-rr.c | 9 +++++++++ accel/tcg/tcg-accel-ops.c | 1 + 2 files changed, 10 insertions(+)
accel/tcg/tcg-accel-ops-rr.c +9 -0
@@ -295,3 +295,12 @@ void rr_create_vcpu_thread_postcheck(CPUState *cpu) cpu->created = true; } } + +bool rr_destroy_vcpu_thread_precheck (CPUState *cpu) +{ +if (single_tcg_cpu_thread) { + single_tcg_cpu_thread =NULL ; +return true; + } +return false; +}
accel/tcg/tcg-accel-ops.c +1 -0
@@ -102,6 +102,7 @@ static void tcg_accel_ops_init(AccelOpsClass *ops) ops->vcpu_thread_fn = rr_vcpu_thread_fn; ops->create_vcpu_thread_precheck = rr_create_vcpu_thread_precheck; ops->create_vcpu_thread_postcheck = rr_create_vcpu_thread_postcheck; + ops->destroy_vcpu_thread_precheck = rr_destroy_vcpu_thread_precheck; ops->kick_vcpu_thread = rr_kick_vcpu_thread;if (icount_enabled ()) {
Signature · 1 line
2.35.1
Re: [PATCH v4 11/13] accel/tcg: Add rr_destroy_vcpu_thread_precheck()
accel/tcg/tcg-accel-ops-rr.c void rr_create_vcpu_thread_postcheck(CPUState *cpu) · line 306
Quoted 8 lines · Philippe Mathieu-Daudé
accel/tcg/tcg-accel-ops-rr.c +8
-0+bool rr_destroy_vcpu_thread_precheck (CPUState *cpu) +{ +if (single_tcg_cpu_thread) { + single_tcg_cpu_thread =NULL ; +return true; + } +return false; +}
This would become
void rr_destroy_vcpu_thread(CPUState *cpu)
{
if (single_tcg_cpu_thread) {
g_free(single_tcg_cpu_thread);
g_free(single_tcg_halt_cond);
single_tcg_cpu_thread = NULL;
single_tcg_halt_cond = NULL;
}
}r~
PATCH v4 12/13 softmmu/cpus: Free cpu->thread in generic_destroy_vcpu_thread()
In reply to Philippe Mathieu-DaudéFrom: Mark Kanda <[email protected]>
Free cpu->thread in a new AccelOpsClass::destroy_vcpu_thread() handler generic_destroy_vcpu_thread().
vCPU hotunplug related leak reported by Valgrind:
==102631== 8 bytes in 1 blocks are definitely lost in loss record 1,037 of 8,555
==102631== at 0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==102631== by 0x69EE4CD: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.5600.4) ==102631== by 0x92443A: kvm_start_vcpu_thread (kvm-accel-ops.c:68) ==102631== by 0x4505C2: qemu_init_vcpu (cpus.c:643) ==102631== by 0x76B4D1: x86_cpu_realizefn (cpu.c:6520) ==102631== by 0x9344A7: device_set_realized (qdev.c:531) ==102631== by 0x93E329: property_set_bool (object.c:2273) ==102631== by 0x93C2F8: object_property_set (object.c:1408) ==102631== by 0x940796: object_property_set_qobject (qom-qobject.c:28) ==102631== by 0x93C663: object_property_set_bool (object.c:1477) ==102631== by 0x933D3B: qdev_realize (qdev.c:333) ==102631== by 0x455EC4: qdev_device_add_from_qdict (qdev-monitor.c:713)
Message-Id: <[email protected]>
--- softmmu/cpus.c | 1 + 1 file changed, 1 insertion(+)
softmmu/cpus.c +1 -0
@@ -619,6 +619,7 @@ static void common_vcpu_thread_create(CPUState *cpu)static void common_vcpu_thread_destroy (CPUState *cpu) { +g_free (cpu->thread); }void cpu_remove_sync (CPUState *cpu)
Signature · 1 line
2.35.1
Re: [PATCH v4 12/13] softmmu/cpus: Free cpu->thread in generic_destroy_vcpu_thread()
Thanks Philippe,
In the patch subject, 'generic_destroy_vcpu_thread()' should be changed to 'common_vcpu_thread_destroy()'. Same goes for the next patch (Free cpu->halt_cond).
Thanks/regards,
-Mark
Quoted 40 lines · Philippe Mathieu-Daudé
From: Mark Kanda <[email protected]>
Free
cpu->threadin a newAccelOpsClass::destroy_vcpu_thread()handlergeneric_destroy_vcpu_thread().vCPU hotunplug related leak reported by Valgrind:
==102631== 8 bytes in 1 blocks are definitely lost in loss record 1,037 of 8,555 ==102631== at 0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==102631== by 0x69EE4CD: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.5600.4) ==102631== by 0x92443A: kvm_start_vcpu_thread (kvm-accel-ops.c:68) ==102631== by 0x4505C2: qemu_init_vcpu (cpus.c:643) ==102631== by 0x76B4D1: x86_cpu_realizefn (cpu.c:6520) ==102631== by 0x9344A7: device_set_realized (qdev.c:531) ==102631== by 0x93E329: property_set_bool (object.c:2273) ==102631== by 0x93C2F8: object_property_set (object.c:1408) ==102631== by 0x940796: object_property_set_qobject (qom-qobject.c:28) ==102631== by 0x93C663: object_property_set_bool (object.c:1477) ==102631== by 0x933D3B: qdev_realize (qdev.c:333) ==102631== by 0x455EC4: qdev_device_add_from_qdict (qdev-monitor.c:713)Signed-off-by Mark Kanda <[email protected]>Message-Id: <[email protected]>
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- softmmu/cpus.c | 1 + 1 file changed, 1 insertion(+)softmmu/cpus.c +1
-0@@ -619,6 +619,7 @@ static void common_vcpu_thread_create(CPUState *cpu)static void common_vcpu_thread_destroy (CPUState *cpu) { +g_free (cpu->thread); }void cpu_remove_sync (CPUState *cpu)
Re: [PATCH v4 12/13] softmmu/cpus: Free cpu->thread in generic_destroy_vcpu_thread()
In reply to Philippe Mathieu-DaudéQuoted 4 lines · Philippe Mathieu-Daudé
static void
common_vcpu_thread_destroy(CPUState *cpu){
+g_free(cpu->thread);
}
Missing free of halt_cond.
r~
PATCH v4 13/13 softmmu/cpus: Free cpu->halt_cond in generic_destroy_vcpu_thread()
In reply to Philippe Mathieu-DaudéFrom: Mark Kanda <[email protected]>
vCPU hotunplug related leak reported by Valgrind:
==102631== 56 bytes in 1 blocks are definitely lost in loss record 5,089 of 8,555
==102631== at 0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==102631== by 0x69EE4CD: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.5600.4) ==102631== by 0x924452: kvm_start_vcpu_thread (kvm-accel-ops.c:69) ==102631== by 0x4505C2: qemu_init_vcpu (cpus.c:643) ==102631== by 0x76B4D1: x86_cpu_realizefn (cpu.c:6520) ==102631== by 0x9344A7: device_set_realized (qdev.c:531) ==102631== by 0x93E329: property_set_bool (object.c:2273) ==102631== by 0x93C2F8: object_property_set (object.c:1408) ==102631== by 0x940796: object_property_set_qobject (qom-qobject.c:28) ==102631== by 0x93C663: object_property_set_bool (object.c:1477) ==102631== by 0x933D3B: qdev_realize (qdev.c:333) ==102631== by 0x455EC4: qdev_device_add_from_qdict (qdev-monitor.c:713)
Message-Id: <[email protected]>
--- softmmu/cpus.c | 1 + 1 file changed, 1 insertion(+)
softmmu/cpus.c +1 -0
@@ -620,6 +620,7 @@ static void common_vcpu_thread_create(CPUState *cpu)static void common_vcpu_thread_destroy (CPUState *cpu) {g_free (cpu->thread); +g_free (cpu->halt_cond); }void cpu_remove_sync (CPUState *cpu)
Signature · 1 line
2.35.1
Re: [PATCH v4 13/13] softmmu/cpus: Free cpu->halt_cond in generic_destroy_vcpu_thread()
Quoted 18 lines · Philippe Mathieu-Daudé
From: Mark Kanda<[email protected]>
vCPU hotunplug related leak reported by Valgrind:
==102631== 56 bytes in 1 blocks are definitely lost in loss record 5,089 of 8,555 ==102631== at 0x4C3ADBB: calloc (vg_replace_malloc.c:1117) ==102631== by 0x69EE4CD: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.5600.4) ==102631== by 0x924452: kvm_start_vcpu_thread (kvm-accel-ops.c:69) ==102631== by 0x4505C2: qemu_init_vcpu (cpus.c:643) ==102631== by 0x76B4D1: x86_cpu_realizefn (cpu.c:6520) ==102631== by 0x9344A7: device_set_realized (qdev.c:531) ==102631== by 0x93E329: property_set_bool (object.c:2273) ==102631== by 0x93C2F8: object_property_set (object.c:1408) ==102631== by 0x940796: object_property_set_qobject (qom-qobject.c:28) ==102631== by 0x93C663: object_property_set_bool (object.c:1477) ==102631== by 0x933D3B: qdev_realize (qdev.c:333) ==102631== by 0x455EC4: qdev_device_add_from_qdict (qdev-monitor.c:713)
Quoted 6 lines
Signed-off-by Mark Kanda<[email protected]>Message-Id:<[email protected]>
Signed-off-by Philippe Mathieu-Daudé<[email protected]>--- softmmu/cpus.c | 1 + 1 file changed, 1 insertion(+)
Eh. Merge with previous.
r~