[PATCH v2 2/5] target-i386/kvm: Hyper-V SynIC MSR's support
This patch does Hyper-V Synthetic interrupt controller(Hyper-V SynIC) MSR's support and migration. Hyper-V SynIC is enabled by cpu's 'hv-synic' option. This patch does not allow cpu creation if 'hv-synic' option specified but kernel doesn't support Hyper-V SynIC. Changes v2: * activate Hyper-V SynIC by enabling corresponding vcpu cap * reject cpu initialization if user requested Hyper-V SynIC but kernel does not support Hyper-V SynIC Signed-off-by: Andrey Smetanin Reviewed-by: Roman Kagan Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Richard Henderson CC: Eduardo Habkost CC: "Andreas Färber" CC: Marcelo Tosatti CC: Roman Kagan CC: Denis V. Lunev CC: kvm@vger.kernel.org --- target-i386/cpu-qom.h | 1 + target-i386/cpu.c | 1 + target-i386/cpu.h | 5 target-i386/kvm.c | 67 ++- target-i386/machine.c | 39 ++ 5 files changed, 112 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index e3bfe9d..7ea5b34 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -94,6 +94,7 @@ typedef struct X86CPU { bool hyperv_reset; bool hyperv_vpindex; bool hyperv_runtime; +bool hyperv_synic; bool check_cpuid; bool enforce_cpuid; bool expose_kvm; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e5f1c5b..1462e19 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3142,6 +3142,7 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false), DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false), DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false), +DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false), DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), diff --git a/target-i386/cpu.h b/target-i386/cpu.h index fc4a605..8cf33df 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -918,6 +918,11 @@ typedef struct CPUX86State { uint64_t msr_hv_tsc; uint64_t msr_hv_crash_params[HV_X64_MSR_CRASH_PARAMS]; uint64_t msr_hv_runtime; +uint64_t msr_hv_synic_control; +uint64_t msr_hv_synic_version; +uint64_t msr_hv_synic_evt_page; +uint64_t msr_hv_synic_msg_page; +uint64_t msr_hv_synic_sint[HV_SYNIC_SINT_COUNT]; /* exception/interrupt handling */ int error_code; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 2a9953b..cfcd01d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -86,6 +86,7 @@ static bool has_msr_hv_crash; static bool has_msr_hv_reset; static bool has_msr_hv_vpindex; static bool has_msr_hv_runtime; +static bool has_msr_hv_synic; static bool has_msr_mtrr; static bool has_msr_xss; @@ -521,7 +522,8 @@ static bool hyperv_enabled(X86CPU *cpu) cpu->hyperv_crash || cpu->hyperv_reset || cpu->hyperv_vpindex || -cpu->hyperv_runtime); +cpu->hyperv_runtime || +cpu->hyperv_synic); } static Error *invtsc_mig_blocker; @@ -610,6 +612,14 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cpu->hyperv_runtime && has_msr_hv_runtime) { c->eax |= HV_X64_MSR_VP_RUNTIME_AVAILABLE; } +if (cpu->hyperv_synic) { +if (!has_msr_hv_synic || +kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC, 0)) { +fprintf(stderr, "Hyper-V SynIC is not supported by kernel\n"); +return -ENOSYS; +} +c->eax |= HV_X64_MSR_SYNIC_AVAILABLE; +} c = &cpuid_data.entries[cpuid_i++]; c->function = HYPERV_CPUID_ENLIGHTMENT_INFO; if (cpu->hyperv_relaxed_timing) { @@ -950,6 +960,10 @@ static int kvm_get_supported_msrs(KVMState *s) has_msr_hv_runtime = true; continue; } +if (kvm_msr_list->indices[i] == HV_X64_MSR_SCONTROL) { +has_msr_hv_synic = true; +continue; +} } } @@ -1511,6 +1525,31 @@ static int kvm_put_msrs(X86CPU *cpu, int level) kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_VP_RUNTIME, env->msr_hv_runtime); } +if (cpu->hyperv_synic) { +int j; + +if (!env->msr_hv_synic_version) { +/* First time initialization */ +env->msr_hv_synic_version = HV_SYNIC_VERSION_1; +for (j = 0; j < ARRAY_SIZE(env->msr_hv_synic_sint); j++) { +env->msr_hv_synic_sint[j] = HV_SYNIC_SINT_MASKED; +} +} + +kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_SCONTROL, + env->msr_hv_synic_control); +kvm_msr_entry_set(&msrs[n++], HV_X64_M
Re: [PATCH v2 2/5] target-i386/kvm: Hyper-V SynIC MSR's support
On 10/11/2015 13:52, Andrey Smetanin wrote: > This patch does Hyper-V Synthetic interrupt > controller(Hyper-V SynIC) MSR's support and > migration. Hyper-V SynIC is enabled by cpu's > 'hv-synic' option. > > This patch does not allow cpu creation if > 'hv-synic' option specified but kernel > doesn't support Hyper-V SynIC. > > Changes v2: > * activate Hyper-V SynIC by enabling corresponding vcpu cap > * reject cpu initialization if user requested Hyper-V SynIC > but kernel does not support Hyper-V SynIC > > Signed-off-by: Andrey Smetanin > Reviewed-by: Roman Kagan > Signed-off-by: Denis V. Lunev > CC: Paolo Bonzini > CC: Richard Henderson > CC: Eduardo Habkost > CC: "Andreas Färber" > CC: Marcelo Tosatti > CC: Roman Kagan > CC: Denis V. Lunev > CC: kvm@vger.kernel.org > > --- > target-i386/cpu-qom.h | 1 + > target-i386/cpu.c | 1 + > target-i386/cpu.h | 5 > target-i386/kvm.c | 67 > ++- > target-i386/machine.c | 39 ++ > 5 files changed, 112 insertions(+), 1 deletion(-) > > diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h > index e3bfe9d..7ea5b34 100644 > --- a/target-i386/cpu-qom.h > +++ b/target-i386/cpu-qom.h > @@ -94,6 +94,7 @@ typedef struct X86CPU { > bool hyperv_reset; > bool hyperv_vpindex; > bool hyperv_runtime; > +bool hyperv_synic; > bool check_cpuid; > bool enforce_cpuid; > bool expose_kvm; > diff --git a/target-i386/cpu.c b/target-i386/cpu.c > index e5f1c5b..1462e19 100644 > --- a/target-i386/cpu.c > +++ b/target-i386/cpu.c > @@ -3142,6 +3142,7 @@ static Property x86_cpu_properties[] = { > DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false), > DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false), > DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false), > +DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false), > DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), > DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), > DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), > diff --git a/target-i386/cpu.h b/target-i386/cpu.h > index fc4a605..8cf33df 100644 > --- a/target-i386/cpu.h > +++ b/target-i386/cpu.h > @@ -918,6 +918,11 @@ typedef struct CPUX86State { > uint64_t msr_hv_tsc; > uint64_t msr_hv_crash_params[HV_X64_MSR_CRASH_PARAMS]; > uint64_t msr_hv_runtime; > +uint64_t msr_hv_synic_control; > +uint64_t msr_hv_synic_version; > +uint64_t msr_hv_synic_evt_page; > +uint64_t msr_hv_synic_msg_page; > +uint64_t msr_hv_synic_sint[HV_SYNIC_SINT_COUNT]; > > /* exception/interrupt handling */ > int error_code; > diff --git a/target-i386/kvm.c b/target-i386/kvm.c > index 2a9953b..cfcd01d 100644 > --- a/target-i386/kvm.c > +++ b/target-i386/kvm.c > @@ -86,6 +86,7 @@ static bool has_msr_hv_crash; > static bool has_msr_hv_reset; > static bool has_msr_hv_vpindex; > static bool has_msr_hv_runtime; > +static bool has_msr_hv_synic; > static bool has_msr_mtrr; > static bool has_msr_xss; > > @@ -521,7 +522,8 @@ static bool hyperv_enabled(X86CPU *cpu) > cpu->hyperv_crash || > cpu->hyperv_reset || > cpu->hyperv_vpindex || > -cpu->hyperv_runtime); > +cpu->hyperv_runtime || > +cpu->hyperv_synic); > } > > static Error *invtsc_mig_blocker; > @@ -610,6 +612,14 @@ int kvm_arch_init_vcpu(CPUState *cs) > if (cpu->hyperv_runtime && has_msr_hv_runtime) { > c->eax |= HV_X64_MSR_VP_RUNTIME_AVAILABLE; > } > +if (cpu->hyperv_synic) { > +if (!has_msr_hv_synic || > +kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC, 0)) { > +fprintf(stderr, "Hyper-V SynIC is not supported by > kernel\n"); > +return -ENOSYS; > +} > +c->eax |= HV_X64_MSR_SYNIC_AVAILABLE; > +} > c = &cpuid_data.entries[cpuid_i++]; > c->function = HYPERV_CPUID_ENLIGHTMENT_INFO; > if (cpu->hyperv_relaxed_timing) { > @@ -950,6 +960,10 @@ static int kvm_get_supported_msrs(KVMState *s) > has_msr_hv_runtime = true; > continue; > } > +if (kvm_msr_list->indices[i] == HV_X64_MSR_SCONTROL) { > +has_msr_hv_synic = true; > +continue; > +} > } > } > > @@ -1511,6 +1525,31 @@ static int kvm_put_msrs(X86CPU *cpu, int level) > kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_VP_RUNTIME, >env->msr_hv_runtime); > } > +if (cpu->hyperv_synic) { > +int j; > + > +if (!env->msr_hv_synic_version) { > +/* First time initialization */ > +env->msr_hv_synic_version = HV_SYNIC_VERSION_1; > +for (j = 0; j < ARRAY_
Re: [PATCH v2 2/5] target-i386/kvm: Hyper-V SynIC MSR's support
On 11/10/2015 04:14 PM, Paolo Bonzini wrote: On 10/11/2015 13:52, Andrey Smetanin wrote: This patch does Hyper-V Synthetic interrupt controller(Hyper-V SynIC) MSR's support and migration. Hyper-V SynIC is enabled by cpu's 'hv-synic' option. This patch does not allow cpu creation if 'hv-synic' option specified but kernel doesn't support Hyper-V SynIC. Changes v2: * activate Hyper-V SynIC by enabling corresponding vcpu cap * reject cpu initialization if user requested Hyper-V SynIC but kernel does not support Hyper-V SynIC Signed-off-by: Andrey Smetanin Reviewed-by: Roman Kagan Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Richard Henderson CC: Eduardo Habkost CC: "Andreas Färber" CC: Marcelo Tosatti CC: Roman Kagan CC: Denis V. Lunev CC: kvm@vger.kernel.org --- target-i386/cpu-qom.h | 1 + target-i386/cpu.c | 1 + target-i386/cpu.h | 5 target-i386/kvm.c | 67 ++- target-i386/machine.c | 39 ++ 5 files changed, 112 insertions(+), 1 deletion(-) diff --git a/target-i386/cpu-qom.h b/target-i386/cpu-qom.h index e3bfe9d..7ea5b34 100644 --- a/target-i386/cpu-qom.h +++ b/target-i386/cpu-qom.h @@ -94,6 +94,7 @@ typedef struct X86CPU { bool hyperv_reset; bool hyperv_vpindex; bool hyperv_runtime; +bool hyperv_synic; bool check_cpuid; bool enforce_cpuid; bool expose_kvm; diff --git a/target-i386/cpu.c b/target-i386/cpu.c index e5f1c5b..1462e19 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -3142,6 +3142,7 @@ static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("hv-reset", X86CPU, hyperv_reset, false), DEFINE_PROP_BOOL("hv-vpindex", X86CPU, hyperv_vpindex, false), DEFINE_PROP_BOOL("hv-runtime", X86CPU, hyperv_runtime, false), +DEFINE_PROP_BOOL("hv-synic", X86CPU, hyperv_synic, false), DEFINE_PROP_BOOL("check", X86CPU, check_cpuid, true), DEFINE_PROP_BOOL("enforce", X86CPU, enforce_cpuid, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), diff --git a/target-i386/cpu.h b/target-i386/cpu.h index fc4a605..8cf33df 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -918,6 +918,11 @@ typedef struct CPUX86State { uint64_t msr_hv_tsc; uint64_t msr_hv_crash_params[HV_X64_MSR_CRASH_PARAMS]; uint64_t msr_hv_runtime; +uint64_t msr_hv_synic_control; +uint64_t msr_hv_synic_version; +uint64_t msr_hv_synic_evt_page; +uint64_t msr_hv_synic_msg_page; +uint64_t msr_hv_synic_sint[HV_SYNIC_SINT_COUNT]; /* exception/interrupt handling */ int error_code; diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 2a9953b..cfcd01d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -86,6 +86,7 @@ static bool has_msr_hv_crash; static bool has_msr_hv_reset; static bool has_msr_hv_vpindex; static bool has_msr_hv_runtime; +static bool has_msr_hv_synic; static bool has_msr_mtrr; static bool has_msr_xss; @@ -521,7 +522,8 @@ static bool hyperv_enabled(X86CPU *cpu) cpu->hyperv_crash || cpu->hyperv_reset || cpu->hyperv_vpindex || -cpu->hyperv_runtime); +cpu->hyperv_runtime || +cpu->hyperv_synic); } static Error *invtsc_mig_blocker; @@ -610,6 +612,14 @@ int kvm_arch_init_vcpu(CPUState *cs) if (cpu->hyperv_runtime && has_msr_hv_runtime) { c->eax |= HV_X64_MSR_VP_RUNTIME_AVAILABLE; } +if (cpu->hyperv_synic) { +if (!has_msr_hv_synic || +kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_SYNIC, 0)) { +fprintf(stderr, "Hyper-V SynIC is not supported by kernel\n"); +return -ENOSYS; +} +c->eax |= HV_X64_MSR_SYNIC_AVAILABLE; +} c = &cpuid_data.entries[cpuid_i++]; c->function = HYPERV_CPUID_ENLIGHTMENT_INFO; if (cpu->hyperv_relaxed_timing) { @@ -950,6 +960,10 @@ static int kvm_get_supported_msrs(KVMState *s) has_msr_hv_runtime = true; continue; } +if (kvm_msr_list->indices[i] == HV_X64_MSR_SCONTROL) { +has_msr_hv_synic = true; +continue; +} } } @@ -1511,6 +1525,31 @@ static int kvm_put_msrs(X86CPU *cpu, int level) kvm_msr_entry_set(&msrs[n++], HV_X64_MSR_VP_RUNTIME, env->msr_hv_runtime); } +if (cpu->hyperv_synic) { +int j; + +if (!env->msr_hv_synic_version) { +/* First time initialization */ +env->msr_hv_synic_version = HV_SYNIC_VERSION_1; +for (j = 0; j < ARRAY_SIZE(env->msr_hv_synic_sint); j++) { +env->msr_hv_synic_sint[j] = HV_SYNIC_SINT_MASKED; +} +} I would prefer to put this in kvm_
Re: [PATCH v2 2/5] target-i386/kvm: Hyper-V SynIC MSR's support
On 11/11/2015 10:09, Andrey Smetanin wrote: >> >> I would prefer to put this in kvm_arch_init_vcpu, if possible. >> > Ok. I think the kvm_arch_init_vcpu() is called after migration restores > cpu->env->msr_hv_synic_* values, so unconditional initialization of > cpu->env->msr_hv_synic_* values can overwrite migrated values. The check > "if (!env->msr_hv_synic_version) {" is neccessary for first time > initialization to protect against such overwriting. This is why this > code migrates 'msr_hv_synic_version' value. No, kvm_arch_init_vcpu is called at the very beginning, when the VCPU thread is created. main -> machine_class->init -> pc_init1 -> pc_cpus_init -> pc_new_cpu -> cpu_x86_create -> object_property_set_bool -> x86_cpu_realizefn -> qemu_init_vcpu -> qemu_kvm_start_vcpu -> qemu_kvm_cpu_thread_fn (in new thread) -> kvm_init_vcpu -> kvm_arch_init_vcpu This is long before qemu_start_incoming_migration, which is among the last things done before calling main_loop Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/5] target-i386/kvm: Hyper-V SynIC MSR's support
On 11/11/2015 12:17 PM, Paolo Bonzini wrote: On 11/11/2015 10:09, Andrey Smetanin wrote: I would prefer to put this in kvm_arch_init_vcpu, if possible. Ok. I think the kvm_arch_init_vcpu() is called after migration restores cpu->env->msr_hv_synic_* values, so unconditional initialization of cpu->env->msr_hv_synic_* values can overwrite migrated values. The check "if (!env->msr_hv_synic_version) {" is neccessary for first time initialization to protect against such overwriting. This is why this code migrates 'msr_hv_synic_version' value. No, kvm_arch_init_vcpu is called at the very beginning, when the VCPU thread is created. main -> machine_class->init -> pc_init1 -> pc_cpus_init -> pc_new_cpu -> cpu_x86_create -> object_property_set_bool -> x86_cpu_realizefn -> qemu_init_vcpu -> qemu_kvm_start_vcpu -> qemu_kvm_cpu_thread_fn (in new thread) -> kvm_init_vcpu -> kvm_arch_init_vcpu This is long before qemu_start_incoming_migration, which is among the last things done before calling main_loop In this case I'll remove migration of msr_hv_synic_version and make first time initialization inside kvm_arch_init_vcpu() - inside section where SynIC availability cpuid bit is set. Thank you for clarification. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 2/5] target-i386/kvm: Hyper-V SynIC MSR's support
On 11/11/2015 10:25, Andrey Smetanin wrote: > In this case I'll remove migration of msr_hv_synic_version and make > first time initialization inside kvm_arch_init_vcpu() - inside section > where SynIC availability cpuid bit is set. Thanks! Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html