]> git.baikalelectronics.ru Git - kernel.git/commitdiff
KVM: SVM: fix task switch emulation on INTn instruction.
authorMaxim Levitsky <mlevitsk@redhat.com>
Thu, 14 Jul 2022 12:44:53 +0000 (15:44 +0300)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 14 Jul 2022 15:32:00 +0000 (11:32 -0400)
Recently KVM's SVM code switched to re-injecting software interrupt events,
if something prevented their delivery.

Task switch due to task gate in the IDT, however is an exception
to this rule, because in this case, INTn instruction causes
a task switch intercept and its emulation completes the INTn
emulation as well.

Add a missing case to task_switch_interception for that.

This fixes 32 bit kvm unit test taskswitch2.

Fixes: 8d1cd5e00a27d2 ("KVM: SVM: Re-inject INTn instead of retrying the insn on "failure"")
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
Message-Id: <20220714124453.188655-1-mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/svm/svm.c

index 37ce061dfc7671ae23f471ca99581cfe70806580..1d8eb3333f46337f68660207e322466c3d78be47 100644 (file)
@@ -2446,6 +2446,7 @@ static int task_switch_interception(struct kvm_vcpu *vcpu)
                        kvm_clear_exception_queue(vcpu);
                        break;
                case SVM_EXITINTINFO_TYPE_INTR:
+               case SVM_EXITINTINFO_TYPE_SOFT:
                        kvm_clear_interrupt_queue(vcpu);
                        break;
                default: