| Message ID | cf141dbe0b7d2d0837c02e452889f5669c78444d.1689837093.git.lixianglai@loongson.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Adds CPU hot-plug support to Loongarch | expand |
On Thu, 20 Jul 2023 15:15:09 +0800 xianglai li <lixianglai@loongson.cn> wrote: > Introduce new functions to destroy CPU address space resources s/functions/function/ > for cpu hot-(un)plug. > > Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn> > Cc: Song Gao <gaosong@loongson.cn> > Cc: "Michael S. Tsirkin" <mst@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Cc: Ani Sinha <anisinha@redhat.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Richard Henderson <richard.henderson@linaro.org> > Cc: Eduardo Habkost <eduardo@habkost.net> > Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> > Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org> > Cc: Yanan Wang <wangyanan55@huawei.com> > Cc: "Daniel P. Berrangé" <berrange@redhat.com> > Cc: Peter Xu <peterx@redhat.com> > Cc: David Hildenbrand <david@redhat.com> > Signed-off-by: xianglai li <lixianglai@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 */
Hi Igor Mammedov: The first four patches are written with reference to the patch in the public modification section of Arm's CPU Hotplug, and the Arm CPU HotPlug-related patches will be merged into the community in the near future, so the first four patches will be discarded and rebase based on the latest code. Thanks, xianglai. On 7/28/23 8:13 PM, Igor Mammedov wrote: > On Thu, 20 Jul 2023 15:15:09 +0800 > xianglai li <lixianglai@loongson.cn> wrote: > >> Introduce new functions to destroy CPU address space resources > s/functions/function/ > >> for cpu hot-(un)plug. >> >> Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn> >> Cc: Song Gao <gaosong@loongson.cn> >> Cc: "Michael S. Tsirkin" <mst@redhat.com> >> Cc: Igor Mammedov <imammedo@redhat.com> >> Cc: Ani Sinha <anisinha@redhat.com> >> Cc: Paolo Bonzini <pbonzini@redhat.com> >> Cc: Richard Henderson <richard.henderson@linaro.org> >> Cc: Eduardo Habkost <eduardo@habkost.net> >> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> >> Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org> >> Cc: Yanan Wang <wangyanan55@huawei.com> >> Cc: "Daniel P. Berrangé" <berrange@redhat.com> >> Cc: Peter Xu <peterx@redhat.com> >> Cc: David Hildenbrand <david@redhat.com> >> Signed-off-by: xianglai li <lixianglai@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 */
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; int num_ases; 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) +{ + 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 */
Introduce new functions to destroy CPU address space resources for cpu hot-(un)plug. Cc: Xiaojuan Yang <yangxiaojuan@loongson.cn> Cc: Song Gao <gaosong@loongson.cn> Cc: "Michael S. Tsirkin" <mst@redhat.com> Cc: Igor Mammedov <imammedo@redhat.com> Cc: Ani Sinha <anisinha@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Richard Henderson <richard.henderson@linaro.org> Cc: Eduardo Habkost <eduardo@habkost.net> Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com> Cc: "Philippe Mathieu-Daudé" <philmd@linaro.org> Cc: Yanan Wang <wangyanan55@huawei.com> Cc: "Daniel P. Berrangé" <berrange@redhat.com> Cc: Peter Xu <peterx@redhat.com> Cc: David Hildenbrand <david@redhat.com> Signed-off-by: xianglai li <lixianglai@loongson.cn> --- include/exec/cpu-common.h | 8 ++++++++ include/hw/core/cpu.h | 1 + softmmu/physmem.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+)