Messages in this thread | | | Date | Wed, 6 Oct 2021 15:36:44 +0200 | Subject | Re: [PATCH MANUALSEL 5.14 8/9] KVM: x86: nSVM: restore int_vector in svm_clear_vintr | From | Paolo Bonzini <> |
| |
On 06/10/21 15:30, Sasha Levin wrote: > From: Maxim Levitsky <mlevitsk@redhat.com> > > [ Upstream commit aee77e1169c1900fe4248dc186962e745b479d9e ] > > In svm_clear_vintr we try to restore the virtual interrupt > injection that might be pending, but we fail to restore > the interrupt vector. > > Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> > Message-Id: <20210914154825.104886-2-mlevitsk@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Sasha Levin <sashal@kernel.org> > --- > arch/x86/kvm/svm/svm.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c > index 69639f9624f5..19d6ffdd3f73 100644 > --- a/arch/x86/kvm/svm/svm.c > +++ b/arch/x86/kvm/svm/svm.c > @@ -1601,6 +1601,8 @@ static void svm_clear_vintr(struct vcpu_svm *svm) > > svm->vmcb->control.int_ctl |= svm->nested.ctl.int_ctl & > V_IRQ_INJECTION_BITS_MASK; > + > + svm->vmcb->control.int_vector = svm->nested.ctl.int_vector; > } > > vmcb_mark_dirty(svm->vmcb, VMCB_INTR); >
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
| |