From patchwork Fri Apr 14 15:37:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9681377 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 6CA1360326 for ; Fri, 14 Apr 2017 15:38:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5EACC2869B for ; Fri, 14 Apr 2017 15:38:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53864286C0; Fri, 14 Apr 2017 15:38:19 +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 279A42869B for ; Fri, 14 Apr 2017 15:38:16 +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 1cz3GJ-0007EP-Es; Fri, 14 Apr 2017 15:35:51 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cz3GI-0007D2-6M for xen-devel@lists.xen.org; Fri, 14 Apr 2017 15:35:50 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id B1/41-03648-55CE0F85; Fri, 14 Apr 2017 15:35:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsUyZ7p8oG7omw8 RBi1X2CyWfFzM4sDocXT3b6YAxijWzLyk/IoE1ozZC9oYC05LVSxZd5utgfG/UBcjF4eQwEQm iW1nvrNCOH8ZJT5e+MwM4WxklFhycBsbhNPDKHFj9jb2LkZODjYBI4mzR6czgtgiAtIS1z5fZ gQpYhZoYJJ4fu4gkMPBISwQKLF4QihIDYuAqsS2TVdYQGxeAU+Je9fuM4HYEgJyEjtWP2ECKe cU8JI4/hdspBBQyc/mC4wQJYYSpx9uY5zAyLeAkWEVo0ZxalFZapGusbFeUlFmekZJbmJmjq6 hgZlebmpxcWJ6ak5iUrFecn7uJkZgqDAAwQ7GnesDDzFKcjApifIuePUhQogvKT+lMiOxOCO+ qDQntfgQowwHh5IE7ymQnGBRanpqRVpmDjBoYdISHDxKIrw/QdK8xQWJucWZ6RCpU4yKUuK8X K+BEgIgiYzSPLg2WKRcYpSVEuZlBDpEiKcgtSg3swRV/hWjOAejkjDvMZDxPJl5JXDTXwEtZg JazDAZbHFJIkJKqoGx886xawpnOlZIZ8cnsLy/Z/jLPvHjTes5wY8VHI26r4n5PQq+r6Ecl8G 8432b/K74j2dPXI0zenpq57z+8msC33KyTXzn+QnXbVOweHK5teHWtUO3WrVVMjYEb+jh0bzJ LCOwW71s9rSZR8/zudgvbtgi1lJXyOpp/a5C500GV6DRirSXASFKLMUZiYZazEXFiQDuetXaj wIAAA== X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1492184147!60268482!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.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8860 invoked from network); 14 Apr 2017 15:35:48 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 14 Apr 2017 15:35:48 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v3EFZcp3019082 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Apr 2017 15:35:38 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v3EFZbmX009699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Apr 2017 15:35:38 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v3EFZY7r022346; Fri, 14 Apr 2017 15:35:35 GMT Received: from ovs101.us.oracle.com (/10.149.76.201) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 14 Apr 2017 08:35:34 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Fri, 14 Apr 2017 11:37:30 -0400 Message-Id: <1492184258-3277-2-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1492184258-3277-1-git-send-email-boris.ostrovsky@oracle.com> References: <1492184258-3277-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] 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, jbeulich@suse.com, Boris Ostrovsky Subject: [Xen-devel] [PATCH v3 1/9] mm: Separate free page chunk merging into its own routine 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 is needed for subsequent changes to memory scrubbing. Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- Changes in v3: * Simplify merge_and_free_buddy() (and drop can_merge()) xen/common/page_alloc.c | 74 ++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 33 deletions(-) diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index 9e41fb4..6fe55ee 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -919,11 +919,50 @@ static int reserve_offlined_page(struct page_info *head) return count; } +/* Returns new buddy head. */ +static struct page_info * +merge_and_free_buddy(struct page_info *pg, unsigned int node, + unsigned int zone, unsigned int order) +{ + ASSERT(spin_is_locked(&heap_lock)); + + /* Merge chunks as far as possible. */ + while ( order < MAX_ORDER ) + { + unsigned long mask = 1UL << order; + struct page_info *buddy; + + if ( (page_to_mfn(pg) & mask) ) + buddy = pg - mask; /* Merge with predecessor block. */ + else + buddy = pg + mask; /* Merge with successor block. */ + + if ( !mfn_valid(_mfn(page_to_mfn(buddy))) || + !page_state_is(buddy, free) || + (PFN_ORDER(buddy) != order) || + (phys_to_nid(page_to_maddr(buddy)) != node) ) + break; + + page_list_del(buddy, &heap(node, zone, order)); + + /* Adjust current buddy head if we merged backwards. */ + if ( buddy < pg ) + pg = buddy; + + order++; + } + + PFN_ORDER(pg) = order; + page_list_add_tail(pg, &heap(node, zone, order)); + + return pg; +} + /* Free 2^@order set of pages. */ static void free_heap_pages( struct page_info *pg, unsigned int order) { - 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); @@ -970,38 +1009,7 @@ static void free_heap_pages( midsize_alloc_zone_pages = max( midsize_alloc_zone_pages, total_avail_pages / MIDSIZE_ALLOC_FRAC); - /* 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(_mfn(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; - pg -= mask; - page_list_del(pg, &heap(node, zone, order)); - } - else - { - /* Merge with successor block? */ - if ( !mfn_valid(_mfn(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; - page_list_del(pg + mask, &heap(node, zone, order)); - } - - order++; - } - - PFN_ORDER(pg) = order; - page_list_add_tail(pg, &heap(node, zone, order)); + pg = merge_and_free_buddy(pg, node, zone, order); if ( tainted ) reserve_offlined_page(pg);