[PATCH 5/5 V2] [PPC] Setup stack memory segment for hugetlb pages

Eric Munson
2008-07-28T19:17:22Z

Currently the memory slice that holds the process stack is always initialized
to hold small pages. This patch defines the weak function that is declared
in the previos patch to convert the stack slice to hugetlb pages.

Signed-off-by: Eric Munson <ebmunson@us.ibm.com>

---
Based on 2.6.26-rc8-mm1

Changes from V1:
Instead of setting the mm-wide page size to huge pages, set only the relavent
slice psize using an arch defined weak function.

arch/powerpc/mm/hugetlbpage.c | 6 ++++++
arch/powerpc/mm/slice.c | 11 +++++++++++
include/asm-powerpc/hugetlb.h | 3 +++
3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index fb42c4d..bd7f777 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -152,6 +152,12 @@ pmd_t *hpmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long addr,
}
#endif

+void hugetlb_mm_setup(struct mm_struct *mm, unsigned long addr,
+ unsigned long len)
+{
+ slice_convert_address(mm, addr, len, shift_to_mmu_psize(HPAGE_SHIFT));
+}
+
/* Build list of addresses of gigantic pages. This function is used in early
* boot before the buddy or bootmem allocator is setup.
*/
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 583be67..d984733 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -30,6 +30,7 @@
#include <linux/err.h>
#include <linux/spinlock.h>
#include <linux/module.h>
+#include <linux/hugetlb.h>
#include <asm/mman.h>
#include <asm/mmu.h>
#include <asm/spu.h>
@@ -397,6 +398,16 @@ static unsigned long slice_find_area(struct mm_struct *mm, unsigned long len,
#define MMU_PAGE_BASE MMU_PAGE_4K
#endif

+void slice_convert_address(struct mm_struct *mm, unsigned long addr,
+ unsigned long len, unsigned int psize)
+{
+ struct slice_mask mask;
+
+ mask = slice_range_to_mask(addr, len);
+ slice_convert(mm, mask, psize);
+ slice_flush_segments(mm);
+}
+
unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
unsigned long flags, unsigned int psize,
int topdown, int use_cache)
diff --git a/include/asm-powerpc/hugetlb.h b/include/asm-powerpc/hugetlb.h
index 26f0d0a..10ef089 100644
--- a/include/asm-powerpc/hugetlb.h
+++ b/include/asm-powerpc/hugetlb.h
@@ -17,6 +17,9 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,
pte_t *ptep);

+void slice_convert_address(struct mm_struct *mm, unsigned long addr,
+ unsigned long len, unsigned int psize);
+
/*
* If the arch doesn't supply something else, assume that hugepage
* size aligned regions are ok without further preparation.
--
1.5.6.1