From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: [PATCH v2 2/3] xen: introduce function merge_free_trunks Date: Mon, 30 Jun 2014 21:39:43 +0800 Message-ID: <1404135584-29206-2-git-send-email-bob.liu@oracle.com> References: <1404135584-29206-1-git-send-email-bob.liu@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X1boY-0007qe-OK for xen-devel@lists.xenproject.org; Mon, 30 Jun 2014 13:40:10 +0000 Received: by mail-oa0-f41.google.com with SMTP id l6so8810125oag.14 for ; Mon, 30 Jun 2014 06:40:07 -0700 (PDT) In-Reply-To: <1404135584-29206-1-git-send-email-bob.liu@oracle.com> 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.xenproject.org Cc: keir@xen.org, ian.campbell@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org Separated from free_heap_pages(), will be used by idle vcpu scrubbing. Signed-off-by: Bob Liu --- xen/common/page_alloc.c | 118 +++++++++++++++++++++++++---------------------- 1 file changed, 64 insertions(+), 54 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index c184f86..ab293c8 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -831,11 +831,73 @@ static int reserve_offlined_page(struct page_info *head) return count; } +static void merge_free_trunks(struct page_info *pg, unsigned int order, + unsigned int node, unsigned int zone, bool_t need_scrub) +{ + unsigned long mask; + + ASSERT(spin_is_locked(&heap_lock)); + + /* Merge chunks as far as possible. */ + while ( order < MAX_ORDER ) + { + mask = 1UL << order; + + if ( (page_to_mfn(pg) & mask) ) + { + /* Merge with predecessor block? */ + if ( !mfn_valid(page_to_mfn(pg-mask)) || + !page_state_is(pg-mask, free) || + (PFN_ORDER(pg-mask) != order) || + (phys_to_nid(page_to_maddr(pg-mask)) != node) ) + break; + /* If we need scrub, only merge with PGC_need_scrub pages */ + if ( need_scrub ) + { + if ( !test_bit(_PGC_need_scrub, &(pg-mask)->count_info) ) + break; + } + else + { + if ( test_bit(_PGC_need_scrub, &(pg-mask)->count_info) ) + break; + } + pg -= mask; + page_list_del(pg, &heap(node, zone, order)); + } + else + { + /* Merge with successor block? */ + if ( !mfn_valid(page_to_mfn(pg+mask)) || + !page_state_is(pg+mask, free) || + (PFN_ORDER(pg+mask) != order) || + (phys_to_nid(page_to_maddr(pg+mask)) != node) ) + break; + if ( need_scrub ) + { + if ( !test_bit(_PGC_need_scrub, &(pg+mask)->count_info) ) + break; + } + else + { + if ( test_bit(_PGC_need_scrub, &(pg+mask)->count_info) ) + break; + } + page_list_del(pg + mask, &heap(node, zone, order)); + } + + order++; + } + + PFN_ORDER(pg) = order; + page_list_add_tail(pg, &heap(node, zone, order)); +} + /* Free 2^@order set of pages. */ static void free_heap_pages( struct page_info *pg, unsigned int order, bool_t need_scrub) { - unsigned long mask, mfn = page_to_mfn(pg); + unsigned long mfn = page_to_mfn(pg); unsigned int i, node = phys_to_nid(page_to_maddr(pg)), tainted = 0; unsigned int zone = page_to_zone(pg); @@ -891,59 +953,7 @@ static void free_heap_pages( } } - /* Merge chunks as far as possible. */ - while ( order < MAX_ORDER ) - { - mask = 1UL << order; - - if ( (page_to_mfn(pg) & mask) ) - { - /* Merge with predecessor block? */ - if ( !mfn_valid(page_to_mfn(pg-mask)) || - !page_state_is(pg-mask, free) || - (PFN_ORDER(pg-mask) != order) || - (phys_to_nid(page_to_maddr(pg-mask)) != node) ) - break; - /* If we need scrub, only merge with PGC_need_scrub pages */ - if ( need_scrub ) - { - if ( !test_bit(_PGC_need_scrub, &(pg-mask)->count_info) ) - break; - } - else - { - if ( test_bit(_PGC_need_scrub, &(pg-mask)->count_info) ) - break; - } - pg -= mask; - page_list_del(pg, &heap(node, zone, order)); - } - else - { - /* Merge with successor block? */ - if ( !mfn_valid(page_to_mfn(pg+mask)) || - !page_state_is(pg+mask, free) || - (PFN_ORDER(pg+mask) != order) || - (phys_to_nid(page_to_maddr(pg+mask)) != node) ) - break; - if ( need_scrub ) - { - if ( !test_bit(_PGC_need_scrub, &(pg+mask)->count_info) ) - break; - } - else - { - if ( test_bit(_PGC_need_scrub, &(pg+mask)->count_info) ) - break; - } - page_list_del(pg + mask, &heap(node, zone, order)); - } - - order++; - } - - PFN_ORDER(pg) = order; - page_list_add_tail(pg, &heap(node, zone, order)); + merge_free_trunks(pg, order, node, zone, need_scrub); if ( tainted ) reserve_offlined_page(pg); -- 1.7.10.4