From patchwork Wed Mar 8 18:03:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9611819 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 0246F602B4 for ; Wed, 8 Mar 2017 18:34:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2DFE285B1 for ; Wed, 8 Mar 2017 18:34:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E763B285CC; Wed, 8 Mar 2017 18:34:13 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 AE94B285B1 for ; Wed, 8 Mar 2017 18:34:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754119AbdCHSeC (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 Received: by mail-wm0-f68.google.com with SMTP id v190so7453317wme.3; Wed, 08 Mar 2017 10:32:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ovMb6Al/SZGuQ5VSugKfpypaGmO5vIOt2R6f3wpR51Q=; b=B9yT4EaMRaBc86pIFQ4B6nVHtYgs43JYPbh/DtEFrhxh00EjWEm0gTvL2E0AyVeEqF lnBohPCmiKc44wD1zwD9yMO3Y5HmpNbUO+kTx/XE4q8Ogqgm5DzBpvj1Y+XzAKPAScRt ySyqc03zDJj3Ar6azkj35+ifsP0PKr3vKFrYwQGwzFd6nmnomxIiJm1JOdrHsuiLjLWs jpg1iuf94qbhecfIep5LEdy6UvN5ZxCfMRtiBVAQ2Yrj/5G72el/LxJNkbDnJaAHspuy 3HlsVVZP5ZVTweNlLo+FL3LvMThr3sr9CYjFytGT2polqdIYokHwekrY38vupZ1PwZT1 fCSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ovMb6Al/SZGuQ5VSugKfpypaGmO5vIOt2R6f3wpR51Q=; b=tEL5rki4inbIJJ5/z76z503iJp63TJ3Qvw5L7SyBWOrONhNOY+jOVA8lUoExOGGVJU KEnSQvpzNWL1vp+Sih6/NPCRf1LkuD9uCfc3DtagFhKN/QEvm8zla03NLQY5I07qIvEZ k66LAmnPdFLppO/QjH+1/+tdc+ZbFneArSHJIqbekJD5heSvajXALbBEfqgPWFYYHCjC S/I/uRLUvDVud9mSCiD9BO25Pl9tAwlPkIKshKfgcuPtPIjdxLsIeRkvEk36q8B3Bi2P X2vSESYFOxtOs5msyV8JvwNTtkaEmvmW2nNormyhjO742aCrPc3bcFEO0U/VLf+sikOo ojWQ== X-Gm-Message-State: AMke39lbYYhQgLpfgdNaUv2yG5is47fYbb/HbHdONW1fNb/FMR5LQ2KAHGJ2+Z1DlAE40Q== X-Received: by 10.28.30.79 with SMTP id e76mr23834042wme.96.1488996241195; Wed, 08 Mar 2017 10:04:01 -0800 (PST) Received: from 640k.lan (94-36-220-234.adsl-ull.clienti.tiscali.it. [94.36.220.234]) by smtp.gmail.com with ESMTPSA id z70sm5125458wrc.2.2017.03.08.10.04.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Mar 2017 10:04:00 -0800 (PST) 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: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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),