diff options
| author | Akihiko Odaki <akihiko.odaki@daynix.com> | 2024-07-14 19:46:52 +0900 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-07-16 12:47:44 +0200 |
| commit | f8b64d35a625e49ee73f7d54ae80cb5503be975b (patch) | |
| tree | ad2138351f1447c88a9f071f6b51be11bf1474da | |
| parent | e0bf95443ee9326d44031373420cf9f3513ee255 (diff) | |
| download | focaccia-qemu-f8b64d35a625e49ee73f7d54ae80cb5503be975b.tar.gz focaccia-qemu-f8b64d35a625e49ee73f7d54ae80cb5503be975b.zip | |
cpu: Free queued CPU work
Running qemu-system-aarch64 -M virt -nographic and terminating it will result in a LeakSanitizer error due to remaining queued CPU work so free it. Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com> Link: https://lore.kernel.org/r/20240714-cpu-v1-1-19c2f8de2055@daynix.com Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | cpu-common.c | 11 | ||||
| -rw-r--r-- | hw/core/cpu-common.c | 1 | ||||
| -rw-r--r-- | include/hw/core/cpu.h | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/cpu-common.c b/cpu-common.c index ce78273af5..7ae136f98c 100644 --- a/cpu-common.c +++ b/cpu-common.c @@ -331,6 +331,17 @@ void async_safe_run_on_cpu(CPUState *cpu, run_on_cpu_func func, queue_work_on_cpu(cpu, wi); } +void free_queued_cpu_work(CPUState *cpu) +{ + while (!QSIMPLEQ_EMPTY(&cpu->work_list)) { + struct qemu_work_item *wi = QSIMPLEQ_FIRST(&cpu->work_list); + QSIMPLEQ_REMOVE_HEAD(&cpu->work_list, node); + if (wi->free) { + g_free(wi); + } + } +} + void process_queued_cpu_work(CPUState *cpu) { struct qemu_work_item *wi; diff --git a/hw/core/cpu-common.c b/hw/core/cpu-common.c index b19e1fdacf..d2e3e4570a 100644 --- a/hw/core/cpu-common.c +++ b/hw/core/cpu-common.c @@ -281,6 +281,7 @@ static void cpu_common_finalize(Object *obj) g_free(cpu->plugin_state); } #endif + free_queued_cpu_work(cpu); g_array_free(cpu->gdb_regs, TRUE); qemu_lockcnt_destroy(&cpu->in_ioctl_lock); qemu_mutex_destroy(&cpu->work_mutex); diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index a2c8536943..8e6466c1dd 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -1001,6 +1001,12 @@ void cpu_resume(CPUState *cpu); void cpu_remove_sync(CPUState *cpu); /** + * free_queued_cpu_work() - free all items on CPU work queue + * @cpu: The CPU which work queue to free. + */ +void free_queued_cpu_work(CPUState *cpu); + +/** * process_queued_cpu_work() - process all items on CPU work queue * @cpu: The CPU which work queue to process. */ |