renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 12:44:14 +08:00
Code

KVM: VMX: Reorder some skip_emulated_instruction calls

Browse Source 
The functions being moved ahead of skip_emulated_instruction here don't
need updated IPs, and skipping the emulated instruction at the end will
make it easier to return its value.

Signed-off-by: Kyle Huey <khuey@kylehuey.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
This commit is contained in:
Kyle Huey 2016-11-29 12:40:38 -08:00 committed by Paolo Bonzini
parent 6a908b628c
commit 09ca3f2049
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86/kvm/vmx.c
View File

@ -5708,8 +5708,8 @@ static int handle_cr(struct kvm_vcpu *vcpu)
case 2: /* clts */ case 2: /* clts */
handle_clts(vcpu); handle_clts(vcpu);
trace_kvm_cr_write(0, kvm_read_cr0(vcpu)); trace_kvm_cr_write(0, kvm_read_cr0(vcpu));
skip_emulated_instruction(vcpu);
vmx_fpu_activate(vcpu); vmx_fpu_activate(vcpu);
skip_emulated_instruction(vcpu);
return 1; return 1;
case 1: /*mov from cr*/ case 1: /*mov from cr*/
switch (cr) { switch (cr) {
@ -6133,8 +6133,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu)
gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS); gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);
if (!kvm_io_bus_write(vcpu, KVM_FAST_MMIO_BUS, gpa, 0, NULL)) { if (!kvm_io_bus_write(vcpu, KVM_FAST_MMIO_BUS, gpa, 0, NULL)) {
skip_emulated_instruction(vcpu);
trace_kvm_fast_mmio(gpa); trace_kvm_fast_mmio(gpa);
skip_emulated_instruction(vcpu);
return 1; return 1;
} }
@ -6507,8 +6507,8 @@ static int handle_pause(struct kvm_vcpu *vcpu)
if (ple_gap) if (ple_gap)
grow_ple_window(vcpu); grow_ple_window(vcpu);
skip_emulated_instruction(vcpu);
kvm_vcpu_on_spin(vcpu); kvm_vcpu_on_spin(vcpu);
skip_emulated_instruction(vcpu);
return 1; return 1;
} }
@ -6962,8 +6962,8 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
vmx->nested.vmxon = true; vmx->nested.vmxon = true;
skip_emulated_instruction(vcpu);
nested_vmx_succeed(vcpu); nested_vmx_succeed(vcpu);
skip_emulated_instruction(vcpu);
return 1; return 1;
out_shadow_vmcs: out_shadow_vmcs:
@ -7083,8 +7083,8 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
if (!nested_vmx_check_permission(vcpu)) if (!nested_vmx_check_permission(vcpu))
return 1; return 1;
free_nested(to_vmx(vcpu)); free_nested(to_vmx(vcpu));
skip_emulated_instruction(vcpu);
nested_vmx_succeed(vcpu); nested_vmx_succeed(vcpu);
skip_emulated_instruction(vcpu);
return 1; return 1;
} }
@ -7124,8 +7124,8 @@ static int handle_vmclear(struct kvm_vcpu *vcpu)
nested_free_vmcs02(vmx, vmptr); nested_free_vmcs02(vmx, vmptr);
skip_emulated_instruction(vcpu);
nested_vmx_succeed(vcpu); nested_vmx_succeed(vcpu);
skip_emulated_instruction(vcpu);
return 1; return 1;
} }