x86: Delay skip of emulated hypercall instruction
authorMarian Rotariu <mrotariu@bitdefender.com>
Mon, 30 Apr 2018 09:23:01 +0000 (12:23 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Jun 2018 19:02:57 +0000 (04:02 +0900)
commit33d1c29e935ef72dbcaf0eeeb67b6cb0788fa045
tree1ca13172ff5bbdcc69fca5624622eef738f58425
parentce44a4d5db630728a5a20cf833afeafe1dce88f6
x86: Delay skip of emulated hypercall instruction

[ Upstream commit 6356ee0c9602004e0a3b4b2dad68ee2ee9385b17 ]

The IP increment should be done after the hypercall emulation, after
calling the various handlers. In this way, these handlers can accurately
identify the the IP of the VMCALL if they need it.

This patch keeps the same functionality for the Hyper-V handler which does
not use the return code of the standard kvm_skip_emulated_instruction()
call.

Signed-off-by: Marian Rotariu <mrotariu@bitdefender.com>
[Hyper-V hypercalls also need kvm_skip_emulated_instruction() - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kvm/hyperv.c
arch/x86/kvm/x86.c