From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B16AC47071 for ; Thu, 16 Nov 2023 17:18:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345189AbjKPRSk (ORCPT ); Thu, 16 Nov 2023 12:18:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231289AbjKPRSj (ORCPT ); Thu, 16 Nov 2023 12:18:39 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 491A2B7 for ; Thu, 16 Nov 2023 09:18:36 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8EC63C433C8; Thu, 16 Nov 2023 17:18:33 +0000 (UTC) Date: Thu, 16 Nov 2023 17:18:31 +0000 From: Catalin Marinas To: Huang Shijie Cc: will@kernel.org, gregkh@linuxfoundation.org, rafael@kernel.org, arnd@arndb.de, mark.rutland@arm.com, broonie@kernel.org, keescook@chromium.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, patches@amperecomputing.com Subject: Re: [PATCH] arm64: irq: set the correct node for VMAP stack Message-ID: References: <20231114091643.59530-1-shijie@os.amperecomputing.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231114091643.59530-1-shijie@os.amperecomputing.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Nov 14, 2023 at 05:16:43PM +0800, Huang Shijie wrote: > diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c > index 6ad5c6ef5329..e62d3cb3f74c 100644 > --- a/arch/arm64/kernel/irq.c > +++ b/arch/arm64/kernel/irq.c > @@ -57,7 +57,7 @@ static void init_irq_stacks(void) > unsigned long *p; > > for_each_possible_cpu(cpu) { > - p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, cpu_to_node(cpu)); > + p = arch_alloc_vmap_stack(IRQ_STACK_SIZE, early_cpu_to_node(cpu)); > per_cpu(irq_stack_ptr, cpu) = p; > } > } This looks alright to me, I don't have a better suggestion. The generic code already has the cpu_to_node_map[] array populated by early_map_cpu_to_node(), so let's reuse it. > diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c > index eaa31e567d1e..90519d981471 100644 > --- a/drivers/base/arch_numa.c > +++ b/drivers/base/arch_numa.c > @@ -144,7 +144,7 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid) > unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; > EXPORT_SYMBOL(__per_cpu_offset); > > -static int __init early_cpu_to_node(int cpu) > +int early_cpu_to_node(int cpu) > { > return cpu_to_node_map[cpu]; > } > diff --git a/include/asm-generic/numa.h b/include/asm-generic/numa.h > index 1a3ad6d29833..fc8a9bd6a444 100644 > --- a/include/asm-generic/numa.h > +++ b/include/asm-generic/numa.h > @@ -38,6 +38,7 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid); > void numa_store_cpu_info(unsigned int cpu); > void numa_add_cpu(unsigned int cpu); > void numa_remove_cpu(unsigned int cpu); > +int early_cpu_to_node(int cpu); Here I'd move this just below early_map_cpu_to_node() and, for completeness, also add the dummy static inline for the !NUMA case. -- Catalin