public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
	LKML <linux-kernel@vger.kernel.org>,
	KVM list <kvm@vger.kernel.org>
Subject: [PATCH 4/6] KVM: MMU: introduce mmu_topup_memory_cache_atomic()
Date: Tue, 15 Jun 2010 10:46:56 +0800	[thread overview]
Message-ID: <4C16E9A0.9080808@cn.fujitsu.com> (raw)
In-Reply-To: <4C16E7F4.5060801@cn.fujitsu.com>

Introduce mmu_topup_memory_cache_atomic(), it support topup memory
cache in atomic context.

And, when we prefetch pte, we need topup the rmap's cache

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
 arch/x86/kvm/mmu.c |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 734b106..92ff099 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -290,15 +290,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 +307,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)
+{
+	return mmu_topup_memory_cache_atomic(&vcpu->arch.mmu_rmap_desc_cache,
+					     rmap_desc_cache, 1);
+}
+
 static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc,
 				  struct kmem_cache *cache)
 {
-- 
1.6.1.2

  parent reply	other threads:[~2010-06-15  2:46 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4C16E6ED.7020009@cn.fujitsu.com>
2010-06-15  2:46 ` [PATCH 1/6] KVM: MMU: fix gfn got in kvm_mmu_page_get_gfn() Xiao Guangrong
     [not found] ` <4C16E75F.6020003@cn.fujitsu.com>
2010-06-15  2:46   ` [PATCH 2/6] KVM: MMU: fix conflict access permissions in direct sp Xiao Guangrong
     [not found]   ` <4C16E7AD.1060101@cn.fujitsu.com>
2010-06-15  2:46     ` [PATCH 3/6] KVM: MMU: introduce gfn_to_page_atomic() and gfn_to_pfn_atomic() Xiao Guangrong
2010-06-15 11:22       ` Avi Kivity
2010-06-16  7:59         ` Andi Kleen
2010-06-16  8:05           ` Avi Kivity
2010-06-16  8:49             ` Andi Kleen
2010-06-16  9:40               ` Avi Kivity
2010-06-16 10:51         ` huang ying
2010-06-16 11:08           ` Avi Kivity
2010-06-17  6:46         ` Xiao Guangrong
     [not found]     ` <4C16E7F4.5060801@cn.fujitsu.com>
2010-06-15  2:46       ` Xiao Guangrong [this message]
     [not found]       ` <4C16E82E.5010306@cn.fujitsu.com>
2010-06-15  2:47         ` [PATCH 5/6] KVM: MMU: prefetch ptes when intercepted guest #PF Xiao Guangrong
2010-06-15 11:41           ` Avi Kivity
2010-06-17  7:25             ` Xiao Guangrong
2010-06-17  8:07               ` Avi Kivity
2010-06-17  9:04                 ` Xiao Guangrong
2010-06-17  9:20                   ` Avi Kivity
2010-06-17  9:29                     ` Xiao Guangrong
2010-06-16  3:55           ` Marcelo Tosatti
     [not found]         ` <4C16E867.8040606@cn.fujitsu.com>
2010-06-15  2:47           ` [PATCH 6/6] KVM: MMU: trace pte prefetch Xiao Guangrong
2010-06-15 12:09             ` Avi Kivity
2010-06-17  7:27               ` Xiao Guangrong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C16E9A0.9080808@cn.fujitsu.com \
    --to=xiaoguangrong@cn.fujitsu.com \
    --cc=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox