From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751192AbdFDXrD (ORCPT ); Sun, 4 Jun 2017 19:47:03 -0400 Received: from shards.monkeyblade.net ([184.105.139.130]:52514 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751147AbdFDXqz (ORCPT ); Sun, 4 Jun 2017 19:46:55 -0400 Date: Sun, 04 Jun 2017 19:46:53 -0400 (EDT) Message-Id: <20170604.194653.1906726081560123777.davem@davemloft.net> To: jane.chu@oracle.com Cc: tglx@linutronix.de, atish.patra@oracle.com, Liam.Howlett@oracle.com, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] arch/sparc: support NR_CPUS = 4096 From: David Miller In-Reply-To: <1496353153-587795-1-git-send-email-jane.chu@oracle.com> References: <1496353153-587795-1-git-send-email-jane.chu@oracle.com> X-Mailer: Mew version 6.7 on Emacs 25.2 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Sun, 04 Jun 2017 16:05:16 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jane Chu Date: Thu, 1 Jun 2017 15:39:13 -0600 > diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c > index 4d0248a..5b19108 100644 > --- a/arch/sparc/kernel/irq_64.c > +++ b/arch/sparc/kernel/irq_64.c > @@ -1034,12 +1034,12 @@ static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb) > { > #ifdef CONFIG_SMP > unsigned long page; > + unsigned int order; > > - BUILD_BUG_ON((NR_CPUS * sizeof(u16)) > (PAGE_SIZE - 64)); > - > - page = get_zeroed_page(GFP_KERNEL); > + order = get_order(num_possible_cpus() * sizeof(u16) + 64); > + page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order); > if (!page) { The only reason we allocated these two items together was because it was convenient and it all fit into a single page. Since it now doesn't, it makes sense to split it up. Simply use a single page for the cpu_list_pa and kzalloc for the cpu_mondo_block. This also allows to keep the BUILD_BUG_ON(), which I really wish you hadn't tried to remove. static void __init init_cpu_send_mondo_info(struct trap_per_cpu *tb) { #ifdef CONFIG_SMP unsigned long page; void *mondo; BUILD_BUG_ON((NR_CPUS * sizeof(u16)) > PAGE_SIZE); mondo = kzalloc(64, GFP_KERNEL); if (!mondo) { prom_printf("SUN4V: Error, cannot allocate mondo block.\n"); prom_halt(); } tb->cpu_mondo_block_pa = __pa(mondo); page = get_zeroed_page(GFP_KERNEL); if (!page) { prom_printf("SUN4V: Error, cannot allocate cpu list page.\n"); prom_halt(); } tb->cpu_list_pa = __pa(page); #endif } Thanks.