Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755793Ab0FYMKh (ORCPT ); Fri, 25 Jun 2010 08:10:37 -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 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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2066 Lines: 65 This function not only return the gfn's hva but also the page number after @gfn in the slot It's used in the later patch Signed-off-by: Xiao Guangrong --- include/linux/kvm_host.h | 1 + virt/kvm/kvm_main.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletions(-) 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) -- 1.6.1.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/