i386: add cpu hot remove support
v4 cover i386: add cpu hot remove support
Via implementing ACPI standard methods _EJ0 in bios, after Guest OS hot remove one vCPU, it is able to send a signal to QEMU, then QEMU could notify
the assigned vCPU of exiting. meanwhile, and intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself.
this work is based on Andreas Färber's qom-cpu branch tree.
git://github.com/afaerber/qemu-cpu.git
this series patches must be used with seabios patch and KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347
for seabios patches:
http://comments.gmane.org/gmane.comp.emulators.qemu/230460
Chen Fan (10):
x86: move apic_state field from CPUX86State to X86CPU
apic: remove redundant variable 'apic_no' from apic_init_common()
apic: remove local_apics array and using CPU_FOREACH instead
x86: add x86_cpu_unrealizefn() for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interface pc_hot_del_cpu()
piix4: implement function cpu_status_write() for vcpu ejection
cpus: reclaim allocated vCPU objects
cpu-exec.c | 2 +- cpus.c | 51 +++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++------ hw/i386/kvm/apic.c | 18 +++++++- hw/i386/kvmvapic.c | 8 ++-- hw/i386/pc.c | 51 ++++++++++++++++++----- hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 91 ++++++++++++++++++++++------------------- hw/intc/apic_common.c | 17 ++------ include/hw/boards.h | 2 + include/hw/i386/apic_internal.h | 6 +-- include/hw/i386/pc.h | 1 + include/qom/cpu.h | 20 +++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++ qapi-schema.json | 12 ++++++ qmp-commands.hx | 23 +++++++++++ qmp.c | 9 ++++ qom/cpu.c | 26 +++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 57 ++++++++++++++++++++------ target-i386/cpu.h | 4 -- target-i386/helper.c | 9 ++-- target-i386/kvm.c | 23 +++++------ target-i386/misc_helper.c | 8 ++-- 26 files changed, 403 insertions(+), 137 deletions(-)
Signature · 1 line
1.8.1.4
RFC v4 1/10 x86: move apic_state field from CPUX86State to X86CPU
This motion is preparing for refactoring vCPU apic subsequently.
--- cpu-exec.c | 2 +- cpus.c | 5 ++--- hw/i386/kvmvapic.c | 8 +++----- hw/i386/pc.c | 17 ++++++++--------- target-i386/cpu-qom.h | 4 ++++ target-i386/cpu.c | 22 ++++++++++------------ target-i386/cpu.h | 4 ---- target-i386/helper.c | 9 ++++----- target-i386/kvm.c | 23 ++++++++++------------- target-i386/misc_helper.c | 8 ++++---- 10 files changed, 46 insertions(+), 56 deletions(-)
cpu-exec.c +1 -1
@@ -320,7 +320,7 @@ int cpu_exec(CPUArchState *env)#if !defined(CONFIG_USER_ONLY )if (interrupt_request &CPU_INTERRUPT_POLL ) { cpu->interrupt_request &= ~CPU_INTERRUPT_POLL ; -apic_poll_irq (env->apic_state); +apic_poll_irq (x86_env_get_cpu (env)->apic_state); }#endif if (interrupt_request &CPU_INTERRUPT_INIT ) {
cpus.c +2 -3
@@ -1383,12 +1383,11 @@ void qmp_inject_nmi(Error **errp)CPU_FOREACH (cs) {X86CPU *cpu =X86_CPU (cs); -CPUX86State *env = &cpu->env; -if (!env->apic_state) { +if (!cpu->apic_state) {cpu_interrupt (cs,CPU_INTERRUPT_NMI ); }else { -apic_deliver_nmi (env->apic_state); +apic_deliver_nmi (cpu->apic_state); } }#elif defined(TARGET_S390X )
hw/i386/kvmvapic.c +3 -5
@@ -366,7 +366,7 @@ static int vapic_enable(VAPICROMState *s, X86CPU *cpu) (((hwaddr )cpu_number) <<VAPIC_CPU_SHIFT );cpu_physical_memory_rw (vapic_paddr + offsetof(VAPICState , enabled), (void *)&enabled,sizeof (enabled),1 ); -apic_enable_vapic (cpu->env.apic_state, vapic_paddr); +apic_enable_vapic (cpu->apic_state, vapic_paddr); s->state =VAPIC_ACTIVE ;
@@ -496,12 +496,10 @@ static void vapic_enable_tpr_reporting(bool enable) };CPUState *cs;X86CPU *cpu; -CPUX86State *env;CPU_FOREACH (cs) { cpu =X86_CPU (cs); - env = &cpu->env; - info.apic = env->apic_state; + info.apic = cpu->apic_state;run_on_cpu (cs, vapic_do_enable_tpr_reporting, &info); } }
@@ -697,7 +695,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data,default :case 4 :if (!kvm_irqchip_in_kernel ()) { -apic_poll_irq (env->apic_state); +apic_poll_irq (cpu->apic_state); }break ; }
hw/i386/pc.c +8 -9
@@ -169,13 +169,14 @@ void cpu_smm_update(CPUX86State *env)int cpu_get_pic_interrupt (CPUX86State *env) {int intno; +X86CPU *cpu =x86_env_get_cpu (env); - intno =apic_get_interrupt (env->apic_state); + intno =apic_get_interrupt (cpu->apic_state);if (intno >=0 ) {return intno; }/* read the irq from the PIC */ -if (!apic_accept_pic_intr (env->apic_state)) { +if (!apic_accept_pic_intr (cpu->apic_state)) {return -1 ; }
@@ -187,15 +188,13 @@ static void pic_irq_request(void *opaque, int irq, int level) {CPUState *cs = first_cpu;X86CPU *cpu =X86_CPU (cs); -CPUX86State *env = &cpu->env;DPRINTF ("pic_irqs: %s irq %d\n" , level?"raise" :"lower" , irq); -if (env->apic_state) { +if (cpu->apic_state) {CPU_FOREACH (cs) { cpu =X86_CPU (cs); - env = &cpu->env; -if (apic_accept_pic_intr (env->apic_state)) { -apic_deliver_pic_intr (env->apic_state, level); +if (apic_accept_pic_intr (cpu->apic_state)) { +apic_deliver_pic_intr (cpu->apic_state, level); } } }else {
@@ -890,7 +889,7 @@ DeviceState *cpu_get_current_apic(void) {if (current_cpu) {X86CPU *cpu =X86_CPU (current_cpu); -return cpu->env.apic_state; +return cpu->apic_state; }else {return NULL ; }
@@ -984,7 +983,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) }/* map APIC MMIO area if CPU has APIC */ -if (cpu && cpu->env.apic_state) { +if (cpu && cpu->apic_state) {/* XXX: what if the base changes? */ sysbus_mmio_map_overlap (SYS_BUS_DEVICE (icc_bridge),0 ,APIC_DEFAULT_ADDRESS ,0x1000 );
target-i386/cpu-qom.h +4 -0
@@ -66,6 +66,10 @@ typedef struct X86CPU {CPUX86State env; +/* in order to simplify APIC support, we leave this pointer to the +user */ +struct DeviceState *apic_state; +bool hyperv_vapic;bool hyperv_relaxed_timing;int hyperv_spinlock_attempts;
target-i386/cpu.c +10 -12
@@ -2415,7 +2415,7 @@ static void x86_cpu_reset(CPUState *s)#if !defined(CONFIG_USER_ONLY )/* We hard-wire the BSP to the first CPU. */ if (s->cpu_index ==0 ) { -apic_designate_bsp (env->apic_state); +apic_designate_bsp (cpu->apic_state); } s->halted = !cpu_is_bsp (cpu);
@@ -2425,7 +2425,7 @@ static void x86_cpu_reset(CPUState *s)#ifndef CONFIG_USER_ONLY bool cpu_is_bsp (X86CPU *cpu) { -return cpu_get_apic_base (cpu->env.apic_state) &MSR_IA32_APICBASE_BSP ; +return cpu_get_apic_base (cpu->apic_state) &MSR_IA32_APICBASE_BSP ; }/* TODO: remove me, when reset over QOM tree is implemented */
@@ -2466,31 +2466,29 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type ="xen-apic" ; } - env->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type); -if (env->apic_state ==NULL ) { + cpu->apic_state =qdev_try_create (qdev_get_parent_bus (dev), apic_type); +if (cpu->apic_state ==NULL ) {error_setg (errp,"APIC device '%s' could not be created" , apic_type);return ; }object_property_add_child (OBJECT (cpu),"apic" , -OBJECT (env->apic_state),NULL ); -qdev_prop_set_uint8 (env->apic_state,"id" , env->cpuid_apic_id); +OBJECT (cpu->apic_state),NULL ); +qdev_prop_set_uint8 (cpu->apic_state,"id" , env->cpuid_apic_id);/* TODO: convert to link<> */ - apic =APIC_COMMON (env->apic_state); + apic =APIC_COMMON (cpu->apic_state); apic->cpu = cpu; }static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp) { -CPUX86State *env = &cpu->env; - -if (env->apic_state ==NULL ) { +if (cpu->apic_state ==NULL ) {return ; } -if (qdev_init (env->apic_state)) { +if (qdev_init (cpu->apic_state)) {error_setg (errp,"APIC device '%s' could not be initialized" , -object_get_typename (OBJECT (env->apic_state))); +object_get_typename (OBJECT (cpu->apic_state)));return ; } }
target-i386/cpu.h +0 -4
@@ -891,10 +891,6 @@ typedef struct CPUX86State {int tsc_khz;void *kvm_xsave_buf; -/* in order to simplify APIC support, we leave this pointer to the -user */ -struct DeviceState *apic_state; -uint64_t mcg_cap;uint64_t mcg_ctl;uint64_t mce_banks[MCE_BANKS_DEF *4 ];
target-i386/helper.c +4 -5
@@ -1248,7 +1248,8 @@ void cpu_report_tpr_access(CPUX86State *env, TPRAccess access) } else {cpu_restore_state (env, env->mem_io_pc); -apic_handle_tpr_access_report (env->apic_state, env->eip, access); +apic_handle_tpr_access_report (x86_env_get_cpu (env)->apic_state, + env->eip, access); } }#endif /* !CONFIG_USER_ONLY */
@@ -1295,14 +1296,12 @@ void do_cpu_init(X86CPU *cpu)cpu_reset (cs); cs->interrupt_request = sipi; env->pat = pat; - apic_init_reset(env->apic_state); + apic_init_reset(cpu->apic_state); }void do_cpu_sipi (X86CPU *cpu) { -CPUX86State *env = &cpu->env; - -apic_sipi (env->apic_state); +apic_sipi (cpu->apic_state); }#else void do_cpu_init (X86CPU *cpu)
target-i386/kvm.c +10 -13
@@ -1074,8 +1074,8 @@ static int kvm_put_sregs(X86CPU *cpu) sregs.cr3 = env->cr[3 ]; sregs.cr4 = env->cr[4 ]; - sregs.cr8 =cpu_get_apic_tpr (env->apic_state); - sregs.apic_base =cpu_get_apic_base (env->apic_state); + sregs.cr8 =cpu_get_apic_tpr (cpu->apic_state); + sregs.apic_base =cpu_get_apic_base (cpu->apic_state); sregs.efer = env->efer;
@@ -1624,8 +1624,7 @@ static int kvm_get_mp_state(X86CPU *cpu)static int kvm_get_apic (X86CPU *cpu) { -CPUX86State *env = &cpu->env; -DeviceState *apic = env->apic_state; +DeviceState *apic = cpu->apic_state;struct kvm_lapic_state kapic;int ret;
@@ -1642,8 +1641,7 @@ static int kvm_get_apic(X86CPU *cpu)static int kvm_put_apic (X86CPU *cpu) { -CPUX86State *env = &cpu->env; -DeviceState *apic = env->apic_state; +DeviceState *apic = cpu->apic_state;struct kvm_lapic_state kapic;if (apic &&kvm_irqchip_in_kernel ()) {
@@ -1967,7 +1965,7 @@ void kvm_arch_pre_run(CPUState *cpu, struct kvm_run *run) }DPRINTF ("setting tpr\n" ); - run->cr8 =cpu_get_apic_tpr (env->apic_state); + run->cr8 =cpu_get_apic_tpr (x86_cpu->apic_state); } }
@@ -1981,8 +1979,8 @@ void kvm_arch_post_run(CPUState *cpu, struct kvm_run *run) }else { env->eflags &= ~IF_MASK ; } -cpu_set_apic_tpr (env->apic_state, run->cr8); -cpu_set_apic_base (env->apic_state, run->apic_base); +cpu_set_apic_tpr (x86_cpu->apic_state, run->cr8); +cpu_set_apic_base (x86_cpu->apic_state, run->apic_base); }int kvm_arch_process_async_events (CPUState *cs)
@@ -2019,7 +2017,7 @@ int kvm_arch_process_async_events(CPUState *cs)if (cs->interrupt_request &CPU_INTERRUPT_POLL ) { cs->interrupt_request &= ~CPU_INTERRUPT_POLL ; -apic_poll_irq (env->apic_state); +apic_poll_irq (cpu->apic_state); } if (((cs->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) ||
@@ -2037,7 +2035,7 @@ int kvm_arch_process_async_events(CPUState *cs)if (cs->interrupt_request &CPU_INTERRUPT_TPR ) { cs->interrupt_request &= ~CPU_INTERRUPT_TPR ;kvm_cpu_synchronize_state (cs); -apic_handle_tpr_access_report (env->apic_state, env->eip, +apic_handle_tpr_access_report (cpu->apic_state, env->eip, env->tpr_access_type); }
@@ -2061,11 +2059,10 @@ static int kvm_handle_halt(X86CPU *cpu)static int kvm_handle_tpr_access (X86CPU *cpu) { -CPUX86State *env = &cpu->env;CPUState *cs =CPU (cpu);struct kvm_run *run = cs->kvm_run; -apic_handle_tpr_access_report (env->apic_state, run->tpr_access.rip, +apic_handle_tpr_access_report (cpu->apic_state, run->tpr_access.rip, run->tpr_access.is_write ?TPR_ACCESS_WRITE :TPR_ACCESS_READ );return 1 ;
target-i386/misc_helper.c +4 -4
@@ -155,7 +155,7 @@ target_ulong helper_read_crN(CPUX86State *env, int reg)break ;case 8 :if (!(env->hflags2 &HF2_VINTR_MASK )) { - val =cpu_get_apic_tpr (env->apic_state); + val =cpu_get_apic_tpr (x86_env_get_cpu (env)->apic_state); }else { val = env->v_tpr; }
@@ -179,7 +179,7 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0)break ;case 8 :if (!(env->hflags2 &HF2_VINTR_MASK )) { -cpu_set_apic_tpr (env->apic_state, t0); +cpu_set_apic_tpr (x86_env_get_cpu (env)->apic_state, t0); } env->v_tpr = t0 &0x0f ;break ;
@@ -286,7 +286,7 @@ void helper_wrmsr(CPUX86State *env) env->sysenter_eip = val;break ;case MSR_IA32_APICBASE : -cpu_set_apic_base (env->apic_state, val); +cpu_set_apic_base (x86_env_get_cpu (env)->apic_state, val);break ;case MSR_EFER : {
@@ -437,7 +437,7 @@ void helper_rdmsr(CPUX86State *env) val = env->sysenter_eip;break ;case MSR_IA32_APICBASE : - val =cpu_get_apic_base (env->apic_state); + val =cpu_get_apic_base (x86_env_get_cpu (env)->apic_state);break ;case MSR_EFER : val = env->efer;
Signature · 1 line
1.8.1.4
RFC v4 2/10 apic: remove redundant variable 'apic_no' from apic_init_common()
In reply to Chen FanIn struct APICCommonState, there is an id field yet, which was set earlier, qdev_prop_set_uint8(env->apic_state, "id", env->cpuid_apic_id);
so we use the id field instead of the variable 'apic_no' to represent the unique apic index.
--- hw/intc/apic_common.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
hw/intc/apic_common.c +1 -5
@@ -289,13 +289,9 @@ static int apic_init_common(ICCDevice *dev)APICCommonState *s =APIC_COMMON (dev);APICCommonClass *info;static DeviceState *vapic; -static int apic_no;static bool mmio_registered; -if (apic_no >=MAX_APICS ) { -return -1 ; - } - s->idx = apic_no++; + s->idx = s->id; info =APIC_COMMON_GET_CLASS (s); info->init (s);
Signature · 1 line
1.8.1.4
RFC v4 3/10 apic: remove local_apics array and using CPU_FOREACH instead
In reply to Chen FanUsing CPU_FOREACH() marco instead of scaning the entire local_apics array for fast searching apic.
--- hw/intc/apic.c | 73 ++++++++++++++++++----------------------- include/hw/i386/apic_internal.h | 2 -- 2 files changed, 32 insertions(+), 43 deletions(-)
hw/intc/apic.c +32 -41
@@ -32,8 +32,6 @@#define SYNC_TO_VAPIC 0x2#define SYNC_ISR_IRR_TO_VAPIC 0x4 -static APICCommonState *local_apics[MAX_APICS +1 ]; -static void apic_set_irq (APICCommonState *s,int vector_num,int trigger_mode);static void apic_update_irq (APICCommonState *s); static void apic_get_delivery_bitmask(uint32_t *deliver_bitmask,
@@ -200,18 +198,15 @@ static void apic_external_nmi(APICCommonState *s)#define foreach_apic (apic, deliver_bitmask, code) \ {\ + CPUState *cpu;\ int __i, __j, __mask;\ - for(__i = 0; __i < MAX_APIC_WORDS; __i++) {\ + CPU_FOREACH(cpu) {\ + apic = APIC_COMMON(X86_CPU(cpu)->apic_state);\ + __i = apic->idx / 32;\ + __j = apic->idx % 32;\ __mask = deliver_bitmask[__i];\ - if (__mask) {\ - for(__j = 0; __j < 32; __j++) {\ - if (__mask & (1 << __j)) {\ - apic = local_apics[__i * 32 + __j];\ - if (apic) {\ - code;\ - }\ - }\ - }\ + if (__mask & (1 << __j)) {\ + code;\ }\ }\ }
@@ -235,9 +230,13 @@ static void apic_bus_deliver(const uint32_t *deliver_bitmask, } }if (d >=0 ) { - apic_iter = local_apics[d]; -if (apic_iter) { -apic_set_irq (apic_iter, vector_num, trigger_mode); +CPUState *cpu; +CPU_FOREACH (cpu) { + apic_iter =APIC_COMMON (X86_CPU (cpu)->apic_state); +if (apic_iter->idx == d) { +apic_set_irq (apic_iter, vector_num, trigger_mode); +break ; + } } } }
@@ -422,18 +421,14 @@ static void apic_eoi(APICCommonState *s)static int apic_find_dest (uint8_t dest) { -APICCommonState *apic = local_apics[dest]; -int i; - -if (apic && apic->id == dest) -return dest;/* shortcut in case apic->id == apic->idx */ +APICCommonState *apic; +CPUState *cpu; -for (i =0 ; i <MAX_APICS ; i++) { - apic = local_apics[i]; -if (apic && apic->id == dest) -return i; -if (!apic) -break ; +CPU_FOREACH (cpu) { + apic =APIC_COMMON (X86_CPU (cpu)->apic_state); +if (apic->id == dest) { +return apic->idx; + } }return -1 ;
@@ -443,7 +438,7 @@ static void apic_get_delivery_bitmask(uint32_t *deliver_bitmask, uint8_t dest, uint8_t dest_mode) {APICCommonState *apic_iter; -int i; +CPUState *cpu;if (dest_mode ==0 ) {if (dest ==0xff ) {
@@ -457,20 +452,17 @@ static void apic_get_delivery_bitmask(uint32_t *deliver_bitmask, }else {/* XXX: cluster mode */ memset (deliver_bitmask,0x00 ,MAX_APIC_WORDS *sizeof (uint32_t )); -for (i =0 ; i <MAX_APICS ; i++) { - apic_iter = local_apics[i]; -if (apic_iter) { -if (apic_iter->dest_mode ==0xf ) { -if (dest & apic_iter->log_dest) -apic_set_bit (deliver_bitmask, i); - }else if (apic_iter->dest_mode ==0x0 ) { -if ((dest &0xf0 ) == (apic_iter->log_dest &0xf0 ) && - (dest & apic_iter->log_dest &0x0f )) { -apic_set_bit (deliver_bitmask, i); - } +CPU_FOREACH (cpu) { + apic_iter =APIC_COMMON (X86_CPU (cpu)->apic_state); +if (apic_iter->dest_mode ==0xf ) { +if (dest & apic_iter->log_dest) { +apic_set_bit (deliver_bitmask, apic_iter->idx); + } + }else if (apic_iter->dest_mode ==0x0 ) { +if ((dest &0xf0 ) == (apic_iter->log_dest &0xf0 ) && + (dest & apic_iter->log_dest &0x0f )) { +apic_set_bit (deliver_bitmask, apic_iter->idx); } - }else { -break ; } } }
@@ -877,7 +869,6 @@ static void apic_init(APICCommonState *s) APIC_SPACE_SIZE); s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , apic_timer, s); - local_apics[s->idx] = s; msi_supported = true; }
include/hw/i386/apic_internal.h +0 -2
@@ -64,8 +64,6 @@#define VAPIC_ENABLE_BIT 0#define VAPIC_ENABLE_MASK (1 << VAPIC_ENABLE_BIT) -#define MAX_APICS 255 -typedef struct APICCommonState APICCommonState ;#define TYPE_APIC_COMMON "apic-common"
Signature · 1 line
1.8.1.4
RFC v4 4/10 x86: add x86_cpu_unrealizefn() for cpu apic remove
In reply to Chen FanImplement x86_cpu_unrealizefn() for corresponding x86_cpu_realizefn(), which is mostly used to clear the apic related information at here. and refactor apic initialization, use QOM realizefn.
--- hw/i386/kvm/apic.c | 18 ++++++++++++++++-- hw/intc/apic.c | 18 ++++++++++++++++-- hw/intc/apic_common.c | 11 +++-------- include/hw/i386/apic_internal.h | 4 +++- target-i386/cpu-qom.h | 1 + target-i386/cpu.c | 35 +++++++++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+), 13 deletions(-)
hw/i386/kvm/apic.c +16 -2
@@ -171,21 +171,35 @@ static const MemoryRegionOps kvm_apic_io_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void kvm_apic_init (APICCommonState *s) +static void kvm_apic_realize (DeviceState *dev,Error **errp) { +APICCommonState *s =APIC_COMMON (dev); +APICCommonClass *acc =APIC_COMMON_GET_CLASS (s); +memory_region_init_io (&s->io_memory,NULL , &kvm_apic_io_ops, s,"kvm-apic-msi" ,APIC_SPACE_SIZE );if (kvm_has_gsi_routing ()) { msi_supported = true; } + + acc->parent_realize (dev, errp); +} + +static void kvm_apic_unrealize (DeviceState *dev,Error **errp) +{ +APICCommonState *s =APIC_COMMON (dev); +memory_region_destroy (&s->io_memory); }static void kvm_apic_class_init (ObjectClass *klass,void *data) {APICCommonClass *k =APIC_COMMON_CLASS (klass); +DeviceClass *dc =DEVICE_CLASS (klass); - k->init = kvm_apic_init; + k->parent_realize = dc->realize; + dc->realize = kvm_apic_realize; + dc->unrealize = kvm_apic_unrealize; k->set_base = kvm_apic_set_base; k->set_tpr = kvm_apic_set_tpr; k->get_tpr = kvm_apic_get_tpr;
hw/intc/apic.c +16 -2
@@ -863,21 +863,35 @@ static const MemoryRegionOps apic_io_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void apic_init (APICCommonState *s) +static void apic_realize (DeviceState *dev,Error **errp) { +APICCommonState *s =APIC_COMMON (dev); +APICCommonClass *acc =APIC_COMMON_GET_CLASS (s); +memory_region_init_io (&s->io_memory,OBJECT (s), &apic_io_ops, s,"apic-msi" ,APIC_SPACE_SIZE ); s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , apic_timer, s); msi_supported = true; + + acc->parent_realize (dev, errp); +} + +static void apic_unrealize (DeviceState *dev,Error **errp) +{ +APICCommonState *s =APIC_COMMON (dev); +memory_region_destroy (&s->io_memory); }static void apic_class_init (ObjectClass *klass,void *data) {APICCommonClass *k =APIC_COMMON_CLASS (klass); +DeviceClass *dc =DEVICE_CLASS (klass); - k->init = apic_init; + k->parent_realize = dc->realize; + dc->realize = apic_realize; + dc->unrealize = apic_unrealize; k->set_base = apic_set_base; k->set_tpr = apic_set_tpr; k->get_tpr = apic_get_tpr;
hw/intc/apic_common.c +3 -8
@@ -284,17 +284,15 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id)return 0 ; } -static int apic_init_common (ICCDevice *dev) +static void apic_common_realize (DeviceState *dev,Error **errp) {APICCommonState *s =APIC_COMMON (dev); -APICCommonClass *info; +APICCommonClass *info =APIC_COMMON_GET_CLASS (s);static DeviceState *vapic;static bool mmio_registered; s->idx = s->id; - info =APIC_COMMON_GET_CLASS (s); - info->init (s);if (!mmio_registered) {ICCBus *b =ICC_BUS (qdev_get_parent_bus (DEVICE (dev)));memory_region_add_subregion (b->apic_address_space,0 , &s->io_memory);
@@ -310,8 +308,6 @@ static int apic_init_common(ICCDevice *dev)if (apic_report_tpr_access && info->enable_tpr_reporting) { info->enable_tpr_reporting (s, true); } - -return 0 ; }static void apic_dispatch_pre_save (void *opaque)
@@ -377,14 +373,13 @@ static Property apic_properties_common[] = {static void apic_common_class_init (ObjectClass *klass,void *data) { -ICCDeviceClass *idc =ICC_DEVICE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); + dc->realize = apic_common_realize; dc->vmsd = &vmstate_apic_common; dc->reset = apic_reset_common; dc->no_user =1 ; dc->props = apic_properties_common; - idc->init = apic_init_common; }static const TypeInfo apic_common_type = {
include/hw/i386/apic_internal.h +3 -1
@@ -78,7 +78,9 @@ typedef struct APICCommonClass {ICCDeviceClass parent_class; -void (*init)(APICCommonState *s); +DeviceRealize parent_realize; +DeviceUnrealize parent_unrealize; +void (*set_base)(APICCommonState *s,uint64_t val);void (*set_tpr)(APICCommonState *s,uint8_t val);uint8_t (*get_tpr)(APICCommonState *s);
target-i386/cpu-qom.h +1 -0
@@ -50,6 +50,7 @@ typedef struct X86CPUClass {/*< public >*/ DeviceRealize parent_realize; +DeviceUnrealize parent_unrealize;void (*parent_reset)(CPUState *cpu); } X86CPUClass;
target-i386/cpu.c +35 -0
@@ -2492,10 +2492,31 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) return; } } + +static void x86_cpu_apic_unrealize (X86CPU *cpu,Error **errp) +{ +Error *local_err =NULL ; + +if (cpu->apic_state ==NULL ) { +return ; + } + +object_property_set_bool (OBJECT (cpu->apic_state), + false,"realized" , &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } + +qdev_free (cpu->apic_state); +}#else static void x86_cpu_apic_realize (X86CPU *cpu,Error **errp) { } +static void x86_cpu_apic_unrealize (X86CPU *cpu,Error **errp) +{ +}#endif static void x86_cpu_realizefn (DeviceState *dev,Error **errp)
@@ -2571,6 +2592,18 @@ out: } } +static void x86_cpu_unrealizefn (DeviceState *dev,Error **errp) +{ +X86CPU *cpu =X86_CPU (dev); +Error *local_err =NULL ; + +x86_cpu_apic_unrealize (cpu, &local_err); +if (local_err !=NULL ) { +error_propagate (errp, local_err); +return ; + } +} +/* Enables contiguous-apic-ID mode, for compatibility */ static bool compat_apic_id_mode;
@@ -2702,7 +2735,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)DeviceClass *dc =DEVICE_CLASS (oc); xcc->parent_realize = dc->realize; + xcc->parent_unrealize = dc->unrealize; dc->realize = x86_cpu_realizefn; + dc->unrealize = x86_cpu_unrealizefn; dc->bus_type =TYPE_ICC_BUS ; dc->props = x86_cpu_properties;
Signature · 1 line
1.8.1.4
RFC v4 5/10 qmp: add 'cpu-del' command support
In reply to Chen Fan--- hw/i386/pc.c | 6 ++++++ hw/i386/pc_piix.c | 3 ++- include/hw/boards.h | 2 ++ include/hw/i386/pc.h | 1 + qapi-schema.json | 12 ++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ qmp.c | 9 +++++++++ 7 files changed, 55 insertions(+), 1 deletion(-)
hw/i386/pc.c +6 -0
@@ -956,6 +956,12 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)pc_new_cpu (current_cpu_model, apic_id, icc_bridge, errp); } +void pc_hot_del_cpu (const int64_t id,Error **errp) +{ +/* TODO: hot remove vCPU. */ +error_setg (errp,"Hot-remove CPU is not supported." ); +} +void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge) {int i;
hw/i386/pc_piix.c +2 -1
@@ -337,7 +337,8 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)#define PC_I440FX_MACHINE_OPTIONS \ PC_DEFAULT_MACHINE_OPTIONS, \ .desc = "Standard PC (i440FX + PIIX, 1996)", \ - .hot_add_cpu = pc_hot_add_cpu + .hot_add_cpu = pc_hot_add_cpu, \ + .hot_del_cpu = pc_hot_del_cpu#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONSstatic QEMUMachine pc_i440fx_machine_v1_7 = {
include/hw/boards.h +2 -0
@@ -20,6 +20,7 @@ typedef void QEMUMachineInitFunc(QEMUMachineInitArgs *args);typedef void QEMUMachineResetFunc (void );typedef void QEMUMachineHotAddCPUFunc (const int64_t id,Error **errp); +typedef void QEMUMachineHotDelCPUFunc (const int64_t id,Error **errp); typedef struct QEMUMachine { const char *name;
@@ -28,6 +29,7 @@ typedef struct QEMUMachine {QEMUMachineInitFunc *init;QEMUMachineResetFunc *reset;QEMUMachineHotAddCPUFunc *hot_add_cpu; +QEMUMachineHotDelCPUFunc *hot_del_cpu;BlockInterfaceType block_default_type;int max_cpus; unsigned int no_serial:1,
include/hw/i386/pc.h +1 -0
@@ -96,6 +96,7 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level);void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge);void pc_hot_add_cpu (const int64_t id,Error **errp); +void pc_hot_del_cpu (const int64_t id,Error **errp);void pc_acpi_init (const char *default_dsdt); PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
qapi-schema.json +12 -0
@@ -1479,6 +1479,18 @@ ## { 'command': 'cpu-add', 'data': {'id': 'int'} } +# @cpu-del + +# Deletes CPU with specified ID +# +# @id: ID of CPU to be deleted, valid values [0..max_cpus) +# +# Returns: Nothing on success +# +# Since 1.7 +## +{ 'command': 'cpu-del', 'data': {'id': 'int'} } + ## # @memsave: #
qmp-commands.hx +23 -0
@@ -411,6 +411,29 @@ Example: EQMP { + .name = "cpu-del", + .args_type = "id:i", + .mhandler.cmd_new = qmp_marshal_input_cpu_del, + }, + +SQMP +cpu-del +------- + +Deletes virtual cpu + +Arguments: + +- "id": cpu id (json-int) + +Example: + +-> { "execute": "cpu-del", "arguments": { "id": 2 } } +<- { "return": {} } + +EQMP + + { .name = "memsave", .args_type = "val:l,size:i,filename:s,cpu:i?", .mhandler.cmd_new = qmp_marshal_input_memsave,
qmp.c +9 -0
@@ -118,6 +118,15 @@ void qmp_cpu_add(int64_t id, Error **errp) } } +void qmp_cpu_del (int64_t id,Error **errp) +{ +if (current_machine->hot_del_cpu) { + current_machine->hot_del_cpu (id, errp); + }else { +error_setg (errp,"Not supported" ); + } +} +#ifndef CONFIG_VNC /* If VNC support is enabled, the "true" query-vnc command is defined in the VNC subsystem */
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [RFC qom-cpu v4 05/10] qmp: add 'cpu-del' command support
Quoted 15 lines · Chen Fan
Signed-off-by Chen Fan <[email protected]>--- hw/i386/pc.c | 6 ++++++ hw/i386/pc_piix.c | 3 ++- include/hw/boards.h | 2 ++ include/hw/i386/pc.h | 1 + qapi-schema.json | 12 ++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ qmp.c | 9 +++++++++ 7 files changed, 55 insertions(+), 1 deletion(-)+++
b/qapi-schema.jsonqapi-schema.json +0
-0@@ -1479,6 +1479,18 @@ ## { 'command': 'cpu-add', 'data': {'id': 'int'} }
qapi-schema.json line 1490
Quoted 10 lines
qapi-schema.json +9
-0+# @cpu-del + +# Deletes CPU with specified ID +# +# @id: ID of CPU to be deleted, valid values [0..max_cpus) +# +# Returns: Nothing on success +# +# Since 1.7
Since this mail is still titled RFC, there's no way it will make it into 1.7. Are you shooting for 1.8?
Signature · 2 lines
Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
Re: [Qemu-devel] [RFC qom-cpu v4 05/10] qmp: add 'cpu-del' command support
Quoted 17 lines · Eric Blake
Quoted 16 lines · Chen Fan
Signed-off-by Chen Fan <[email protected]>--- hw/i386/pc.c | 6 ++++++ hw/i386/pc_piix.c | 3 ++- include/hw/boards.h | 2 ++ include/hw/i386/pc.h | 1 + qapi-schema.json | 12 ++++++++++++ qmp-commands.hx | 23 +++++++++++++++++++++++ qmp.c | 9 +++++++++ 7 files changed, 55 insertions(+), 1 deletion(-)+++
b/qapi-schema.jsonqapi-schema.json +0
-0@@ -1479,6 +1479,18 @@ ## { 'command': 'cpu-add', 'data': {'id': 'int'} }
Quoted 13 lines
qapi-schema.json line 1490
Quoted 9 lines
qapi-schema.json +9
-0+# @cpu-del + +# Deletes CPU with specified ID +# +# @id: ID of CPU to be deleted, valid values [0..max_cpus) +# +# Returns: Nothing on success +# +# Since 1.7Since this mail is still titled RFC, there's no way it will make it into 1.7. Are you shooting for 1.8?
Hi, this patchseries had not been commented yet, maybe I should send it again after Rebase without RFC for 1.8.
Thanks,
Chen
RFC v4 6/10 qom cpu: rename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier'
In reply to Chen FanRename variable 'cpu_added_notifier' to 'cpu_hotplug_notifier', for adding vcpu-remove notifier support.
--- hw/acpi/piix4.c | 10 +++++----- hw/i386/pc.c | 2 +- include/sysemu/sysemu.h | 2 +- qom/cpu.c | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-)
hw/acpi/piix4.c +5 -5
@@ -95,7 +95,7 @@ typedef struct PIIX4PMState {uint8_t s4_val;CPUStatus gpe_cpu; -Notifier cpu_added_notifier; +Notifier cpu_hotplug_notifier; } PIIX4PMState;#define TYPE_PIIX4_PM "PIIX4_PM"
@@ -661,9 +661,9 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,pm_update_sci (s); } -static void piix4_cpu_added_req (Notifier *n,void *opaque) +static void piix4_cpu_hotplug (Notifier *n,void *opaque) { -PIIX4PMState *s =container_of (n, PIIX4PMState, cpu_added_notifier); +PIIX4PMState *s =container_of (n, PIIX4PMState, cpu_hotplug_notifier);piix4_cpu_hotplug_req (s,CPU (opaque),PLUG ); }
@@ -696,8 +696,8 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,memory_region_init_io (&s->io_cpu,OBJECT (s), &cpu_hotplug_ops, s,"acpi-cpu-hotplug" ,PIIX4_PROC_LEN );memory_region_add_subregion (parent,PIIX4_PROC_BASE , &s->io_cpu); - s->cpu_added_notifier.notify = piix4_cpu_added_req; -qemu_register_cpu_added_notifier (&s->cpu_added_notifier); + s->cpu_hotplug_notifier.notify = piix4_cpu_hotplug; +qemu_register_cpu_hotplug_notifier (&s->cpu_hotplug_notifier); }static void enable_device (PIIX4PMState *s,int slot)
hw/i386/pc.c +1 -1
@@ -406,7 +406,7 @@ void pc_cmos_init(ram_addr_t ram_size, ram_addr_t above_4g_mem_size,/* init CPU hotplug notifier */ cpu_hotplug_cb.rtc_state = s; cpu_hotplug_cb.cpu_added_notifier.notify = rtc_notify_cpu_added; -qemu_register_cpu_added_notifier (&cpu_hotplug_cb.cpu_added_notifier); +qemu_register_cpu_hotplug_notifier (&cpu_hotplug_cb.cpu_added_notifier);if (set_boot_dev (s, boot_device)) {exit (1 );
include/sysemu/sysemu.h +1 -1
@@ -158,7 +158,7 @@ void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict);void drive_hot_add (Monitor *mon,const QDict *qdict);/* CPU hotplug */ -void qemu_register_cpu_added_notifier (Notifier *notifier); +void qemu_register_cpu_hotplug_notifier (Notifier *notifier);/* pcie aer error injection */ void pcie_aer_inject_error_print (Monitor *mon,const QObject *data);
qom/cpu.c +5 -5
@@ -67,12 +67,12 @@ static void cpu_common_get_memory_mapping(CPUState *cpu, }/* CPU hot-plug notifiers */ -static NotifierList cpu_added_notifiers = -NOTIFIER_LIST_INITIALIZER (cpu_add_notifiers); +static NotifierList cpu_hotplug_notifiers = +NOTIFIER_LIST_INITIALIZER (cpu_hotplug_notifiers); -void qemu_register_cpu_added_notifier (Notifier *notifier) +void qemu_register_cpu_hotplug_notifier (Notifier *notifier) { -notifier_list_add (&cpu_added_notifiers, notifier); +notifier_list_add (&cpu_hotplug_notifiers, notifier); }void cpu_reset_interrupt (CPUState *cpu,int mask)
@@ -219,7 +219,7 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp)if (dev->hotplugged) {cpu_synchronize_post_init (cpu); -notifier_list_notify (&cpu_added_notifiers, dev); +notifier_list_notify (&cpu_hotplug_notifiers, dev);cpu_resume (cpu); } }
Signature · 1 line
1.8.1.4
RFC v4 7/10 qom cpu: add UNPLUG cpu notifier support
In reply to Chen FanMove struct HotplugEventType from file piix4.c to file qom/cpu.c, and add struct CPUNotifier for supporting UNPLUG cpu notifier.
--- hw/acpi/piix4.c | 8 ++------ include/qom/cpu.h | 10 ++++++++++ qom/cpu.c | 6 +++++- 3 files changed, 17 insertions(+), 7 deletions(-)
hw/acpi/piix4.c +2 -6
@@ -636,11 +636,6 @@ static const MemoryRegionOps cpu_hotplug_ops = { }, }; -typedef enum { -PLUG , -UNPLUG , -}HotplugEventType ; -static void piix4_cpu_hotplug_req (PIIX4PMState *s,CPUState *cpu,HotplugEventType action) {
@@ -664,8 +659,9 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,static void piix4_cpu_hotplug (Notifier *n,void *opaque) {PIIX4PMState *s =container_of (n, PIIX4PMState, cpu_hotplug_notifier); +CPUNotifier *notifier = opaque; -piix4_cpu_hotplug_req (s,CPU (opaque),PLUG ); +piix4_cpu_hotplug_req (s,CPU (notifier->dev), notifier->type); } static int piix4_device_hotplug(DeviceState *qdev, PCIDevice *dev,
include/qom/cpu.h +10 -0
@@ -507,6 +507,16 @@ void qemu_init_vcpu(CPUState *cpu);*/ void cpu_single_step (CPUState *cpu,int enabled); +typedef enum { +PLUG , +UNPLUG , +}HotplugEventType ; + +typedef struct CPUNotifier { +DeviceState *dev; +HotplugEventType type; +}CPUNotifier ; +#ifdef CONFIG_SOFTMMU extern const struct VMStateDescription vmstate_cpu_common;#else
qom/cpu.c +5 -1
@@ -216,10 +216,14 @@ static ObjectClass *cpu_common_class_by_name(const char *cpu_model)static void cpu_common_realizefn (DeviceState *dev,Error **errp) {CPUState *cpu =CPU (dev); +CPUNotifier notifier; + + notifier.dev = dev; + notifier.type =PLUG ;if (dev->hotplugged) {cpu_synchronize_post_init (cpu); -notifier_list_notify (&cpu_hotplug_notifiers, dev); +notifier_list_notify (&cpu_hotplug_notifiers, ¬ifier);cpu_resume (cpu); } }
Signature · 1 line
1.8.1.4
RFC v4 8/10 i386: implement pc interface pc_hot_del_cpu()
In reply to Chen FanImplement cpu interface pc_hot_del_cpu() for unrealizing device vCPU. emiting vcpu-remove notifier to ACPI, then ACPI could send sci interrupt to OS for hot-remove vcpu.
--- hw/i386/pc.c | 30 ++++++++++++++++++++++++++++-- qom/cpu.c | 12 ++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-)
hw/i386/pc.c +28 -2
@@ -958,8 +958,34 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)void pc_hot_del_cpu (const int64_t id,Error **errp) { -/* TODO: hot remove vCPU. */ -error_setg (errp,"Hot-remove CPU is not supported." ); +CPUState *cpu; +bool found = false; +X86CPUClass *xcc; + +CPU_FOREACH (cpu) { +CPUClass *cc =CPU_GET_CLASS (cpu); +int64_t cpuid = cc->get_arch_id (cpu); + +if (cpuid == id) { + found = true; +break ; + } + } + +if (!found) { +error_setg (errp,"Unable to find cpu-index: %" PRIi64 +", it doesn't exist or has been deleted." , id); +return ; + } + +if (cpu == first_cpu && !CPU_NEXT (cpu)) { +error_setg (errp,"Unable to delete the last " +"one cpu when VM running." ); +return ; + } + + xcc =X86_CPU_GET_CLASS (DEVICE (cpu)); + xcc->parent_unrealize (DEVICE (cpu), errp); }void pc_cpus_init (const char *cpu_model,DeviceState *icc_bridge)
qom/cpu.c +12 -0
@@ -228,6 +228,17 @@ static void cpu_common_realizefn(DeviceState *dev, Error **errp) } } +static void cpu_common_unrealizefn (DeviceState *dev,Error **errp) +{ +CPUNotifier notifier; + + notifier.dev = dev; + notifier.type =UNPLUG ; + +notifier_list_notify (&cpu_hotplug_notifiers, ¬ifier); +} + +static void cpu_common_initfn (Object *obj) {CPUState *cpu =CPU (obj);
@@ -258,6 +269,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) k->gdb_read_register = cpu_common_gdb_read_register; k->gdb_write_register = cpu_common_gdb_write_register; dc->realize = cpu_common_realizefn; + dc->unrealize = cpu_common_unrealizefn; dc->no_user =1 ; }
Signature · 1 line
1.8.1.4
RFC v4 9/10 piix4: implement function cpu_status_write() for vcpu ejection
In reply to Chen FanWhen OS eject a vcpu (like: echo 1 > /sys/bus/acpi/devices/LNXCPUXX/eject), it will call acpi EJ0 method, the firmware will write the new cpumap, QEMU will know which vcpu need to be ejected.
--- hw/acpi/piix4.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
hw/acpi/piix4.c +36 -1
@@ -61,6 +61,7 @@ struct pci_status {typedef struct CPUStatus {uint8_t sts[PIIX4_PROC_LEN ]; +uint8_t old_sts[PIIX4_PROC_LEN ]; }CPUStatus ; typedef struct PIIX4PMState {
@@ -611,6 +612,12 @@ static const MemoryRegionOps piix4_pci_ops = { }, }; +static void acpi_piix_eject_vcpu (int64_t cpuid) +{ +/* TODO: eject a vcpu, release allocated vcpu and exit the vcpu pthread. */ +PIIX4_DPRINTF ("vcpu: %" PRIu64" need to be ejected.\n" , cpuid); +} +static uint64_t cpu_status_read (void *opaque,hwaddr addr,unsigned int size) {PIIX4PMState *s = opaque;
@@ -623,7 +630,27 @@ static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)static void cpu_status_write (void *opaque,hwaddr addr,uint64_t data,unsigned int size) { -/* TODO: implement VCPU removal on guest signal that CPU can be removed */ +PIIX4PMState *s = opaque; +CPUStatus *cpus = &s->gpe_cpu; +uint8_t val; +int i; +int64_t cpuid =0 ; + + val = cpus->old_sts[addr] ^ data; + +if (val ==0 ) { +return ; + } + +for (i =0 ; i <8 ; i++) { +if (val &1 << i) { + cpuid =8 * addr + i; + } + } + +if (cpuid !=0 ) { +acpi_piix_eject_vcpu (cpuid); + } }static const MemoryRegionOps cpu_hotplug_ops = {
@@ -643,13 +670,20 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,ACPIGPE *gpe = &s->ar.gpe;CPUClass *k =CPU_GET_CLASS (cpu);int64_t cpu_id; +int i;assert (s !=NULL ); *gpe->sts = *gpe->sts |PIIX4_CPU_HOTPLUG_STATUS ; cpu_id = k->get_arch_id (CPU (cpu)); + +for (i =0 ; i <PIIX4_PROC_LEN ; i++) { + g->old_sts[i] = g->sts[i]; + } +if (action ==PLUG ) { g->sts[cpu_id /8 ] |= (1 << (cpu_id %8 )); + g->old_sts[cpu_id /8 ] |= (1 << (cpu_id %8 )); }else { g->sts[cpu_id /8 ] &= ~(1 << (cpu_id %8 )); }
@@ -688,6 +722,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,g_assert ((id /8 ) <PIIX4_PROC_LEN ); s->gpe_cpu.sts[id /8 ] |= (1 << (id %8 )); + s->gpe_cpu.old_sts[id /8 ] |= (1 << (id %8 )); }memory_region_init_io (&s->io_cpu,OBJECT (s), &cpu_hotplug_ops, s,"acpi-cpu-hotplug" ,PIIX4_PROC_LEN );
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [RFC qom-cpu v4 09/10] piix4: implement function cpu_status_write() for vcpu ejection
Hi,
Quoted 3 lines · Chen Fan
When OS eject a vcpu (like: echo 1 >
/sys/bus/acpi/devices/LNXCPUXX/eject), it will call acpi EJ0 method, the firmware will write the new cpumap, QEMU will know which vcpu need to be ejected.
I think that the _EJ0 callback (CPEJ method in hw/i386/acpi-dsdt-cpu-hotplug.dsl) currently does not write the new cpumap, it only sleeps. So cpu_state_write is never called on ejection, and the cpu objects remain allocated in qemu. Is there an updated version of the patchseries with a CPEJ that writes the new cpumap?
thanks,
- Vasilis
Quoted 93 lines
Signed-off-by Chen Fan <[email protected]>--- hw/acpi/piix4.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)hw/acpi/piix4.c +36
-1@@ -61,6 +61,7 @@ struct pci_status {typedef struct CPUStatus {uint8_t sts[PIIX4_PROC_LEN ]; +uint8_t old_sts[PIIX4_PROC_LEN ]; }CPUStatus ; typedef struct PIIX4PMState {@@ -611,6 +612,12 @@ static const MemoryRegionOps piix4_pci_ops = { }, }; +static void acpi_piix_eject_vcpu (int64_t cpuid) +{ +/* TODO: eject a vcpu, release allocated vcpu and exit the vcpu pthread. */ +PIIX4_DPRINTF ("vcpu: %" PRIu64" need to be ejected.\n" , cpuid); +} +static uint64_t cpu_status_read (void *opaque,hwaddr addr,unsigned int size) {PIIX4PMState *s = opaque;@@ -623,7 +630,27 @@ static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)static void cpu_status_write (void *opaque,hwaddr addr,uint64_t data,unsigned int size) { -/* TODO: implement VCPU removal on guest signal that CPU can be removed */ +PIIX4PMState *s = opaque; +CPUStatus *cpus = &s->gpe_cpu; +uint8_t val; +int i; +int64_t cpuid =0 ; + + val = cpus->old_sts[addr] ^ data; + +if (val ==0 ) { +return ; + } + +for (i =0 ; i <8 ; i++) { +if (val &1 << i) { + cpuid =8 * addr + i; + } + } + +if (cpuid !=0 ) { +acpi_piix_eject_vcpu (cpuid); + } }static const MemoryRegionOps cpu_hotplug_ops = {@@ -643,13 +670,20 @@ static void piix4_cpu_hotplug_req(PIIX4PMState *s, CPUState *cpu,ACPIGPE *gpe = &s->ar.gpe;CPUClass *k =CPU_GET_CLASS (cpu);int64_t cpu_id; +int i;assert (s !=NULL ); *gpe->sts = *gpe->sts |PIIX4_CPU_HOTPLUG_STATUS ; cpu_id = k->get_arch_id (CPU (cpu)); + +for (i =0 ; i <PIIX4_PROC_LEN ; i++) { + g->old_sts[i] = g->sts[i]; + } +if (action ==PLUG ) { g->sts[cpu_id /8 ] |= (1 << (cpu_id %8 )); + g->old_sts[cpu_id /8 ] |= (1 << (cpu_id %8 )); }else { g->sts[cpu_id /8 ] &= ~(1 << (cpu_id %8 )); }@@ -688,6 +722,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion *parent,g_assert ((id /8 ) <PIIX4_PROC_LEN ); s->gpe_cpu.sts[id /8 ] |= (1 << (id %8 )); + s->gpe_cpu.old_sts[id /8 ] |= (1 << (id %8 )); }memory_region_init_io (&s->io_cpu,OBJECT (s), &cpu_hotplug_ops, s,"acpi-cpu-hotplug" ,PIIX4_PROC_LEN );Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [RFC qom-cpu v4 09/10] piix4: implement function cpu_status_write() for vcpu ejection
Quoted 11 lines · Vasilis Liaskovitis
Hi,
Quoted 3 lines · Chen Fan
When OS eject a vcpu (like: echo 1 >
/sys/bus/acpi/devices/LNXCPUXX/eject), it will call acpi EJ0 method, the firmware will write the new cpumap, QEMU will know which vcpu need to be ejected.I think that the
_EJ0callback (CPEJ method in hw/i386/acpi-dsdt-cpu-hotplug.dsl) currently does not write the new cpumap, it only sleeps. Socpu_state_writeis never called on ejection, and the cpu objects remain allocated in qemu. Is there an updated version of the patchseries with a CPEJ that writes the new cpumap?
oops, never mind. I missed your seabios patch mentioned in the head message, got it now.
thanks,
- Vasilis
Re: [Qemu-devel] [RFC qom-cpu v4 09/10] piix4: implement function cpu_status_write() for vcpu ejection
Quoted 8 lines · Vasilis Liaskovitis
Quoted 7 lines · Vasilis Liaskovitis
Hi,
Quoted 3 lines · Chen Fan
When OS eject a vcpu (like: echo 1 >
/sys/bus/acpi/devices/LNXCPUXX/eject), it will call acpi EJ0 method, the firmware will write the new cpumap, QEMU will know which vcpu need to be ejected.
Quoted 8 lines
Quoted 4 lines
I think that the
_EJ0callback (CPEJ method in hw/i386/acpi-dsdt-cpu-hotplug.dsl) currently does not write the new cpumap, it only sleeps. Socpu_state_writeis never called on ejection, and the cpu objects remain allocated in qemu. Is there an updated version of the patchseries with a CPEJ that writes the new cpumap?oops, never mind. I missed your seabios patch mentioned in the head message, got it now.
Ok, thanks for your attention.
Quoted 3 lines
thanks,
- Vasilis
RFC v4 10/10 cpus: reclaim allocated vCPU objects
In reply to Chen FanAfter ACPI get a signal to eject a vCPU, then it will notify
the vCPU thread to exit in KVM, and the vCPU must be removed from CPU list, before the vCPU really removed, there will release the all related vCPU objects.
--- cpus.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ hw/acpi/piix4.c | 23 +++++++++++++++++------ include/qom/cpu.h | 10 ++++++++++ include/sysemu/kvm.h | 1 + kvm-all.c | 25 +++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 6 deletions(-)
cpus.c +46 -0
@@ -714,6 +714,26 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)qemu_cpu_kick (cpu); } +static void qemu_kvm_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); + +if (kvm_destroy_vcpu (cpu) <0 ) { +fprintf (stderr,"kvm_destroy_vcpu failed.\n" ); +exit (1 ); + } + +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +qdev_free (DEVICE (cpu)); +} + +static void qemu_tcg_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +qdev_free (DEVICE (cpu)); +} +static void flush_queued_work (CPUState *cpu) {struct qemu_work_item *wi;
@@ -805,6 +825,11 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) } }qemu_kvm_wait_io_event (cpu); +if (cpu->exit && !cpu_can_run (cpu)) { +qemu_kvm_destroy_vcpu (cpu); +qemu_mutex_unlock (&qemu_global_mutex); +return NULL ; + } }return NULL ;
@@ -857,6 +882,7 @@ static void tcg_exec_all(void);static void *qemu_tcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg; +CPUState *remove_cpu =NULL ;qemu_tcg_init_cpu_signals ();qemu_thread_get_self (cpu->thread);
@@ -889,6 +915,16 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } }qemu_tcg_wait_io_event (); +CPU_FOREACH (cpu) { +if (cpu->exit && !cpu_can_run (cpu)) { + remove_cpu = cpu; +break ; + } + } +if (remove_cpu) { +qemu_tcg_destroy_vcpu (remove_cpu); + remove_cpu =NULL ; + } }return NULL ;
@@ -1045,6 +1081,13 @@ void resume_all_vcpus(void) } } +void cpu_remove (CPUState *cpu) +{ + cpu->stop = true; + cpu->exit = true; +qemu_cpu_kick (cpu); +} +static void qemu_tcg_init_vcpu (CPUState *cpu) {/* share a single thread for all cpus with TCG */
@@ -1219,6 +1262,9 @@ static void tcg_exec_all(void)break ; } }else if (cpu->stop || cpu->stopped) { +if (cpu->exit) { + next_cpu =CPU_NEXT (cpu); + }break ; } }
hw/acpi/piix4.c +17 -6
@@ -612,10 +612,21 @@ static const MemoryRegionOps piix4_pci_ops = { }, }; -static void acpi_piix_eject_vcpu (int64_t cpuid) +static void acpi_piix_eject_vcpu (PIIX4PMState *s,int64_t cpuid) { -/* TODO: eject a vcpu, release allocated vcpu and exit the vcpu pthread. */ -PIIX4_DPRINTF ("vcpu: %" PRIu64" need to be ejected.\n" , cpuid); +CPUStatus *g = &s->gpe_cpu; +CPUState *cpu; + +CPU_FOREACH (cpu) { +CPUClass *cc =CPU_GET_CLASS (cpu); +int64_t id = cc->get_arch_id (cpu); + +if (cpuid == id) { + g->old_sts[cpuid /8 ] &= ~(1 << (cpuid %8 )); +cpu_remove (cpu); +break ; + } + } }static uint64_t cpu_status_read (void *opaque,hwaddr addr,unsigned int size)
@@ -634,7 +645,7 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,CPUStatus *cpus = &s->gpe_cpu;uint8_t val;int i; -int64_t cpuid =0 ; +int64_t cpuid =-1 ; val = cpus->old_sts[addr] ^ data;
@@ -648,8 +659,8 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data, } } -if (cpuid !=0 ) { -acpi_piix_eject_vcpu (cpuid); +if (cpuid !=-1 ) { +acpi_piix_eject_vcpu (s, cpuid); } }
include/qom/cpu.h +10 -0
@@ -181,6 +181,7 @@ struct CPUState {bool created;bool stop;bool stopped; +bool exit;volatile sig_atomic_t exit_request;volatile sig_atomic_t tcg_exit_req;uint32_t interrupt_request;
@@ -206,6 +207,7 @@ struct CPUState {QTAILQ_HEAD (CPUTailQ, CPUState);extern struct CPUTailQ cpus;#define CPU_NEXT (cpu) QTAILQ_NEXT(cpu, node) +#define CPU_REMOVE (cpu) QTAILQ_REMOVE(&cpus, cpu, node)#define CPU_FOREACH (cpu) QTAILQ_FOREACH(cpu, &cpus, node)#define CPU_FOREACH_SAFE (cpu, next_cpu) \ QTAILQ_FOREACH_SAFE(cpu, &cpus, node, next_cpu)
@@ -487,6 +489,14 @@ void cpu_exit(CPUState *cpu);void cpu_resume (CPUState *cpu);/** +* qemu_remove_vcpu: +* @cpu: The vCPU to remove. +* +* Requests the CPU @cpu to be removed. +*/ +void cpu_remove (CPUState *cpu); + +/** * qemu_init_vcpu: * @cpu: The vCPU to initialize. *
include/sysemu/kvm.h +1 -0
@@ -167,6 +167,7 @@ int kvm_has_intx_set_mask(void);int kvm_init_vcpu (CPUState *cpu);int kvm_cpu_exec (CPUState *cpu); +int kvm_destroy_vcpu (CPUState *cpu);#ifdef NEED_CPU_H
kvm-all.c +25 -0
@@ -226,6 +226,31 @@ static void kvm_reset_vcpu(void *opaque)kvm_arch_reset_vcpu (cpu); } +int kvm_destroy_vcpu (CPUState *cpu) +{ +KVMState *s = kvm_state; +long mmap_size; +int ret =0 ; + +DPRINTF ("kvm_destroy_vcpu\n" ); + + mmap_size =kvm_ioctl (s,KVM_GET_VCPU_MMAP_SIZE ,0 ); +if (mmap_size <0 ) { + ret = mmap_size; +DPRINTF ("KVM_GET_VCPU_MMAP_SIZE failed\n" ); + goto err; + } + + ret =munmap (cpu->kvm_run, mmap_size); +if (ret <0 ) { + goto err; + } + +close (cpu->kvm_fd); +err: +return ret; +} +int kvm_init_vcpu (CPUState *cpu) {KVMState *s = kvm_state;
Signature · 1 line
1.8.1.4
Re: [Qemu-devel] [RFC qom-cpu v4 10/10] cpus: reclaim allocated vCPU objects
Quoted 18 lines · On Wed, 9 Oct 2013 17:43:18 +0800 Chen Fan <[email protected]> wrote:
After ACPI get a signal to eject a vCPU, then it will notify
the vCPU thread to exit in KVM, and the vCPU must be removed from CPU list, before the vCPU really removed, there will release the all related vCPU objects.Signed-off-by Chen Fan <[email protected]>--- cpus.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ hw/acpi/piix4.c | 23 +++++++++++++++++------ include/qom/cpu.h | 10 ++++++++++ include/sysemu/kvm.h | 1 + kvm-all.c | 25 +++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 6 deletions(-)cpus.c +0
-0
cpus.c void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) · line 721
Quoted 8 lines
cpus.c +5
-0@@ -714,6 +714,26 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)qemu_cpu_kick (cpu); } +static void qemu_kvm_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); + +if (kvm_destroy_vcpu (cpu) <0 ) {
Does it actually do what it's supposed to do?
If I recall correctly KVM patches were dimmed as not correct approach.
perhaps in case of KVM for now, it should return failure (i.e. no unplug for KVM).
Quoted 211 lines
cpus.c +41
-0+fprintf (stderr,"kvm_destroy_vcpu failed.\n" ); +exit (1 ); + } + +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +qdev_free (DEVICE (cpu)); +} + +static void qemu_tcg_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +qdev_free (DEVICE (cpu)); +} +static void flush_queued_work (CPUState *cpu) {struct qemu_work_item *wi;@@ -805,6 +825,11 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) } }qemu_kvm_wait_io_event (cpu); +if (cpu->exit && !cpu_can_run (cpu)) { +qemu_kvm_destroy_vcpu (cpu); +qemu_mutex_unlock (&qemu_global_mutex); +return NULL ; + } }return NULL ;@@ -857,6 +882,7 @@ static void tcg_exec_all(void);static void *qemu_tcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg; +CPUState *remove_cpu =NULL ;qemu_tcg_init_cpu_signals ();qemu_thread_get_self (cpu->thread);@@ -889,6 +915,16 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } }qemu_tcg_wait_io_event (); +CPU_FOREACH (cpu) { +if (cpu->exit && !cpu_can_run (cpu)) { + remove_cpu = cpu; +break ; + } + } +if (remove_cpu) { +qemu_tcg_destroy_vcpu (remove_cpu); + remove_cpu =NULL ; + } }return NULL ;@@ -1045,6 +1081,13 @@ void resume_all_vcpus(void) } } +void cpu_remove (CPUState *cpu) +{ + cpu->stop = true; + cpu->exit = true; +qemu_cpu_kick (cpu); +} +static void qemu_tcg_init_vcpu (CPUState *cpu) {/* share a single thread for all cpus with TCG */ @@ -1219,6 +1262,9 @@ static void tcg_exec_all(void)break ; } }else if (cpu->stop || cpu->stopped) { +if (cpu->exit) { + next_cpu =CPU_NEXT (cpu); + }break ; } }hw/acpi/piix4.c +17
-6@@ -612,10 +612,21 @@ static const MemoryRegionOps piix4_pci_ops = { }, }; -static void acpi_piix_eject_vcpu (int64_t cpuid) +static void acpi_piix_eject_vcpu (PIIX4PMState *s,int64_t cpuid) { -/* TODO: eject a vcpu, release allocated vcpu and exit the vcpu pthread. */ -PIIX4_DPRINTF ("vcpu: %" PRIu64" need to be ejected.\n" , cpuid); +CPUStatus *g = &s->gpe_cpu; +CPUState *cpu; + +CPU_FOREACH (cpu) { +CPUClass *cc =CPU_GET_CLASS (cpu); +int64_t id = cc->get_arch_id (cpu); + +if (cpuid == id) { + g->old_sts[cpuid /8 ] &= ~(1 << (cpuid %8 )); +cpu_remove (cpu); +break ; + } + } }static uint64_t cpu_status_read (void *opaque,hwaddr addr,unsigned int size)@@ -634,7 +645,7 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,CPUStatus *cpus = &s->gpe_cpu;uint8_t val;int i; -int64_t cpuid =0 ; +int64_t cpuid =-1 ; val = cpus->old_sts[addr] ^ data;@@ -648,8 +659,8 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data, } } -if (cpuid !=0 ) { -acpi_piix_eject_vcpu (cpuid); +if (cpuid !=-1 ) { +acpi_piix_eject_vcpu (s, cpuid); } }include/qom/cpu.h +10
-0@@ -181,6 +181,7 @@ struct CPUState {bool created;bool stop;bool stopped; +bool exit;volatile sig_atomic_t exit_request;volatile sig_atomic_t tcg_exit_req;uint32_t interrupt_request;@@ -206,6 +207,7 @@ struct CPUState {QTAILQ_HEAD (CPUTailQ, CPUState);extern struct CPUTailQ cpus;#define CPU_NEXT (cpu) QTAILQ_NEXT(cpu, node) +#define CPU_REMOVE (cpu) QTAILQ_REMOVE(&cpus, cpu, node)#define CPU_FOREACH (cpu) QTAILQ_FOREACH(cpu, &cpus, node)#define CPU_FOREACH_SAFE (cpu, next_cpu) \ QTAILQ_FOREACH_SAFE(cpu, &cpus, node, next_cpu)@@ -487,6 +489,14 @@ void cpu_exit(CPUState *cpu);void cpu_resume (CPUState *cpu);/** +* qemu_remove_vcpu: +* @cpu: The vCPU to remove. +* +* Requests the CPU @cpu to be removed. +*/ +void cpu_remove (CPUState *cpu); + +/** * qemu_init_vcpu: * @cpu: The vCPU to initialize. * include/sysemu/kvm.h +1
-0@@ -167,6 +167,7 @@ int kvm_has_intx_set_mask(void);int kvm_init_vcpu (CPUState *cpu);int kvm_cpu_exec (CPUState *cpu); +int kvm_destroy_vcpu (CPUState *cpu);#ifdef NEED_CPU_H kvm-all.c +25
-0@@ -226,6 +226,31 @@ static void kvm_reset_vcpu(void *opaque)kvm_arch_reset_vcpu (cpu); } +int kvm_destroy_vcpu (CPUState *cpu) +{ +KVMState *s = kvm_state; +long mmap_size; +int ret =0 ; + +DPRINTF ("kvm_destroy_vcpu\n" ); + + mmap_size =kvm_ioctl (s,KVM_GET_VCPU_MMAP_SIZE ,0 ); +if (mmap_size <0 ) { + ret = mmap_size; +DPRINTF ("KVM_GET_VCPU_MMAP_SIZE failed\n" ); + goto err; + } + + ret =munmap (cpu->kvm_run, mmap_size); +if (ret <0 ) { + goto err; + } + +close (cpu->kvm_fd); +err: +return ret; +} +int kvm_init_vcpu (CPUState *cpu) {KVMState *s = kvm_state;
Re: [Qemu-devel] [RFC qom-cpu v4 10/10] cpus: reclaim allocated vCPU objects
Quoted 32 lines · Igor Mammedov
Quoted 18 lines · On Wed, 9 Oct 2013 17:43:18 +0800 Chen Fan <[email protected]> wrote:
After ACPI get a signal to eject a vCPU, then it will notify
the vCPU thread to exit in KVM, and the vCPU must be removed from CPU list, before the vCPU really removed, there will release the all related vCPU objects.Signed-off-by Chen Fan <[email protected]>--- cpus.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ hw/acpi/piix4.c | 23 +++++++++++++++++------ include/qom/cpu.h | 10 ++++++++++ include/sysemu/kvm.h | 1 + kvm-all.c | 25 +++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 6 deletions(-)cpus.c +0
-0cpus.c void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data) · line 721
Quoted 8 lines
cpus.c +5
-0@@ -714,6 +714,26 @@ void async_run_on_cpu(CPUState *cpu, void (*func)(void *data), void *data)qemu_cpu_kick (cpu); } +static void qemu_kvm_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); + +if (kvm_destroy_vcpu (cpu) <0 ) {Does it actually do what it's supposed to do?
If I recall correctly KVM patches were dimmed as not correct approach.
Quoted 2 lines
perhaps in case of KVM for now, it should return failure (i.e. no unplug for KVM).
yes, for now there must be to make some patches to release cpu for KVM. hoping KVM developers could give some advices.
Thanks,
Chen
Quoted 214 lines
Quoted 212 lines
cpus.c +41
-0+fprintf (stderr,"kvm_destroy_vcpu failed.\n" ); +exit (1 ); + } + +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +qdev_free (DEVICE (cpu)); +} + +static void qemu_tcg_destroy_vcpu (CPUState *cpu) +{ +CPU_REMOVE (cpu); +object_property_set_bool (OBJECT (cpu), false,"realized" ,NULL ); +qdev_free (DEVICE (cpu)); +} +static void flush_queued_work (CPUState *cpu) {struct qemu_work_item *wi;@@ -805,6 +825,11 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) } }qemu_kvm_wait_io_event (cpu); +if (cpu->exit && !cpu_can_run (cpu)) { +qemu_kvm_destroy_vcpu (cpu); +qemu_mutex_unlock (&qemu_global_mutex); +return NULL ; + } }return NULL ;@@ -857,6 +882,7 @@ static void tcg_exec_all(void);static void *qemu_tcg_cpu_thread_fn (void *arg) {CPUState *cpu = arg; +CPUState *remove_cpu =NULL ;qemu_tcg_init_cpu_signals ();qemu_thread_get_self (cpu->thread);@@ -889,6 +915,16 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) } }qemu_tcg_wait_io_event (); +CPU_FOREACH (cpu) { +if (cpu->exit && !cpu_can_run (cpu)) { + remove_cpu = cpu; +break ; + } + } +if (remove_cpu) { +qemu_tcg_destroy_vcpu (remove_cpu); + remove_cpu =NULL ; + } }return NULL ;@@ -1045,6 +1081,13 @@ void resume_all_vcpus(void) } } +void cpu_remove (CPUState *cpu) +{ + cpu->stop = true; + cpu->exit = true; +qemu_cpu_kick (cpu); +} +static void qemu_tcg_init_vcpu (CPUState *cpu) {/* share a single thread for all cpus with TCG */ @@ -1219,6 +1262,9 @@ static void tcg_exec_all(void)break ; } }else if (cpu->stop || cpu->stopped) { +if (cpu->exit) { + next_cpu =CPU_NEXT (cpu); + }break ; } }hw/acpi/piix4.c +17
-6@@ -612,10 +612,21 @@ static const MemoryRegionOps piix4_pci_ops = { }, }; -static void acpi_piix_eject_vcpu (int64_t cpuid) +static void acpi_piix_eject_vcpu (PIIX4PMState *s,int64_t cpuid) { -/* TODO: eject a vcpu, release allocated vcpu and exit the vcpu pthread. */ -PIIX4_DPRINTF ("vcpu: %" PRIu64" need to be ejected.\n" , cpuid); +CPUStatus *g = &s->gpe_cpu; +CPUState *cpu; + +CPU_FOREACH (cpu) { +CPUClass *cc =CPU_GET_CLASS (cpu); +int64_t id = cc->get_arch_id (cpu); + +if (cpuid == id) { + g->old_sts[cpuid /8 ] &= ~(1 << (cpuid %8 )); +cpu_remove (cpu); +break ; + } + } }static uint64_t cpu_status_read (void *opaque,hwaddr addr,unsigned int size)@@ -634,7 +645,7 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data,CPUStatus *cpus = &s->gpe_cpu;uint8_t val;int i; -int64_t cpuid =0 ; +int64_t cpuid =-1 ; val = cpus->old_sts[addr] ^ data;@@ -648,8 +659,8 @@ static void cpu_status_write(void *opaque, hwaddr addr, uint64_t data, } } -if (cpuid !=0 ) { -acpi_piix_eject_vcpu (cpuid); +if (cpuid !=-1 ) { +acpi_piix_eject_vcpu (s, cpuid); } }include/qom/cpu.h +10
-0@@ -181,6 +181,7 @@ struct CPUState {bool created;bool stop;bool stopped; +bool exit;volatile sig_atomic_t exit_request;volatile sig_atomic_t tcg_exit_req;uint32_t interrupt_request;@@ -206,6 +207,7 @@ struct CPUState {QTAILQ_HEAD (CPUTailQ, CPUState);extern struct CPUTailQ cpus;#define CPU_NEXT (cpu) QTAILQ_NEXT(cpu, node) +#define CPU_REMOVE (cpu) QTAILQ_REMOVE(&cpus, cpu, node)#define CPU_FOREACH (cpu) QTAILQ_FOREACH(cpu, &cpus, node)#define CPU_FOREACH_SAFE (cpu, next_cpu) \ QTAILQ_FOREACH_SAFE(cpu, &cpus, node, next_cpu)@@ -487,6 +489,14 @@ void cpu_exit(CPUState *cpu);void cpu_resume (CPUState *cpu);/** +* qemu_remove_vcpu: +* @cpu: The vCPU to remove. +* +* Requests the CPU @cpu to be removed. +*/ +void cpu_remove (CPUState *cpu); + +/** * qemu_init_vcpu: * @cpu: The vCPU to initialize. * include/sysemu/kvm.h +1
-0@@ -167,6 +167,7 @@ int kvm_has_intx_set_mask(void);int kvm_init_vcpu (CPUState *cpu);int kvm_cpu_exec (CPUState *cpu); +int kvm_destroy_vcpu (CPUState *cpu);#ifdef NEED_CPU_H kvm-all.c +25
-0@@ -226,6 +226,31 @@ static void kvm_reset_vcpu(void *opaque)kvm_arch_reset_vcpu (cpu); } +int kvm_destroy_vcpu (CPUState *cpu) +{ +KVMState *s = kvm_state; +long mmap_size; +int ret =0 ; + +DPRINTF ("kvm_destroy_vcpu\n" ); + + mmap_size =kvm_ioctl (s,KVM_GET_VCPU_MMAP_SIZE ,0 ); +if (mmap_size <0 ) { + ret = mmap_size; +DPRINTF ("KVM_GET_VCPU_MMAP_SIZE failed\n" ); + goto err; + } + + ret =munmap (cpu->kvm_run, mmap_size); +if (ret <0 ) { + goto err; + } + +close (cpu->kvm_fd); +err: +return ret; +} +int kvm_init_vcpu (CPUState *cpu) {KVMState *s = kvm_state;
Quoted 4 lines · On Wed, 9 Oct 2013 17:43:08 +0800 Chen Fan <[email protected]> wrote:
Via implementing ACPI standard methods
_EJ0in bios, after Guest OS hot remove one vCPU, it is able to send a signal to QEMU, then QEMU could notify
the assigned vCPU of exiting. meanwhile, and intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself.
have you tried following sequence:
cpu-add 1
cpu-add 2
cpu-del 1
and then do migration?
Quoted 53 lines
this work is based on Andreas Färber's qom-cpu branch tree.
git://github.com/afaerber/qemu-cpu.gitthis series patches must be used with seabios patch and KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347for seabios patches:
http://comments.gmane.org/gmane.comp.emulators.qemu/230460Chen Fan (10):
x86: moveapic_statefield from CPUX86State to X86CPU
apic: remove redundant variable 'apic_no' fromapic_init_common()
apic: removelocal_apicsarray and usingCPU_FOREACHinstead
x86: addx86_cpu_unrealizefn()for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interfacepc_hot_del_cpu()
piix4: implement functioncpu_status_write()for vcpu ejection
cpus: reclaim allocated vCPU objectscpu-exec.c | 2 +- cpus.c | 51 +++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++------ hw/i386/kvm/apic.c | 18 +++++++- hw/i386/kvmvapic.c | 8 ++-- hw/i386/pc.c | 51 ++++++++++++++++++----- hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 91 ++++++++++++++++++++++------------------- hw/intc/apic_common.c | 17 ++------ include/hw/boards.h | 2 + include/hw/i386/apic_internal.h | 6 +-- include/hw/i386/pc.h | 1 + include/qom/cpu.h | 20 +++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++ qapi-schema.json | 12 ++++++ qmp-commands.hx | 23 +++++++++++ qmp.c | 9 ++++ qom/cpu.c | 26 +++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 57 ++++++++++++++++++++------ target-i386/cpu.h | 4 -- target-i386/helper.c | 9 ++-- target-i386/kvm.c | 23 +++++------ target-i386/misc_helper.c | 8 ++-- 26 files changed, 403 insertions(+), 137 deletions(-)
Quoted 8 lines · Igor Mammedov
Quoted 4 lines · On Wed, 9 Oct 2013 17:43:08 +0800 Chen Fan <[email protected]> wrote:
Via implementing ACPI standard methods
_EJ0in bios, after Guest OS hot remove one vCPU, it is able to send a signal to QEMU, then QEMU could notify
the assigned vCPU of exiting. meanwhile, and intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself.
Quoted 5 lines
have you tried following sequence:
cpu-add 1
cpu-add 2
cpu-del 1
and then do migration?
Hi, Igor, Thanks for your test case. I had test the above sequence, when I add two vcpu, then delete the first one, I found command 'lscpu' show:
CPU(s): 1
On-line CPU(s) list: 0,2
off -line CPU(s) list:
I know it is wrong, but I want to know which is expected to show, A or B?
A:
CPU(s): 2
On-line CPU(s) list: 0,2
off -line CPU(s) list:
B:
CPU(s): 2
On-line CPU(s) list: 0,1
off -line CPU(s) list:
Thanks,
Chen
Quoted 55 lines
Quoted 54 lines
this work is based on Andreas Färber's qom-cpu branch tree.
git://github.com/afaerber/qemu-cpu.gitthis series patches must be used with seabios patch and KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347for seabios patches:
http://comments.gmane.org/gmane.comp.emulators.qemu/230460Chen Fan (10):
x86: moveapic_statefield from CPUX86State to X86CPU
apic: remove redundant variable 'apic_no' fromapic_init_common()
apic: removelocal_apicsarray and usingCPU_FOREACHinstead
x86: addx86_cpu_unrealizefn()for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interfacepc_hot_del_cpu()
piix4: implement functioncpu_status_write()for vcpu ejection
cpus: reclaim allocated vCPU objectscpu-exec.c | 2 +- cpus.c | 51 +++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++------ hw/i386/kvm/apic.c | 18 +++++++- hw/i386/kvmvapic.c | 8 ++-- hw/i386/pc.c | 51 ++++++++++++++++++----- hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 91 ++++++++++++++++++++++------------------- hw/intc/apic_common.c | 17 ++------ include/hw/boards.h | 2 + include/hw/i386/apic_internal.h | 6 +-- include/hw/i386/pc.h | 1 + include/qom/cpu.h | 20 +++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++ qapi-schema.json | 12 ++++++ qmp-commands.hx | 23 +++++++++++ qmp.c | 9 ++++ qom/cpu.c | 26 +++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 57 ++++++++++++++++++++------ target-i386/cpu.h | 4 -- target-i386/helper.c | 9 ++-- target-i386/kvm.c | 23 +++++------ target-i386/misc_helper.c | 8 ++-- 26 files changed, 403 insertions(+), 137 deletions(-)
Quoted 27 lines · On Wed, 04 Dec 2013 10:15:16 +0800 Chen Fan <[email protected]>…
Quoted 8 lines · Igor Mammedov
Quoted 4 lines · On Wed, 9 Oct 2013 17:43:08 +0800 Chen Fan <[email protected]> wrote:
Via implementing ACPI standard methods
_EJ0in bios, after Guest OS hot remove one vCPU, it is able to send a signal to QEMU, then QEMU could notify
the assigned vCPU of exiting. meanwhile, and intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself.Quoted 5 lines
have you tried following sequence:
cpu-add 1
cpu-add 2
cpu-del 1
and then do migration?Hi, Igor, Thanks for your test case. I had test the above sequence, when I add two vcpu, then delete the first one, I found command 'lscpu' show:
CPU(s): 1
On-line CPU(s) list: 0,2
off -line CPU(s) list:I know it is wrong, but I want to know which is expected to show, A or B?
A:
CPU(s): 2
On-line CPU(s) list: 0,2
off -line CPU(s) list:
Quoted 5 lines
B:
CPU(s): 2
On-line CPU(s) list: 0,1
off -line CPU(s) list:
if you deleted #1 CPU than A is correct.
There is certain thing that depend on cpu_index in QEMU code base, migration is one of them. It should break if for arbitrary CPU removal/addition is introduced.
Quoted 60 lines
Thanks,
ChenQuoted 55 lines
Quoted 54 lines
this work is based on Andreas Färber's qom-cpu branch tree.
git://github.com/afaerber/qemu-cpu.gitthis series patches must be used with seabios patch and KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347for seabios patches:
http://comments.gmane.org/gmane.comp.emulators.qemu/230460Chen Fan (10):
x86: moveapic_statefield from CPUX86State to X86CPU
apic: remove redundant variable 'apic_no' fromapic_init_common()
apic: removelocal_apicsarray and usingCPU_FOREACHinstead
x86: addx86_cpu_unrealizefn()for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interfacepc_hot_del_cpu()
piix4: implement functioncpu_status_write()for vcpu ejection
cpus: reclaim allocated vCPU objectscpu-exec.c | 2 +- cpus.c | 51 +++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++------ hw/i386/kvm/apic.c | 18 +++++++- hw/i386/kvmvapic.c | 8 ++-- hw/i386/pc.c | 51 ++++++++++++++++++----- hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 91 ++++++++++++++++++++++------------------- hw/intc/apic_common.c | 17 ++------ include/hw/boards.h | 2 + include/hw/i386/apic_internal.h | 6 +-- include/hw/i386/pc.h | 1 + include/qom/cpu.h | 20 +++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++ qapi-schema.json | 12 ++++++ qmp-commands.hx | 23 +++++++++++ qmp.c | 9 ++++ qom/cpu.c | 26 +++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 57 ++++++++++++++++++++------ target-i386/cpu.h | 4 -- target-i386/helper.c | 9 ++-- target-i386/kvm.c | 23 +++++------ target-i386/misc_helper.c | 8 ++-- 26 files changed, 403 insertions(+), 137 deletions(-)
Quoted 36 lines · Igor Mammedov
Quoted 27 lines · On Wed, 04 Dec 2013 10:15:16 +0800 Chen Fan <[email protected]>…
Quoted 8 lines · Igor Mammedov
Quoted 4 lines · On Wed, 9 Oct 2013 17:43:08 +0800 Chen Fan <[email protected]> wrote:
Via implementing ACPI standard methods
_EJ0in bios, after Guest OS hot remove one vCPU, it is able to send a signal to QEMU, then QEMU could notify
the assigned vCPU of exiting. meanwhile, and intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself.Quoted 5 lines
have you tried following sequence:
cpu-add 1
cpu-add 2
cpu-del 1
and then do migration?Hi, Igor, Thanks for your test case. I had test the above sequence, when I add two vcpu, then delete the first one, I found command 'lscpu' show:
CPU(s): 1
On-line CPU(s) list: 0,2
off -line CPU(s) list:I know it is wrong, but I want to know which is expected to show, A or B?
A:
CPU(s): 2
On-line CPU(s) list: 0,2
off -line CPU(s) list:Quoted 5 lines
B:
CPU(s): 2
On-line CPU(s) list: 0,1
off -line CPU(s) list:
Quoted 5 lines
if you deleted #1 CPU than A is correct.
There is certain thing that depend on
cpu_indexin QEMU code base, migration is one of them. It should break if for arbitrary CPU removal/addition is introduced.
Thanks for your explaining.
Chen
Quoted 61 lines
Quoted 60 lines
Thanks,
ChenQuoted 55 lines
Quoted 54 lines
this work is based on Andreas Färber's qom-cpu branch tree.
git://github.com/afaerber/qemu-cpu.gitthis series patches must be used with seabios patch and KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347for seabios patches:
http://comments.gmane.org/gmane.comp.emulators.qemu/230460Chen Fan (10):
x86: moveapic_statefield from CPUX86State to X86CPU
apic: remove redundant variable 'apic_no' fromapic_init_common()
apic: removelocal_apicsarray and usingCPU_FOREACHinstead
x86: addx86_cpu_unrealizefn()for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interfacepc_hot_del_cpu()
piix4: implement functioncpu_status_write()for vcpu ejection
cpus: reclaim allocated vCPU objectscpu-exec.c | 2 +- cpus.c | 51 +++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++------ hw/i386/kvm/apic.c | 18 +++++++- hw/i386/kvmvapic.c | 8 ++-- hw/i386/pc.c | 51 ++++++++++++++++++----- hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 91 ++++++++++++++++++++++------------------- hw/intc/apic_common.c | 17 ++------ include/hw/boards.h | 2 + include/hw/i386/apic_internal.h | 6 +-- include/hw/i386/pc.h | 1 + include/qom/cpu.h | 20 +++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++ qapi-schema.json | 12 ++++++ qmp-commands.hx | 23 +++++++++++ qmp.c | 9 ++++ qom/cpu.c | 26 +++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 57 ++++++++++++++++++++------ target-i386/cpu.h | 4 -- target-i386/helper.c | 9 ++-- target-i386/kvm.c | 23 +++++------ target-i386/misc_helper.c | 8 ++-- 26 files changed, 403 insertions(+), 137 deletions(-)
Quoted 8 lines · Igor Mammedov
Quoted 4 lines · On Wed, 9 Oct 2013 17:43:08 +0800 Chen Fan <[email protected]> wrote:
Via implementing ACPI standard methods
_EJ0in bios, after Guest OS hot remove one vCPU, it is able to send a signal to QEMU, then QEMU could notify
the assigned vCPU of exiting. meanwhile, and intruduce the QOM command 'cpu-del' to remove vCPU from QEMU itself.
Quoted 5 lines
have you tried following sequence:
cpu-add 1
cpu-add 2
cpu-del 1
and then do migration?
Hi, igor,
I have one question to confirm, After I started VM with -smp 1,
maxcpus=4, then did following sequence:
1) cpu-add id=2
2) migrate
on the destination side,
when I configured the VM with -smp 2, maxcpus=4, then migration failed. when I configured the VM with -smp 3, maxcpus=4, then the destination VM has three VCPU threads and could not add cpu 1. was this a bug? or how to do migration?
Thanks,
Chen
Quoted 54 lines
Quoted 53 lines
this work is based on Andreas Färber's qom-cpu branch tree.
git://github.com/afaerber/qemu-cpu.gitthis series patches must be used with seabios patch and KVM patch together.
for KVM patches:
http://comments.gmane.org/gmane.comp.emulators.kvm.devel/114347for seabios patches:
http://comments.gmane.org/gmane.comp.emulators.qemu/230460Chen Fan (10):
x86: moveapic_statefield from CPUX86State to X86CPU
apic: remove redundant variable 'apic_no' fromapic_init_common()
apic: removelocal_apicsarray and usingCPU_FOREACHinstead
x86: addx86_cpu_unrealizefn()for cpu apic remove
qmp: add 'cpu-del' command support
qom cpu: rename variable 'cpu_added_notifier' to
'cpu_hotplug_notifier'
qom cpu: add UNPLUG cpu notifier support
i386: implement pc interfacepc_hot_del_cpu()
piix4: implement functioncpu_status_write()for vcpu ejection
cpus: reclaim allocated vCPU objectscpu-exec.c | 2 +- cpus.c | 51 +++++++++++++++++++++-- hw/acpi/piix4.c | 66 ++++++++++++++++++++++++------ hw/i386/kvm/apic.c | 18 +++++++- hw/i386/kvmvapic.c | 8 ++-- hw/i386/pc.c | 51 ++++++++++++++++++----- hw/i386/pc_piix.c | 3 +- hw/intc/apic.c | 91 ++++++++++++++++++++++------------------- hw/intc/apic_common.c | 17 ++------ include/hw/boards.h | 2 + include/hw/i386/apic_internal.h | 6 +-- include/hw/i386/pc.h | 1 + include/qom/cpu.h | 20 +++++++++ include/sysemu/kvm.h | 1 + include/sysemu/sysemu.h | 2 +- kvm-all.c | 25 +++++++++++ qapi-schema.json | 12 ++++++ qmp-commands.hx | 23 +++++++++++ qmp.c | 9 ++++ qom/cpu.c | 26 +++++++++--- target-i386/cpu-qom.h | 5 +++ target-i386/cpu.c | 57 ++++++++++++++++++++------ target-i386/cpu.h | 4 -- target-i386/helper.c | 9 ++-- target-i386/kvm.c | 23 +++++------ target-i386/misc_helper.c | 8 ++-- 26 files changed, 403 insertions(+), 137 deletions(-)