summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/pgalloc.h
diff options
context:
space:
mode:
authorHuang Pei <huangpei@loongson.cn>2021-06-11 15:09:46 +0800
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>2021-06-21 11:27:30 +0200
commited914d48b6a1040d1039d371b56273d422c0081e (patch)
tree596f4949f98a8f5e76c575d932590e4f2fec7ddb /arch/mips/include/asm/pgalloc.h
parent06476b5bed2a686b6a1c8a9e011104a631adffc3 (diff)
downloadlinux-ed914d48b6a1040d1039d371b56273d422c0081e.tar.bz2
MIPS: add PMD table accounting into MIPS'pmd_alloc_one
This fixes Page Table accounting bug. MIPS is the ONLY arch just defining __HAVE_ARCH_PMD_ALLOC_ONE alone. Since commit b2b29d6d011944 (mm: account PMD tables like PTE tables), "pmd_free" in asm-generic with PMD table accounting and "pmd_alloc_one" in MIPS without PMD table accounting causes PageTable accounting number negative, which read by global_zone_page_state(), always returns 0. Signed-off-by: Huang Pei <huangpei@loongson.cn> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/include/asm/pgalloc.h')
-rw-r--r--arch/mips/include/asm/pgalloc.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index 8b18424b3120..d0cf997b4ba8 100644
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -59,11 +59,15 @@ do { \
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
{
- pmd_t *pmd;
+ pmd_t *pmd = NULL;
+ struct page *pg;
- pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
- if (pmd)
+ pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
+ if (pg) {
+ pgtable_pmd_page_ctor(pg);
+ pmd = (pmd_t *)page_address(pg);
pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
+ }
return pmd;
}