From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marcelo Tosatti Subject: KVM: attempt async pf only if address is contained in vma Date: Mon, 18 Oct 2010 20:24:03 -0200 Message-ID: <20101018222402.GA27350@amt.cnet> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: kvm To: Gleb Natapov Return-path: Received: from mx1.redhat.com ([209.132.183.28]:2359 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753931Ab0JRXxL (ORCPT ); Mon, 18 Oct 2010 19:53:11 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o9INrAxu014092 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 18 Oct 2010 19:53:11 -0400 Content-Disposition: inline Sender: kvm-owner@vger.kernel.org List-ID: Only attempt async pagefault if address is contained within vma. Signed-off-by: Marcelo Tosatti diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 5d57ec9..a9cfbd2 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -996,8 +996,9 @@ static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic, if (vma == NULL || addr < vma->vm_start || !(vma->vm_flags & VM_PFNMAP)) { - if (async && !(vma->vm_flags & VM_PFNMAP) && - (vma->vm_flags & VM_WRITE)) + if (async && vma && !(vma->vm_flags & VM_PFNMAP) && + (vma->vm_flags & VM_WRITE) && + addr >= vma->vm_start) *async = true; up_read(¤t->mm->mmap_sem); return_fault_page: