* [PATCH FOR STABLE]: Revert "MIPS: add PMD table accounting into"
@ 2021-07-26 7:26 Huang Pei
2021-07-26 7:26 ` [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one" Huang Pei
0 siblings, 1 reply; 5+ messages in thread
From: Huang Pei @ 2021-07-26 7:26 UTC (permalink / raw)
To: Thomas Bogendoerfer, ambrosehua
Cc: Bibo Mao, stable, Greg Kroah-Hartman, Jiaxun Yang, Li Xuefeng,
Yang Tiezhu, Gao Juxin, Huacai Chen, Jinyang He
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one"
2021-07-26 7:26 [PATCH FOR STABLE]: Revert "MIPS: add PMD table accounting into" Huang Pei
@ 2021-07-26 7:26 ` Huang Pei
2021-07-26 7:47 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Huang Pei @ 2021-07-26 7:26 UTC (permalink / raw)
To: Thomas Bogendoerfer, ambrosehua
Cc: Bibo Mao, stable, Greg Kroah-Hartman, Jiaxun Yang, Li Xuefeng,
Yang Tiezhu, Gao Juxin, Huacai Chen, Jinyang He
This reverts commit 002d8b395fa1c0679fc3c3e68873de6c1cc300a2.
Commit b2b29d6d011944 (mm: account PMD tables like PTE tables) is
introduced between v5.9 and v5.10, so this fix (commit 002d8b395fa1)
should NOT apply to any pre-5.10 branch.
Signed-off-by: Huang Pei <huangpei@loongson.cn>
---
arch/mips/include/asm/pgalloc.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index dd10854321ca..166842337eb2 100644
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -62,15 +62,11 @@ do { \
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
{
- pmd_t *pmd = NULL;
- struct page *pg;
+ pmd_t *pmd;
- pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
- if (pg) {
- pgtable_pmd_page_ctor(pg);
- pmd = (pmd_t *)page_address(pg);
+ pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
+ if (pmd)
pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
- }
return pmd;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one"
2021-07-26 7:26 ` [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one" Huang Pei
@ 2021-07-26 7:47 ` Greg Kroah-Hartman
0 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2021-07-26 7:47 UTC (permalink / raw)
To: Huang Pei
Cc: Thomas Bogendoerfer, ambrosehua, Bibo Mao, stable, Jiaxun Yang,
Li Xuefeng, Yang Tiezhu, Gao Juxin, Huacai Chen, Jinyang He
On Mon, Jul 26, 2021 at 03:26:42PM +0800, Huang Pei wrote:
> This reverts commit 002d8b395fa1c0679fc3c3e68873de6c1cc300a2.
>
> Commit b2b29d6d011944 (mm: account PMD tables like PTE tables) is
> introduced between v5.9 and v5.10, so this fix (commit 002d8b395fa1)
> should NOT apply to any pre-5.10 branch.
>
> Signed-off-by: Huang Pei <huangpei@loongson.cn>
> ---
> arch/mips/include/asm/pgalloc.h | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
> index dd10854321ca..166842337eb2 100644
> --- a/arch/mips/include/asm/pgalloc.h
> +++ b/arch/mips/include/asm/pgalloc.h
> @@ -62,15 +62,11 @@ do { \
>
> static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
> {
> - pmd_t *pmd = NULL;
> - struct page *pg;
> + pmd_t *pmd;
>
> - pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
> - if (pg) {
> - pgtable_pmd_page_ctor(pg);
> - pmd = (pmd_t *)page_address(pg);
> + pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
> + if (pmd)
> pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
> - }
> return pmd;
> }
>
> --
> 2.25.1
>
Queued up everywhere, thanks.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one"
2021-07-26 1:48 Huang Pei
@ 2021-07-26 7:00 ` Jiaxun Yang
0 siblings, 0 replies; 5+ messages in thread
From: Jiaxun Yang @ 2021-07-26 7:00 UTC (permalink / raw)
To: Huang Pei, Thomas Bogendoerfer, ambrosehua
Cc: Bibo Mao, stable, Li Xuefeng, Yang Tiezhu, Gao Juxin,
Huacai Chen, Jinyang He
在 2021/7/26 上午9:48, Huang Pei 写道:
> This reverts commit 002d8b395fa1c0679fc3c3e68873de6c1cc300a2.
>
> b2b29d6d011944 (mm: account PMD tables like PTE tables) is
> introduced between v5.9 and v5.10, so this fix should NOT
> apply to any pre-5.10 branch
Missing sign-off.
Also I think you should make it clear that the patch is for stable in
subject
(like [PATCH for stable]) and Cc stable folks like Greg to catch their
attention.
Thanks.
- Jiaxun
> ---
> arch/mips/include/asm/pgalloc.h | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
> index dd10854321ca..166842337eb2 100644
> --- a/arch/mips/include/asm/pgalloc.h
> +++ b/arch/mips/include/asm/pgalloc.h
> @@ -62,15 +62,11 @@ do { \
>
> static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
> {
> - pmd_t *pmd = NULL;
> - struct page *pg;
> + pmd_t *pmd;
>
> - pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
> - if (pg) {
> - pgtable_pmd_page_ctor(pg);
> - pmd = (pmd_t *)page_address(pg);
> + pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
> + if (pmd)
> pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
> - }
> return pmd;
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one"
@ 2021-07-26 1:48 Huang Pei
2021-07-26 7:00 ` Jiaxun Yang
0 siblings, 1 reply; 5+ messages in thread
From: Huang Pei @ 2021-07-26 1:48 UTC (permalink / raw)
To: Thomas Bogendoerfer, ambrosehua
Cc: Bibo Mao, stable, Jiaxun Yang, Li Xuefeng, Yang Tiezhu,
Gao Juxin, Huacai Chen, Jinyang He
This reverts commit 002d8b395fa1c0679fc3c3e68873de6c1cc300a2.
b2b29d6d011944 (mm: account PMD tables like PTE tables) is
introduced between v5.9 and v5.10, so this fix should NOT
apply to any pre-5.10 branch
---
arch/mips/include/asm/pgalloc.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
index dd10854321ca..166842337eb2 100644
--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -62,15 +62,11 @@ do { \
static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
{
- pmd_t *pmd = NULL;
- struct page *pg;
+ pmd_t *pmd;
- pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
- if (pg) {
- pgtable_pmd_page_ctor(pg);
- pmd = (pmd_t *)page_address(pg);
+ pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
+ if (pmd)
pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
- }
return pmd;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-07-26 7:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-26 7:26 [PATCH FOR STABLE]: Revert "MIPS: add PMD table accounting into" Huang Pei
2021-07-26 7:26 ` [PATCH] Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one" Huang Pei
2021-07-26 7:47 ` Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2021-07-26 1:48 Huang Pei
2021-07-26 7:00 ` Jiaxun Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.