Kirill A. Shutemov wrote: > Geert Uytterhoeven wrote: > > On Thu, Oct 10, 2013 at 8:05 PM, Kirill A. Shutemov > > <[email protected]> wrote: > > > Signed-off-by: Kirill A. Shutemov <[email protected]> > > > Cc: Geert Uytterhoeven <[email protected]> > > > --- > > > arch/m68k/include/asm/motorola_pgalloc.h | 5 ++++- > > > arch/m68k/include/asm/sun3_pgalloc.h | 5 ++++- > > > 2 files changed, 8 insertions(+), 2 deletions(-) > > > > > > diff --git a/arch/m68k/include/asm/motorola_pgalloc.h > > > b/arch/m68k/include/asm/motorola_pgalloc.h > > > index 2f02f264e6..dd254eeb03 100644 > > > --- a/arch/m68k/include/asm/motorola_pgalloc.h > > > +++ b/arch/m68k/include/asm/motorola_pgalloc.h > > > @@ -40,7 +40,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct > > > *mm, unsigned long addres > > > flush_tlb_kernel_page(pte); > > > nocache_page(pte); > > ^^^^^^^^^^^^^^^^^^ > > > kunmap(page); > > > - pgtable_page_ctor(page); > > > + if (!pgtable_page_ctor(page)) { > > > + __free_page(page); > > > > Shouldn't you mark the page cacheable again, like is done in pte_free()? > > Hm. You're right. Updated patch below.
I also noticed that one of pte_alloc_one didn't have the constructor at all. New patch revision bellow. >From 22109077ef31ea28bbfe6b72902854214285bc0c Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <[email protected]> Date: Wed, 9 Oct 2013 03:58:39 +0300 Subject: [PATCHv3] m68k: handle pgtable_page_ctor() fail Signed-off-by: Kirill A. Shutemov <[email protected]> Cc: Geert Uytterhoeven <[email protected]> --- arch/m68k/include/asm/mcf_pgalloc.h | 4 ++++ arch/m68k/include/asm/motorola_pgalloc.h | 8 ++++++-- arch/m68k/include/asm/sun3_pgalloc.h | 5 ++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h index 313f3dd23c..f9924fbcfe 100644 --- a/arch/m68k/include/asm/mcf_pgalloc.h +++ b/arch/m68k/include/asm/mcf_pgalloc.h @@ -56,6 +56,10 @@ static inline struct page *pte_alloc_one(struct mm_struct *mm, if (!page) return NULL; + if (!pgtable_page_ctor(page)) { + __free_page(page); + return NULL; + } pte = kmap(page); if (pte) { diff --git a/arch/m68k/include/asm/motorola_pgalloc.h b/arch/m68k/include/asm/motorola_pgalloc.h index 2f02f264e6..24bcba496c 100644 --- a/arch/m68k/include/asm/motorola_pgalloc.h +++ b/arch/m68k/include/asm/motorola_pgalloc.h @@ -29,18 +29,22 @@ static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address) { - struct page *page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); + struct page *page; pte_t *pte; + page = alloc_pages(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO, 0); if(!page) return NULL; + if (!pgtable_page_ctor(page)) { + __free_page(page); + return NULL; + } pte = kmap(page); __flush_page_to_ram(pte); flush_tlb_kernel_page(pte); nocache_page(pte); kunmap(page); - pgtable_page_ctor(page); return page; } diff --git a/arch/m68k/include/asm/sun3_pgalloc.h b/arch/m68k/include/asm/sun3_pgalloc.h index 48d80d5a66..f868506e33 100644 --- a/arch/m68k/include/asm/sun3_pgalloc.h +++ b/arch/m68k/include/asm/sun3_pgalloc.h @@ -59,7 +59,10 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, return NULL; clear_highpage(page); - pgtable_page_ctor(page); + if (!pgtable_page_ctor(page)) { + __free_page(page); + return NULL; + } return page; } -- Kirill A. Shutemov -- To unsubscribe from this list: send the line "unsubscribe linux-m68k" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
