From patchwork Wed Sep 25 23:20:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Srivatsa S. Bhat" X-Patchwork-Id: 2945591 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C0520BFF05 for ; Wed, 25 Sep 2013 23:25:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD33E2034F for ; Wed, 25 Sep 2013 23:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E152520207 for ; Wed, 25 Sep 2013 23:25:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755317Ab3IYXYc (ORCPT ); Wed, 25 Sep 2013 19:24:32 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:42288 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755469Ab3IYXY3 (ORCPT ); Wed, 25 Sep 2013 19:24:29 -0400 Received: from /spool/local by e28smtp08.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Sep 2013 04:54:27 +0530 Received: from d28dlp03.in.ibm.com (9.184.220.128) by e28smtp08.in.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 26 Sep 2013 04:54:25 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp03.in.ibm.com (Postfix) with ESMTP id 5A2EF1258054; Thu, 26 Sep 2013 04:54:38 +0530 (IST) Received: from d28av01.in.ibm.com (d28av01.in.ibm.com [9.184.220.63]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r8PNONL149152226; Thu, 26 Sep 2013 04:54:23 +0530 Received: from d28av01.in.ibm.com (localhost [127.0.0.1]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id r8PNOLm5020894; Thu, 26 Sep 2013 04:54:24 +0530 Received: from srivatsabhat.in.ibm.com ([9.79.250.85]) by d28av01.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id r8PNOHnm020771; Thu, 26 Sep 2013 04:54:18 +0530 From: "Srivatsa S. Bhat" Subject: [RFC PATCH v4 29/40] mm: Add a way to request pages of a particular region from the region allocator To: akpm@linux-foundation.org, mgorman@suse.de, dave@sr71.net, hannes@cmpxchg.org, tony.luck@intel.com, matthew.garrett@nebula.com, riel@redhat.com, arjan@linux.intel.com, srinivas.pandruvada@linux.intel.com, willy@linux.intel.com, kamezawa.hiroyu@jp.fujitsu.com, lenb@kernel.org, rjw@sisk.pl Cc: gargankita@gmail.com, paulmck@linux.vnet.ibm.com, svaidy@linux.vnet.ibm.com, andi@firstfloor.org, isimatu.yasuaki@jp.fujitsu.com, santosh.shilimkar@ti.com, kosaki.motohiro@gmail.com, srivatsa.bhat@linux.vnet.ibm.com, linux-pm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Thu, 26 Sep 2013 04:50:15 +0530 Message-ID: <20130925232014.26184.62048.stgit@srivatsabhat.in.ibm.com> In-Reply-To: <20130925231250.26184.31438.stgit@srivatsabhat.in.ibm.com> References: <20130925231250.26184.31438.stgit@srivatsabhat.in.ibm.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13092523-2000-0000-0000-00000DDDF120 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,KHOP_BIG_TO_CC, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When moving freepages from one migratetype to another (using move_freepages() or equivalent), we might encounter situations in which we would like to move pages that are in the region allocator. In such cases, we need a way to request pages of a particular region from the region allocator. We already have the code to perform the heavy-lifting of actually moving the pages of a region from the region allocator to a requested freelist or migratetype. So just reorganize that code in such a way that we can also pin-point a region and specify that we want the region allocator to allocate pages from that particular region. Signed-off-by: Srivatsa S. Bhat --- mm/page_alloc.c | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/mm/page_alloc.c b/mm/page_alloc.c index ac04b45..ed5298c 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1003,24 +1003,18 @@ static void add_to_region_allocator(struct zone *z, struct free_list *free_list, *next_region = region_id; } -/* Delete freepages from the region allocator and add them to buddy freelists */ -static int del_from_region_allocator(struct zone *zone, unsigned int order, - int migratetype) +static void __del_from_region_allocator(struct zone *zone, unsigned int order, + int migratetype, int region_id) { struct region_allocator *reg_alloc; struct free_area_region *reg_area; struct list_head *ralloc_list; struct free_list *free_list; unsigned long nr_pages; - int next_region; + struct page *page; reg_alloc = &zone->region_allocator; - - next_region = reg_alloc->next_region; - if (next_region < 0) - return -ENOMEM; - - reg_area = ®_alloc->region[next_region].region_area[order]; + reg_area = ®_alloc->region[region_id].region_area[order]; ralloc_list = ®_area->list; list_for_each_entry(page, ralloc_list, lru) @@ -1029,20 +1023,34 @@ static int del_from_region_allocator(struct zone *zone, unsigned int order, free_list = &zone->free_area[order].free_list[migratetype]; nr_pages = add_to_freelist_bulk(ralloc_list, free_list, order, - next_region); + region_id); reg_area->nr_free -= nr_pages; WARN_ON(reg_area->nr_free != 0); /* Pick a new next_region */ - clear_bit(next_region, reg_alloc->ralloc_mask); - next_region = find_first_bit(reg_alloc->ralloc_mask, + clear_bit(region_id, reg_alloc->ralloc_mask); + region_id = find_first_bit(reg_alloc->ralloc_mask, MAX_NR_ZONE_REGIONS); - if (next_region >= MAX_NR_ZONE_REGIONS) - next_region = -1; /* No free regions available */ + if (region_id >= MAX_NR_ZONE_REGIONS) + region_id = -1; /* No free regions available */ + + reg_alloc->next_region = region_id; +} + +/* Delete freepages from the region allocator and add them to buddy freelists */ +static int del_from_region_allocator(struct zone *zone, unsigned int order, + int migratetype) +{ + int next_region; + + next_region = zone->region_allocator.next_region; + + if (next_region < 0) + return -ENOMEM; - reg_alloc->next_region = next_region; + __del_from_region_allocator(zone, order, migratetype, next_region); return 0; }