[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 16/19] i386: kill off hv_cpuid_check_and_set()
From: |
Vitaly Kuznetsov |
Subject: |
[PATCH v6 16/19] i386: kill off hv_cpuid_check_and_set() |
Date: |
Thu, 22 Apr 2021 18:11:27 +0200 |
hv_cpuid_check_and_set() does too much:
- Checks if the feature is supported by KVM;
- Checks if all dependencies are enabled;
- Sets the feature bit in cpu->hyperv_features for 'passthrough' mode.
To reduce the complexity, move all the logic except for dependencies
check out of it. Also, in 'passthrough' mode we don't really need to
check dependencies because KVM is supposed to provide a consistent
set anyway.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
target/i386/kvm/kvm.c | 105 +++++++++++++++---------------------------
1 file changed, 36 insertions(+), 69 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index d5551c4ab5cf..2c1a77f9b00f 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -1144,16 +1144,12 @@ static bool hyperv_feature_supported(CPUState *cs, int
feature)
return true;
}
-static int hv_cpuid_check_and_set(CPUState *cs, int feature, Error **errp)
+/* Checks that all feature dependencies are enabled */
+static void hv_feature_check_deps(X86CPU *cpu, int feature, Error **errp)
{
- X86CPU *cpu = X86_CPU(cs);
uint64_t deps;
int dep_feat;
- if (!hyperv_feat_enabled(cpu, feature) && !cpu->hyperv_passthrough) {
- return 0;
- }
-
deps = kvm_hyperv_properties[feature].dependencies;
while (deps) {
dep_feat = ctz64(deps);
@@ -1161,26 +1157,10 @@ static int hv_cpuid_check_and_set(CPUState *cs, int
feature, Error **errp)
error_setg(errp, "Hyper-V %s requires Hyper-V %s",
kvm_hyperv_properties[feature].desc,
kvm_hyperv_properties[dep_feat].desc);
- return 1;
+ return;
}
deps &= ~(1ull << dep_feat);
}
-
- if (!hyperv_feature_supported(cs, feature)) {
- if (hyperv_feat_enabled(cpu, feature)) {
- error_setg(errp, "Hyper-V %s is not supported by kernel",
- kvm_hyperv_properties[feature].desc);
- return 1;
- } else {
- return 0;
- }
- }
-
- if (cpu->hyperv_passthrough) {
- cpu->hyperv_features |= BIT(feature);
- }
-
- return 0;
}
static uint32_t hv_build_cpuid_leaf(CPUState *cs, uint32_t func, int reg)
@@ -1219,6 +1199,8 @@ static uint32_t hv_build_cpuid_leaf(CPUState *cs,
uint32_t func, int reg)
void kvm_hyperv_expand_features(X86CPU *cpu, Error **errp)
{
CPUState *cs = CPU(cpu);
+ Error *local_err = NULL;
+ int feat;
if (!hyperv_enabled(cpu))
return;
@@ -1274,53 +1256,38 @@ void kvm_hyperv_expand_features(X86CPU *cpu, Error
**errp)
cpu->hyperv_spinlock_attempts =
hv_cpuid_get_host(cs, HV_CPUID_ENLIGHTMENT_INFO, R_EBX);
- }
- /* Features */
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_RELAXED, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_VAPIC, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_TIME, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_CRASH, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_RESET, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_VPINDEX, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_RUNTIME, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_SYNIC, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_STIMER, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_FREQUENCIES, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_REENLIGHTENMENT, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_TLBFLUSH, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_EVMCS, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_IPI, errp)) {
- return;
- }
- if (hv_cpuid_check_and_set(cs, HYPERV_FEAT_STIMER_DIRECT, errp)) {
- return;
+ /*
+ * Mark feature as enabled in 'cpu->hyperv_features' as
+ * hv_build_cpuid_leaf() uses this info to build guest CPUIDs.
+ */
+ for (feat = 0; feat < ARRAY_SIZE(kvm_hyperv_properties); feat++) {
+ if (hyperv_feature_supported(cs, feat)) {
+ cpu->hyperv_features |= BIT(feat);
+ }
+ }
+ } else {
+ /* Check features availability and dependencies */
+ for (feat = 0; feat < ARRAY_SIZE(kvm_hyperv_properties); feat++) {
+ /* If the feature was not requested skip it. */
+ if (!hyperv_feat_enabled(cpu, feat)) {
+ continue;
+ }
+
+ /* Check if the feature is supported by KVM */
+ if (!hyperv_feature_supported(cs, feat)) {
+ error_setg(errp, "Hyper-V %s is not supported by kernel",
+ kvm_hyperv_properties[feat].desc);
+ return;
+ }
+
+ /* Check dependencies */
+ hv_feature_check_deps(cpu, feat, &local_err);
+ if (local_err != NULL) {
+ error_propagate(errp, local_err);
+ return;
+ }
+ }
}
/* Additional dependencies not covered by kvm_hyperv_properties[] */
--
2.30.2
- [PATCH v6 02/19] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, (continued)
- [PATCH v6 02/19] i386: invert hyperv_spinlock_attempts setting logic with hv_passthrough, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 04/19] i386: stop using env->features[] for filling Hyper-V CPUIDs, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 06/19] i386: introduce hv_cpuid_get_host(), Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 05/19] i386: introduce hyperv_feature_supported(), Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 07/19] i386: drop FEAT_HYPERV feature leaves, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 08/19] i386: introduce hv_cpuid_cache, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 11/19] i386: switch hyperv_expand_features() to using error_setg(), Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 09/19] i386: split hyperv_handle_properties() into hyperv_expand_features()/hyperv_fill_cpuids(), Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 17/19] i386: HV_HYPERCALL_AVAILABLE privilege bit is always needed, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 10/19] i386: move eVMCS enablement to hyperv_init_vcpu(), Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 16/19] i386: kill off hv_cpuid_check_and_set(),
Vitaly Kuznetsov <=
- [PATCH v6 18/19] i386: Hyper-V SynIC requires POST_MESSAGES/SIGNAL_EVENTS priviliges, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 19/19] qtest/hyperv: Introduce a simple hyper-v test, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 12/19] i386: adjust the expected KVM_GET_SUPPORTED_HV_CPUID array size, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 13/19] i386: prefer system KVM_GET_SUPPORTED_HV_CPUID ioctl over vCPU's one, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 15/19] i386: expand Hyper-V features during CPU feature expansion time, Vitaly Kuznetsov, 2021/04/22
- [PATCH v6 14/19] i386: use global kvm_state in hyperv_enabled() check, Vitaly Kuznetsov, 2021/04/22