arch/sparc: support NR_CPUS = 4096
PATCH v3 1/1 arch/sparc: support NR_CPUS = 4096
Linux SPARC64 limits NR_CPUS to 4064 because init_cpu_send_mondo_info() only allocates a single page for NR_CPUS mondo entries. Thus we cannot use all 4096 CPUs on some SPARC platforms.
To fix, allocate (2^order) pages where order is set according to the size of cpu_list for possible cpus. Since cpu_list_pa and cpu_mondo_block_pa are not used in asm code, there are no imm13 offsets from the base PA that will break because they can only reach one page.
Orabug: 25505750
--- arch/sparc/Kconfig | 4 ++-- arch/sparc/kernel/irq_64.c | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-)
arch/sparc/Kconfig +2 -2
@@ -192,9 +192,9 @@ config NR_CPUS int "Maximum number of CPUs" depends on SMP range 2 32 if SPARC32 - range 2 1024 if SPARC64 + range 2 4096 if SPARC64 default 32 if SPARC32 - default 64 if SPARC64 + default 4096 if SPARC64 source kernel/Kconfig.hz
arch/sparc/kernel/irq_64.c +13 -4
@@ -1034,17 +1034,26 @@ static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb) {#ifdef CONFIG_SMP unsigned long page; +void *mondo, *p; -BUILD_BUG_ON ((NR_CPUS *sizeof (u16)) > (PAGE_SIZE -64 )); +BUILD_BUG_ON ((NR_CPUS *sizeof (u16)) >PAGE_SIZE ); + +/* Make sure mondo block is 64byte aligned */ + p =kzalloc (127 ,GFP_KERNEL ); +if (!p) { +prom_printf ("SUN4V: Error, cannot allocate mondo block.\n" ); +prom_halt (); + } + mondo = (void *)(((unsigned long )p +63 ) & ~0x3f ); + tb->cpu_mondo_block_pa =__pa (mondo); page =get_zeroed_page (GFP_KERNEL );if (!page) { -prom_printf ("SUN4V: Error, cannot allocate cpu mondo page.\n" ); +prom_printf ("SUN4V: Error, cannot allocate cpu list page.\n" );prom_halt (); } - tb->cpu_mondo_block_pa =__pa (page); - tb->cpu_list_pa =__pa (page +64 ); + tb->cpu_list_pa =__pa (page);#endif }
Signature · 1 line
1.7.1
David Miller
maintainerFrom: Jane Chu <[email protected]>
Date: Tue, 6 Jun 2017 14:32:29 -0600
Quoted 9 lines
Linux SPARC64 limits
NR_CPUSto 4064 becauseinit_cpu_send_mondo_info()only allocates a single page forNR_CPUSmondo entries. Thus we cannot use all 4096 CPUs on some SPARC platforms.To fix, allocate (2^order) pages where order is set according to the size of
cpu_listfor possible cpus. Sincecpu_list_paandcpu_mondo_block_paare not used in asm code, there are no imm13 offsets from the base PA that will break because they can only reach one page.
Quoted 6 lines
Orabug: 25505750
Signed-off-by Jane Chu <[email protected]>Reviewed-by Bob Picco <[email protected]>Reviewed-by Atish Patra <[email protected]>
Looks a lot better, applied, thanks!