From patchwork Thu Feb 8 05:13:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Gao X-Patchwork-Id: 10206599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DB39F600F6 for ; Thu, 8 Feb 2018 05:12:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCACD2905A for ; Thu, 8 Feb 2018 05:12:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C0CA92914D; Thu, 8 Feb 2018 05:12:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ADFFE29147 for ; Thu, 8 Feb 2018 05:12:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750869AbeBHFL6 (ORCPT ); Thu, 8 Feb 2018 00:11:58 -0500 Received: from mga17.intel.com ([192.55.52.151]:9549 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750711AbeBHFL5 (ORCPT ); Thu, 8 Feb 2018 00:11:57 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Feb 2018 21:11:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,476,1511856000"; d="scan'208";a="16402229" Received: from gao-cwp.sh.intel.com ([10.239.13.104]) by fmsmga008.fm.intel.com with ESMTP; 07 Feb 2018 21:11:55 -0800 From: Chao Gao To: kvm@vger.kernel.org Cc: Chao Gao , linux-kernel@vger.kernel.org, x86@kernel.org, "H. Peter Anvin" , Ingo Molnar , Thomas Gleixner , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Paolo Bonzini Subject: [PATCH] x86/kvm/vmx: Don't halt vcpu when L1 is injecting events to L2 Date: Thu, 8 Feb 2018 13:13:36 +0800 Message-Id: <1518066816-7197-1-git-send-email-chao.gao@intel.com> X-Mailer: git-send-email 1.9.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Although L2 is in halt state, it will be in the active state after VM entry if the VM entry is vectoring. Halting the vcpu here means the event won't be injected to L2 and this decision isn't reported to L1. Thus L0 drops an event that should be injected to L2. Because virtual interrupt delivery may wake L2 vcpu, if VID is enabled, do the same thing -- don't halt L2. Signed-off-by: Chao Gao --- arch/x86/kvm/vmx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index bb5b488..e1fe4e4 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -10985,8 +10985,14 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) if (ret) return ret; - if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) - return kvm_vcpu_halt(vcpu); + if (vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) { + u32 intr_info = vmcs_read32(VM_ENTRY_INTR_INFO_FIELD); + u32 exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL); + + if (!(intr_info & VECTORING_INFO_VALID_MASK) && + !(exec_control & SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY)) + return kvm_vcpu_halt(vcpu); + } vmx->nested.nested_run_pending = 1;