Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46723bfa authored by Yasuaki Ishimatsu's avatar Yasuaki Ishimatsu Committed by Linus Torvalds
Browse files

memory-hotplug: implement register_page_bootmem_info_section of sparse-vmemmap 



For removing memmap region of sparse-vmemmap which is allocated bootmem,
memmap region of sparse-vmemmap needs to be registered by
get_page_bootmem().  So the patch searches pages of virtual mapping and
registers the pages by get_page_bootmem().

NOTE: register_page_bootmem_memmap() is not implemented for ia64,
      ppc, s390, and sparc.  So introduce CONFIG_HAVE_BOOTMEM_INFO_NODE
      and revert register_page_bootmem_info_node() when platform doesn't
      support it.

      It's implemented by adding a new Kconfig option named
      CONFIG_HAVE_BOOTMEM_INFO_NODE, which will be automatically selected
      by memory-hotplug feature fully supported archs(currently only on
      x86_64).

      Since we have 2 config options called MEMORY_HOTPLUG and
      MEMORY_HOTREMOVE used for memory hot-add and hot-remove separately,
      and codes in function register_page_bootmem_info_node() are only
      used for collecting infomation for hot-remove, so reside it under
      MEMORY_HOTREMOVE.

      Besides page_isolation.c selected by MEMORY_ISOLATION under
      MEMORY_HOTPLUG is also such case, move it too.

[mhocko@suse.cz: put register_page_bootmem_memmap inside CONFIG_MEMORY_HOTPLUG_SPARSE]
[linfeng@cn.fujitsu.com: introduce CONFIG_HAVE_BOOTMEM_INFO_NODE and revert register_page_bootmem_info_node()]
[mhocko@suse.cz: remove the arch specific functions without any implementation]
[linfeng@cn.fujitsu.com: mm/Kconfig: move auto selects from MEMORY_HOTPLUG to MEMORY_HOTREMOVE as needed]
[rientjes@google.com: fix defined but not used warning]
Signed-off-by: default avatarWen Congyang <wency@cn.fujitsu.com>
Signed-off-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
Reviewed-by: default avatarWu Jianguo <wujianguo@huawei.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Jianguo Wu <wujianguo@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: default avatarMichal Hocko <mhocko@suse.cz>
Signed-off-by: default avatarLin Feng <linfeng@cn.fujitsu.com>
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24d335ca

arch/ia64/mm/discontig.c

+1 −0
Original line number Diff line number Diff line
@@ -822,4 +822,5 @@ int __meminit vmemmap_populate(struct page *start_page, 
{

	return vmemmap_populate_basepages(start_page, size, node);

}



#endif

arch/powerpc/mm/init_64.c

+1 −0
Original line number Diff line number Diff line
@@ -297,5 +297,6 @@ int __meminit vmemmap_populate(struct page *start_page, 


	return 0;

}



#endif /* CONFIG_SPARSEMEM_VMEMMAP */

arch/sparc/mm/init_64.c

+1 −0
Original line number Diff line number Diff line
@@ -2235,6 +2235,7 @@ void __meminit vmemmap_populate_print_last(void) 
		node_start = 0;

	}

}



#endif /* CONFIG_SPARSEMEM_VMEMMAP */



static void prot_init_common(unsigned long page_none,

arch/x86/mm/init_64.c

+60 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,66 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) 
	return 0;

}



#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) && defined(CONFIG_HAVE_BOOTMEM_INFO_NODE)

void register_page_bootmem_memmap(unsigned long section_nr,

				  struct page *start_page, unsigned long size)

{

	unsigned long addr = (unsigned long)start_page;

	unsigned long end = (unsigned long)(start_page + size);

	unsigned long next;

	pgd_t *pgd;

	pud_t *pud;

	pmd_t *pmd;

	unsigned int nr_pages;

	struct page *page;



	for (; addr < end; addr = next) {

		pte_t *pte = NULL;



		pgd = pgd_offset_k(addr);

		if (pgd_none(*pgd)) {

			next = (addr + PAGE_SIZE) & PAGE_MASK;

			continue;

		}

		get_page_bootmem(section_nr, pgd_page(*pgd), MIX_SECTION_INFO);



		pud = pud_offset(pgd, addr);

		if (pud_none(*pud)) {

			next = (addr + PAGE_SIZE) & PAGE_MASK;

			continue;

		}

		get_page_bootmem(section_nr, pud_page(*pud), MIX_SECTION_INFO);



		if (!cpu_has_pse) {

			next = (addr + PAGE_SIZE) & PAGE_MASK;

			pmd = pmd_offset(pud, addr);

			if (pmd_none(*pmd))

				continue;

			get_page_bootmem(section_nr, pmd_page(*pmd),

					 MIX_SECTION_INFO);



			pte = pte_offset_kernel(pmd, addr);

			if (pte_none(*pte))

				continue;

			get_page_bootmem(section_nr, pte_page(*pte),

					 SECTION_INFO);

		} else {

			next = pmd_addr_end(addr, end);



			pmd = pmd_offset(pud, addr);

			if (pmd_none(*pmd))

				continue;



			nr_pages = 1 << (get_order(PMD_SIZE));

			page = pmd_page(*pmd);

			while (nr_pages--)

				get_page_bootmem(section_nr, page++,

						 SECTION_INFO);

		}

	}

}

#endif



void __meminit vmemmap_populate_print_last(void)

{

	if (p_start) {

include/linux/memory_hotplug.h

+6 −7
Original line number Diff line number Diff line
@@ -174,17 +174,16 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) 
#endif /* CONFIG_NUMA */

#endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */



#ifdef CONFIG_SPARSEMEM_VMEMMAP

#ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE

extern void register_page_bootmem_info_node(struct pglist_data *pgdat);

#else

static inline void register_page_bootmem_info_node(struct pglist_data *pgdat)

{

}

static inline void put_page_bootmem(struct page *page)

{

}

#else

extern void register_page_bootmem_info_node(struct pglist_data *pgdat);

extern void put_page_bootmem(struct page *page);

#endif

extern void put_page_bootmem(struct page *page);

extern void get_page_bootmem(unsigned long ingo, struct page *page,

			     unsigned long type);



/*

 * Lock for memory hotplug guarantees 1) all callbacks for memory hotplug