Hi Phillipe, This patch has been taken as it is from ARM's RFC and the common patch-set mentioned below. So SOBs are all wrong everywhere. Original RFC posted in the year 2020. [1] https://lore.kernel.org/qemu-devel/20200613213629.21984-23-salil.mehta@xxxxxxxxxx/ Recently posted RFC V2 [2] https://lore.kernel.org/qemu-devel/20230926100436.28284-1-salil.mehta@xxxxxxxxxx/T/#m5f5ae40b091d69d01012880d7500d96874a9d39c Recent common patch-set for Virtual CPU Hotplug [3] https://lore.kernel.org/qemu-devel/20230930001933.2660-9-salil.mehta@xxxxxxxxxx/ [4] https://lore.kernel.org/qemu-devel/20230930001933.2660-10-salil.mehta@xxxxxxxxxx/ Beside my original patch-set had bug which you have inherited in this patch-set. Thanks Salil > From: qemu-arm-bounces+salil.mehta=huawei.com@xxxxxxxxxx <qemu-arm- > bounces+salil.mehta=huawei.com@xxxxxxxxxx> On Behalf Of Philippe Mathieu- > Daudé > Sent: Monday, September 18, 2023 5:03 PM > To: qemu-devel@xxxxxxxxxx > Cc: Laurent Vivier <laurent@xxxxxxxxx>; Paolo Bonzini > <pbonzini@xxxxxxxxxx>; Max Filippov <jcmvbkbc@xxxxxxxxx>; David Hildenbrand > <david@xxxxxxxxxx>; Peter Xu <peterx@xxxxxxxxxx>; Anton Johansson > <anjo@xxxxxx>; Peter Maydell <peter.maydell@xxxxxxxxxx>; > kvm@xxxxxxxxxxxxxxx; Marek Vasut <marex@xxxxxxx>; David Gibson > <david@xxxxxxxxxxxxxxxxxxxxx>; Brian Cain <bcain@xxxxxxxxxxx>; Yoshinori > Sato <ysato@xxxxxxxxxxxxxxxxxxxx>; Edgar E . Iglesias > <edgar.iglesias@xxxxxxxxx>; Claudio Fontana <cfontana@xxxxxxx>; Daniel > Henrique Barboza <dbarboza@xxxxxxxxxxxxxxxx>; Artyom Tarasenko > <atar4qemu@xxxxxxxxx>; Marcelo Tosatti <mtosatti@xxxxxxxxxx>; qemu- > ppc@xxxxxxxxxx; Liu Zhiwei <zhiwei_liu@xxxxxxxxxxxxxxxxx>; Aurelien Jarno > <aurelien@xxxxxxxxxxx>; Ilya Leoshkevich <iii@xxxxxxxxxxxxx>; Daniel > Henrique Barboza <danielhb413@xxxxxxxxx>; Bastian Koppelmann > <kbastian@xxxxxxxxxxxxxxxxxxxxx>; Cédric Le Goater <clg@xxxxxxxx>; Alistair > Francis <alistair.francis@xxxxxxx>; Alessandro Di Federico <ale@xxxxxx>; > Song Gao <gaosong@xxxxxxxxxxx>; Marcel Apfelbaum > <marcel.apfelbaum@xxxxxxxxx>; Chris Wulff <crwulff@xxxxxxxxx>; Michael S. > Tsirkin <mst@xxxxxxxxxx>; Alistair Francis <alistair@xxxxxxxxxxxxx>; > Fabiano Rosas <farosas@xxxxxxx>; qemu-s390x@xxxxxxxxxx; wangyanan (Y) > <wangyanan55@xxxxxxxxxx>; Luc Michel <luc@xxxxxxxxxx>; Weiwei Li > <liweiwei@xxxxxxxxxxx>; Bin Meng <bin.meng@xxxxxxxxxxxxx>; Stafford Horne > <shorne@xxxxxxxxx>; Xiaojuan Yang <yangxiaojuan@xxxxxxxxxxx>; Daniel P . > Berrange <berrange@xxxxxxxxxx>; Thomas Huth <thuth@xxxxxxxxxx>; Philippe > Mathieu-Daudé <philmd@xxxxxxxxxx>; qemu-arm@xxxxxxxxxx; Jiaxun Yang > <jiaxun.yang@xxxxxxxxxxx>; Richard Henderson > <richard.henderson@xxxxxxxxxx>; Aleksandar Rikalo > <aleksandar.rikalo@xxxxxxxxxx>; Bernhard Beschow <shentey@xxxxxxxxx>; Mark > Cave-Ayland <mark.cave-ayland@xxxxxxxxxxxx>; qemu-riscv@xxxxxxxxxx; Alex > Bennée <alex.bennee@xxxxxxxxxx>; Nicholas Piggin <npiggin@xxxxxxxxx>; Greg > Kurz <groug@xxxxxxxx>; Michael Rolnik <mrolnik@xxxxxxxxx>; Eduardo Habkost > <eduardo@xxxxxxxxxxx>; Markus Armbruster <armbru@xxxxxxxxxx>; Palmer > Dabbelt <palmer@xxxxxxxxxxx>; xianglai li <lixianglai@xxxxxxxxxxx>; Salil > Mehta <salil.mehta@xxxxxxxxxx>; Igor Mammedov <imammedo@xxxxxxxxxx>; Ani > Sinha <anisinha@xxxxxxxxxx>; Bibo Mao <maobibo@xxxxxxxxxxx> > Subject: [PATCH 07/22] exec/cpu: Introduce the CPU address space > destruction function > > From: xianglai li <lixianglai@xxxxxxxxxxx> > > Introduce new function to destroy CPU address space resources > for cpu hot-(un)plug. > > Co-authored-by: "Salil Mehta" <salil.mehta@xxxxxxxxxx> > Cc: "Salil Mehta" <salil.mehta@xxxxxxxxxx> > Cc: Xiaojuan Yang <yangxiaojuan@xxxxxxxxxxx> > Cc: Song Gao <gaosong@xxxxxxxxxxx> > Cc: "Michael S. Tsirkin" <mst@xxxxxxxxxx> > Cc: Igor Mammedov <imammedo@xxxxxxxxxx> > Cc: Ani Sinha <anisinha@xxxxxxxxxx> > Cc: Paolo Bonzini <pbonzini@xxxxxxxxxx> > Cc: Richard Henderson <richard.henderson@xxxxxxxxxx> > Cc: Eduardo Habkost <eduardo@xxxxxxxxxxx> > Cc: Marcel Apfelbaum <marcel.apfelbaum@xxxxxxxxx> > Cc: "Philippe Mathieu-Daudé" <philmd@xxxxxxxxxx> > Cc: Yanan Wang <wangyanan55@xxxxxxxxxx> > Cc: "Daniel P. Berrangé" <berrange@xxxxxxxxxx> > Cc: Peter Xu <peterx@xxxxxxxxxx> > Cc: David Hildenbrand <david@xxxxxxxxxx> > Cc: Bibo Mao <maobibo@xxxxxxxxxxx> > Signed-off-by: xianglai li <lixianglai@xxxxxxxxxxx> > Message-ID: > <3a4fc2a3df4b767c3c296a7da3bc15ca9c251316.1694433326.git.lixianglai@loongso > n.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 41788c0bdd..eb56a228a2 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 92a4234439..c90cf3a162 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 18277ddd67..c75e3e8042 100644 > --- a/softmmu/physmem.c > +++ b/softmmu/physmem.c > @@ -761,6 +761,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]; > @@ -774,6 +775,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 */ > -- > 2.41.0 > >
