Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   Huang Shijie <shijie@os.amperecomputing.com>
To:     catalin.marinas@arm.com
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,
        Huang Shijie <shijie@os.amperecomputing.com>
Subject: [PATCH v2] arm64: irq: set the correct node for VMAP stack
Date:   Sat, 18 Nov 2023 23:47:07 +0800
Message-Id: <20231118154707.3668-1-shijie@os.amperecomputing.com>
In-Reply-To: <ZVZO55IjQSbzWnfG@arm.com>
References: <ZVZO55IjQSbzWnfG@arm.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?t2xv7hdzCfBc/6jO2RVgVSUIRvUr6pG7VGZtgdWIMdhLfZJ/NY9Wq8LYVgNy?=
 =?us-ascii?Q?XFRHfOBfkIv3zqXb+BzizmTOOKc+wjfvrChtvl2emmvblxFRgCg+vkuQ6epn?=
 =?us-ascii?Q?FPQoKbyBXN2LI+7Y2Fe2DEeqP5Z/FU3ANYX5Mw6Byd7JYpblqIOdGmvlD/UJ?=
 =?us-ascii?Q?pAVps3V0JnDBXA3AVSp6jfE48Isx+4OsmSzJfBbGH6q4kJ4VY6/0EwDEgHjT?=
 =?us-ascii?Q?95g+WVTGcwDNx4gIvav86WrUfdq65bc8fIbin6rycyjnRte3cfcGxCxGrMj/?=
 =?us-ascii?Q?hlNHJT//9RWULGCyH1gpF002+BlvH6iw1jSDBRu3frjD8tTK7XlslDUPIg5A?=
 =?us-ascii?Q?83LjgtjFQzMHIc3R5W3EFRehhdiA8/9zwCRJ4QtDyn6R3PJDBKFynY4NdrlE?=
 =?us-ascii?Q?LQ9B1ADs7DxGoKUZOLqGQU+vLBSpVGnC8QZkZMIWu7uWGlJ6DpHuX3PT49ja?=
 =?us-ascii?Q?5xUNtZ3GA1cF/xGNxNO0NTeN8ThMoQhFw1qcnj1zTzOB9WVLoWYTGema31ds?=
 =?us-ascii?Q?Wbso6b2WghM51lo6/IB7pZM6CCPAT07AM/xSgagJN/b9CYcFPT8pxIWtbSsE?=
 =?us-ascii?Q?Ip6VmEBOsKpYf1avAb/Pir66DS3uS2du63VfLYYghplXs9QCPsFKWPGQT9Q7?=
 =?us-ascii?Q?ySZ0CJZRclOLLMhyg36q1MQ1kA2FQ1QhNaFLhF7XesvSCr7+5XJOuRjyyMNS?=
 =?us-ascii?Q?BTn+daVFTrvUvrpbVsKI6uYzGBwIGgKZ8kjyDVi7qDiloPI5Tx97w5iDLUGl?=
 =?us-ascii?Q?+PoudgTNPSipgPMkkuoDoYYjUt2fPq8CzfAU+GebYOMOi2o/a0alRmvO6IWT?=
 =?us-ascii?Q?gZQdbj8oIT/TX/OVzOPJ2NRYJ+92IqQoGsnFEYpaH9eC5jvoNgRld0wqWW1Q?=
 =?us-ascii?Q?Fu1rEd5mprKoBbwV8jWPd67kAU2b6bibvdZi9SxGvTD4tttFCH/35Tc0D/kL?=
 =?us-ascii?Q?NqnB2gZdsIMvLsEL93VS+ozp32msiRMmCNZ083BNccv1BkeuW2cEfvxlwh5Q?=
 =?us-ascii?Q?UCkIKBVr1HmPdp7XWWQbSht+YSmvMFPD0Z1mRHhRWYGIPDt6OokadhUm8bio?=
 =?us-ascii?Q?Em+aULtV2lUYrJI0gJKFZ24wiM2qPNoN3lcXkm+FFrv80tj+3wVSF1AoceM6?=
 =?us-ascii?Q?AozqASe0exGKxXMn8rqcl009MnjUv+9f26rAv09SnDieglE0UpIumYSWys46?=
 =?us-ascii?Q?4A/Mr+XsOcNz8oE0uEh0S8O6LyDEW/0m5NDyZz7vRCul8kAb93lxnqah55Ic?=
 =?us-ascii?Q?M+CHZvPsywv6qtJ36ax7AN4303DDnT4qkz1dZD1Kq3onM0pKSvIBup85eeH5?=
 =?us-ascii?Q?vp9prFH7Kcegbk8DFOlUwX3c/jGHkf+9WSPlRUj3xTksy0GUSSgorovC7Sor?=
 =?us-ascii?Q?W0BOhOZL9fK9GAoiFJ1PTvz4e55frv/qCSOlz6R/xVGKcWdbFW7+gRUQb0sX?=
 =?us-ascii?Q?dEKOfsO9a7Z/MgtgLgiVWrqUcQTSzGvWy7GHTnDNIu8gmW2mF/5LyLS7wAcQ?=
 =?us-ascii?Q?6KqEeKhQHFq+rmnHl1Gl+iKDVhDQivGzV53OFV5h8JPOgkedx52qbWdLt7A4?=
 =?us-ascii?Q?89gVe4CiQinLC83H2HDm3e26hk4zyzDhDKPeM8C70FegQS/6Zg3kLcaYfsXi?=
 =?us-ascii?Q?JA=3D=3D?=
