From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
Eduardo Habkost <ehabkost@redhat.com>,
Igor Mammedov <imammedo@redhat.com>
Subject: [PATCH v3 17/19] i386: expand Hyper-V features during CPU feature expansion time
Date: Thu, 7 Jan 2021 16:14:46 +0100 [thread overview]
Message-ID: <20210107151446.541013-1-vkuznets@redhat.com> (raw)
In-Reply-To: <20210107150640.539239-1-vkuznets@redhat.com>
To make Hyper-V features appear in e.g. QMP query-cpu-model-expansion we
need to expand and set the corresponding CPUID leaves early. Modify
x86_cpu_get_supported_feature_word() to call newly intoduced Hyper-V
specific kvm_hv_get_supported_cpuid() instead of
kvm_arch_get_supported_cpuid(). We can't use kvm_arch_get_supported_cpuid()
as Hyper-V specific CPUID leaves intersect with KVM's.
Note, early expansion will only happen when KVM supports system wide
KVM_GET_SUPPORTED_HV_CPUID ioctl (KVM_CAP_SYS_HYPERV_CPUID).
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/cpu.c | 4 ++++
target/i386/kvm/kvm-stub.c | 5 +++++
target/i386/kvm/kvm.c | 15 ++++++++++++---
target/i386/kvm/kvm_i386.h | 1 +
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 9f6cabfc7787..48007a876e32 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -6398,6 +6398,10 @@ static void x86_cpu_expand_features(X86CPU *cpu, Error **errp)
if (env->cpuid_xlevel2 == UINT32_MAX) {
env->cpuid_xlevel2 = env->cpuid_min_xlevel2;
}
+
+ if (kvm_enabled()) {
+ kvm_hyperv_expand_features(cpu, errp);
+ }
}
/*
diff --git a/target/i386/kvm/kvm-stub.c b/target/i386/kvm/kvm-stub.c
index 0a163ae207c5..20994c3a16bf 100644
--- a/target/i386/kvm/kvm-stub.c
+++ b/target/i386/kvm/kvm-stub.c
@@ -44,3 +44,8 @@ bool kvm_hv_evmcs_available(void)
{
return false;
}
+
+void kvm_hyperv_expand_features(X86CPU *cpu, Error **errp)
+{
+ return;
+}
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 36309cda3860..40c5589c6af6 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -1219,13 +1219,22 @@ static uint32_t hv_build_cpuid_leaf(CPUState *cs, uint32_t func, int reg)
* of 'hv_passthrough' mode and fills the environment with all supported
* Hyper-V features.
*/
-static void hyperv_expand_features(CPUState *cs, Error **errp)
+void kvm_hyperv_expand_features(X86CPU *cpu, Error **errp)
{
- X86CPU *cpu = X86_CPU(cs);
+ CPUState *cs = CPU(cpu);
if (!hyperv_enabled(cpu))
return;
+ /*
+ * When kvm_hyperv_expand_features is called at CPU feature expansion
+ * time per-CPU kvm_state is not available yet so we can only proceed
+ * when KVM_CAP_SYS_HYPERV_CPUID is supported.
+ */
+ if (!cs->kvm_state &&
+ !kvm_check_extension(kvm_state, KVM_CAP_SYS_HYPERV_CPUID))
+ return;
+
if (cpu->hyperv_passthrough) {
cpu->hyperv_vendor_id[0] =
hv_cpuid_get_host(cs, HV_CPUID_VENDOR_AND_MAX_FUNCTIONS, R_EBX);
@@ -1558,7 +1567,7 @@ int kvm_arch_init_vcpu(CPUState *cs)
env->apic_bus_freq = KVM_APIC_BUS_FREQUENCY;
/* Paravirtualization CPUIDs */
- hyperv_expand_features(cs, &local_err);
+ kvm_hyperv_expand_features(cpu, &local_err);
if (local_err) {
error_report_err(local_err);
return -ENOSYS;
diff --git a/target/i386/kvm/kvm_i386.h b/target/i386/kvm/kvm_i386.h
index 08968cfb33f1..f0d8afbc53e6 100644
--- a/target/i386/kvm/kvm_i386.h
+++ b/target/i386/kvm/kvm_i386.h
@@ -48,6 +48,7 @@ bool kvm_has_waitpkg(void);
bool kvm_hv_vpindex_settable(void);
bool kvm_hv_evmcs_available(void);
+void kvm_hyperv_expand_features(X86CPU *cpu, Error **errp);
uint64_t kvm_swizzle_msi_ext_dest_id(uint64_t address);
--
2.29.2
next prev parent reply other threads:[~2021-01-07 15:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-07 15:06 [PATCH v3 00/19] i386: KVM: expand Hyper-V features early and provide simple 'hv-default=on' option Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 01/19] linux-headers: update against 5.11-rc2 Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 02/19] i386: introduce kvm_hv_evmcs_available() Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 03/19] i386: keep hyperv_vendor string up-to-date Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 04/19] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 05/19] i386: always fill Hyper-V CPUID feature leaves from X86CPU data Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 06/19] i386: stop using env->features[] for filling Hyper-V CPUIDs Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 07/19] i386: introduce hyperv_feature_supported() Vitaly Kuznetsov
2021-01-07 15:06 ` [PATCH v3 08/19] i386: introduce hv_cpuid_get_host() Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 09/19] i386: drop FEAT_HYPERV feature leaves Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 10/19] i386: introduce hv_cpuid_cache Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 11/19] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids() Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 12/19] i386: move eVMCS enablement to hyperv_init_vcpu() Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 13/19] i386: switch hyperv_expand_features() to using error_setg() Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 14/19] i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 15/19] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one Vitaly Kuznetsov
2021-01-07 15:14 ` [PATCH v3 16/19] i386: use global kvm_state in hyperv_enabled() check Vitaly Kuznetsov
2021-01-07 15:14 ` Vitaly Kuznetsov [this message]
2021-01-07 15:14 ` [PATCH v3 18/19] i386: provide simple 'hv-default=on' option Vitaly Kuznetsov
2021-01-15 2:11 ` Igor Mammedov
2021-01-15 9:20 ` Vitaly Kuznetsov
2021-01-20 13:13 ` Igor Mammedov
2021-01-20 14:38 ` Vitaly Kuznetsov
2021-01-20 19:08 ` Igor Mammedov
2021-01-20 20:49 ` Eduardo Habkost
2021-01-21 13:27 ` Igor Mammedov
2021-01-21 16:23 ` Igor Mammedov
2021-01-21 17:08 ` Eduardo Habkost
2021-01-25 13:42 ` David Edmondson
2021-01-21 8:45 ` Vitaly Kuznetsov
2021-01-21 13:49 ` Igor Mammedov
2021-01-21 16:51 ` Vitaly Kuznetsov
2021-01-20 19:55 ` Eduardo Habkost
2021-01-07 15:14 ` [PATCH v3 19/19] qtest/hyperv: Introduce a simple hyper-v test Vitaly Kuznetsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210107151446.541013-1-vkuznets@redhat.com \
--to=vkuznets@redhat.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).