# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1284796635 -3600
# Node ID 7405e0ddb912a993982e4e4122856965b7c706dd
# Parent 0da4bfd2bc23937d2e1a8bfa6d259be0d9e482ad
x86_32: [un]map_domain_page() is now IRQ safe.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/arch/x86/x86_32/domain_page.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff -r 0da4bfd2bc23 -r 7405e0ddb912 xen/arch/x86/x86_32/domain_page.c
--- a/xen/arch/x86/x86_32/domain_page.c Sat Sep 18 08:34:15 2010 +0100
+++ b/xen/arch/x86/x86_32/domain_page.c Sat Sep 18 08:57:15 2010 +0100
@@ -43,21 +43,21 @@ static inline struct vcpu *mapcache_curr
void *map_domain_page(unsigned long mfn)
{
- unsigned long va;
- unsigned int idx, i, flags;
+ unsigned long va, flags;
+ unsigned int idx, i;
struct vcpu *v;
struct mapcache_domain *dcache;
struct mapcache_vcpu *vcache;
struct vcpu_maphash_entry *hashent;
- ASSERT(!in_irq());
-
perfc_incr(map_domain_page_count);
v = mapcache_current_vcpu();
dcache = &v->domain->arch.mapcache;
vcache = &v->arch.mapcache;
+
+ local_irq_save(flags);
hashent = &vcache->hash[MAPHASH_HASHFN(mfn)];
if ( hashent->mfn == mfn )
@@ -70,7 +70,7 @@ void *map_domain_page(unsigned long mfn)
goto out;
}
- spin_lock_irqsave(&dcache->lock, flags);
+ spin_lock(&dcache->lock);
/* Has some other CPU caused a wrap? We must flush if so. */
if ( unlikely(dcache->epoch != vcache->shadow_epoch) )
@@ -106,11 +106,12 @@ void *map_domain_page(unsigned long mfn)
set_bit(idx, dcache->inuse);
dcache->cursor = idx + 1;
- spin_unlock_irqrestore(&dcache->lock, flags);
+ spin_unlock(&dcache->lock);
l1e_write(&dcache->l1tab[idx], l1e_from_pfn(mfn, __PAGE_HYPERVISOR));
out:
+ local_irq_restore(flags);
va = MAPCACHE_VIRT_START + (idx << PAGE_SHIFT);
return (void *)va;
}
@@ -120,10 +121,8 @@ void unmap_domain_page(const void *va)
unsigned int idx;
struct vcpu *v;
struct mapcache_domain *dcache;
- unsigned long mfn;
- struct vcpu_maphash_entry *hashent;
-
- ASSERT(!in_irq());
+ unsigned long mfn, flags;
+ struct vcpu_maphash_entry *hashent;
ASSERT((void *)MAPCACHE_VIRT_START <= va);
ASSERT(va < (void *)MAPCACHE_VIRT_END);
@@ -135,6 +134,8 @@ void unmap_domain_page(const void *va)
idx = ((unsigned long)va - MAPCACHE_VIRT_START) >> PAGE_SHIFT;
mfn = l1e_get_pfn(dcache->l1tab[idx]);
hashent = &v->arch.mapcache.hash[MAPHASH_HASHFN(mfn)];
+
+ local_irq_save(flags);
if ( hashent->idx == idx )
{
@@ -164,6 +165,8 @@ void unmap_domain_page(const void *va)
/* /Second/, mark as garbage. */
set_bit(idx, dcache->garbage);
}
+
+ local_irq_restore(flags);
}
void mapcache_domain_init(struct domain *d)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home