[RFC][PATCH v2 21/23] (um) __vmalloc: add gfp flags variant of pte and pmd allocation

[RFC][PATCH v2 21/23] (um) __vmalloc: add gfp flags variant of pte and pmd allocation

[Prasad Joshi]

diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
index 32c8ce4..8b6257e 100644
--- a/arch/um/include/asm/pgalloc.h
+++ b/arch/um/include/asm/pgalloc.h
@@ -27,6 +27,7 @@ extern pgd_t *pgd_alloc(struct mm_struct *);
 extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);

 extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
+extern pte_t *__pte_alloc_one_kernel(struct mm_struct *, unsigned long, gfp_t);
 extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);

 static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 8137ccc..e4caf17 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -284,12 +284,15 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
    free_page((unsigned long) pgd);
 }

-pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
+pte_t *
+__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address,
gfp_t gfp_mask)
 {
-   pte_t *pte;
+   return (pte_t *)__get_free_page(gfp_mask | __GFP_ZERO);
+}

-   pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
-   return pte;
+pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
+{
+   return __pte_alloc_one_kernel(mm, address, GFP_KERNEL | __GFP_REPEAT);
 }

 pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
@@ -303,15 +306,21 @@ pgtable_t pte_alloc_one(struct mm_struct *mm,
unsigned long address)
 }

 #ifdef CONFIG_3_LEVEL_PGTABLES
-pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
+pmd_t *
+__pmd_alloc_one(struct mm_struct *mm, unsigned long address, gfp_t gfp_mask)
 {
-   pmd_t *pmd = (pmd_t *) __get_free_page(GFP_KERNEL);
+   pmd_t *pmd = (pmd_t *) __get_free_page(gfp_mask);

    if (pmd)
        memset(pmd, 0, PAGE_SIZE);

    return pmd;
 }
+
+pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
+{
+   return __pmd_alloc_one(mm, address, GFP_KERNEL);
+}
 #endif

 void *uml_kmalloc(int size, int flags)

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [RFC][PATCH v2 21/23] (um) __vmalloc: add gfp flags variant of pte and pmd allocation

[richard -rw- weinberger]

On Mon, Mar 14, 2011 at 7:12 PM, Prasad Joshi <prasadjoshi124@gmail.com> wrote:
> diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
> index 32c8ce4..8b6257e 100644
> --- a/arch/um/include/asm/pgalloc.h
> +++ b/arch/um/include/asm/pgalloc.h
> @@ -27,6 +27,7 @@ extern pgd_t *pgd_alloc(struct mm_struct *);
>  extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
>
>  extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
> +extern pte_t *__pte_alloc_one_kernel(struct mm_struct *, unsigned long, gfp_t);
>  extern pgtable_t pte_alloc_one(struct mm_struct *, unsigned long);
>
>  static inline void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
> diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
> index 8137ccc..e4caf17 100644
> --- a/arch/um/kernel/mem.c
> +++ b/arch/um/kernel/mem.c
> @@ -284,12 +284,15 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
>    free_page((unsigned long) pgd);
>  }
>
> -pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
> +pte_t *
> +__pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address,
> gfp_t gfp_mask)
>  {
> -   pte_t *pte;
> +   return (pte_t *)__get_free_page(gfp_mask | __GFP_ZERO);
> +}
>
> -   pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT|__GFP_ZERO);
> -   return pte;
> +pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
> +{
> +   return __pte_alloc_one_kernel(mm, address, GFP_KERNEL | __GFP_REPEAT);
>  }
>
>  pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long address)
> @@ -303,15 +306,21 @@ pgtable_t pte_alloc_one(struct mm_struct *mm,
> unsigned long address)
>  }
>
>  #ifdef CONFIG_3_LEVEL_PGTABLES
> -pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
> +pmd_t *
> +__pmd_alloc_one(struct mm_struct *mm, unsigned long address, gfp_t gfp_mask)
>  {
> -   pmd_t *pmd = (pmd_t *) __get_free_page(GFP_KERNEL);
> +   pmd_t *pmd = (pmd_t *) __get_free_page(gfp_mask);
>
>    if (pmd)
>        memset(pmd, 0, PAGE_SIZE);
>
>    return pmd;
>  }
> +
> +pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
> +{
> +   return __pmd_alloc_one(mm, address, GFP_KERNEL);
> +}
>  #endif
>
>  void *uml_kmalloc(int size, int flags)
> --
> 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/
>

Sorry, this patch seems damaged.

-- 
Thanks,
//richard

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>