From patchwork Wed Aug 16 18:33:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9904489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E9A44603B5 for ; Wed, 16 Aug 2017 18:33:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD48628A47 for ; Wed, 16 Aug 2017 18:33:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D231628A49; Wed, 16 Aug 2017 18:33:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3D38C28A41 for ; Wed, 16 Aug 2017 18:33:15 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1di35d-0005Sy-4U; Wed, 16 Aug 2017 18:30:49 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1di35b-0005SK-Cg for xen-devel@lists.xen.org; Wed, 16 Aug 2017 18:30:47 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 81/DB-01724-65F84995; Wed, 16 Aug 2017 18:30:46 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnkeJIrShJLcpLzFFi42KZM10+UDe0f0q kwZK72hZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bTa4dZCr7aVHT8NGxg/KXVxcjFISQwkUni /ZknjBDOb0aJ89NbWbsYOYGcDYwSbz7EQiR6GCU+fHvDDJJgEzCSOHt0OiOILSIgLXHt82Wwb maBaUwSe7+9A3I4OIQFfCXePQ8CqWERUJW4sfEFWC+vgKfEiwNdbCC2hICCxJSH78HinAJeEm u3r2ODWOwpseTDQWaIGkOJzxuXMk9g5FvAyLCKUaM4tagstUjXyEIvqSgzPaMkNzEzR9fQwFg vN7W4ODE9NScxqVgvOT93EyMwUOoZGBh3MLaf8DvEKMnBpCTK65U/JVKILyk/pTIjsTgjvqg0 J7X4EKMMB4eSBG9+L1BOsCg1PbUiLTMHGLIwaQkOHiUR3hk9QGne4oLE3OLMdIjUKUZdjlcT/ n9jEmLJy89LlRLnfQsyQwCkKKM0D24ELH4uMcpKCfMyMjAwCPEUpBblZpagyr9iFOdgVBLmPQ kyhSczrwRu0yugI5iAjrjSPgnkiJJEhJRUA+PM9AOPL+R8TGqRcNi4M8Ip9/7xjx/MjUVm1jd 92bht0gUZ5gOLpt6bHCEvYjRV7PVf61k33EUDXLsmPnBY/fPcp85IbzPx2c8u1udfTusUivAr Yl338/LGhBdxH/NSnk68seBt2R4te2nek3EX/7bHMO87LPtQ7LTIHq4EY48ps6/vzIss1ZRVY inOSDTUYi4qTgQA26SC+ZoCAAA= X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-12.tower-31.messagelabs.com!1502908243!93509885!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58269 invoked from network); 16 Aug 2017 18:30:45 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-12.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 16 Aug 2017 18:30:45 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v7GIUZ1F022332 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Aug 2017 18:30:35 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v7GIUZUQ008170 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Aug 2017 18:30:35 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v7GIUYNH003317; Wed, 16 Aug 2017 18:30:35 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 16 Aug 2017 11:30:34 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Wed, 16 Aug 2017 14:33:08 -0400 Message-Id: <1502908394-9760-3-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1502908394-9760-1-git-send-email-boris.ostrovsky@oracle.com> References: <1502908394-9760-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, Boris Ostrovsky Subject: [Xen-devel] [PATCHES v8 2/8] mm: Extract allocation loop from alloc_heap_pages() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP This will make code a bit more readable, especially with changes that will be introduced in subsequent patches. Signed-off-by: Boris Ostrovsky Acked-by: Jan Beulich --- xen/common/page_alloc.c | 139 +++++++++++++++++++++++++++--------------------- 1 file changed, 77 insertions(+), 62 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index a39fd81..5c550b5 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -693,22 +693,15 @@ static void page_list_add_scrub(struct page_info *pg, unsigned int node, page_list_add(pg, &heap(node, zone, order)); } -/* Allocate 2^@order contiguous pages. */ -static struct page_info *alloc_heap_pages( - unsigned int zone_lo, unsigned int zone_hi, - unsigned int order, unsigned int memflags, - struct domain *d) +static struct page_info *get_free_buddy(unsigned int zone_lo, + unsigned int zone_hi, + unsigned int order, unsigned int memflags, + const struct domain *d) { - unsigned int i, j, zone = 0, nodemask_retry = 0, first_dirty; nodeid_t first_node, node = MEMF_get_node(memflags), req_node = node; - unsigned long request = 1UL << order; + nodemask_t nodemask = d ? d->node_affinity : node_online_map; + unsigned int j, zone, nodemask_retry = 0; struct page_info *pg; - nodemask_t nodemask = (d != NULL ) ? d->node_affinity : node_online_map; - bool_t need_tlbflush = 0; - uint32_t tlbflush_timestamp = 0; - - /* Make sure there are enough bits in memflags for nodeID. */ - BUILD_BUG_ON((_MEMF_bits - _MEMF_node) < (8 * sizeof(nodeid_t))); if ( node == NUMA_NO_NODE ) { @@ -724,34 +717,6 @@ static struct page_info *alloc_heap_pages( first_node = node; ASSERT(node < MAX_NUMNODES); - ASSERT(zone_lo <= zone_hi); - ASSERT(zone_hi < NR_ZONES); - - if ( unlikely(order > MAX_ORDER) ) - return NULL; - - spin_lock(&heap_lock); - - /* - * Claimed memory is considered unavailable unless the request - * is made by a domain with sufficient unclaimed pages. - */ - if ( (outstanding_claims + request > - total_avail_pages + tmem_freeable_pages()) && - ((memflags & MEMF_no_refcount) || - !d || d->outstanding_pages < request) ) - goto not_found; - - /* - * TMEM: When available memory is scarce due to tmem absorbing it, allow - * only mid-size allocations to avoid worst of fragmentation issues. - * Others try tmem pools then fail. This is a workaround until all - * post-dom0-creation-multi-page allocations can be eliminated. - */ - if ( ((order == 0) || (order >= 9)) && - (total_avail_pages <= midsize_alloc_zone_pages) && - tmem_freeable_pages() ) - goto try_tmem; /* * Start with requested node, but exhaust all node memory in requested @@ -763,17 +728,17 @@ static struct page_info *alloc_heap_pages( zone = zone_hi; do { /* Check if target node can support the allocation. */ - if ( !avail[node] || (avail[node][zone] < request) ) + if ( !avail[node] || (avail[node][zone] < (1UL << order)) ) continue; /* Find smallest order which can satisfy the request. */ for ( j = order; j <= MAX_ORDER; j++ ) if ( (pg = page_list_remove_head(&heap(node, zone, j))) ) - goto found; + return pg; } while ( zone-- > zone_lo ); /* careful: unsigned zone may wrap */ if ( (memflags & MEMF_exact_node) && req_node != NUMA_NO_NODE ) - goto not_found; + return NULL; /* Pick next node. */ if ( !node_isset(node, nodemask) ) @@ -790,46 +755,96 @@ static struct page_info *alloc_heap_pages( { /* When we have tried all in nodemask, we fall back to others. */ if ( (memflags & MEMF_exact_node) || nodemask_retry++ ) - goto not_found; + return NULL; nodes_andnot(nodemask, node_online_map, nodemask); first_node = node = first_node(nodemask); if ( node >= MAX_NUMNODES ) - goto not_found; + return NULL; } } +} + +/* Allocate 2^@order contiguous pages. */ +static struct page_info *alloc_heap_pages( + unsigned int zone_lo, unsigned int zone_hi, + unsigned int order, unsigned int memflags, + struct domain *d) +{ + nodeid_t node; + unsigned int i, buddy_order, zone, first_dirty; + unsigned long request = 1UL << order; + struct page_info *pg; + bool need_tlbflush = false; + uint32_t tlbflush_timestamp = 0; + + /* Make sure there are enough bits in memflags for nodeID. */ + BUILD_BUG_ON((_MEMF_bits - _MEMF_node) < (8 * sizeof(nodeid_t))); + + ASSERT(zone_lo <= zone_hi); + ASSERT(zone_hi < NR_ZONES); + + if ( unlikely(order > MAX_ORDER) ) + return NULL; + + spin_lock(&heap_lock); + + /* + * Claimed memory is considered unavailable unless the request + * is made by a domain with sufficient unclaimed pages. + */ + if ( (outstanding_claims + request > + total_avail_pages + tmem_freeable_pages()) && + ((memflags & MEMF_no_refcount) || + !d || d->outstanding_pages < request) ) + { + spin_unlock(&heap_lock); + return NULL; + } - try_tmem: - /* Try to free memory from tmem */ - if ( (pg = tmem_relinquish_pages(order, memflags)) != NULL ) + /* + * TMEM: When available memory is scarce due to tmem absorbing it, allow + * only mid-size allocations to avoid worst of fragmentation issues. + * Others try tmem pools then fail. This is a workaround until all + * post-dom0-creation-multi-page allocations can be eliminated. + */ + if ( ((order == 0) || (order >= 9)) && + (total_avail_pages <= midsize_alloc_zone_pages) && + tmem_freeable_pages() ) { - /* reassigning an already allocated anonymous heap page */ + /* Try to free memory from tmem. */ + pg = tmem_relinquish_pages(order, memflags); spin_unlock(&heap_lock); return pg; } - not_found: - /* No suitable memory blocks. Fail the request. */ - spin_unlock(&heap_lock); - return NULL; + pg = get_free_buddy(zone_lo, zone_hi, order, memflags, d); + if ( !pg ) + { + /* No suitable memory blocks. Fail the request. */ + spin_unlock(&heap_lock); + return NULL; + } - found: + node = phys_to_nid(page_to_maddr(pg)); + zone = page_to_zone(pg); + buddy_order = PFN_ORDER(pg); first_dirty = pg->u.free.first_dirty; /* We may have to halve the chunk a number of times. */ - while ( j != order ) + while ( buddy_order != order ) { - j--; - page_list_add_scrub(pg, node, zone, j, - (1U << j) > first_dirty ? + buddy_order--; + page_list_add_scrub(pg, node, zone, buddy_order, + (1U << buddy_order) > first_dirty ? first_dirty : INVALID_DIRTY_IDX); - pg += 1U << j; + pg += 1U << buddy_order; if ( first_dirty != INVALID_DIRTY_IDX ) { /* Adjust first_dirty */ - if ( first_dirty >= 1U << j ) - first_dirty -= 1U << j; + if ( first_dirty >= 1U << buddy_order ) + first_dirty -= 1U << buddy_order; else first_dirty = 0; /* We've moved past original first_dirty */ }