diff options
| author | Tim Deegan <tim@xen.org> | 2013-07-29 12:12:17 +0100 |
|---|---|---|
| committer | Tim Deegan <tim@xen.org> | 2013-07-29 16:13:19 +0100 |
| commit | 4936f1eab977818e441946fa614aa2014e8754cc (patch) | |
| tree | 06af40cf207a46bc48e39b00041d04564e8327ad /xen | |
| parent | 704302ce9404c73cfb687d31adcf67094ab5bb53 (diff) | |
| download | xen-4936f1eab977818e441946fa614aa2014e8754cc.tar.gz xen-4936f1eab977818e441946fa614aa2014e8754cc.tar.bz2 xen-4936f1eab977818e441946fa614aa2014e8754cc.zip | |
Don't take the domain lock for p2m operations.
P2M ops are covered by their own locks, and these uses of the domain
lock are relics of shadow-v1 code.
Signed-off-by: Tim Deegan <tim@xen.org>
Reviewed-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen')
| -rw-r--r-- | xen/arch/arm/mm.c | 4 | ||||
| -rw-r--r-- | xen/arch/x86/mm.c | 9 | ||||
| -rw-r--r-- | xen/common/memory.c | 4 |
3 files changed, 3 insertions, 14 deletions
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index d1290cd366..f301e656c0 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -875,13 +875,9 @@ static int xenmem_add_to_physmap_one( return -ENOSYS; } - domain_lock(d); - /* Map at new location. */ rc = guest_physmap_add_page(d, gpfn, mfn, 0); - domain_unlock(d); - return rc; } diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c00841cd84..e7f0e134ab 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4596,11 +4596,6 @@ static int xenmem_add_to_physmap_once( return -EINVAL; } - domain_lock(d); - - if ( page ) - put_page(page); - /* Remove previously mapped page if it was present. */ prev_mfn = mfn_x(get_gfn(d, xatp->gpfn, &p2mt)); if ( mfn_valid(prev_mfn) ) @@ -4631,7 +4626,9 @@ static int xenmem_add_to_physmap_once( if ( xatp->space == XENMAPSPACE_gmfn || xatp->space == XENMAPSPACE_gmfn_range ) put_gfn(d, gfn); - domain_unlock(d); + + if ( page ) + put_page(page); return rc; } diff --git a/xen/common/memory.c b/xen/common/memory.c index 06a0d0ac4c..50b740f752 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -693,8 +693,6 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) return rc; } - domain_lock(d); - page = get_page_from_gfn(d, xrfp.gpfn, NULL, P2M_ALLOC); if ( page ) { @@ -704,8 +702,6 @@ long do_memory_op(unsigned long cmd, XEN_GUEST_HANDLE_PARAM(void) arg) else rc = -ENOENT; - domain_unlock(d); - rcu_unlock_domain(d); break; |