From patchwork Fri Jun 25 12:06:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 108033 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5PCAdLB006994 for ; Fri, 25 Jun 2010 12:10:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755610Ab0FYMKf (ORCPT ); Fri, 25 Jun 2010 08:10:35 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:50548 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755747Ab0FYMKc (ORCPT ); Fri, 25 Jun 2010 08:10:32 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id C2A29170028; Fri, 25 Jun 2010 20:10:27 +0800 (CST) Received: from fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id o5PC7tsU011838; Fri, 25 Jun 2010 20:07:56 +0800 Received: from [10.167.141.99] (unknown [10.167.141.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id BA31C10C005; Fri, 25 Jun 2010 20:10:25 +0800 (CST) Message-ID: <4C249BD5.4040208@cn.fujitsu.com> Date: Fri, 25 Jun 2010 20:06:45 +0800 From: Xiao Guangrong User-Agent: Thunderbird 2.0.0.24 (Windows/20100228) MIME-Version: 1.0 To: Avi Kivity CC: Marcelo Tosatti , LKML , KVM list Subject: [PATCH v2 6/10] KVM: MMU: introduce gfn_to_hva_many() function References: <4C2498EC.2010006@cn.fujitsu.com> In-Reply-To: <4C2498EC.2010006@cn.fujitsu.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 25 Jun 2010 12:10:40 +0000 (UTC) diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 515fefd..8f7af32 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -289,6 +289,7 @@ void kvm_disable_largepages(void); void kvm_arch_flush_shadow(struct kvm *kvm); struct page *gfn_to_page(struct kvm *kvm, gfn_t gfn); +unsigned long gfn_to_hva_many(struct kvm *kvm, gfn_t gfn, int *entry); unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn); void kvm_release_page_clean(struct page *page); void kvm_release_page_dirty(struct page *page); diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 60bb3d5..a007889 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -913,15 +913,26 @@ static unsigned long gfn_to_hva_memslot(struct kvm_memory_slot *slot, gfn_t gfn) return slot->userspace_addr + (gfn - slot->base_gfn) * PAGE_SIZE; } -unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn) +unsigned long gfn_to_hva_many(struct kvm *kvm, gfn_t gfn, int *entry) { struct kvm_memory_slot *slot; slot = gfn_to_memslot(kvm, gfn); + if (!slot || slot->flags & KVM_MEMSLOT_INVALID) return bad_hva(); + + if (entry) + *entry = slot->npages - (gfn - slot->base_gfn); + return gfn_to_hva_memslot(slot, gfn); } +EXPORT_SYMBOL_GPL(gfn_to_hva_many); + +unsigned long gfn_to_hva(struct kvm *kvm, gfn_t gfn) +{ + return gfn_to_hva_many(kvm, gfn, NULL); +} EXPORT_SYMBOL_GPL(gfn_to_hva); static pfn_t hva_to_pfn(struct kvm *kvm, unsigned long addr, bool atomic)