Skip to contentSkip to conversation

x86/kvm/hyper-v: tweak HYPERV_CPUID_ENLIGHTMENT_INFO

PATCH In review Vitaly Kuznetsov 2 participants 4 messages Jan 24, 2019

Subsystems (4)
lore
Share & tools
lore

Vitaly Kuznetsov

author maintainer
#0 lore raw

PATCH 1/1 x86/kvm/hyper-v: tweak HYPERV_CPUID_ENLIGHTMENT_INFO

We shouldn't probably be suggesting using Enlightened VMCS when it's not enabled (not supported from guest's point of view). System reset through synthetic MSR is not recommended neither by genuine Hyper-V nor my QEMU.

Windows seems to be fine either way but let's be consistent.

Fixes 2bc39970e932 ("x86/kvm/hyper-v: Introduce KVM_GET_SUPPORTED_HV_CPUID")
---
 arch/x86/kvm/hyperv.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/hyperv.c +2 -2
index ac44a681f065..4730fcaa70cf 100644
@@ -1847,11 +1847,11 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
 		case HYPERV_CPUID_ENLIGHTMENT_INFO:
 			ent->eax |= HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED;
 			ent->eax |= HV_X64_APIC_ACCESS_RECOMMENDED;
-			ent->eax |= HV_X64_SYSTEM_RESET_RECOMMENDED;
 			ent->eax |= HV_X64_RELAXED_TIMING_RECOMMENDED;
 			ent->eax |= HV_X64_CLUSTER_IPI_RECOMMENDED;
 			ent->eax |= HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED;
-			ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
+			if (evmcs_ver)
+				ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
 
 			/*
 			 * Default number of spinlock retry attempts, matches
Signature · 1 line
2.20.1
#1 lore raw
Quoted 37 lines · Vitaly Kuznetsov

We shouldn't probably be suggesting using Enlightened VMCS when it's not enabled (not supported from guest's point of view). System reset through synthetic MSR is not recommended neither by genuine Hyper-V nor my QEMU.

Windows seems to be fine either way but let's be consistent.

Fixes 2bc39970e932 ("x86/kvm/hyper-v: Introduce KVM_GET_SUPPORTED_HV_CPUID")

---
arch/x86/kvm/hyperv.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/hyperv.c +2 -2
index ac44a681f065..4730fcaa70cf 100644
@@ -1847,11 +1847,11 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
 		case HYPERV_CPUID_ENLIGHTMENT_INFO:
 			ent->eax |= HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED;
 			ent->eax |= HV_X64_APIC_ACCESS_RECOMMENDED;
-			ent->eax |= HV_X64_SYSTEM_RESET_RECOMMENDED;
 			ent->eax |= HV_X64_RELAXED_TIMING_RECOMMENDED;
 			ent->eax |= HV_X64_CLUSTER_IPI_RECOMMENDED;
 			ent->eax |= HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED;
-			ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
+			if (evmcs_ver)
+				ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
 
 			/*
 			 * Default number of spinlock retry attempts, matches
Signature · 1 line
2.20.1

Seems to me that there are 2 unrelated separated patches here. Why not split them? For content itself: Reviewed-by: Liran Alon <[email protected]>

author maintainer
#2 lore raw
Quoted 30 lines · Liran Alon
Quoted 30 lines · Vitaly Kuznetsov

We shouldn't probably be suggesting using Enlightened VMCS when it's not enabled (not supported from guest's point of view). System reset through synthetic MSR is not recommended neither by genuine Hyper-V nor my QEMU.

Windows seems to be fine either way but let's be consistent.

Fixes 2bc39970e932 ("x86/kvm/hyper-v: Introduce KVM_GET_SUPPORTED_HV_CPUID")

---
arch/x86/kvm/hyperv.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/hyperv.c +2 -2
index ac44a681f065..4730fcaa70cf 100644
@@ -1847,11 +1847,11 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
 		case HYPERV_CPUID_ENLIGHTMENT_INFO:
 			ent->eax |= HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED;
 			ent->eax |= HV_X64_APIC_ACCESS_RECOMMENDED;
-			ent->eax |= HV_X64_SYSTEM_RESET_RECOMMENDED;
 			ent->eax |= HV_X64_RELAXED_TIMING_RECOMMENDED;
 			ent->eax |= HV_X64_CLUSTER_IPI_RECOMMENDED;
 			ent->eax |= HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED;
-			ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
+			if (evmcs_ver)
+				ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
 
Quoted 8 lines
Quoted 5 lines
arch/x86/kvm/hyperv.c +0 -0
 			/*
 			 * Default number of spinlock retry attempts, matches
Signature · 1 line
2.20.1

Seems to me that there are 2 unrelated separated patches here. Why not split them?

They seem to be too small :-) No problem, I'll split them up in v2.

Quoted 2 lines

For content itself: Reviewed-by: Liran Alon <[email protected]>

Thanks!

Signature · 1 line
Vitaly
#3 lore raw
Quoted 45 lines · Vitaly Kuznetsov
Quoted 30 lines · Liran Alon
Quoted 30 lines · Vitaly Kuznetsov

We shouldn't probably be suggesting using Enlightened VMCS when it's not enabled (not supported from guest's point of view). System reset through synthetic MSR is not recommended neither by genuine Hyper-V nor my QEMU.

Windows seems to be fine either way but let's be consistent.

Fixes 2bc39970e932 ("x86/kvm/hyper-v: Introduce KVM_GET_SUPPORTED_HV_CPUID")

---
arch/x86/kvm/hyperv.c | 4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/hyperv.c +2 -2
index ac44a681f065..4730fcaa70cf 100644
@@ -1847,11 +1847,11 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid,
 		case HYPERV_CPUID_ENLIGHTMENT_INFO:
 			ent->eax |= HV_X64_REMOTE_TLB_FLUSH_RECOMMENDED;
 			ent->eax |= HV_X64_APIC_ACCESS_RECOMMENDED;
-			ent->eax |= HV_X64_SYSTEM_RESET_RECOMMENDED;
 			ent->eax |= HV_X64_RELAXED_TIMING_RECOMMENDED;
 			ent->eax |= HV_X64_CLUSTER_IPI_RECOMMENDED;
 			ent->eax |= HV_X64_EX_PROCESSOR_MASKS_RECOMMENDED;
-			ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
+			if (evmcs_ver)
+				ent->eax |= HV_X64_ENLIGHTENED_VMCS_RECOMMENDED;
 
Quoted 8 lines
Quoted 5 lines
arch/x86/kvm/hyperv.c +0 -0
 			/*
 			 * Default number of spinlock retry attempts, matches
Signature · 1 line
2.20.1

Seems to me that there are 2 unrelated separated patches here. Why not split them?

Quoted 1 line

They seem to be too small :-) No problem, I'll split them up in v2.

I don’t think in general that it matters how small they are.
Separating to small logical patches allows better bisect, easier review and better revert resolution. So better overall. :)

Quoted 8 lines
Quoted 3 lines

For content itself: Reviewed-by: Liran Alon <[email protected]>

Thanks!

Signature · 1 line
Vitaly