From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752320AbdHQIIj (ORCPT ); Thu, 17 Aug 2017 04:08:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43660 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750857AbdHQIGf (ORCPT ); Thu, 17 Aug 2017 04:06:35 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com CCAE690145 Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx01.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com Subject: Re: [PATCH 1/3] KVM: x86: simplify ept_misconfig To: Paolo Bonzini , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: wanpeng.li@hotmail.com, rkrcmar@redhat.com References: <1502470352-19447-1-git-send-email-pbonzini@redhat.com> <1502470352-19447-2-git-send-email-pbonzini@redhat.com> From: David Hildenbrand Organization: Red Hat GmbH Message-ID: Date: Thu, 17 Aug 2017 10:06:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <1502470352-19447-2-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 17 Aug 2017 08:06:34 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11.08.2017 18:52, Paolo Bonzini wrote: > Calling handle_mmio_page_fault() has been unnecessary since commit > e9ee956e311d ("KVM: x86: MMU: Move handle_mmio_page_fault() call to > kvm_mmu_page_fault()", 2016-02-22) > > Signed-off-by: Paolo Bonzini > --- > arch/x86/kvm/vmx.c | 13 +++---------- > 1 file changed, 3 insertions(+), 10 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index df8d2f127508..45fb0ea78ee8 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -6410,17 +6410,10 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) > return kvm_skip_emulated_instruction(vcpu); > } > > - ret = handle_mmio_page_fault(vcpu, gpa, true); > vcpu->arch.gpa_available = true; > - if (likely(ret == RET_MMIO_PF_EMULATE)) > - return x86_emulate_instruction(vcpu, gpa, 0, NULL, 0) == > - EMULATE_DONE; > - > - if (unlikely(ret == RET_MMIO_PF_INVALID)) > - return kvm_mmu_page_fault(vcpu, gpa, 0, NULL, 0); > - > - if (unlikely(ret == RET_MMIO_PF_RETRY)) > - return 1; > + ret = kvm_mmu_page_fault(vcpu, gpa, PFERR_RSVD_MASK, NULL, 0); > + if (ret >= 0) > + return ret; > > /* It is the real ept misconfig */ > WARN_ON(1); > I think we can now un-export handle_mmio_page_fault(), as it is only arch/x86/kvm/mmu.c -- Thanks, David