X-OriginatorOrg: os.amperecomputing.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 802dc9b1-52df-46f8-40d1-08dbe84db52e
X-MS-Exchange-CrossTenant-AuthSource: PH0PR01MB7975.prod.exchangelabs.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2023 15:47:45.6044
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3bc2b170-fd94-476d-b0ce-4229bdc904a7
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: +gTgczTAw3VdkPQgyqJq9wPdkVBB/NJlJ2QzGo/P9BPoJgBs4bR3Wg1LN0T0XKjpIQn12B1lqQq9dF1Sj1lQPxaYpKvW9pDQYQqQVoGZ00+QyYFA9iRr/DKUkOt4JM9L
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR01MB6259
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 18 Nov 2023 07:52:15 -0800 (PST)

In current code, init_irq_stacks() will call cpu_to_node().
The cpu_to_node() depends on percpu "numa_node" which is initialized in:
     arch_call_rest_init() --> rest_init() -- kernel_init()
	--> kernel_init_freeable() --> smp_prepare_cpus()

But init_irq_stacks() is called in init_IRQ() which is before
arch_call_rest_init().

So in init_irq_stacks(), the cpu_to_node() does not work, it
always return 0. In NUMA, it makes the node 1 cpu accesses the IRQ stack which
is in the node 0.

This patch fixes it by exporting the early_cpu_to_node(), and use it
in the init_irq_stacks().

Signed-off-by: Huang Shijie <shijie@os.amperecomputing.com>
---
v1 --> v2:
	fix the !NUMA compiling error.

---
 arch/arm64/kernel/irq.c    | 3 ++-
 drivers/base/arch_numa.c   | 2 +-
 include/asm-generic/numa.h | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/irq.c b/arch/arm64/kernel/irq.c
index 6ad5c6ef5329..5226030979ae 100644
--- a/arch/arm64/kernel/irq.c
+++ b/arch/arm64/kernel/irq.c
@@ -25,6 +25,7 @@
 #include <asm/softirq_stack.h>
 #include <asm/stacktrace.h>
 #include <asm/vmap_stack.h>
+#include <asm/numa.h>
 
 /* Only access this in an NMI enter/exit */
 DEFINE_PER_CPU(struct nmi_ctx, nmi_contexts);
@@ -57,7 +58,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;
 	}
 }
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..16073111bffc 100644
--- a/include/asm-generic/numa.h
+++ b/include/asm-generic/numa.h
@@ -35,6 +35,7 @@ int __init numa_add_memblk(int nodeid, u64 start, u64 end);
 void __init numa_set_distance(int from, int to, int distance);
 void __init numa_free_distance(void);
 void __init early_map_cpu_to_node(unsigned int cpu, int nid);
+int early_cpu_to_node(int cpu);
 void numa_store_cpu_info(unsigned int cpu);
 void numa_add_cpu(unsigned int cpu);
 void numa_remove_cpu(unsigned int cpu);
@@ -46,6 +47,7 @@ static inline void numa_add_cpu(unsigned int cpu) { }
 static inline void numa_remove_cpu(unsigned int cpu) { }
 static inline void arch_numa_init(void) { }
 static inline void early_map_cpu_to_node(unsigned int cpu, int nid) { }
+static inline int early_cpu_to_node(int cpu) { return 0; }
 
 #endif	/* CONFIG_NUMA */
 
-- 
2.40.1