From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754136AbdCHSeC (ORCPT ); Wed, 8 Mar 2017 13:34:02 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:36717 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbdCHSdU (ORCPT ); Wed, 8 Mar 2017 13:33:20 -0500 From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: bdas@redhat.com, dmatlack@google.com Subject: [PATCH 2/6] KVM: VMX: cleanup check for invalid EPT violation Date: Wed, 8 Mar 2017 19:03:52 +0100 Message-Id: <1488996236-5676-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1488996236-5676-1-git-send-email-pbonzini@redhat.com> References: <1488996236-5676-1-git-send-email-pbonzini@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org handle_ept_violation is checking for "guest-linear-address invalid" + "paging-structure walk", which is a sign of a bug in KVM. However, _all_ EPT violations without a valid guest linear address are paging structure walks, because those EPT violations happen when loading the guest PDPTEs. So simplify the check to only look at bit 7 of the exit qualification. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 89b74d9bc357..cb9034601c7b 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6232,12 +6232,10 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) unsigned long exit_qualification; gpa_t gpa; u32 error_code; - int gla_validity; exit_qualification = vmcs_readl(EXIT_QUALIFICATION); - gla_validity = (exit_qualification >> 7) & 0x3; - if (gla_validity == 0x2) { + if ((exit_qualification & 0x80) == 0) { printk(KERN_ERR "EPT: Handling EPT violation failed!\n"); printk(KERN_ERR "EPT: GPA: 0x%lx, GVA: 0x%lx\n", (long unsigned int)vmcs_read64(GUEST_PHYSICAL_ADDRESS), -- 1.8.3.1