Messages in this thread Patch in this message | | | From | Vitaly Kuznetsov <> | Subject | [PATCH 3/5] x86: KVM: svm: clear interrupt shadow on all paths in skip_emulated_instruction() | Date | Thu, 1 Aug 2019 07:14:16 +0200 |
| |
Regardless of the way how we skip instruction, interrupt shadow needs to be cleared.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Reviewed-by: Jim Mattson <jmattson@google.com> --- arch/x86/kvm/svm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 80f576e05112..7c7dff3f461f 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -784,13 +784,15 @@ static void skip_emulated_instruction(struct kvm_vcpu *vcpu) EMULATE_DONE) pr_err_once("KVM: %s: unable to skip instruction\n", __func__); - return; + goto clear_int_shadow; } if (svm->next_rip - kvm_rip_read(vcpu) > MAX_INST_SIZE) printk(KERN_ERR "%s: ip 0x%lx next 0x%llx\n", __func__, kvm_rip_read(vcpu), svm->next_rip); kvm_rip_write(vcpu, svm->next_rip); + +clear_int_shadow: svm_set_interrupt_shadow(vcpu, 0); } -- 2.20.1
| |