Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757212Ab1CNSDB (ORCPT ); Mon, 14 Mar 2011 14:03:01 -0400 Received: from mail-qy0-f181.google.com ([209.85.216.181]:64281 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757186Ab1CNSCt (ORCPT ); Mon, 14 Mar 2011 14:02:49 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=HrcMxWpSY32L+stRZViFFVQlD/rVK+tAcSUJ4S43X2QDMp3P31btvKHJ7v8tenyajW eNv6XYYT9FttXvKCtByMULLkysFM+k+/Aise4yXmP54YJwE9WVI6YPBVQdrUVeBJvmTP KhmyVaJN+2H4w44v5nIM11DOlFpNkKXKNEmbQ= MIME-Version: 1.0 Date: Mon, 14 Mar 2011 18:02:48 +0000 Message-ID: Subject: [RFC][PATCH v2 18/23] (tile) __vmalloc: add gfp flags variant of pte and pmd allocation From: Prasad Joshi To: Chris Metcalf , Prasad Joshi , Anand Mitra , Andrew Morton , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-arch@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3236 Lines: 87 __vmalloc: propagating GFP allocation flag. - adds functions to allow caller to pass the GFP flag for memory allocation - helps in fixing the Bug 30702 (__vmalloc(GFP_NOFS) can callback file system evict_inode). Signed-off-by: Anand Mitra Signed-off-by: Prasad Joshi --- Chnagelog: arch/tile/include/asm/pgalloc.h | 13 ++++++++++++- arch/tile/mm/pgtable.c | 10 ++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) --- diff --git a/arch/tile/include/asm/pgalloc.h b/arch/tile/include/asm/pgalloc.h index cf52791..2dcad88 100644 --- a/arch/tile/include/asm/pgalloc.h +++ b/arch/tile/include/asm/pgalloc.h @@ -69,14 +69,23 @@ extern pgd_t *pgd_alloc(struct mm_struct *mm); extern void pgd_free(struct mm_struct *mm, pgd_t *pgd); extern pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address); +extern pgtable_t __pte_alloc_one(struct mm_struct *, unsigned long, gfp_t); + extern void pte_free(struct mm_struct *mm, struct page *pte); #define pmd_pgtable(pmd) pmd_page(pmd) static inline pte_t * +__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address, + gfp_t gfp_mask) +{ + return pfn_to_kaddr(page_to_pfn(__pte_alloc_one(mm, address, gfp_mask))); +} + +static inline pte_t * pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) { - return pfn_to_kaddr(page_to_pfn(pte_alloc_one(mm, address))); + return __pte_alloc_one_kernel(mm, address, GFP_KERNEL | __GFP_REPEAT); } static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte) @@ -108,6 +117,8 @@ void shatter_pmd(pmd_t *pmd); #define L1_USER_PGTABLE_ORDER L2_USER_PGTABLE_ORDER #define pud_populate(mm, pud, pmd) \ pmd_populate_kernel((mm), (pmd_t *)(pud), (pte_t *)(pmd)) +#define __pmd_alloc_one(mm, addr, mask) \ + ((pmd_t *)page_to_virt(__pte_alloc_one((mm), (addr), (mask)))) #define pmd_alloc_one(mm, addr) \ ((pmd_t *)page_to_virt(pte_alloc_one((mm), (addr)))) #define pmd_free(mm, pmdp) \ diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c index 1f5430c..34ee920 100644 --- a/arch/tile/mm/pgtable.c +++ b/arch/tile/mm/pgtable.c @@ -218,9 +218,10 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd) #define L2_USER_PGTABLE_PAGES (1 << L2_USER_PGTABLE_ORDER) -struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) +struct page * +__pte_alloc_one(struct mm_struct *mm, unsigned long address, gfp_t gfp_mask) { - gfp_t flags = GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO|__GFP_COMP; + gfp_t flags = gfp_mask | __GFP_ZERO | __GFP_COMP; struct page *p; #ifdef CONFIG_HIGHPTE @@ -235,6 +236,11 @@ struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) return p; } +struct page *pte_alloc_one(struct mm_struct *mm, unsigned long address) +{ + return __pte_alloc_one(mm, address, GFP_KERNEL); +} + /* * Free page immediately (used in __pte_alloc if we raced with another * process). We have to correct whatever pte_alloc_one() did before -- 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/