From patchwork Wed Jan 6 10:53:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 12001349 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14E48C43381 for ; Wed, 6 Jan 2021 10:54:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CADA723105 for ; Wed, 6 Jan 2021 10:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726422AbhAFKyw (ORCPT ); Wed, 6 Jan 2021 05:54:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59840 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726211AbhAFKyu (ORCPT ); Wed, 6 Jan 2021 05:54:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1609930404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7De1ngoOgky9O4PV2XjGG95Ljxiw6Nzdpvpp/JwdNqE=; b=WAt77w25E3MrmxJ/whsBabrzm45HbnnQI+Y+7lTdMuiNWbaWDfHcOe7jyVOwrTzMDFyxlG LgDTU2dieYEAjRZyPAZvm5kiHvzEJvDES1t8cXQ8L4HHcAMAlXX5AgxmFC+GVH3mqy5PRc bqLAdLSdbeSWTiYDg2MmlALG62eVKmA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-316-4upRnGpaNLq2e2x1HbL4mw-1; Wed, 06 Jan 2021 05:53:23 -0500 X-MC-Unique: 4upRnGpaNLq2e2x1HbL4mw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 596E4107ACE3; Wed, 6 Jan 2021 10:53:21 +0000 (UTC) Received: from localhost.localdomain (unknown [10.35.206.196]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9269D5B4A9; Wed, 6 Jan 2021 10:53:16 +0000 (UTC) From: Maxim Levitsky To: kvm@vger.kernel.org Cc: Joerg Roedel , Wanpeng Li , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)), x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), Vitaly Kuznetsov , "H. Peter Anvin" , Sean Christopherson , Paolo Bonzini , Ingo Molnar , Borislav Petkov , Jim Mattson , Thomas Gleixner , Maxim Levitsky Subject: [PATCH 2/2] KVM: nVMX: fix for disappearing L1->L2 event injection on L1 migration Date: Wed, 6 Jan 2021 12:53:06 +0200 Message-Id: <20210106105306.450602-3-mlevitsk@redhat.com> In-Reply-To: <20210106105306.450602-1-mlevitsk@redhat.com> References: <20210106105306.450602-1-mlevitsk@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org If migration happens while L2 entry with an injected event to L2 is pending, we weren't including the event in the migration state and it would be lost leading to L2 hang. Fix this by queueing the injected event in similar manner to how we queue interrupted injections. This can be reproduced by running an IO intense task in L2, and repeatedly migrating the L1. Suggested-by: Paolo Bonzini Signed-off-by: Maxim Levitsky --- arch/x86/kvm/vmx/nested.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index e2f26564a12de..2ea0bb14f385f 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -2355,12 +2355,12 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) * Interrupt/Exception Fields */ if (vmx->nested.nested_run_pending) { - vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, - vmcs12->vm_entry_intr_info_field); - vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, - vmcs12->vm_entry_exception_error_code); - vmcs_write32(VM_ENTRY_INSTRUCTION_LEN, - vmcs12->vm_entry_instruction_len); + if ((vmcs12->vm_entry_intr_info_field & VECTORING_INFO_VALID_MASK)) + vmx_process_injected_event(&vmx->vcpu, + vmcs12->vm_entry_intr_info_field, + vmcs12->vm_entry_instruction_len, + vmcs12->vm_entry_exception_error_code); + vmcs_write32(GUEST_INTERRUPTIBILITY_INFO, vmcs12->guest_interruptibility_info); vmx->loaded_vmcs->nmi_known_unmasked =