vCPU hotunplug related memory leaks
v2 cover vCPU hotunplug related memory leaks
This series addresses a few vCPU hotunplug related leaks (found with Valgrind).
v2: Create AccelOpsClass::destroy_vcpu_thread() for vcpu thread related cleanup (Philippe)
Mark Kanda (5):
accel: Introduce AccelOpsClass::destroy_vcpu_thread() softmmu/cpus: Free cpu->thread in destroy_vcpu_thread_generic() softmmu/cpus: Free cpu->halt_cond in destroy_vcpu_thread_generic()
cpu: Free cpu->cpu_ases in cpu_exec_unrealizefn() i386/cpu: Free env->xsave_buf in x86_cpu_unrealizefn()
accel/accel-common.c | 7 +++++++ accel/hvf/hvf-accel-ops.c | 1 + accel/kvm/kvm-accel-ops.c | 1 + accel/qtest/qtest.c | 1 + accel/tcg/tcg-accel-ops.c | 1 + accel/xen/xen-all.c | 1 + cpu.c | 1 + include/sysemu/accel-ops.h | 3 +++ softmmu/cpus.c | 3 +++ target/i386/cpu.c | 5 +++++ target/i386/hax/hax-accel-ops.c | 1 + target/i386/nvmm/nvmm-accel-ops.c | 1 + target/i386/whpx/whpx-accel-ops.c | 1 + 13 files changed, 27 insertions(+)
Signature · 1 line
2.27.0
PATCH v2 1/5 accel: Introduce AccelOpsClass::destroy_vcpu_thread()
Add destroy_vcpu_thread() to AccelOps as a method for vcpu thread cleanup. This will be used in subsequent patches.
--- include/sysemu/accel-ops.h | 1 + softmmu/cpus.c | 3 +++ 2 files changed, 4 insertions(+)
include/sysemu/accel-ops.h +1 -0
@@ -31,6 +31,7 @@ struct AccelOpsClass {bool (*cpus_are_resettable)(void );void (*create_vcpu_thread)(CPUState *cpu);/* MANDATORY NON-NULL */ +void (*destroy_vcpu_thread)(CPUState *cpu);void (*kick_vcpu_thread)(CPUState *cpu);bool (*cpu_thread_is_idle)(CPUState *cpu);
softmmu/cpus.c +3 -0
@@ -609,6 +609,9 @@ 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) { + cpus_accel->destroy_vcpu_thread (cpu); + } }void cpus_register_accel (const AccelOpsClass *ops)
Signature · 1 line
2.27.0
Re: [PATCH v2 1/5] accel: Introduce AccelOpsClass::destroy_vcpu_thread()
Quoted 4 lines · Mark Kanda
Add
destroy_vcpu_thread()to AccelOps as a method for vcpu thread cleanup. This will be used in subsequent patches.Suggested-by Philippe Mathieu-Daude <[email protected]>
Thanks, but preferably:
Quoted 5 lines
Signed-off-by Mark Kanda <[email protected]>--- include/sysemu/accel-ops.h | 1 + softmmu/cpus.c | 3 +++ 2 files changed, 4 insertions(+)
PATCH v2 2/5 softmmu/cpus: Free cpu->thread in destroy_vcpu_thread_generic()
In reply to Mark KandaUse a new AccelOpsClass::destroy_vcpu_thread() handler destroy_vcpu_thread_generic() to free cpu->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)
--- accel/accel-common.c | 6 ++++++ accel/hvf/hvf-accel-ops.c | 1 + accel/kvm/kvm-accel-ops.c | 1 + accel/qtest/qtest.c | 1 + accel/tcg/tcg-accel-ops.c | 1 + accel/xen/xen-all.c | 1 + include/sysemu/accel-ops.h | 2 ++ target/i386/hax/hax-accel-ops.c | 1 + target/i386/nvmm/nvmm-accel-ops.c | 1 + target/i386/whpx/whpx-accel-ops.c | 1 + 10 files changed, 16 insertions(+)
accel/accel-common.c +6 -0
@@ -28,6 +28,7 @@#include "cpu.h" #include "hw/core/accel-cpu.h" +#include "sysemu/accel-ops.h" #ifndef CONFIG_USER_ONLY #include "accel-softmmu.h"
@@ -135,3 +136,8 @@ static void register_accel_types(void) }type_init (register_accel_types); + +void destroy_vcpu_thread_generic (CPUState *cpu) +{ +g_free (cpu->thread); +}
accel/hvf/hvf-accel-ops.c +1 -0
@@ -467,6 +467,7 @@ 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->destroy_vcpu_thread = destroy_vcpu_thread_generic; ops->kick_vcpu_thread = hvf_kick_vcpu_thread; ops->synchronize_post_reset = hvf_cpu_synchronize_post_reset;
accel/kvm/kvm-accel-ops.c +1 -0
@@ -89,6 +89,7 @@ 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->destroy_vcpu_thread = destroy_vcpu_thread_generic; 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 +1 -0
@@ -51,6 +51,7 @@ 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->destroy_vcpu_thread = destroy_vcpu_thread_generic; ops->get_virtual_clock = qtest_get_virtual_clock; };
accel/tcg/tcg-accel-ops.c +1 -0
@@ -94,6 +94,7 @@ void tcg_handle_interrupt(CPUState *cpu, int mask)static void tcg_accel_ops_init (AccelOpsClass *ops) { + ops->destroy_vcpu_thread = destroy_vcpu_thread_generic;if (qemu_tcg_mttcg_enabled ()) { ops->create_vcpu_thread = mttcg_start_vcpu_thread; ops->kick_vcpu_thread = mttcg_kick_vcpu_thread;
accel/xen/xen-all.c +1 -0
@@ -220,6 +220,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->destroy_vcpu_thread = destroy_vcpu_thread_generic; }static const TypeInfo xen_accel_ops_type = {
include/sysemu/accel-ops.h +2 -0
@@ -46,4 +46,6 @@ struct AccelOpsClass { int64_t (*get_elapsed_ticks)(void); }; +/* free vcpu thread structures */ +void destroy_vcpu_thread_generic (CPUState *cpu);#endif /* ACCEL_OPS_H */
target/i386/hax/hax-accel-ops.c +1 -0
@@ -79,6 +79,7 @@ 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->destroy_vcpu_thread = destroy_vcpu_thread_generic; ops->kick_vcpu_thread = hax_kick_vcpu_thread; ops->synchronize_post_reset = hax_cpu_synchronize_post_reset;
target/i386/nvmm/nvmm-accel-ops.c +1 -0
@@ -88,6 +88,7 @@ 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->destroy_vcpu_thread = destroy_vcpu_thread_generic; ops->kick_vcpu_thread = nvmm_kick_vcpu_thread; ops->synchronize_post_reset = nvmm_cpu_synchronize_post_reset;
target/i386/whpx/whpx-accel-ops.c +1 -0
@@ -93,6 +93,7 @@ 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->destroy_vcpu_thread = destroy_vcpu_thread_generic; ops->kick_vcpu_thread = whpx_kick_vcpu_thread; ops->cpu_thread_is_idle = whpx_vcpu_thread_is_idle;
Signature · 1 line
2.27.0
PATCH v2 3/5 softmmu/cpus: Free cpu->halt_cond in destroy_vcpu_thread_generic()
In reply to Mark KandavCPU 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)
--- accel/accel-common.c | 1 + 1 file changed, 1 insertion(+)
accel/accel-common.c +1 -0
@@ -140,4 +140,5 @@ type_init(register_accel_types);void destroy_vcpu_thread_generic (CPUState *cpu) {g_free (cpu->thread); +g_free (cpu->halt_cond); }
Signature · 1 line
2.27.0
PATCH v2 4/5 cpu: Free cpu->cpu_ases in cpu_exec_unrealizefn()
In reply to Mark KandavCPU 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)
--- cpu.c | 1 + 1 file changed, 1 insertion(+)
cpu.c +1 -0
@@ -173,6 +173,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)if (tcg_enabled ()) {tcg_exec_unrealizefn (cpu); } +g_free (cpu->cpu_ases);cpu_list_remove (cpu); }
Signature · 1 line
2.27.0
Re: [PATCH v2 4/5] cpu: Free cpu->cpu_ases in cpu_exec_unrealizefn()
Quoted 26 lines · Mark Kanda
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]>--- cpu.c | 1 + 1 file changed, 1 insertion(+)cpu.c +0
-0
cpu.c void cpu_exec_unrealizefn(CPUState *cpu) · line 176
Quoted 4 lines
cpu.c +1
-0@@ -173,6 +173,7 @@ void cpu_exec_unrealizefn(CPUState *cpu)if (tcg_enabled ()) {tcg_exec_unrealizefn (cpu); } +g_free (cpu->cpu_ases);
There is an API mismatch here. We miss cpu_address_space_destroy().
cpu_exec_unrealizefn() then calls cpu_address_space_destroy(), and cpu_address_space_destroy() frees cpu_ases.
Otherwise other cpu_address_space_init() calls will keep leaking.
Quoted 2 lines
cpu.c +0
-0cpu_list_remove (cpu); }
Re: [PATCH v2 4/5] cpu: Free cpu->cpu_ases in cpu_exec_unrealizefn()
Quoted 34 lines · Philippe Mathieu-Daudé
Quoted 26 lines · Mark Kanda
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]>---
cpu.c| 1 +1 file changed, 1 insertion(+)cpu.c +0
-0cpu.c void cpu_exec_unrealizefn(CPUState *cpu) · line 176
Quoted 4 lines
cpu.c +1
-0@@ -173,6 +173,7 @@ void cpu_exec_unrealizefn(CPUState *cpu) if (tcg_enabled()) { tcg_exec_unrealizefn(cpu); } + g_free(cpu->cpu_ases);There is an API mismatch here. We miss
cpu_address_space_destroy().
Quoted 5 lines
cpu_exec_unrealizefn()then callscpu_address_space_destroy(), andcpu_address_space_destroy()freescpu_ases.Otherwise other
cpu_address_space_init()calls will keep leaking.
Will fix in v3.
Thanks Philippe,
-Mark
PATCH v2 5/5 i386/cpu: Free env->xsave_buf in x86_cpu_unrealizefn()
In reply to Mark KandavCPU hotunplug 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/cpu.c | 5 +++++ 1 file changed, 5 insertions(+)
target/i386/cpu.c +5 -0
@@ -6572,6 +6572,11 @@ static void x86_cpu_unrealizefn(DeviceState *dev) } xcc->parent_unrealize (dev); + +#if defined(CONFIG_KVM ) || defined(CONFIG_HVF ) +CPUX86State *env = &cpu->env; +g_free (env->xsave_buf); +#endif } typedef struct BitProperty {
Signature · 1 line
2.27.0
Re: [PATCH v2 5/5] i386/cpu: Free env->xsave_buf in x86_cpu_unrealizefn()
Quoted 25 lines · Mark Kanda
vCPU hotunplug 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)Signed-off-by Mark Kanda <[email protected]>--- target/i386/cpu.c | 5 +++++ 1 file changed, 5 insertions(+)target/i386/cpu.c +0
-0
target/i386/cpu.c static void x86_cpu_unrealizefn(DeviceState *dev) · line 6578
Quoted 7 lines
target/i386/cpu.c +4
-0@@ -6572,6 +6572,11 @@ static void x86_cpu_unrealizefn(DeviceState *dev) } xcc->parent_unrealize (dev); + +#if defined(CONFIG_KVM ) || defined(CONFIG_HVF ) +CPUX86State *env = &cpu->env; +g_free (env->xsave_buf);
This belong to hvf_arch_vcpu_destroy().
And for KVM, in the missing kvm_arch_destroy_vcpu().
Quoted 4 lines
target/i386/cpu.c +1
-0+#endif } typedef struct BitProperty {
Re: [PATCH v2 5/5] i386/cpu: Free env->xsave_buf in x86_cpu_unrealizefn()
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 25 lines · Mark Kanda
vCPU hotunplug 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== by0x4C3B288:posix_memalign(vg_replace_malloc.c:1429) ==132362== by0xB41195:qemu_try_memalign(memalign.c:53) ==132362== by0xB41204:qemu_memalign(memalign.c:73)
==132362== by0x7131CB:kvm_init_xsave(kvm.c:1601)
==132362== by0x7148ED:kvm_arch_init_vcpu(kvm.c:2031)
==132362== by0x91D224:kvm_init_vcpu(kvm-all.c:516)
==132362== by0x9242C9:kvm_vcpu_thread_fn(kvm-accel-ops.c:40) ==132362== by0xB2EB26:qemu_thread_start(qemu-thread-posix.c:556) ==132362== by0x7EB2159:start_thread(in/usr/lib64/libpthread-2.28.so) ==132362== by0x9D45DD2: clone (in/usr/lib64/libc-2.28.so)Signed-off-by Mark Kanda <[email protected]>---
target/i386/cpu.c| 5 +++++1 file changed, 5 insertions(+)target/i386/cpu.c +0
-0target/i386/cpu.c static void x86_cpu_unrealizefn(DeviceState *dev) · line 6577
Quoted 6 lines
target/i386/cpu.c +4
-0@@ -6572,6 +6572,11 @@ static void x86_cpu_unrealizefn(DeviceState *dev) } xcc->parent_unrealize(dev); + +#if defined(CONFIG_KVM ) || defined(CONFIG_HVF ) + CPUX86State *env = &cpu->env; + g_free(env->xsave_buf);This belong to
hvf_arch_vcpu_destroy().
Quoted 2 lines
And for KVM, in the missing
kvm_arch_destroy_vcpu().
Will fix in v3.
Thanks Philippe,
-Mark