From: Marcelo Tosatti <mtosatti@redhat.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm-devel <kvm@vger.kernel.org>, Jeremy Fitzhardinge <jeremy@goop.org>
Subject: KVM: guest: only batch user pte updates
Date: Tue, 10 Feb 2009 19:45:32 -0200 [thread overview]
Message-ID: <20090210214532.GA4082@amt.cnet> (raw)
KVM's paravirt mmu pte batching has issues with, at least, kernel
updates from DEBUG_PAGEALLOC.
This has been experienced with slab allocation from irq context from
within lazy mmu sections:
https://bugzilla.redhat.com/show_bug.cgi?id=480822
DEBUG_PAGEALLOC will map/unmap the kernel pagetables to catch bad
accesses, with code such as:
__change_page_attr():
/*
* Do we really change anything ?
*/
if (pte_val(old_pte) != pte_val(new_pte)) {
set_pte_atomic(kpte, new_pte);
cpa->flags |= CPA_FLUSHTLB;
}
A present->nonpresent update can be queued, but not yet committed to
memory. So the set_pte_atomic will be skipped but the update flushed
afterwards. set_pte_ATOMIC.
Only allow batching from set_pte_at, which is the interesting case.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 478bca9..ba2086a 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -86,7 +86,7 @@ static void kvm_deferred_mmu_op(void *buffer, int len)
state->mmu_queue_len += len;
}
-static void kvm_mmu_write(void *dest, u64 val)
+static void kvm_mmu_write(void *dest, u64 val, bool batch)
{
__u64 pte_phys;
struct kvm_mmu_op_write_pte wpte;
@@ -107,6 +107,8 @@ static void kvm_mmu_write(void *dest, u64 val)
wpte.pte_phys = pte_phys;
kvm_deferred_mmu_op(&wpte, sizeof wpte);
+ if (!batch)
+ mmu_queue_flush(kvm_para_state());
}
/*
@@ -117,54 +119,54 @@ static void kvm_mmu_write(void *dest, u64 val)
*/
static void kvm_set_pte(pte_t *ptep, pte_t pte)
{
- kvm_mmu_write(ptep, pte_val(pte));
+ kvm_mmu_write(ptep, pte_val(pte), false);
}
static void kvm_set_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte)
{
- kvm_mmu_write(ptep, pte_val(pte));
+ kvm_mmu_write(ptep, pte_val(pte), true);
}
static void kvm_set_pmd(pmd_t *pmdp, pmd_t pmd)
{
- kvm_mmu_write(pmdp, pmd_val(pmd));
+ kvm_mmu_write(pmdp, pmd_val(pmd), false);
}
#if PAGETABLE_LEVELS >= 3
#ifdef CONFIG_X86_PAE
static void kvm_set_pte_atomic(pte_t *ptep, pte_t pte)
{
- kvm_mmu_write(ptep, pte_val(pte));
+ kvm_mmu_write(ptep, pte_val(pte), false);
}
static void kvm_set_pte_present(struct mm_struct *mm, unsigned long addr,
pte_t *ptep, pte_t pte)
{
- kvm_mmu_write(ptep, pte_val(pte));
+ kvm_mmu_write(ptep, pte_val(pte), false);
}
static void kvm_pte_clear(struct mm_struct *mm,
unsigned long addr, pte_t *ptep)
{
- kvm_mmu_write(ptep, 0);
+ kvm_mmu_write(ptep, 0, false);
}
static void kvm_pmd_clear(pmd_t *pmdp)
{
- kvm_mmu_write(pmdp, 0);
+ kvm_mmu_write(pmdp, 0, false);
}
#endif
static void kvm_set_pud(pud_t *pudp, pud_t pud)
{
- kvm_mmu_write(pudp, pud_val(pud));
+ kvm_mmu_write(pudp, pud_val(pud), false);
}
#if PAGETABLE_LEVELS == 4
static void kvm_set_pgd(pgd_t *pgdp, pgd_t pgd)
{
- kvm_mmu_write(pgdp, pgd_val(pgd));
+ kvm_mmu_write(pgdp, pgd_val(pgd), false);
}
#endif
#endif /* PAGETABLE_LEVELS >= 3 */
next reply other threads:[~2009-02-10 21:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 21:45 Marcelo Tosatti [this message]
2009-02-10 22:17 ` KVM: guest: only batch user pte updates Jeremy Fitzhardinge
2009-02-10 22:41 ` Marcelo Tosatti
2009-02-10 23:14 ` Jeremy Fitzhardinge
2009-02-11 11:56 ` Avi Kivity
2009-02-11 16:57 ` Jeremy Fitzhardinge
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=20090210214532.GA4082@amt.cnet \
--to=mtosatti@redhat.com \
--cc=avi@redhat.com \
--cc=jeremy@goop.org \
--cc=kvm@vger.kernel.org \
/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