From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT 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 9875FC43381 for ; Fri, 15 Feb 2019 02:18:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F1C420643 for ; Fri, 15 Feb 2019 02:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550197085; bh=jrqR/ux9vwogeT1cZ9T3ECu1glJFLPgWI0hcgo4cOtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Mncc1Uxc5r8JiFCT/pWZkpTW1wvRPtkXVZUnJt+JNCkHNFouISlTrCMGlgOBVYOBN X4dwxD760GDp90DxhXkQjjwN2sH8OdjmcZ9qoCdcH9y0bdFvPwhkSh81QKq6KmBqpY dnA59gK0GB7CgeRSiGRrNnFeKjeN98jwmDduStu4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405948AbfBOCPv (ORCPT ); Thu, 14 Feb 2019 21:15:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:55388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405933AbfBOCPq (ORCPT ); Thu, 14 Feb 2019 21:15:46 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 36D992229F; Fri, 15 Feb 2019 02:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550196945; bh=jrqR/ux9vwogeT1cZ9T3ECu1glJFLPgWI0hcgo4cOtM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPTpUKtHzoahtQtxR6TiLBtkDxaw0Vc6Riw9Sgp70fZqYwHk7NYlXfjEQuKsq99uX LpvvtGm8F6QDJFySQVhrFk9Mh8y32p9ZWj1aXbkMCR1hV08IX+PyENIsP456DAMwkj +y36Hi19v89EvmgMSBIy7DYZLXLI9sIY/owZxxxo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vitaly Kuznetsov , Paolo Bonzini , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.4 20/20] KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1 Date: Thu, 14 Feb 2019 21:15:11 -0500 Message-Id: <20190215021511.179333-20-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190215021511.179333-1-sashal@kernel.org> References: <20190215021511.179333-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vitaly Kuznetsov [ Upstream commit 619ad846fc3452adaf71ca246c5aa711e2055398 ] kvm-unit-tests' eventinj "NMI failing on IDT" test results in NMI being delivered to the host (L1) when it's running nested. The problem seems to be: svm_complete_interrupts() raises 'nmi_injected' flag but later we decide to reflect EXIT_NPF to L1. The flag remains pending and we do NMI injection upon entry so it got delivered to L1 instead of L2. It seems that VMX code solves the same issue in prepare_vmcs12(), this was introduced with code refactoring in commit 5f3d5799974b ("KVM: nVMX: Rework event injection and recovery"). Signed-off-by: Vitaly Kuznetsov Signed-off-by: Paolo Bonzini Signed-off-by: Sasha Levin --- arch/x86/kvm/svm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ecdf724da371..415a30a74f9a 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -2388,6 +2388,14 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) kvm_mmu_reset_context(&svm->vcpu); kvm_mmu_load(&svm->vcpu); + /* + * Drop what we picked up for L2 via svm_complete_interrupts() so it + * doesn't end up in L1. + */ + svm->vcpu.arch.nmi_injected = false; + kvm_clear_exception_queue(&svm->vcpu); + kvm_clear_interrupt_queue(&svm->vcpu); + return 0; } -- 2.19.1