Small cpu loop cleanups
cover Small cpu loop cleanups
Also fix "info cpus" to show correct halt status with in kernel irq chip.
I removed patch that uses on_vcpu() for init/sipi handling for now.
Gleb Natapov (8):
env->kvm_cpu_state.init is always zero here.
Do not use env->halted to decide where halted state should be
handled.
Call kvm_arch_load_regs() instead of kvm_load_registers() Rename kvm_(load|save)_mpstate to kvm_arch_(load|save)_mpstate Retrieve mp state info in cpu_synchronize_state() env->exception_index is not used by kvm code. s->cpu_env cannot be zero here.
env->exit_request is not used by kvm.
hw/apic.c | 6 ++---- qemu-kvm-ia64.c | 6 ++---- qemu-kvm-x86.c | 9 +++------ qemu-kvm.c | 39 +++++++++++++++++++++++++++++++-------- qemu-kvm.h | 4 ++++ target-i386/machine.c | 6 +++--- target-ia64/machine.c | 4 ++-- vl.c | 1 - 8 files changed, 47 insertions(+), 28 deletions(-)
PATCH 1/8 env->kvm_cpu_state.init is always zero here.
--- qemu-kvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
qemu-kvm.c +1 -1
@@ -412,7 +412,7 @@ static int kvm_main_loop_cpu(CPUState *env)if (env->kvm_cpu_state.sipi_needed)update_regs_for_sipi (env); } -if (!env->halted && !env->kvm_cpu_state.init) +if (!env->halted)kvm_cpu_exec (env); env->exit_request =0 ; env->exception_index =EXCP_INTERRUPT ;
Signature · 1 line
1.6.2.1
PATCH 2/8 Do not use env->halted to decide where halted state should be handled.
In reply to Gleb NatapovUse kvm_irqchip_in_kernel() for that. If irq chip is not handled by userspace kernel should be entered even when CPU is halted.
--- hw/apic.c | 3 +-- qemu-kvm.c | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-)
hw/apic.c +1 -2
@@ -467,8 +467,7 @@ static void apic_init_ipi(APICState *s)cpu_reset (s->cpu_env); -if (!(s->apicbase &MSR_IA32_APICBASE_BSP ) && - (!kvm_enabled () || !qemu_kvm_irqchip_in_kernel ())) +if (!(s->apicbase &MSR_IA32_APICBASE_BSP )) s->cpu_env->halted =1 ;if (kvm_enabled () && !qemu_kvm_irqchip_in_kernel ())
qemu-kvm.c +3 -3
@@ -217,6 +217,8 @@ static int has_work(CPUState *env) {if (!vm_running || (env && env->kvm_cpu_state.stopped))return 0 ; +if (kvm_irqchip_in_kernel (kvm_context)) +return 1 ;if (!env->halted)return 1 ;return kvm_arch_has_work (env);
@@ -390,8 +392,6 @@ static int kvm_main_loop_cpu(CPUState *env)setup_kernel_sigmask (env);pthread_mutex_lock (&qemu_mutex); -if (kvm_irqchip_in_kernel (kvm_context)) - env->halted =0 ;kvm_qemu_init_env (env);#ifdef TARGET_I386
@@ -412,7 +412,7 @@ static int kvm_main_loop_cpu(CPUState *env)if (env->kvm_cpu_state.sipi_needed)update_regs_for_sipi (env); } -if (!env->halted) +if (!env->halted ||kvm_irqchip_in_kernel (kvm_context))kvm_cpu_exec (env); env->exit_request =0 ; env->exception_index =EXCP_INTERRUPT ;
Signature · 1 line
1.6.2.1
PATCH 3/8 Call kvm_arch_load_regs() instead of kvm_load_registers()
In reply to Gleb NatapovThe call is done from vcpu thread.
--- qemu-kvm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
qemu-kvm.c +1 -1
@@ -399,7 +399,7 @@ static int kvm_main_loop_cpu(CPUState *env)#endif cpu_single_env = env; -kvm_load_registers (env); +kvm_arch_load_regs (env);while (1 ) {while (!has_work (env))
Signature · 1 line
1.6.2.1
PATCH 4/8 Rename kvm_(load|save)_mpstate to kvm_arch_(load|save)_mpstate
In reply to Gleb NatapovTo be consistent with other function naming.
--- qemu-kvm-ia64.c | 4 ++-- qemu-kvm-x86.c | 4 ++-- qemu-kvm.h | 2 ++ target-i386/machine.c | 6 +++--- target-ia64/machine.c | 4 ++-- 5 files changed, 11 insertions(+), 9 deletions(-)
qemu-kvm-ia64.c +2 -2
@@ -98,7 +98,7 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) { } -void kvm_save_mpstate (CPUState *env) +void kvm_arch_save_mpstate (CPUState *env) {#ifdef KVM_CAP_MP_STATE int r;
@@ -112,7 +112,7 @@ void kvm_save_mpstate(CPUState *env)#endif } -void kvm_load_mpstate (CPUState *env) +void kvm_arch_load_mpstate (CPUState *env) {#ifdef KVM_CAP_MP_STATE struct kvm_mp_state mp_state = { .mp_state = env->mp_state };
qemu-kvm-x86.c +2 -2
@@ -295,7 +295,7 @@ void kvm_load_tsc(CPUState *env)perror ("kvm_set_tsc FAILED.\n" ); } -void kvm_save_mpstate (CPUState *env) +void kvm_arch_save_mpstate (CPUState *env) {#ifdef KVM_CAP_MP_STATE int r;
@@ -309,7 +309,7 @@ void kvm_save_mpstate(CPUState *env)#endif } -void kvm_load_mpstate (CPUState *env) +void kvm_arch_load_mpstate (CPUState *env) {#ifdef KVM_CAP_MP_STATE struct kvm_mp_state mp_state = { .mp_state = env->mp_state };
qemu-kvm.h +2 -0
@@ -69,6 +69,8 @@ int kvm_arch_qemu_create_context(void);void kvm_arch_save_regs (CPUState *env);void kvm_arch_load_regs (CPUState *env); +void kvm_arch_load_mpstate (CPUState *env); +void kvm_arch_save_mpstate (CPUState *env);int kvm_arch_qemu_init_env (CPUState *cenv);void kvm_arch_pre_kvm_run (void *opaque,CPUState *env);void kvm_arch_post_kvm_run (void *opaque,CPUState *env);
target-i386/machine.c +3 -3
@@ -34,7 +34,7 @@ void cpu_save(QEMUFile *f, void *opaque)if (kvm_enabled ()) {kvm_save_registers (env); -kvm_save_mpstate (env); +kvm_arch_save_mpstate (env); }for (i =0 ; i <CPU_NB_REGS ; i++)
@@ -369,12 +369,12 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)kvm_load_tsc (env);if (version_id >=5 ) {qemu_get_be32s (f, &env->mp_state); -kvm_load_mpstate (env); +kvm_arch_load_mpstate (env); } }else {kvm_load_registers (env);kvm_load_tsc (env); -kvm_load_mpstate (env); +kvm_arch_load_mpstate (env); } }return 0 ;
target-ia64/machine.c +2 -2
@@ -10,7 +10,7 @@ void cpu_save(QEMUFile *f, void *opaque)if (kvm_enabled ()) {kvm_save_registers (env); -kvm_save_mpstate (env); +kvm_arch_save_mpstate (env); } }
@@ -20,7 +20,7 @@ int cpu_load(QEMUFile *f, void *opaque, int version_id)if (kvm_enabled ()) {kvm_load_registers (env); -kvm_load_mpstate (env); +kvm_arch_load_mpstate (env); }return 0 ; }
Signature · 1 line
1.6.2.1
PATCH 5/8 Retrieve mp state info in cpu_synchronize_state()
In reply to Gleb NatapovAnd set env->halted based on the value to show accurate vcpu state in QEMU monitor.
--- qemu-kvm.c | 27 +++++++++++++++++++++++++++ qemu-kvm.h | 2 ++ 2 files changed, 29 insertions(+), 0 deletions(-)
qemu-kvm.c +27 -0
@@ -200,6 +200,33 @@ void kvm_save_registers(CPUState *env)on_vcpu (env, kvm_do_save_registers, env); } +static void kvm_do_load_mpstate (void *_env) +{ +CPUState *env = _env; + +kvm_arch_load_mpstate (env); +} + +void kvm_load_mpstate (CPUState *env) +{ +if (kvm_enabled () && qemu_system_ready) +on_vcpu (env, kvm_do_load_mpstate, env); +} + +static void kvm_do_save_mpstate (void *_env) +{ +CPUState *env = _env; + +kvm_arch_save_mpstate (env); + env->halted = (env->mp_state ==KVM_MP_STATE_HALTED ); +} + +void kvm_save_mpstate (CPUState *env) +{ +if (kvm_enabled ()) +on_vcpu (env, kvm_do_save_mpstate, env); +} +int kvm_cpu_exec (CPUState *env) {int r;
qemu-kvm.h +2 -0
@@ -221,11 +221,13 @@ static inline int kvm_sync_vcpus(void) { return 0; }static inline void kvm_arch_get_registers (CPUState *env) {kvm_save_registers (env); +kvm_save_mpstate (env); }static inline void kvm_arch_put_registers (CPUState *env) {kvm_load_registers (env); +kvm_load_mpstate (env); }static inline void cpu_synchronize_state (CPUState *env,int modified)
Signature · 1 line
1.6.2.1
PATCH 6/8 env->exception_index is not used by kvm code.
In reply to Gleb Natapov--- qemu-kvm-ia64.c | 2 -- qemu-kvm-x86.c | 2 -- qemu-kvm.c | 1 - 3 files changed, 0 insertions(+), 5 deletions(-)
qemu-kvm-ia64.c +0 -2
@@ -35,7 +35,6 @@ int kvm_arch_halt(void *opaque, kvm_vcpu_context_t vcpu) {CPUState *env = cpu_single_env; env->hflags |=HF_HALTED_MASK ; - env->exception_index =EXCP_HLT ;return 1 ; }
@@ -135,7 +134,6 @@ void kvm_arch_cpu_reset(CPUState *env) }else { env->interrupt_request &= ~CPU_INTERRUPT_HARD ; env->halted =1 ; - env->exception_index =EXCP_HLT ; } }
qemu-kvm-x86.c +0 -2
@@ -611,7 +611,6 @@ int kvm_arch_halt(void *opaque, kvm_vcpu_context_t vcpu) (env->eflags & IF_MASK)) && !(env->interrupt_request & CPU_INTERRUPT_NMI)) { env->halted =1 ; - env->exception_index =EXCP_HLT ; }return 1 ; }
@@ -707,7 +706,6 @@ void kvm_arch_cpu_reset(CPUState *env) }else { env->interrupt_request &= ~CPU_INTERRUPT_HARD ; env->halted =1 ; - env->exception_index =EXCP_HLT ; } } }
qemu-kvm.c +0 -1
@@ -442,7 +442,6 @@ static int kvm_main_loop_cpu(CPUState *env)if (!env->halted ||kvm_irqchip_in_kernel (kvm_context))kvm_cpu_exec (env); env->exit_request =0 ; - env->exception_index =EXCP_INTERRUPT ;kvm_main_loop_wait (env,0 ); }pthread_mutex_unlock (&qemu_mutex);
Signature · 1 line
1.6.2.1
PATCH 7/8 s->cpu_env cannot be zero here.
In reply to Gleb NatapovRemove redundant check.
--- hw/apic.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
hw/apic.c +1 -2
@@ -471,8 +471,7 @@ static void apic_init_ipi(APICState *s) s->cpu_env->halted =1 ;if (kvm_enabled () && !qemu_kvm_irqchip_in_kernel ()) -if (s->cpu_env) -kvm_apic_init (s->cpu_env); +kvm_apic_init (s->cpu_env); }/* send a SIPI message to the CPU to start it */
Signature · 1 line
1.6.2.1
PATCH 8/8 env->exit_request is not used by kvm.
In reply to Gleb NatapovRemove its use from kvm code.
--- qemu-kvm-x86.c | 3 +-- qemu-kvm.c | 3 --- vl.c | 1 - 3 files changed, 1 insertions(+), 6 deletions(-)
qemu-kvm-x86.c +1 -2
@@ -634,8 +634,7 @@ void kvm_arch_post_kvm_run(void *opaque, CPUState *env)int kvm_arch_has_work (CPUState *env) { -if (env->exit_request || - ((env->interrupt_request &CPU_INTERRUPT_HARD ) && +if (((env->interrupt_request &CPU_INTERRUPT_HARD ) && (env->eflags &IF_MASK )) || (env->interrupt_request &CPU_INTERRUPT_NMI ))return 1 ;
qemu-kvm.c +0 -3
@@ -168,8 +168,6 @@ static int kvm_pre_run(void *opaque, void *data)kvm_arch_pre_kvm_run (opaque, env); -if (env->exit_request) -return 1 ;pthread_mutex_unlock (&qemu_mutex);return 0 ; }
@@ -441,7 +439,6 @@ static int kvm_main_loop_cpu(CPUState *env) }if (!env->halted ||kvm_irqchip_in_kernel (kvm_context))kvm_cpu_exec (env); - env->exit_request =0 ;kvm_main_loop_wait (env,0 ); }pthread_mutex_unlock (&qemu_mutex);
vl.c +0 -1
@@ -3724,7 +3724,6 @@ void qemu_system_reset_request(void) }if (cpu_single_env) {qemu_kvm_cpu_stop (cpu_single_env); -cpu_exit (cpu_single_env); }qemu_notify_event (); }
Signature · 1 line
1.6.2.1
Avi Kivity
AppliedQuoted 2 lines · Gleb Natapov
Also fix "info cpus" to show correct halt status with in kernel irq chip.
Applied all, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function