[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RFC 06/22] i386: move hyperv_limits initialization to x86_cpu_rea
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH RFC 06/22] i386: move hyperv_limits initialization to x86_cpu_realizefn() |
Date: |
Fri, 4 Sep 2020 16:54:15 +0200 |
As a preparation to expanding Hyper-V CPU features early, move
hyperv_limits initialization to x86_cpu_realizefn().
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/cpu.c | 5 +++++
target/i386/cpu.h | 1 +
target/i386/kvm.c | 13 ++++++++++++-
3 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index e605399eb8c0..ef3c672cf415 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6648,6 +6648,11 @@ static void x86_cpu_realizefn(DeviceState *dev, Error
**errp)
cpu->hyperv_version_id[0] = 0x00001bbc;
cpu->hyperv_version_id[1] = 0x00060001;
+ /* Hypervisor implementation limits */
+ cpu->hyperv_limits[0] = 64;
+ cpu->hyperv_limits[1] = 0;
+ cpu->hyperv_limits[2] = 0;
+
if (cpu->ucode_rev == 0) {
/* The default is the same as KVM's. */
if (IS_AMD_CPU(env)) {
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 2630ffd2d4b2..095d0bf75493 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -1662,6 +1662,7 @@ struct X86CPU {
uint32_t hyperv_vendor_id[3];
uint32_t hyperv_interface_id[4];
uint32_t hyperv_version_id[4];
+ uint32_t hyperv_limits[3];
bool check_cpuid;
bool enforce_cpuid;
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
index 169bae2779a4..720c30e9df17 100644
--- a/target/i386/kvm.c
+++ b/target/i386/kvm.c
@@ -1253,6 +1253,15 @@ static int hyperv_handle_properties(CPUState *cs,
env->features[FEAT_HYPERV_EBX] = c->ebx;
env->features[FEAT_HYPERV_EDX] = c->eax;
}
+
+ c = cpuid_find_entry(cpuid, HV_CPUID_IMPLEMENT_LIMITS, 0);
+ if (c) {
+ cpu->hv_max_vps = c->eax;
+ cpu->hyperv_limits[0] = c->ebx;
+ cpu->hyperv_limits[1] = c->ecx;
+ cpu->hyperv_limits[2] = c->edx;
+ }
+
c = cpuid_find_entry(cpuid, HV_CPUID_ENLIGHTMENT_INFO, 0);
if (c) {
env->features[FEAT_HV_RECOMM_EAX] = c->eax;
@@ -1355,7 +1364,9 @@ static int hyperv_handle_properties(CPUState *cs,
c = &cpuid_ent[cpuid_i++];
c->function = HV_CPUID_IMPLEMENT_LIMITS;
c->eax = cpu->hv_max_vps;
- c->ebx = 0x40;
+ c->ebx = cpu->hyperv_limits[0];
+ c->ecx = cpu->hyperv_limits[1];
+ c->edx = cpu->hyperv_limits[2];
if (hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS)) {
__u32 function;
--
2.25.4
- [PATCH RFC 00/22] i386: KVM: expand Hyper-V features early, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 14/22] i386: move eVMCS enablement to hyperv_init_vcpu(), Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 01/22] WIP: update linux/headers, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 03/22] i386: move hyperv_vendor_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 04/22] i386: move hyperv_interface_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 06/22] i386: move hyperv_limits initialization to x86_cpu_realizefn(),
Vitaly Kuznetsov <=
- [PATCH RFC 07/22] i386: fill in FEAT_HYPERV_EDX from edx instead of eax, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 11/22] i386: add reserved FEAT_HV_NESTED_EBX/ECX/EDX CPUID leaves, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 08/22] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 02/22] i386: drop x86_cpu_get_supported_feature_word() forward declaration, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 10/22] i386: add reserved FEAT_HV_RECOMM_ECX/FEAT_HV_RECOMM_EDX CPUID leaves, Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 05/22] i386: move hyperv_version_id initialization to x86_cpu_realizefn(), Vitaly Kuznetsov, 2020/09/04
- [PATCH RFC 09/22] i386: add reserved FEAT_HYPERV_ECX CPUID leaf, Vitaly Kuznetsov, 2020/09/04