Re: [PATCH MANUALSEL 5.10 6/7] KVM: x86: nSVM: restore int_vector in svm_clear_vintr

[Paolo Bonzini]

On 06/10/21 13:12, Sasha Levin wrote:
> From: Maxim Levitsky <mlevitsk@xxxxxxxxxx>
>
> [ 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@xxxxxxxxxx>
> Message-Id: <20210914154825.104886-2-mlevitsk@xxxxxxxxxx>
> Signed-off-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
>   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 1c23aee3778c..5e1d7396a6b8 100644
> --- a/arch/x86/kvm/svm/svm.c
> +++ b/arch/x86/kvm/svm/svm.c
> @@ -1497,6 +1497,8 @@ static void svm_clear_vintr(struct vcpu_svm *svm)
>   			(svm->nested.ctl.int_ctl & V_TPR_MASK));
>   		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@xxxxxxxxxx>