Commit b32d5d7e authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Michael Ellerman
Browse files

powerpc/mm/book3s: Split radix and hash MAX_PHYSMEM limit 



MAX_PHYSMEM #define is used along with sparsemem to determine the SECTION_SHIFT
value. Powerpc also uses the same value to limit the max memory enabled on the
system. With 4K PAGE_SIZE and hash translation mode, we want to limit the max
memory enabled to 64TB due to page table size restrictions. However, with
radix translation, we don't have these restrictions. Hence split the radix
and hash MA_PHYSMEM limit and use different limit for each of them.

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200608070904.387440-4-aneesh.kumar@linux.ibm.com
parent 7746406b

arch/powerpc/include/asm/book3s/64/hash-4k.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
#define REGION_SHIFT		(40)

#define H_KERN_MAP_SIZE		(ASM_CONST(1) << REGION_SHIFT)



/*

 * Limits the linear mapping range

 */

#define H_MAX_PHYSMEM_BITS	46



/*

 * Define the address range of the kernel non-linear virtual area (61TB)

 */

arch/powerpc/include/asm/book3s/64/hash-64k.h

+13 −0
Original line number Diff line number Diff line
@@ -7,6 +7,19 @@ 
#define H_PUD_INDEX_SIZE  10  // size: 8B << 10 = 8KB, maps 2^10 x 16GB = 16TB

#define H_PGD_INDEX_SIZE   8  // size: 8B <<  8 = 2KB, maps 2^8  x 16TB =  4PB



/*

 * If we store section details in page->flags we can't increase the MAX_PHYSMEM_BITS

 * if we increase SECTIONS_WIDTH we will not store node details in page->flags and

 * page_to_nid does a page->section->node lookup

 * Hence only increase for VMEMMAP. Further depending on SPARSEMEM_EXTREME reduce

 * memory requirements with large number of sections.

 * 51 bits is the max physical real address on POWER9

 */

#if defined(CONFIG_SPARSEMEM_VMEMMAP) && defined(CONFIG_SPARSEMEM_EXTREME)

#define H_MAX_PHYSMEM_BITS	51

#else

#define H_MAX_PHYSMEM_BITS	46

#endif



/*

 * Each context is 512TB size. SLB miss for first context/default context

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+2 −2
Original line number Diff line number Diff line
@@ -577,8 +577,8 @@ extern void slb_set_size(u16 size); 
 * For vmalloc and memmap, we use just one context with 512TB. With 64 byte

 * struct page size, we need ony 32 TB in memmap for 2PB (51 bits (MAX_PHYSMEM_BITS)).

 */

#if (MAX_PHYSMEM_BITS > MAX_EA_BITS_PER_CONTEXT)

#define MAX_KERNEL_CTX_CNT	(1UL << (MAX_PHYSMEM_BITS - MAX_EA_BITS_PER_CONTEXT))

#if (H_MAX_PHYSMEM_BITS > MAX_EA_BITS_PER_CONTEXT)

#define MAX_KERNEL_CTX_CNT	(1UL << (H_MAX_PHYSMEM_BITS - MAX_EA_BITS_PER_CONTEXT))

#else

#define MAX_KERNEL_CTX_CNT	1

#endif

arch/powerpc/include/asm/book3s/64/mmu.h

+0 −15
Original line number Diff line number Diff line
@@ -27,21 +27,6 @@ struct mmu_psize_def { 
extern struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT];

#endif /* __ASSEMBLY__ */



/*

 * If we store section details in page->flags we can't increase the MAX_PHYSMEM_BITS

 * if we increase SECTIONS_WIDTH we will not store node details in page->flags and

 * page_to_nid does a page->section->node lookup

 * Hence only increase for VMEMMAP. Further depending on SPARSEMEM_EXTREME reduce

 * memory requirements with large number of sections.

 * 51 bits is the max physical real address on POWER9

 */

#if defined(CONFIG_SPARSEMEM_VMEMMAP) && defined(CONFIG_SPARSEMEM_EXTREME) &&  \

	defined(CONFIG_PPC_64K_PAGES)

#define MAX_PHYSMEM_BITS 51

#else

#define MAX_PHYSMEM_BITS 46

#endif



/* 64-bit classic hash table MMU */

#include <asm/book3s/64/mmu-hash.h>

arch/powerpc/include/asm/book3s/64/pgtable.h

+7 −0
Original line number Diff line number Diff line
@@ -294,6 +294,13 @@ extern unsigned long pci_io_base; 
#include <asm/book3s/64/hash.h>

#include <asm/book3s/64/radix.h>



#if H_MAX_PHYSMEM_BITS > R_MAX_PHYSMEM_BITS

#define  MAX_PHYSMEM_BITS	H_MAX_PHYSMEM_BITS

#else

#define  MAX_PHYSMEM_BITS	R_MAX_PHYSMEM_BITS

#endif





#ifdef CONFIG_PPC_64K_PAGES

#include <asm/book3s/64/pgtable-64k.h>

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE