[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/24] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over v
From: |
Eduardo Habkost |
Subject: |
[PULL 20/24] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one |
Date: |
Tue, 1 Jun 2021 14:10:10 -0400 |
From: Vitaly Kuznetsov <vkuznets@redhat.com>
KVM_GET_SUPPORTED_HV_CPUID was made a system wide ioctl which can be called
prior to creating vCPUs and we are going to use that to expand Hyper-V cpu
features early. Use it when it is supported by KVM.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20210422161130.652779-14-vkuznets@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
target/i386/kvm/kvm.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 9005a4233f0..6bcb74b1d84 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -929,7 +929,8 @@ static struct {
},
};
-static struct kvm_cpuid2 *try_get_hv_cpuid(CPUState *cs, int max)
+static struct kvm_cpuid2 *try_get_hv_cpuid(CPUState *cs, int max,
+ bool do_sys_ioctl)
{
struct kvm_cpuid2 *cpuid;
int r, size;
@@ -938,7 +939,11 @@ static struct kvm_cpuid2 *try_get_hv_cpuid(CPUState *cs,
int max)
cpuid = g_malloc0(size);
cpuid->nent = max;
- r = kvm_vcpu_ioctl(cs, KVM_GET_SUPPORTED_HV_CPUID, cpuid);
+ if (do_sys_ioctl) {
+ r = kvm_ioctl(kvm_state, KVM_GET_SUPPORTED_HV_CPUID, cpuid);
+ } else {
+ r = kvm_vcpu_ioctl(cs, KVM_GET_SUPPORTED_HV_CPUID, cpuid);
+ }
if (r == 0 && cpuid->nent >= max) {
r = -E2BIG;
}
@@ -965,13 +970,17 @@ static struct kvm_cpuid2 *get_supported_hv_cpuid(CPUState
*cs)
/* 0x40000000..0x40000005, 0x4000000A, 0x40000080..0x40000080 leaves */
int max = 10;
int i;
+ bool do_sys_ioctl;
+
+ do_sys_ioctl =
+ kvm_check_extension(kvm_state, KVM_CAP_SYS_HYPERV_CPUID) > 0;
/*
* When the buffer is too small, KVM_GET_SUPPORTED_HV_CPUID fails with
* -E2BIG, however, it doesn't report back the right size. Keep increasing
* it and re-trying until we succeed.
*/
- while ((cpuid = try_get_hv_cpuid(cs, max)) == NULL) {
+ while ((cpuid = try_get_hv_cpuid(cs, max, do_sys_ioctl)) == NULL) {
max++;
}
@@ -981,7 +990,7 @@ static struct kvm_cpuid2 *get_supported_hv_cpuid(CPUState
*cs)
* information early, just check for the capability and set the bit
* manually.
*/
- if (kvm_check_extension(cs->kvm_state,
+ if (!do_sys_ioctl && 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) {
--
2.30.2
- [PULL 07/24] i386: use better matching family/model/stepping for 'max' CPU, (continued)
- [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, 2021/06/01
- [PULL 20/24] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one,
Eduardo Habkost <=
- [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