On Thu, 20 Jul 2023 15:15:09 +0800
xianglai li <lixiang...@loongson.cn> wrote:
> Introduce new functions to destroy CPU address space resources
s/functions/function/
> for cpu hot-(un)plug.
>
> Cc: Xiaojuan Yang <yangxiaoj...@loongson.cn>
> Cc: Song Gao <gaos...@loongson.cn>
> Cc: "Michael S. Tsirkin" <m...@redhat.com>
> Cc: Igor Mammedov <imamm...@redhat.com>
> Cc: Ani Sinha <anisi...@redhat.com>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Cc: Richard Henderson <richard.hender...@linaro.org>
> Cc: Eduardo Habkost <edua...@habkost.net>
> Cc: Marcel Apfelbaum <marcel.apfelb...@gmail.com>
> Cc: "Philippe Mathieu-Daudé" <phi...@linaro.org>
> Cc: Yanan Wang <wangyana...@huawei.com>
> Cc: "Daniel P. Berrangé" <berra...@redhat.com>
> Cc: Peter Xu <pet...@redhat.com>
> Cc: David Hildenbrand <da...@redhat.com>
> Signed-off-by: xianglai li <lixiang...@loongson.cn>
> ---
> include/exec/cpu-common.h | 8 ++++++++
> include/hw/core/cpu.h | 1 +
> softmmu/physmem.c | 24 ++++++++++++++++++++++++
> 3 files changed, 33 insertions(+)
>
> diff --git a/include/exec/cpu-common.h b/include/exec/cpu-common.h
> index 87dc9a752c..27cd4d32b1 100644
> --- a/include/exec/cpu-common.h
> +++ b/include/exec/cpu-common.h
> @@ -120,6 +120,14 @@ 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 which address space needs to be destroyed
> + * @asidx: integer index of this address space
> + *
> + * Note that with KVM only one address space is supported.
> + */
> +void cpu_address_space_destroy(CPUState *cpu, int asidx);
>
> void cpu_physical_memory_rw(hwaddr addr, void *buf,
> hwaddr len, bool is_write);
> diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h
> index fdcbe87352..d6d68dac12 100644
> --- a/include/hw/core/cpu.h
> +++ b/include/hw/core/cpu.h
> @@ -366,6 +366,7 @@ struct CPUState {
> QSIMPLEQ_HEAD(, qemu_work_item) work_list;
>
> CPUAddressSpace *cpu_ases;
> + int cpu_ases_ref_count;
perhaps renaming it to num_ases would be better
> int num_ases;
and this one can be named num__ases_[total|max]
> AddressSpace *as;
> MemoryRegion *memory;
> diff --git a/softmmu/physmem.c b/softmmu/physmem.c
> index 3df73542e1..f4545b4508 100644
> --- a/softmmu/physmem.c
> +++ b/softmmu/physmem.c
> @@ -762,6 +762,7 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
>
> if (!cpu->cpu_ases) {
> cpu->cpu_ases = g_new0(CPUAddressSpace, cpu->num_ases);
> + cpu->cpu_ases_ref_count = cpu->num_ases;
> }
>
> newas = &cpu->cpu_ases[asidx];
> @@ -775,6 +776,29 @@ void cpu_address_space_init(CPUState *cpu, int asidx,
> }
> }
>
> +void cpu_address_space_destroy(CPUState *cpu, int asidx)
^^^ should it be uintX_t ?
> +{
> + CPUAddressSpace *cpuas;
> +
> + assert(asidx < cpu->num_ases);
> + assert(asidx == 0 || !kvm_enabled());
> + assert(cpu->cpu_ases);
> +
> + cpuas = &cpu->cpu_ases[asidx];
> + if (tcg_enabled()) {
> + memory_listener_unregister(&cpuas->tcg_as_listener);
> + }
> +
> + address_space_destroy(cpuas->as);
> +
> + cpu->cpu_ases_ref_count--;
> + if (cpu->cpu_ases_ref_count == 0) {
> + g_free(cpu->cpu_ases);
> + cpu->cpu_ases = NULL;
> + }
> +
> +}
> +
> AddressSpace *cpu_get_address_space(CPUState *cpu, int asidx)
> {
> /* Return the AddressSpace corresponding to the specified index */
