diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-01-05 16:36:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-05 23:55:26 -0800 |
| commit | 143646567f6dcd584e1ab359b5ec83e0545e70cf (patch) | |
| tree | 0fd9d4018799b3cc39902fe66a9e6f3bf5c882b7 /drivers/kvm | |
| parent | 32b35627355c3bf17e1903efd117efed7653a54e (diff) | |
| download | lwn-143646567f6dcd584e1ab359b5ec83e0545e70cf.tar.gz lwn-143646567f6dcd584e1ab359b5ec83e0545e70cf.zip | |
[PATCH] KVM: MMU: Treat user-mode faults as a hint that a page is no longer a page table
Signed-off-by: Avi Kivity <avi@qumranet.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/kvm')
| -rw-r--r-- | drivers/kvm/paging_tmpl.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h index 03c474aaedde..6acb16ea5ce2 100644 --- a/drivers/kvm/paging_tmpl.h +++ b/drivers/kvm/paging_tmpl.h @@ -271,6 +271,7 @@ static int FNAME(fix_write_pf)(struct kvm_vcpu *vcpu, pt_element_t *guest_ent; int writable_shadow; gfn_t gfn; + struct kvm_mmu_page *page; if (is_writeble_pte(*shadow_ent)) return 0; @@ -303,7 +304,17 @@ static int FNAME(fix_write_pf)(struct kvm_vcpu *vcpu, } gfn = walker->gfn; - if (kvm_mmu_lookup_page(vcpu, gfn)) { + + if (user) { + /* + * Usermode page faults won't be for page table updates. + */ + while ((page = kvm_mmu_lookup_page(vcpu, gfn)) != NULL) { + pgprintk("%s: zap %lx %x\n", + __FUNCTION__, gfn, page->role.word); + kvm_mmu_zap_page(vcpu, page); + } + } else if (kvm_mmu_lookup_page(vcpu, gfn)) { pgprintk("%s: found shadow page for %lx, marking ro\n", __FUNCTION__, gfn); *write_pt = 1; |