Commit 0cf76862 authored by Muchun Song's avatar Muchun Song Committed by Zheng Zengkai
Browse files

mm: sparsemem: use huge PMD mapping for vmemmap pages 

mainline inclusion
from mainline-v5.14
commit 2d7a2171
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I3ZCW9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2d7a21715f25122779e2bed17db8c57aa01e922f

-------------------------------------------------

The preparation of splitting huge PMD mapping of vmemmap pages is ready,
so switch the mapping from PTE to PMD.

Link: https://lkml.kernel.org/r/20210616094915.34432-3-songmuchun@bytedance.com


Signed-off-by: default avatarMuchun Song <songmuchun@bytedance.com>
Reviewed-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Cc: Chen Huang <chenhuang5@huawei.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Xiongchun Duan <duanxiongchun@bytedance.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>

Conflicts:
	arch/x86/mm/init_64.c
	mm/memory_hotplug.c
Signed-off-by: default avatarChen Huang <chenhuang5@huawei.com>
Signed-off-by: default avatarNanyong Sun <sunnanyong@huawei.com>
Reviewed-by: default avatarTong Tiangen <tongtiangen@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent f659888a

Documentation/admin-guide/kernel-parameters.txt

+0 −7
Original line number Diff line number Diff line
@@ -1569,13 +1569,6 @@ 
			enabled.

			Allows heavy hugetlb users to free up some more

			memory (6 * PAGE_SIZE for each 2MB hugetlb page).

			This feauture is not free though. Large page

			tables are not used to back vmemmap pages which

			can lead to a performance degradation for some

			workloads. Also there will be memory allocation

			required when hugetlb pages are freed from the

			pool which can lead to corner cases under heavy

			memory pressure.

			Format: { on | off (default) }



			on:  enable the feature

arch/x86/mm/init_64.c

+2 −6
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/gfp.h>

#include <linux/kcore.h>

#include <linux/bootmem_info.h>

#include <linux/hugetlb.h>



#include <asm/processor.h>

#include <asm/bios_ebda.h>
@@ -1558,8 +1557,7 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, 
{

	int err;



	if ((is_hugetlb_free_vmemmap_enabled()  && !altmap) ||

	    end - start < PAGES_PER_SECTION * sizeof(struct page))

	if (end - start < PAGES_PER_SECTION * sizeof(struct page))

		err = vmemmap_populate_basepages(start, end, node, NULL);

	else if (boot_cpu_has(X86_FEATURE_PSE))

		err = vmemmap_populate_hugepages(start, end, node, altmap);
@@ -1587,8 +1585,6 @@ void register_page_bootmem_memmap(unsigned long section_nr, 
	pmd_t *pmd;

	unsigned int nr_pmd_pages;

	struct page *page;

	bool base_mapping = !boot_cpu_has(X86_FEATURE_PSE) ||

			    is_hugetlb_free_vmemmap_enabled();



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

		pte_t *pte = NULL;
@@ -1614,7 +1610,7 @@ void register_page_bootmem_memmap(unsigned long section_nr, 
		}

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



		if (base_mapping) {

		if (!boot_cpu_has(X86_FEATURE_PSE)) {

			next = (addr + PAGE_SIZE) & PAGE_MASK;

			pmd = pmd_offset(pud, addr);

			if (pmd_none(*pmd))

include/linux/hugetlb.h

+6 −19
Original line number Diff line number Diff line
@@ -876,20 +876,6 @@ static inline void huge_ptep_modify_prot_commit(struct vm_area_struct *vma, 
}

#endif



#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP

extern bool hugetlb_free_vmemmap_enabled;



static inline bool is_hugetlb_free_vmemmap_enabled(void)

{

	return hugetlb_free_vmemmap_enabled;

}

#else

static inline bool is_hugetlb_free_vmemmap_enabled(void)

{

	return false;

}

#endif



#else	/* CONFIG_HUGETLB_PAGE */

struct hstate {};
@@ -1043,13 +1029,14 @@ static inline void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr 
					pte_t *ptep, pte_t pte, unsigned long sz)

{

}



static inline bool is_hugetlb_free_vmemmap_enabled(void)

{

	return false;

}

#endif	/* CONFIG_HUGETLB_PAGE */



#ifdef CONFIG_HUGETLB_PAGE_FREE_VMEMMAP

extern bool hugetlb_free_vmemmap_enabled;

#else

#define hugetlb_free_vmemmap_enabled	false

#endif



static inline spinlock_t *huge_pte_lock(struct hstate *h,

					struct mm_struct *mm, pte_t *pte)

{