提交 e5ab32ff 编写于 作者: F Feiyang Chen 提交者: Hongchen Zhang

LoongArch: Add sparse memory vmemmap support

LoongArch inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5OHOB

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

Add sparse memory vmemmap support for LoongArch. SPARSEMEM_VMEMMAP
uses a virtually mapped memmap to optimise pfn_to_page and page_to_pfn
operations. This is the most efficient option when sufficient kernel
resources are available.
Signed-off-by: NMin Zhou <zhoumin@loongson.cn>
Signed-off-by: NFeiyang Chen <chenfeiyang@loongson.cn>
Signed-off-by: NHuacai Chen <chenhuacai@loongson.cn>
上级 3dfa6ea5
...@@ -432,6 +432,7 @@ config ARCH_FLATMEM_ENABLE ...@@ -432,6 +432,7 @@ config ARCH_FLATMEM_ENABLE
config ARCH_SPARSEMEM_ENABLE config ARCH_SPARSEMEM_ENABLE
def_bool y def_bool y
select SPARSEMEM_VMEMMAP_ENABLE
help help
Say Y to support efficient handling of sparse physical memory, Say Y to support efficient handling of sparse physical memory,
for architectures which are either NUMA (Non-Uniform Memory Access) for architectures which are either NUMA (Non-Uniform Memory Access)
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/page.h>
#include <asm/pgtable-bits.h> #include <asm/pgtable-bits.h>
#if CONFIG_PGTABLE_LEVELS == 2 #if CONFIG_PGTABLE_LEVELS == 2
...@@ -61,6 +62,7 @@ ...@@ -61,6 +62,7 @@
#include <linux/mm_types.h> #include <linux/mm_types.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <asm/fixmap.h> #include <asm/fixmap.h>
#include <asm/sparsemem.h>
struct mm_struct; struct mm_struct;
struct vm_area_struct; struct vm_area_struct;
...@@ -88,7 +90,10 @@ extern unsigned long zero_page_mask; ...@@ -88,7 +90,10 @@ extern unsigned long zero_page_mask;
#define VMALLOC_START MODULES_END #define VMALLOC_START MODULES_END
#define VMALLOC_END \ #define VMALLOC_END \
(vm_map_base + \ (vm_map_base + \
min(PTRS_PER_PGD * PTRS_PER_PUD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, (1UL << cpu_vabits)) - PMD_SIZE) min(PTRS_PER_PGD * PTRS_PER_PUD * PTRS_PER_PMD * PTRS_PER_PTE * PAGE_SIZE, (1UL << cpu_vabits)) - PMD_SIZE - VMEMMAP_SIZE)
#define vmemmap ((struct page *)((VMALLOC_END + PMD_SIZE) & PMD_MASK))
#define VMEMMAP_END ((unsigned long)vmemmap + VMEMMAP_SIZE - 1)
#define pte_ERROR(e) \ #define pte_ERROR(e) \
pr_err("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e)) pr_err("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))
......
...@@ -11,6 +11,12 @@ ...@@ -11,6 +11,12 @@
#define SECTION_SIZE_BITS 29 /* 2^29 = Largest Huge Page Size */ #define SECTION_SIZE_BITS 29 /* 2^29 = Largest Huge Page Size */
#define MAX_PHYSMEM_BITS 48 #define MAX_PHYSMEM_BITS 48
#ifndef CONFIG_SPARSEMEM_VMEMMAP
#define VMEMMAP_SIZE 0
#else
#define VMEMMAP_SIZE (sizeof(struct page) * (1UL << (cpu_pabits + 1 - PAGE_SHIFT)))
#endif
#endif /* CONFIG_SPARSEMEM */ #endif /* CONFIG_SPARSEMEM */
#ifdef CONFIG_MEMORY_HOTPLUG #ifdef CONFIG_MEMORY_HOTPLUG
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <linux/pfn.h> #include <linux/pfn.h>
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <linux/gfp.h> #include <linux/gfp.h>
#include <linux/initrd.h> #include <linux/hugetlb.h>
#include <linux/mmzone.h> #include <linux/mmzone.h>
#include <asm/asm-offsets.h> #include <asm/asm-offsets.h>
...@@ -157,6 +157,77 @@ void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) ...@@ -157,6 +157,77 @@ void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
#endif #endif
#endif #endif
#ifdef CONFIG_SPARSEMEM_VMEMMAP
static int __meminit vmemmap_populate_hugepages(unsigned long start, unsigned long end,
int node, struct vmem_altmap *altmap)
{
unsigned long addr = start;
unsigned long next;
pgd_t *pgd;
p4d_t *p4d;
pud_t *pud;
pmd_t *pmd;
for (addr = start; addr < end; addr = next) {
next = pmd_addr_end(addr, end);
pgd = vmemmap_pgd_populate(addr, node);
if (!pgd)
return -ENOMEM;
p4d = vmemmap_p4d_populate(pgd, addr, node);
if (!p4d)
return -ENOMEM;
pud = vmemmap_pud_populate(p4d, addr, node);
if (!pud)
return -ENOMEM;
pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd)) {
void *p = NULL;
p = vmemmap_alloc_block_buf(PMD_SIZE, node, NULL);
if (p) {
pmd_t entry;
entry = pfn_pmd(virt_to_pfn(p), PAGE_KERNEL);
pmd_val(entry) |= _PAGE_HUGE | _PAGE_HGLOBAL;
set_pmd_at(&init_mm, addr, pmd, entry);
continue;
}
} else if (pmd_val(*pmd) & _PAGE_HUGE) {
vmemmap_verify((pte_t *)pmd, node, addr, next);
continue;
}
if (vmemmap_populate_basepages(addr, next, node, NULL))
return -ENOMEM;
}
return 0;
}
#if CONFIG_PGTABLE_LEVELS == 2
int __meminit vmemmap_populate(unsigned long start, unsigned long end,
int node, struct vmem_altmap *altmap)
{
return vmemmap_populate_basepages(start, end, node, NULL);
}
#else
int __meminit vmemmap_populate(unsigned long start, unsigned long end,
int node, struct vmem_altmap *altmap)
{
return vmemmap_populate_hugepages(start, end, node, NULL);
}
#endif
#ifdef CONFIG_MEMORY_HOTPLUG
void vmemmap_free(unsigned long start, unsigned long end,
struct vmem_altmap *altmap)
{
}
#endif
#endif
/* /*
* Align swapper_pg_dir in to 64K, allows its address to be loaded * Align swapper_pg_dir in to 64K, allows its address to be loaded
* with a single LUI instruction in the TLB handlers. If we used * with a single LUI instruction in the TLB handlers. If we used
......
...@@ -3116,6 +3116,8 @@ int vmemmap_remap_alloc(unsigned long start, unsigned long end, ...@@ -3116,6 +3116,8 @@ int vmemmap_remap_alloc(unsigned long start, unsigned long end,
void *sparse_buffer_alloc(unsigned long size); void *sparse_buffer_alloc(unsigned long size);
struct page * __populate_section_memmap(unsigned long pfn, struct page * __populate_section_memmap(unsigned long pfn,
unsigned long nr_pages, int nid, struct vmem_altmap *altmap); unsigned long nr_pages, int nid, struct vmem_altmap *altmap);
void pmd_init(void *addr);
void pud_init(void *addr);
pgd_t *vmemmap_pgd_populate(unsigned long addr, int node); pgd_t *vmemmap_pgd_populate(unsigned long addr, int node);
p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node); p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node);
pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node); pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node);
......
...@@ -580,6 +580,10 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node) ...@@ -580,6 +580,10 @@ pmd_t * __meminit vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node)
return pmd; return pmd;
} }
void __weak __meminit pmd_init(void *addr)
{
}
pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node) pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node)
{ {
pud_t *pud = pud_offset(p4d, addr); pud_t *pud = pud_offset(p4d, addr);
...@@ -587,11 +591,16 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node) ...@@ -587,11 +591,16 @@ pud_t * __meminit vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node)
void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node); void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node);
if (!p) if (!p)
return NULL; return NULL;
pmd_init(p);
pud_populate(&init_mm, pud, p); pud_populate(&init_mm, pud, p);
} }
return pud; return pud;
} }
void __weak __meminit pud_init(void *addr)
{
}
p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node) p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node)
{ {
p4d_t *p4d = p4d_offset(pgd, addr); p4d_t *p4d = p4d_offset(pgd, addr);
...@@ -599,6 +608,7 @@ p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node) ...@@ -599,6 +608,7 @@ p4d_t * __meminit vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node)
void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node); void *p = vmemmap_alloc_block_zero(PAGE_SIZE, node);
if (!p) if (!p)
return NULL; return NULL;
pud_init(p);
p4d_populate(&init_mm, p4d, p); p4d_populate(&init_mm, p4d, p);
} }
return p4d; return p4d;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册