xen/p2m: Don't call get_balloon_scratch_page() twice, keep interrupts disabled for...
authorBoris Ostrovsky <boris.ostrovsky@oracle.com>
Mon, 9 Sep 2013 10:44:26 +0000 (10:44 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Mon, 9 Sep 2013 10:50:52 +0000 (10:50 +0000)
commitd7f8f48d1eb3186b1b80b2ed9a7adab191f753e9
tree712a6bf69b28b03a0defce46f7289d4cfba94eb0
parent9dd4b2944c46e1fdbd0a516c221c8a2670cbf005
xen/p2m: Don't call get_balloon_scratch_page() twice, keep interrupts disabled for multicalls

m2p_remove_override() calls get_balloon_scratch_page() in
MULTI_update_va_mapping() even though it already has pointer to this page from
the earlier call (in scratch_page). This second call doesn't have a matching
put_balloon_scratch_page() thus not restoring preempt count back. (Also, there
is no put_balloon_scratch_page() in the error path.)

In addition, the second multicall uses __xen_mc_entry() which does not disable
interrupts. Rearrange xen_mc_* calls to keep interrupts off while performing
multicalls.

This commit fixes a regression introduced by:

commit ee0726407feaf504dff304fb603652fb2d778b42
Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Date:   Tue Jul 23 17:23:54 2013 +0000

    xen/m2p: use GNTTABOP_unmap_and_replace to reinstate the original mapping

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
arch/x86/xen/p2m.c