Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbbF2Hki (ORCPT ); Mon, 29 Jun 2015 03:40:38 -0400 Received: from mgwkm04.jp.fujitsu.com ([202.219.69.171]:45339 "EHLO mgwkm04.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751034AbbF2Hkb (ORCPT ); Mon, 29 Jun 2015 03:40:31 -0400 X-SecurityPolicyCheck: OK by SHieldMailChecker v2.3.2 X-SHieldMailCheckerPolicyVersion: FJ-ISEC-20150223 X-SHieldMailCheckerMailID: 3913398d0a954711bd599f5eb7ecfb78 Message-ID: <5590F648.2080808@jp.fujitsu.com> Date: Mon, 29 Jun 2015 16:39:52 +0900 From: Kamezawa Hiroyuki User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Xishi Qiu , Andrew Morton , "H. Peter Anvin" , Ingo Molnar , "Luck, Tony" , Hanjun Guo , Xiexiuqi , leon@leon.nu, Dave Hansen , Naoya Horiguchi , Vlastimil Babka , Mel Gorman CC: Linux MM , LKML Subject: Re: [RFC v2 PATCH 4/8] mm: add mirrored memory to buddy system References: <558E084A.60900@huawei.com> <558E09A1.2090102@huawei.com> In-Reply-To: <558E09A1.2090102@huawei.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3618 Lines: 111 On 2015/06/27 11:25, Xishi Qiu wrote: > Before free bootmem, set mirrored pageblock's migratetype to MIGRATE_MIRROR, so > they could free to buddy system's MIGRATE_MIRROR list. > When set reserved memory, skip the mirrored memory. > > Signed-off-by: Xishi Qiu > --- > include/linux/memblock.h | 3 +++ > mm/memblock.c | 21 +++++++++++++++++++++ > mm/nobootmem.c | 3 +++ > mm/page_alloc.c | 3 +++ > 4 files changed, 30 insertions(+) > > diff --git a/include/linux/memblock.h b/include/linux/memblock.h > index 97f71ca..53be030 100644 > --- a/include/linux/memblock.h > +++ b/include/linux/memblock.h > @@ -81,6 +81,9 @@ int memblock_mark_hotplug(phys_addr_t base, phys_addr_t size); > int memblock_clear_hotplug(phys_addr_t base, phys_addr_t size); > int memblock_mark_mirror(phys_addr_t base, phys_addr_t size); > ulong choose_memblock_flags(void); > +#ifdef CONFIG_MEMORY_MIRROR > +void memblock_mark_migratemirror(void); > +#endif > > /* Low level functions */ > int memblock_add_range(struct memblock_type *type, > diff --git a/mm/memblock.c b/mm/memblock.c > index 7612876..0d0b210 100644 > --- a/mm/memblock.c > +++ b/mm/memblock.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -818,6 +819,26 @@ int __init_memblock memblock_mark_mirror(phys_addr_t base, phys_addr_t size) > return memblock_setclr_flag(base, size, 1, MEMBLOCK_MIRROR); > } > > +#ifdef CONFIG_MEMORY_MIRROR > +void __init_memblock memblock_mark_migratemirror(void) > +{ > + unsigned long start_pfn, end_pfn, pfn; > + int i, node; > + struct page *page; > + > + printk(KERN_DEBUG "Mirrored memory:\n"); > + for_each_mirror_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, > + &node) { > + printk(KERN_DEBUG " node %3d: [mem %#010llx-%#010llx]\n", > + node, PFN_PHYS(start_pfn), PFN_PHYS(end_pfn) - 1); > + for (pfn = start_pfn; pfn < end_pfn; > + pfn += pageblock_nr_pages) { > + page = pfn_to_page(pfn); > + set_pageblock_migratetype(page, MIGRATE_MIRROR); > + } > + } > +} > +#endif > > /** > * __next__mem_range - next function for for_each_free_mem_range() etc. > diff --git a/mm/nobootmem.c b/mm/nobootmem.c > index 5258386..31aa6d4 100644 > --- a/mm/nobootmem.c > +++ b/mm/nobootmem.c > @@ -129,6 +129,9 @@ static unsigned long __init free_low_memory_core_early(void) > u64 i; > > memblock_clear_hotplug(0, -1); > +#ifdef CONFIG_MEMORY_MIRROR > + memblock_mark_migratemirror(); > +#endif > > for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, &start, &end, > NULL) > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 6e4d79f..aea78a5 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -4118,6 +4118,9 @@ static void setup_zone_migrate_reserve(struct zone *zone) > > block_migratetype = get_pageblock_migratetype(page); > > + if (is_migrate_mirror(block_migratetype)) > + continue; > + If mirrored area will not have reserved memory, this should break the page allocator's logic. I think both of mirrored and unmirrored range should have reserved area. Thanks, -Kame > /* Only test what is necessary when the reserves are not met */ > if (reserve > 0) { > /* > -- 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/