From: Marcelo Tosatti <mtosatti@redhat.com>
To: kvm <kvm@vger.kernel.org>, Ulrich Obergfell <uobergfe@redhat.com>
Cc: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>,
Takuya Yoshikawa <takuya.yoshikawa@gmail.com>,
Avi Kivity <avi.kivity@gmail.com>
Subject: KVM: MMU: improve n_max_mmu_pages calculation with TDP
Date: Wed, 20 Mar 2013 17:14:20 -0300 [thread overview]
Message-ID: <20130320201420.GA17347@amt.cnet> (raw)
kvm_mmu_calculate_mmu_pages numbers,
maximum number of shadow pages = 2% of mapped guest pages
Does not make sense for TDP guests where mapping all of guest
memory with 4k pages cannot exceed "mapped guest pages / 512"
(not counting root pages).
Allow that maximum for TDP, forcing the guest to recycle otherwise.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 956ca35..a9694a8d7 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -4293,7 +4293,7 @@ nomem:
unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)
{
unsigned int nr_mmu_pages;
- unsigned int nr_pages = 0;
+ unsigned int i, nr_pages = 0;
struct kvm_memslots *slots;
struct kvm_memory_slot *memslot;
@@ -4302,7 +4302,19 @@ unsigned int kvm_mmu_calculate_mmu_pages(struct kvm *kvm)
kvm_for_each_memslot(memslot, slots)
nr_pages += memslot->npages;
- nr_mmu_pages = nr_pages * KVM_PERMILLE_MMU_PAGES / 1000;
+ if (tdp_enabled) {
+ /* one root page */
+ nr_mmu_pages = 1;
+ /* nr_pages / (512^i) per level, due to
+ * guest RAM map being linear */
+ for (i = 1; i < 4; i++) {
+ int nr_pages_round = nr_pages + (1 << (9*i));
+ nr_mmu_pages += nr_pages_round >> (9*i);
+ }
+ } else {
+ nr_mmu_pages = nr_pages * KVM_PERMILLE_MMU_PAGES / 1000;
+ }
+
nr_mmu_pages = max(nr_mmu_pages,
(unsigned int) KVM_MIN_ALLOC_MMU_PAGES);
next reply other threads:[~2013-03-20 20:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 20:14 Marcelo Tosatti [this message]
2013-03-21 5:41 ` KVM: MMU: improve n_max_mmu_pages calculation with TDP Xiao Guangrong
2013-03-21 14:29 ` Marcelo Tosatti
2013-03-22 3:00 ` Xiao Guangrong
2013-03-22 10:31 ` Marcelo Tosatti
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=20130320201420.GA17347@amt.cnet \
--to=mtosatti@redhat.com \
--cc=avi.kivity@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=takuya.yoshikawa@gmail.com \
--cc=uobergfe@redhat.com \
--cc=xiaoguangrong@linux.vnet.ibm.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