sparc64: Add 64K page size support
PATCH 1/1 sparc64: Add 64K page size support
This patch depends on:
[v6] sparc64: Multi-page size support
- Testing
Tested on Sonoma by running stream benchmark instance which allocated 48G worth of 64K pages.
boot params: default_hugepageszdK hugepageszdK hugepages10720
Signed-off-by Nitin Gupta <[email protected]>
--- arch/sparc/include/asm/page_64.h | 3 ++- arch/sparc/mm/hugetlbpage.c | 54 ++++++++++++++++++++++++++++++++-------- arch/sparc/mm/init_64.c | 4 +++ arch/sparc/mm/tsb.c | 5 ++-- 4 files changed, 52 insertions(+), 14 deletions(-)
arch/sparc/include/asm/page_64.h +2 -1
@@ -18,6 +18,7 @@#define HPAGE_SHIFT 23#define REAL_HPAGE_SHIFT 22#define HPAGE_256MB_SHIFT 28 +#define HPAGE_64K_SHIFT 16#define REAL_HPAGE_SIZE (_AC(1,UL) << REAL_HPAGE_SHIFT)#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE )
@@ -26,7 +27,7 @@#define HUGETLB_PAGE_ORDER (HPAGE_SHIFT - PAGE_SHIFT)#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA #define REAL_HPAGE_PER_HPAGE (_AC(1,UL) << (HPAGE_SHIFT - REAL_HPAGE_SHIFT)) -#define HUGE_MAX_HSTATE 2 +#define HUGE_MAX_HSTATE 3#endif #ifndef __ASSEMBLY__
arch/sparc/mm/hugetlbpage.c +43 -11
122 lines not on this page · raw message
arch/sparc/mm/init_64.c +4 -0
@@ -345,6 +345,10 @@ static int __init setup_hugepagesz(char *string) hv_pgsz_mask =HV_PGSZ_MASK_4MB ; hv_pgsz_idx =HV_PGSZ_IDX_4MB ;break ; +case HPAGE_64K_SHIFT : + hv_pgsz_mask =HV_PGSZ_MASK_64K ; + hv_pgsz_idx =HV_PGSZ_IDX_64K ; +break ;default : hv_pgsz_mask =0 ; }
arch/sparc/mm/tsb.c +3 -2
@@ -147,12 +147,13 @@ void flush_tsb_user_page(struct mm_struct *mm, unsigned long vaddr,spin_lock_irqsave (&mm->context.lock, flags); -if (hugepage_shift =PAGE_SHIFT ) { +if (hugepage_shift <HPAGE_SHIFT ) { base = (unsigned long ) mm->context.tsb_block[MM_TSB_BASE ].tsb; nentries = mm->context.tsb_block[MM_TSB_BASE ].tsb_nentries;if (tlb_type = cheetah_plus || tlb_type = hypervisor) base =__pa (base); -__flush_tsb_one_entry (base, vaddr,PAGE_SHIFT , nentries); +__flush_huge_tsb_one_entry (base, vaddr,PAGE_SHIFT , nentries, + hugepage_shift); }#if defined(CONFIG_HUGETLB_PAGE ) || defined(CONFIG_TRANSPARENT_HUGEPAGE ) else if (mm->context.tsb_block[MM_TSB_HUGE].tsb) {
Signature · 1 line
2.9.2
David Miller
maintainerFrom: Nitin Gupta <[email protected]>
Date: Mon, 6 Feb 2017 12:33:26 -0800
Quoted 11 lines
This patch depends on:
[v6] sparc64: Multi-page size support- Testing
Tested on Sonoma by running stream benchmark instance which allocated 48G worth of 64K pages.
boot params:
default_hugepageszdKhugepageszdK hugepages10720Signed-off-by Nitin Gupta <[email protected]>
Also applied, thank you.