Skip to contentSkip to conversation

Check use I/O bitmap first before unconditional I/O exit

PATCH In review Zhihui Zhang 2 participants 2 messages Dec 30, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Check use I/O bitmap first before unconditional I/O exit

---
 arch/x86/kvm/vmx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx.c +4 -4
index b2fe1c2..44d4f829 100644
@@ -6460,11 +6460,11 @@ static bool nested_vmx_exit_handled_io(struct kvm_vcpu *vcpu,
 	int size;
 	u8 b;
 
-	if (nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING))
-		return 1;
-
-	if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS))
+	if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS)) {
+		if (nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING))
+			return 1;
 		return 0;
+	}
 
 	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);
 
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 1 line · Zhihui Zhang

You should explain the "why" here, e.g. point to the SDM section that requires this ordering.

Quoted 9 lines
---
 arch/x86/kvm/vmx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx.c +0 -0
index b2fe1c2..44d4f829 100644

arch/x86/kvm/vmx.c static bool nested_vmx_exit_handled_io(struct kvm_vcpu *vcpu, · line 6465

Quoted 10 lines
arch/x86/kvm/vmx.c +3 -4
@@ -6460,11 +6460,11 @@ static bool nested_vmx_exit_handled_io(struct kvm_vcpu *vcpu,
 	int size;
 	u8 b;
 
-	if (nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING))
-		return 1;
-
-	if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS))
+	if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS)) {
+		if (nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING))
+			return 1;

Minor nit, but what about

if (!nested_cpu_has(vmcs12, CPU_BASED_USE_IO_BITMAPS))

	return nested_cpu_has(vmcs12, CPU_BASED_UNCOND_IO_EXITING);

instead?

Logic is correct, thanks for addressing this.

Could you also write an according sub-test in kvm-unit-tests [1]? We are already checking IO bitmap accesses, but not yet unconditional PIO exiting. Would be great!

Jan

[1] https://git.kernel.org/cgit/virt/kvm/kvm-unit-tests.git

Quoted 6 lines
arch/x86/kvm/vmx.c +1 -0
 		return 0;
+	}
 
 	exit_qualification = vmcs_readl(EXIT_QUALIFICATION);