From patchwork Fri Jun 25 12:06:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Guangrong X-Patchwork-Id: 108038 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 o5PCBJJ4007147 for ; Fri, 25 Jun 2010 12:11:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755827Ab0FYMKk (ORCPT ); Fri, 25 Jun 2010 08:10:40 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:60378 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1755515Ab0FYMKj (ORCPT ); Fri, 25 Jun 2010 08:10:39 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 0C3A517011C; Fri, 25 Jun 2010 20:10:35 +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 o5PC84wW011841; Fri, 25 Jun 2010 20:08:04 +0800 Received: from [10.167.141.99] (unknown [10.167.141.99]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id A617A10C005; Fri, 25 Jun 2010 20:10:34 +0800 (CST) Message-ID: <4C249BDE.9050701@cn.fujitsu.com> Date: Fri, 25 Jun 2010 20:06:54 +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 7/10] KVM: MMU: introduce mmu_topup_memory_cache_atomic() 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:11:51 +0000 (UTC) diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index f151540..6c06666 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -291,15 +291,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; @@ -307,6 +308,26 @@ 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 mmu_topup_memory_cache_atomic(struct kvm_mmu_memory_cache *cache, + struct kmem_cache *base_cache, int min) +{ + return __mmu_topup_memory_cache(cache, base_cache, min, min, + GFP_ATOMIC); +} + +static int pte_prefetch_topup_memory_cache(struct kvm_vcpu *vcpu, int num) +{ + return mmu_topup_memory_cache_atomic(&vcpu->arch.mmu_rmap_desc_cache, + rmap_desc_cache, num); +} + static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc, struct kmem_cache *cache) {