From patchwork Thu Jul 1 13:54:28 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 109123 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 o61DwUMN029674 for ; Thu, 1 Jul 2010 13:58:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756148Ab0GAN6V (ORCPT ); Thu, 1 Jul 2010 09:58:21 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:64436 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755912Ab0GAN6U (ORCPT ); Thu, 1 Jul 2010 09:58:20 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7254E170080; Thu, 1 Jul 2010 21:58:16 +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 o61DteUa019487; Thu, 1 Jul 2010 21:55:40 +0800 Received: from [10.167.141.99] (unknown [10.167.141.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 546F810C165; Thu, 1 Jul 2010 21:58:22 +0800 (CST) Message-ID: <4C2C9E14.4070501@cn.fujitsu.com> Date: Thu, 01 Jul 2010 21:54:28 +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 v4 3/6] KVM: MMU: introduce pte_prefetch_topup_memory_cache() References: <4C2C9DC0.8050607@cn.fujitsu.com> In-Reply-To: <4C2C9DC0.8050607@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]); Thu, 01 Jul 2010 13:58:32 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index a0c5c31..6673484 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -89,6 +89,8 @@ module_param(oos_shadow, bool, 0644); } #endif +#define PTE_PREFETCH_NUM 16 + #define PT_FIRST_AVAIL_BITS_SHIFT 9 #define PT64_SECOND_AVAIL_BITS_SHIFT 52 @@ -290,15 +292,16 @@ static void __set_spte(u64 *sptep, u64 spte) #endif } -static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, - struct kmem_cache *base_cache, int min) +static int __mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, + struct kmem_cache *base_cache, int min, + int max, gfp_t flags) { void *obj; if (cache->nobjs >= min) return 0; - while (cache->nobjs < ARRAY_SIZE(cache->objects)) { - obj = kmem_cache_zalloc(base_cache, GFP_KERNEL); + while (cache->nobjs < max) { + obj = kmem_cache_zalloc(base_cache, flags); if (!obj) return -ENOMEM; cache->objects[cache->nobjs++] = obj; @@ -306,6 +309,20 @@ static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, return 0; } +static int mmu_topup_memory_cache(struct kvm_mmu_memory_cache *cache, + struct kmem_cache *base_cache, int min) +{ + return __mmu_topup_memory_cache(cache, base_cache, min, + ARRAY_SIZE(cache->objects), GFP_KERNEL); +} + +static int pte_prefetch_topup_memory_cache(struct kvm_vcpu *vcpu) +{ + return __mmu_topup_memory_cache(&vcpu->arch.mmu_rmap_desc_cache, + rmap_desc_cache, PTE_PREFETCH_NUM, + PTE_PREFETCH_NUM, GFP_ATOMIC); +} + static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc, struct kmem_cache *cache) {