diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-07-17 10:21:33 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-07-17 10:21:33 +0200 |
| commit | 68caac7f6f4687241a24e804a9fca19aa26fe183 (patch) | |
| tree | d051f7635da5382669c23af09e3f1304478790b0 /xen/common/vmap.c | |
| parent | e0b6459aa2236324213d8af38c44eceb6efcedc3 (diff) | |
| download | xen-68caac7f6f4687241a24e804a9fca19aa26fe183.tar.gz xen-68caac7f6f4687241a24e804a9fca19aa26fe183.tar.bz2 xen-68caac7f6f4687241a24e804a9fca19aa26fe183.zip | |
x86: don't use destroy_xen_mappings() for vunmap()
Its attempt to tear down intermediate page table levels may race with
map_pages_to_xen() establishing them, and now that
map_domain_page_global() is backed by vmap() this teardown is also
wasteful (as it's very likely to need the same address space populated
again within foreseeable time).
As the race between vmap() and vunmap(), according to the latest stage
tester logs, doesn't appear to be the only one still left, the patch
also adds logging for vmap() and vunmap() uses (there shouldn't be too
many of them, so logs shouldn't get flooded). These are supposed to
get removed (and are made stand out clearly) as soon as we're certain
that there's no issue left.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/common/vmap.c')
| -rw-r--r-- | xen/common/vmap.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/xen/common/vmap.c b/xen/common/vmap.c index c2d8a8ce70..e959a17bf8 100644 --- a/xen/common/vmap.c +++ b/xen/common/vmap.c @@ -177,6 +177,7 @@ void *__vmap(const unsigned long *mfn, unsigned int granularity, void *va = vm_alloc(nr * granularity, align); unsigned long cur = (unsigned long)va; +printk("vmap(%p:%#x)\n", va, nr * granularity);//temp for ( ; va && nr--; ++mfn, cur += PAGE_SIZE * granularity ) { if ( map_pages_to_xen(cur, *mfn, granularity, flags) ) @@ -196,9 +197,14 @@ void *vmap(const unsigned long *mfn, unsigned int nr) void vunmap(const void *va) { +#ifndef _PAGE_NONE unsigned long addr = (unsigned long)va; destroy_xen_mappings(addr, addr + PAGE_SIZE * vm_size(va)); +#else /* Avoid tearing down intermediate page tables. */ +printk("vunmap(%p:%#x)\n", va, vm_size(va));//temp + map_pages_to_xen((unsigned long)va, 0, vm_size(va), _PAGE_NONE); +#endif vm_free(va); } #endif |