Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752507AbeAEQoI (ORCPT + 1 other); Fri, 5 Jan 2018 11:44:08 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:20515 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbeAEQoG (ORCPT ); Fri, 5 Jan 2018 11:44:06 -0500 Message-Id: In-Reply-To: <9a5dadc10f88e2fc0ac9fb5d18c5424df33f3f4c.1515169256.git.christophe.leroy@c-s.fr> References: <9a5dadc10f88e2fc0ac9fb5d18c5424df33f3f4c.1515169256.git.christophe.leroy@c-s.fr> From: Christophe Leroy Subject: [PATCH 3/3] powerpc/8xx: Increase the number of mm slices To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Scott Wood , "Aneesh Kumar K.V" , Nicholas Piggin Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 5 Jan 2018 17:44:04 +0100 (CET) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On the 8xx, we can have as many slices as PMD entries. This means we could have 1024 slices in 4k size pages mode and 64 slices in 16k size pages. However, due to a stack overflow in slice_get_unmapped_area(), we limit to 512 slices. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/mmu-8xx.h | 6 +++++- arch/powerpc/include/asm/page_32.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/mmu-8xx.h b/arch/powerpc/include/asm/mmu-8xx.h index d669d0062da4..40aa7b0cd0dc 100644 --- a/arch/powerpc/include/asm/mmu-8xx.h +++ b/arch/powerpc/include/asm/mmu-8xx.h @@ -171,7 +171,11 @@ typedef struct { unsigned long vdso_base; #ifdef CONFIG_PPC_MM_SLICES u16 user_psize; /* page size index */ - unsigned char low_slices_psize[8]; /* 16 slices */ +#if defined(CONFIG_PPC_16K_PAGES) + unsigned char low_slices_psize[32]; /* 64 slices */ +#else + unsigned char low_slices_psize[256]; /* 512 slices */ +#endif unsigned char high_slices_psize[0]; unsigned long slb_addr_limit; #endif diff --git a/arch/powerpc/include/asm/page_32.h b/arch/powerpc/include/asm/page_32.h index f7d1bd1183c8..43695ce7ee07 100644 --- a/arch/powerpc/include/asm/page_32.h +++ b/arch/powerpc/include/asm/page_32.h @@ -62,7 +62,8 @@ extern void copy_page(void *to, void *from); #ifdef CONFIG_PPC_MM_SLICES -#define SLICE_LOW_SHIFT 28 +/* SLICE_LOW_SHIFT >= 23 to avoid stack overflow in slice_get_unmapped_area() */ +#define SLICE_LOW_SHIFT (PMD_SHIFT > 23 ? PMD_SHIFT : 23) #define SLICE_HIGH_SHIFT 0 #define SLICE_LOW_TOP (0xfffffffful) -- 2.13.3