Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936532Ab3DIVtE (ORCPT ); Tue, 9 Apr 2013 17:49:04 -0400 Received: from e23smtp06.au.ibm.com ([202.81.31.148]:57408 "EHLO e23smtp06.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936479Ab3DIVsx (ORCPT ); Tue, 9 Apr 2013 17:48:53 -0400 From: "Srivatsa S. Bhat" Subject: [RFC PATCH v2 02/15] mm: Initialize node memory regions during boot To: akpm@linux-foundation.org, mgorman@suse.de, matthew.garrett@nebula.com, dave@sr71.net, rientjes@google.com, riel@redhat.com, arjan@linux.intel.com, srinivas.pandruvada@linux.intel.com, maxime.coquelin@stericsson.com, loic.pallardy@stericsson.com, kamezawa.hiroyu@jp.fujitsu.com, lenb@kernel.org, rjw@sisk.pl Cc: gargankita@gmail.com, paulmck@linux.vnet.ibm.com, amit.kachhap@linaro.org, svaidy@linux.vnet.ibm.com, andi@firstfloor.org, wujianguo@huawei.com, kmpark@infradead.org, thomas.abraham@linaro.org, santosh.shilimkar@ti.com, srivatsa.bhat@linux.vnet.ibm.com, linux-pm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Date: Wed, 10 Apr 2013 03:16:06 +0530 Message-ID: <20130409214600.4500.41056.stgit@srivatsabhat.in.ibm.com> In-Reply-To: <20130409214443.4500.44168.stgit@srivatsabhat.in.ibm.com> References: <20130409214443.4500.44168.stgit@srivatsabhat.in.ibm.com> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13040921-7014-0000-0000-000002D42E8D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2653 Lines: 78 Initialize the node's memory-regions structures with the information about the region-boundaries, at boot time. Based-on-patch-by: Ankita Garg Signed-off-by: Srivatsa S. Bhat --- include/linux/mm.h | 4 ++++ mm/page_alloc.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/linux/mm.h b/include/linux/mm.h index e19ff30..b7b368a 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -621,6 +621,10 @@ static inline pte_t maybe_mkwrite(pte_t pte, struct vm_area_struct *vma) #define LAST_NID_MASK ((1UL << LAST_NID_WIDTH) - 1) #define ZONEID_MASK ((1UL << ZONEID_SHIFT) - 1) +/* Hard-code memory region size to be 512 MB for now. */ +#define MEM_REGION_SHIFT (29 - PAGE_SHIFT) +#define MEM_REGION_SIZE (1UL << MEM_REGION_SHIFT) + static inline enum zone_type page_zonenum(const struct page *page) { return (page->flags >> ZONES_PGSHIFT) & ZONES_MASK; diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8fcced7..9760e89 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4681,6 +4681,33 @@ static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat) #endif /* CONFIG_FLAT_NODE_MEM_MAP */ } +static void __meminit init_node_memory_regions(struct pglist_data *pgdat) +{ + int nid = pgdat->node_id; + unsigned long start_pfn = pgdat->node_start_pfn; + unsigned long end_pfn = start_pfn + pgdat->node_spanned_pages; + struct node_mem_region *region; + unsigned long i, absent; + int idx; + + for (i = start_pfn, idx = 0; i < end_pfn; + i += region->spanned_pages, idx++) { + + region = &pgdat->node_regions[idx]; + region->pgdat = pgdat; + region->start_pfn = i; + region->spanned_pages = min(MEM_REGION_SIZE, end_pfn - i); + region->end_pfn = region->start_pfn + region->spanned_pages; + + absent = __absent_pages_in_range(nid, region->start_pfn, + region->end_pfn); + + region->present_pages = region->spanned_pages - absent; + } + + pgdat->nr_node_regions = idx; +} + void __paginginit free_area_init_node(int nid, unsigned long *zones_size, unsigned long node_start_pfn, unsigned long *zholes_size) { @@ -4702,6 +4729,7 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, #endif free_area_init_core(pgdat, zones_size, zholes_size); + init_node_memory_regions(pgdat); } #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/