From 14cd36c23d7165156e1ec4ecb082363dfffe7537 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Mon, 30 Sep 2013 13:06:12 +0100 Subject: xen/arm: map_domain_page: reuse slots with avail == 0 If a slot has avail == 0 but still points to the right mfn, reuse it. Signed-off-by: Stefano Stabellini Acked-by: Tim Deegan Acked-by: Ian Campbell --- xen/arch/arm/mm.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 068d7a09e4..474dfef9db 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -259,7 +259,15 @@ void *map_domain_page(unsigned long mfn) i < DOMHEAP_ENTRIES; slot = (slot + 1) % DOMHEAP_ENTRIES, i++ ) { - if ( map[slot].pt.avail == 0 ) + if ( map[slot].pt.avail < 0xf && + map[slot].pt.base == slot_mfn && + map[slot].pt.valid ) + { + /* This slot already points to the right place; reuse it */ + map[slot].pt.avail++; + break; + } + else if ( map[slot].pt.avail == 0 ) { /* Commandeer this 2MB slot */ pte = mfn_to_xen_entry(slot_mfn); @@ -267,12 +275,7 @@ void *map_domain_page(unsigned long mfn) write_pte(map + slot, pte); break; } - else if ( map[slot].pt.avail < 0xf && map[slot].pt.base == slot_mfn ) - { - /* This slot already points to the right place; reuse it */ - map[slot].pt.avail++; - break; - } + } /* If the map fills up, the callers have misbehaved. */ BUG_ON(i == DOMHEAP_ENTRIES); -- cgit v1.2.3