From patchwork Tue Mar 26 15:54:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 231423 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id B19182C0248 for ; Wed, 27 Mar 2013 03:02:44 +1100 (EST) Received: from mail-da0-x232.google.com (mail-da0-x232.google.com [IPv6:2607:f8b0:400e:c00::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 33FE62C0090 for ; Wed, 27 Mar 2013 03:02:09 +1100 (EST) Received: by mail-da0-f50.google.com with SMTP id t1so2206026dae.9 for ; Tue, 26 Mar 2013 09:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=a+TKK5JQQfAYmw8lgQ1m9iF4N0jd+9SGov2PsDbesIQ=; b=zMaafmJPIe6yh2Arha5B4L2ByfxOz/ZjaYYPMGa/tb9X2d/UsReRF8XAWn0l1Yyz/8 am3KPhb9d1hPNa63WUWtm4zfEeVXigvLG7c/fBA6B63kuV8qwVFnJF0Ox0jaSflvt90N LYlAdb35URyn6lranreEXWBtdYsMrGpyx4Rnsevf88xFopul4OtivG9e2WXzuQJwN2/3 ipOmYTMlG/SVEslvkR0sqrVgBPCqAQ953m/7YlyVQkUFdLf6sH4jYm2+Hb79CVcmsZbI pym66NsysNbigrIkYiX+YrRXRF2GZEEf9GLPGExxQH0Sett2rAeLdvhCmW0g7m60ToQa +Q2Q== X-Received: by 10.68.163.1 with SMTP id ye1mr3508158pbb.135.1364313717350; Tue, 26 Mar 2013 09:01:57 -0700 (PDT) Received: from localhost.localdomain ([114.246.172.130]) by mx.google.com with ESMTPS id bs1sm7150356pbc.8.2013.03.26.09.01.41 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Mar 2013 09:01:56 -0700 (PDT) From: Jiang Liu To: Andrew Morton , David Rientjes Subject: [PATCH v3, part4 28/39] mm/ppc: prepare for removing num_physpages and simplify mem_init() Date: Tue, 26 Mar 2013 23:54:47 +0800 Message-Id: <1364313298-17336-29-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364313298-17336-1-git-send-email-jiang.liu@huawei.com> References: <1364313298-17336-1-git-send-email-jiang.liu@huawei.com> Cc: linux-arch@vger.kernel.org, James Bottomley , David Howells , Jiang Liu , Wen Congyang , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Michal Hocko , Minchan Kim , Paul Mackerras , Mel Gorman , Mark Salter , linuxppc-dev@lists.ozlabs.org, Sergei Shtylyov , KAMEZAWA Hiroyuki , Jianguo Wu X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Prepare for removing num_physpages and simplify mem_init(). Signed-off-by: Jiang Liu Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org --- Hi all, Sorry for my mistake that my previous patch series has been screwed up. So I regenerate a third version and also set up a git tree at: git://github.com/jiangliu/linux.git mem_init Any help to review and test are welcomed! Regards! Gerry --- arch/powerpc/mm/mem.c | 56 +++++++++++-------------------------------------- 1 file changed, 12 insertions(+), 44 deletions(-) diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 0e154a9..8aba687 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -303,46 +303,27 @@ void __init paging_init(void) void __init mem_init(void) { -#ifdef CONFIG_NEED_MULTIPLE_NODES - int nid; -#endif - pg_data_t *pgdat; - unsigned long i; - struct page *page; - unsigned long reservedpages = 0, codesize, initsize, datasize, bsssize; - #ifdef CONFIG_SWIOTLB swiotlb_init(0); #endif - num_physpages = memblock_phys_mem_size() >> PAGE_SHIFT; high_memory = (void *) __va(max_low_pfn * PAGE_SIZE); #ifdef CONFIG_NEED_MULTIPLE_NODES - for_each_online_node(nid) { - if (NODE_DATA(nid)->node_spanned_pages != 0) { - printk("freeing bootmem node %d\n", nid); - free_all_bootmem_node(NODE_DATA(nid)); - } + { + pg_data_t *pgdat; + + for_each_online_pgdat(pgdat) + if (pgdat->node_spanned_pages != 0) { + printk("freeing bootmem node %d\n", + pgdat->node_id); + free_all_bootmem_node(pgdat); + } } #else max_mapnr = max_pfn; free_all_bootmem(); #endif - for_each_online_pgdat(pgdat) { - for (i = 0; i < pgdat->node_spanned_pages; i++) { - if (!pfn_valid(pgdat->node_start_pfn + i)) - continue; - page = pgdat_page_nr(pgdat, i); - if (PageReserved(page)) - reservedpages++; - } - } - - codesize = (unsigned long)&_sdata - (unsigned long)&_stext; - datasize = (unsigned long)&_edata - (unsigned long)&_sdata; - initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin; - bsssize = (unsigned long)&__bss_stop - (unsigned long)&__bss_start; #ifdef CONFIG_HIGHMEM { @@ -352,13 +333,9 @@ void __init mem_init(void) for (pfn = highmem_mapnr; pfn < max_mapnr; ++pfn) { phys_addr_t paddr = (phys_addr_t)pfn << PAGE_SHIFT; struct page *page = pfn_to_page(pfn); - if (memblock_is_reserved(paddr)) - continue; - free_highmem_page(page); - reservedpages--; + if (!memblock_is_reserved(paddr)) + free_highmem_page(page); } - printk(KERN_DEBUG "High memory: %luk\n", - totalhigh_pages << (PAGE_SHIFT-10)); } #endif /* CONFIG_HIGHMEM */ @@ -371,16 +348,7 @@ void __init mem_init(void) (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) - 1; #endif - printk(KERN_INFO "Memory: %luk/%luk available (%luk kernel code, " - "%luk reserved, %luk data, %luk bss, %luk init)\n", - nr_free_pages() << (PAGE_SHIFT-10), - num_physpages << (PAGE_SHIFT-10), - codesize >> 10, - reservedpages << (PAGE_SHIFT-10), - datasize >> 10, - bsssize >> 10, - initsize >> 10); - + mem_init_print_info(NULL); #ifdef CONFIG_PPC32 pr_info("Kernel virtual memory layout:\n"); pr_info(" * 0x%08lx..0x%08lx : fixmap\n", FIXADDR_START, FIXADDR_TOP);