Re: [PATCH] KVM: nVMX: don't clear mtf_pending when nested events are blocked

[Paolo Bonzini <pbonzini@redhat.com>]

On 06/04/20 22:12, Oliver Upton wrote:
> If nested events are blocked, don't clear the mtf_pending flag to avoid
> missing later delivery of the MTF VM-exit.
> 
> Fixes: 5ef8acbdd687c ("KVM: nVMX: Emulate MTF when performing instruction emulation")
> Signed-off-by: Oliver Upton <oupton@google.com>
> ---
>  arch/x86/kvm/vmx/nested.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
> index de232306561a0..cbc9ea2de28f9 100644
> --- a/arch/x86/kvm/vmx/nested.c
> +++ b/arch/x86/kvm/vmx/nested.c
> @@ -3645,7 +3645,8 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu)
>  	 * Clear the MTF state. If a higher priority VM-exit is delivered first,
>  	 * this state is discarded.
>  	 */
> -	vmx->nested.mtf_pending = false;
> +	if (!block_nested_events)
> +		vmx->nested.mtf_pending = false;
>  
>  	if (lapic_in_kernel(vcpu) &&
>  		test_bit(KVM_APIC_INIT, &apic->pending_events)) {
> 

Queued, thanks.

Paolo