From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Stabellini Subject: [PATCH] xen/arm: map_domain_page: reuse slots with avail == 0 Date: Fri, 27 Sep 2013 18:45:17 +0100 Message-ID: <1380303917-30212-1-git-send-email-stefano.stabellini@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xensource.com Cc: Ian.Campbell@citrix.com, stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org If a slot has avail == 0 but still points to the right mfn, reuse it. Signed-off-by: Stefano Stabellini --- xen/arch/arm/mm.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 44ec0e3..cbcb769 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -232,7 +232,13 @@ 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 ) + { + /* 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); @@ -240,12 +246,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); -- 1.7.2.5