Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933227Ab3JPK3r (ORCPT ); Wed, 16 Oct 2013 06:29:47 -0400 Received: from mga09.intel.com ([134.134.136.24]:40482 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760342Ab3JPK3p (ORCPT ); Wed, 16 Oct 2013 06:29:45 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,506,1378882800"; d="scan'208";a="393703613" From: "Kirill A. Shutemov" To: "Kirill A. Shutemov" Cc: Geert Uytterhoeven , "Kirill A. Shutemov" , Andrew Morton , Peter Zijlstra , Ingo Molnar , "linux-kernel@vger.kernel.org" , Linux MM , Linux-Arch , Linux/m68k In-Reply-To: <20131016095612.34707E0090@blue.fi.intel.com> References: <1381428359-14843-1-git-send-email-kirill.shutemov@linux.intel.com> <1381428359-14843-20-git-send-email-kirill.shutemov@linux.intel.com> <20131016095612.34707E0090@blue.fi.intel.com> Subject: Re: [PATCH 19/34] m68k: handle pgtable_page_ctor() fail Content-Transfer-Encoding: 7bit Message-Id: <20131016102939.DC0D0E0090@blue.fi.intel.com> Date: Wed, 16 Oct 2013 13:29:39 +0300 (EEST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3874 Lines: 111 Kirill A. Shutemov wrote: > Geert Uytterhoeven wrote: > > On Thu, Oct 10, 2013 at 8:05 PM, Kirill A. Shutemov > > wrote: > > > Signed-off-by: Kirill A. Shutemov > > > Cc: Geert Uytterhoeven > > > --- > > > 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" Date: Wed, 9 Oct 2013 03:58:39 +0300 Subject: [PATCHv3] m68k: handle pgtable_page_ctor() fail Signed-off-by: Kirill A. Shutemov Cc: Geert Uytterhoeven --- 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/