[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/24] i386: move eVMCS enablement to hyperv_init_vcpu()
From: |
Eduardo Habkost |
Subject: |
[PULL 17/24] i386: move eVMCS enablement to hyperv_init_vcpu() |
Date: |
Tue, 1 Jun 2021 14:10:07 -0400 |
From: Vitaly Kuznetsov <vkuznets@redhat.com>
hyperv_expand_features() will be called before we create vCPU so
evmcs enablement should go away. hyperv_init_vcpu() looks like the
right place.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20210422161130.652779-11-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/kvm/kvm.c | 60 ++++++++++++++++++++++++++-----------------
1 file changed, 37 insertions(+), 23 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 10c836a2bf1..57282246c64 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -963,6 +963,7 @@ static struct kvm_cpuid2 *get_supported_hv_cpuid(CPUState
*cs)
{
struct kvm_cpuid2 *cpuid;
int max = 7; /* 0x40000000..0x40000005, 0x4000000A */
+ int i;
/*
* When the buffer is too small, KVM_GET_SUPPORTED_HV_CPUID fails with
@@ -972,6 +973,22 @@ static struct kvm_cpuid2 *get_supported_hv_cpuid(CPUState
*cs)
while ((cpuid = try_get_hv_cpuid(cs, max)) == NULL) {
max++;
}
+
+ /*
+ * KVM_GET_SUPPORTED_HV_CPUID does not set EVMCS CPUID bit before
+ * KVM_CAP_HYPERV_ENLIGHTENED_VMCS is enabled but we want to get the
+ * information early, just check for the capability and set the bit
+ * manually.
+ */
+ if (kvm_check_extension(cs->kvm_state,
+ KVM_CAP_HYPERV_ENLIGHTENED_VMCS) > 0) {
+ for (i = 0; i < cpuid->nent; i++) {
+ if (cpuid->entries[i].function == HV_CPUID_ENLIGHTMENT_INFO) {
+ cpuid->entries[i].eax |= HV_ENLIGHTENED_VMCS_RECOMMENDED;
+ }
+ }
+ }
+
return cpuid;
}
@@ -1201,24 +1218,6 @@ static int hyperv_expand_features(CPUState *cs)
if (!hyperv_enabled(cpu))
return 0;
- if (hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS) ||
- cpu->hyperv_passthrough) {
- uint16_t evmcs_version;
-
- r = kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_ENLIGHTENED_VMCS, 0,
- (uintptr_t)&evmcs_version);
-
- if (hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS) && r) {
- fprintf(stderr, "Hyper-V %s is not supported by kernel\n",
- kvm_hyperv_properties[HYPERV_FEAT_EVMCS].desc);
- return -ENOSYS;
- }
-
- if (!r) {
- cpu->hyperv_nested[0] = evmcs_version;
- }
- }
-
if (cpu->hyperv_passthrough) {
cpu->hyperv_vendor_id[0] =
hv_cpuid_get_host(cs, HV_CPUID_VENDOR_AND_MAX_FUNCTIONS, R_EBX);
@@ -1456,6 +1455,21 @@ static int hyperv_init_vcpu(X86CPU *cpu)
}
}
+ if (hyperv_feat_enabled(cpu, HYPERV_FEAT_EVMCS)) {
+ uint16_t evmcs_version;
+
+ ret = kvm_vcpu_enable_cap(cs, KVM_CAP_HYPERV_ENLIGHTENED_VMCS, 0,
+ (uintptr_t)&evmcs_version);
+
+ if (ret < 0) {
+ fprintf(stderr, "Hyper-V %s is not supported by kernel\n",
+ kvm_hyperv_properties[HYPERV_FEAT_EVMCS].desc);
+ return ret;
+ }
+
+ cpu->hyperv_nested[0] = evmcs_version;
+ }
+
return 0;
}
@@ -1520,6 +1534,11 @@ int kvm_arch_init_vcpu(CPUState *cs)
}
if (hyperv_enabled(cpu)) {
+ r = hyperv_init_vcpu(cpu);
+ if (r) {
+ return r;
+ }
+
cpuid_i = hyperv_fill_cpuids(cs, cpuid_data.entries);
kvm_base = KVM_CPUID_SIGNATURE_NEXT;
has_msr_hv_hypercall = true;
@@ -1869,11 +1888,6 @@ int kvm_arch_init_vcpu(CPUState *cs)
kvm_init_msrs(cpu);
- r = hyperv_init_vcpu(cpu);
- if (r) {
- goto fail;
- }
-
return 0;
fail:
--
2.30.2
- [PULL 05/24] i386/cpu_dump: support AVX512 ZMM regs dump, (continued)
- [PULL 05/24] i386/cpu_dump: support AVX512 ZMM regs dump, Eduardo Habkost, 2021/06/01
- [PULL 07/24] i386: use better matching family/model/stepping for 'max' CPU, Eduardo Habkost, 2021/06/01
- [PULL 06/24] i386: use better matching family/model/stepping for 'qemu64' CPU, Eduardo Habkost, 2021/06/01
- [PULL 10/24] i386: always fill Hyper-V CPUID feature leaves from X86CPU data, Eduardo Habkost, 2021/06/01
- [PULL 09/24] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Eduardo Habkost, 2021/06/01
- [PULL 08/24] i386: keep hyperv_vendor string up-to-date, Eduardo Habkost, 2021/06/01
- [PULL 11/24] i386: stop using env->features[] for filling Hyper-V CPUIDs, Eduardo Habkost, 2021/06/01
- [PULL 13/24] i386: introduce hv_cpuid_get_host(), Eduardo Habkost, 2021/06/01
- [PULL 12/24] i386: introduce hyperv_feature_supported(), Eduardo Habkost, 2021/06/01
- [PULL 14/24] i386: drop FEAT_HYPERV feature leaves, Eduardo Habkost, 2021/06/01
- [PULL 17/24] i386: move eVMCS enablement to hyperv_init_vcpu(),
Eduardo Habkost <=
- [PULL 20/24] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one, Eduardo Habkost, 2021/06/01
- [PULL 21/24] i386: use global kvm_state in hyperv_enabled() check, Eduardo Habkost, 2021/06/01
- [PULL 16/24] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids(), Eduardo Habkost, 2021/06/01
- [PULL 23/24] sev: use explicit indices for mapping firmware error codes to strings, Eduardo Habkost, 2021/06/01
- [PULL 15/24] i386: introduce hv_cpuid_cache, Eduardo Habkost, 2021/06/01
- [PULL 18/24] i386: switch hyperv_expand_features() to using error_setg(), Eduardo Habkost, 2021/06/01
- [PULL 24/24] sev: add missing firmware error conditions, Eduardo Habkost, 2021/06/01
- [PULL 19/24] i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size, Eduardo Habkost, 2021/06/01
- [PULL 22/24] target/i386/sev: add support to query the attestation report, Eduardo Habkost, 2021/06/01
- Re: [PULL 00/24] x86 queue, 2021-06-01, Peter Maydell, 2021/06/02