From d6e02850d3b45c9658457214a749cc48097bdef4 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 7 Nov 2018 12:25:26 +0000 Subject: [PATCH] x86/mem-sharing: Don't leave the altp2m lock held when nominating a page get_gfn_type_access() internally takes the p2m lock, and nothing ever unlocks it. Switch to using the unlocked accessor instead. This wasn't included in XSA-277 because neither mem-sharing nor altp2m are supported. Signed-off-by: Andrew Cooper Acked-by: Tamas K Lengyel Reviewed-by: Jan Beulich --- xen/arch/x86/mm/mem_sharing.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index f4c5074849..77f0d3fb0a 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -820,7 +820,8 @@ static int nominate_page(struct domain *d, gfn_t gfn, if ( !ap2m ) continue; - amfn = get_gfn_type_access(ap2m, gfn_x(gfn), &ap2mt, &ap2ma, 0, NULL); + amfn = __get_gfn_type_access(ap2m, gfn_x(gfn), &ap2mt, &ap2ma, + 0, NULL, false); if ( mfn_valid(amfn) && (!mfn_eq(amfn, mfn) || ap2ma != p2ma) ) { altp2m_list_unlock(d); -- 2.30.2