From: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
To: Xishi Qiu <qiuxishi@huawei.com>,
Andrew Morton <akpm@linux-foundation.org>,
"H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@kernel.org>,
"Luck, Tony" <tony.luck@intel.com>,
Hanjun Guo <guohanjun@huawei.com>, Xiexiuqi <xiexiuqi@huawei.com>,
leon@leon.nu, Dave Hansen <dave.hansen@intel.com>,
Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>,
Vlastimil Babka <vbabka@suse.cz>, Mel Gorman <mgorman@suse.de>
Cc: Linux MM <linux-mm@kvack.org>, LKML <linux-kernel@vger.kernel.org>
Subject: Re: [RFC v2 PATCH 4/8] mm: add mirrored memory to buddy system
Date: Mon, 29 Jun 2015 16:39:52 +0900 [thread overview]
Message-ID: <5590F648.2080808@jp.fujitsu.com> (raw)
In-Reply-To: <558E09A1.2090102@huawei.com>
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 <qiuxishi@huawei.com>
> ---
> 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 <linux/debugfs.h>
> #include <linux/seq_file.h>
> #include <linux/memblock.h>
> +#include <linux/page-isolation.h>
>
> #include <asm-generic/sections.h>
> #include <linux/io.h>
> @@ -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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-06-29 7:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-27 2:19 [RFC v2 PATCH 0/8] mm: mirrored memory support for page buddy allocations Xishi Qiu
2015-06-27 2:23 ` [RFC v2 PATCH 1/8] mm: add a new config to manage the code Xishi Qiu
2015-06-29 6:50 ` Kamezawa Hiroyuki
2015-06-30 2:52 ` Xishi Qiu
2015-06-27 2:24 ` [RFC v2 PATCH 2/8] mm: introduce MIGRATE_MIRROR to manage the mirrored pages Xishi Qiu
2015-06-29 7:32 ` Kamezawa Hiroyuki
2015-06-30 2:45 ` Xishi Qiu
2015-06-30 7:53 ` Kamezawa Hiroyuki
2015-06-30 9:22 ` Xishi Qiu
2015-06-27 2:24 ` [RFC v2 PATCH 3/8] mm: find mirrored memory in memblock Xishi Qiu
2015-06-27 2:25 ` [RFC v2 PATCH 4/8] mm: add mirrored memory to buddy system Xishi Qiu
2015-06-29 7:39 ` Kamezawa Hiroyuki [this message]
2015-06-27 2:26 ` [RFC v2 PATCH 5/8] mm: introduce a new zone_stat_item NR_FREE_MIRROR_PAGES Xishi Qiu
2015-06-27 2:27 ` [RFC v2 PATCH 6/8] mm: add free mirrored pages info Xishi Qiu
2015-06-27 2:27 ` [RFC v2 PATCH 7/8] mm: add the buddy system interface Xishi Qiu
2015-06-29 23:11 ` Luck, Tony
2015-06-30 1:01 ` Kamezawa Hiroyuki
2015-06-30 1:31 ` Xishi Qiu
2015-06-30 2:01 ` Kamezawa Hiroyuki
2015-06-27 2:28 ` [RFC v2 PATCH 8/8] mm: add the PCP interface Xishi Qiu
2015-06-29 15:19 ` [RFC v2 PATCH 0/8] mm: mirrored memory support for page buddy allocations Dave Hansen
2015-06-30 1:26 ` Xishi Qiu
2015-06-30 1:52 ` Dave Hansen
2015-06-30 2:48 ` Xishi Qiu
2015-06-30 9:41 ` Mel Gorman
2015-06-30 10:46 ` Ingo Molnar
2015-06-30 11:53 ` Mel Gorman
2015-06-30 18:12 ` Luck, Tony
2015-07-13 4:56 ` Xishi Qiu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5590F648.2080808@jp.fujitsu.com \
--to=kamezawa.hiroyu@jp.fujitsu.com \
--cc=akpm@linux-foundation.org \
--cc=dave.hansen@intel.com \
--cc=guohanjun@huawei.com \
--cc=hpa@zytor.com \
--cc=leon@leon.nu \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mingo@kernel.org \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=qiuxishi@huawei.com \
--cc=tony.luck@intel.com \
--cc=vbabka@suse.cz \
--cc=xiexiuqi@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox