Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758243Ab3FMNj1 (ORCPT ); Thu, 13 Jun 2013 09:39:27 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:39335 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1758028Ab3FMN17 (ORCPT ); Thu, 13 Jun 2013 09:27:59 -0400 X-IronPort-AV: E=Sophos;i="4.87,858,1363104000"; d="scan'208";a="7537681" From: Tang Chen To: tglx@linutronix.de, mingo@elte.hu, hpa@zytor.com, akpm@linux-foundation.org, tj@kernel.org, trenn@suse.de, yinghai@kernel.org, jiang.liu@huawei.com, wency@cn.fujitsu.com, laijs@cn.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, mgorman@suse.de, minchan@kernel.org, mina86@mina86.com, gong.chen@linux.intel.com, vasilis.liaskovitis@profitbricks.com, lwoodman@redhat.com, riel@redhat.com, jweiner@redhat.com, prarit@redhat.com Cc: x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [Part2 PATCH v4 08/15] x86, numa: Save nid when reserve memory into memblock.reserved[]. Date: Thu, 13 Jun 2013 21:03:32 +0800 Message-Id: <1371128619-8987-9-git-send-email-tangchen@cn.fujitsu.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1371128619-8987-1-git-send-email-tangchen@cn.fujitsu.com> References: <1371128619-8987-1-git-send-email-tangchen@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/13 20:58:46, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/13 20:59:05, Serialize complete at 2013/06/13 20:59:05 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2731 Lines: 76 Since we introduced numa_sync_memblock_nid synchronize nid info in memblock.reserved[] and numa_meminfo, when numa_meminfo has been initialized, we need to save the nid into memblock.reserved[] when we reserve memory. Reported-by: Vasilis Liaskovitis Signed-off-by: Tang Chen --- include/linux/memblock.h | 1 + include/linux/mm.h | 9 +++++++++ mm/memblock.c | 10 +++++++++- 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 93f3453..f558590 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -61,6 +61,7 @@ int memblock_add(phys_addr_t base, phys_addr_t size); int memblock_remove(phys_addr_t base, phys_addr_t size); int memblock_free(phys_addr_t base, phys_addr_t size); int memblock_reserve(phys_addr_t base, phys_addr_t size); +int memblock_reserve_node(phys_addr_t base, phys_addr_t size, int nid); void memblock_trim_memory(phys_addr_t align); #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP diff --git a/include/linux/mm.h b/include/linux/mm.h index b827743..4a94b56 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1662,6 +1662,15 @@ unsigned long change_prot_numa(struct vm_area_struct *vma, unsigned long start, unsigned long end); #endif +#ifdef CONFIG_NUMA +int __init early_numa_find_range_nid(u64 start, u64 size); +#else +static inline int __init early_numa_find_range_nid(u64 start, u64 size) +{ + return 0; +} +#endif + struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); diff --git a/mm/memblock.c b/mm/memblock.c index 9e871e9..cc55ff0 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -580,9 +580,17 @@ static int __init_memblock memblock_reserve_region(phys_addr_t base, return memblock_add_region(_rgn, base, size, nid, flags); } +int __init_memblock memblock_reserve_node(phys_addr_t base, + phys_addr_t size, int nid) +{ + return memblock_reserve_region(base, size, nid, + MEMBLK_FLAGS_DEFAULT); +} + int __init_memblock memblock_reserve(phys_addr_t base, phys_addr_t size) { - return memblock_reserve_region(base, size, MAX_NUMNODES, + int nid = early_numa_find_range_nid(base, size); + return memblock_reserve_region(base, size, nid, MEMBLK_FLAGS_DEFAULT); } -- 1.7.1 -- 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/