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 <kvm@vger.kernel.org>
Subject: [PATCH 8/10] KVM: MMU: cleanup page alloc and free
Date: Fri, 04 Mar 2011 19:01:10 +0800	[thread overview]
Message-ID: <4D70C676.5050602@cn.fujitsu.com> (raw)
In-Reply-To: <4D70C569.1030107@cn.fujitsu.com>

Using __get_free_page instead of alloc_page and page_address,
using free_page instead of __free_page and virt_to_page

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

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 8acb8e3..7d558b8 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -379,15 +379,15 @@ static void mmu_free_memory_cache(struct kvm_mmu_memory_cache *mc,
 static int mmu_topup_memory_cache_page(struct kvm_mmu_memory_cache *cache,
 				       int min)
 {
-	struct page *page;
+	void *page;
 
 	if (cache->nobjs >= min)
 		return 0;
 	while (cache->nobjs < ARRAY_SIZE(cache->objects)) {
-		page = alloc_page(GFP_KERNEL);
+		page = (void *)__get_free_page(GFP_KERNEL);
 		if (!page)
 			return -ENOMEM;
-		cache->objects[cache->nobjs++] = page_address(page);
+		cache->objects[cache->nobjs++] = page;
 	}
 	return 0;
 }
@@ -1043,9 +1043,9 @@ static void kvm_mmu_free_page(struct kvm *kvm, struct kvm_mmu_page *sp)
 	ASSERT(is_empty_shadow_page(sp->spt));
 	hlist_del(&sp->hash_link);
 	list_del(&sp->link);
-	__free_page(virt_to_page(sp->spt));
+	free_page((unsigned long)sp->spt);
 	if (!sp->role.direct)
-		__free_page(virt_to_page(sp->gfns));
+		free_page((unsigned long)sp->gfns);
 	kmem_cache_free(mmu_page_header_cache, sp);
 	kvm_mod_used_mmu_pages(kvm, -1);
 }
-- 
1.7.4

  parent reply	other threads:[~2011-03-04 11:01 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-04 10:56 [PATCH 1/10] KVM: MMU: fix kvm_mmu_slot_remove_write_access Xiao Guangrong
2011-03-04 10:57 ` [PATCH 2/10] KVM: MMU: fix kvm_mmu_get_spte_hierarchy Xiao Guangrong
2011-03-05 16:48   ` Marcelo Tosatti
2011-03-07  3:06     ` Xiao Guangrong
2011-03-07  8:55       ` Avi Kivity
2011-03-04 10:58 ` [PATCH 3/10] KVM: MMU: set spte accessed bit properly Xiao Guangrong
2011-03-04 10:58 ` [PATCH 4/10] KVM: fix rcu usage in init_rmode_* functions Xiao Guangrong
2011-03-04 11:43   ` Jan Kiszka
2011-03-07  2:04     ` Xiao Guangrong
2011-03-04 10:59 ` [PATCH 5/10] KVM: MMU: move mmu pages calculated out of mmu lock Xiao Guangrong
2011-03-04 11:00 ` [PATCH 6/10] KVM: MMU: don not record gfn in kvm_mmu_pte_write Xiao Guangrong
2011-03-06 12:14   ` Avi Kivity
2011-03-06 12:16     ` Avi Kivity
2011-03-07  3:16       ` Xiao Guangrong
2011-03-04 11:00 ` [PATCH 7/10] KVM: MMU: introduce a common function to get no-dirty-logged slot Xiao Guangrong
2011-03-06 12:28   ` Avi Kivity
2011-03-07  3:50     ` Xiao Guangrong
2011-03-04 11:01 ` Xiao Guangrong [this message]
2011-03-04 11:01 ` [PATCH 9/10] KVM: MMU: remove unused macros Xiao Guangrong
2011-03-04 11:02 ` [PATCH 10/10] KVM: cleanup memslot_id function Xiao Guangrong
2011-03-06 12:32   ` Avi Kivity
2011-03-06 12:34 ` [PATCH 1/10] KVM: MMU: fix kvm_mmu_slot_remove_write_access Avi Kivity

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=4D70C676.5050602@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