| Message ID | 20210611021235.2426442-1-huangpei@loongson.cn (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | MIPS: add PMD table accounting into MIPS'pmd_alloc_one | expand |
On 06/11/2021 10:12 AM, Huang Pei wrote: > 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> > --- > arch/mips/include/asm/pgalloc.h | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h > index 8b18424b3120..916bd637d30f 100644 > --- a/arch/mips/include/asm/pgalloc.h > +++ b/arch/mips/include/asm/pgalloc.h > @@ -60,10 +60,14 @@ do { \ > static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) > { > pmd_t *pmd; pmd_t *pmd = NULL; Does it needed? Thanks, Jinyang > + struct page *pg; > > - pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER); > - if (pmd) > + pg = alloc_pages(GFP_KERNEL, 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; > } >
yes，my bad，I will resend soon Original Message From: Jinyang He Sent: 2021年6月11日星期五 13:52 To: Huang Pei; Thomas Bogendoerfer; ambrosehua@gmail.com Cc: Bibo Mao; linux-mips@vger.kernel.org; Jiaxun Yang; Paul Burton; Li Xuefeng; Yang Tiezhu; Gao Juxin; Huacai Chen Subject: Re: [PATCH] MIPS: add PMD table accounting into MIPS'pmd_alloc_one On 06/11/2021 10:12 AM, Huang Pei wrote: > 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> > --- > arch/mips/include/asm/pgalloc.h | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h > index 8b18424b3120..916bd637d30f 100644 > --- a/arch/mips/include/asm/pgalloc.h > +++ b/arch/mips/include/asm/pgalloc.h > @@ -60,10 +60,14 @@ do { \ > static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) > { > pmd_t *pmd; pmd_t *pmd = NULL; Does it needed? Thanks, Jinyang > + struct page *pg; > > - pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER); > - if (pmd) > + pg = alloc_pages(GFP_KERNEL, 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; > } >
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h index 8b18424b3120..916bd637d30f 100644 --- a/arch/mips/include/asm/pgalloc.h +++ b/arch/mips/include/asm/pgalloc.h @@ -60,10 +60,14 @@ do { \ static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address) { pmd_t *pmd; + struct page *pg; - pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER); - if (pmd) + pg = alloc_pages(GFP_KERNEL, 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; }
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> --- arch/mips/include/asm/pgalloc.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)