Received-SPF: pass (google.com: domain of linux-kernel+bounces-185899-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240522-loongarch-booting-fixes-v2-0-727edb96e548@flygoat.com> <20240522-loongarch-booting-fixes-v2-2-727edb96e548@flygoat.com>
In-Reply-To: <20240522-loongarch-booting-fixes-v2-2-727edb96e548@flygoat.com>
From: Huacai Chen <chenhuacai@kernel.org>
Date: Wed, 22 May 2024 16:07:59 +0800
Message-ID: <CAAhV-H4r=2LbOBsM8oas=ewXGA+4Z=Y==iSgZfsdSk7GHOrieA@mail.gmail.com>
Subject: Re: [PATCH v2 2/4] LoongArch: smp: Add all CPUs enabled by fdt to
 NUMA node 0
To: Jiaxun Yang <jiaxun.yang@flygoat.com>
Cc: Binbin Zhou <zhoubinbin@loongson.cn>, loongarch@lists.linux.dev, 
	linux-kernel@vger.kernel.org, stable@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi, Jiaxun,

On Wed, May 22, 2024 at 2:30=E2=80=AFPM Jiaxun Yang <jiaxun.yang@flygoat.co=
m> wrote:
>
> NUMA enabled kernel on FDT based machine fails to boot
> because CPUs are all in NUMA_NO_NODE and mm subsystem
> won't accept that.
>
> Fix by adding them to default NUMA node for now.
>
> Cc: stable@vger.kernel.org
> Fixes: 88d4d957edc7 ("LoongArch: Add FDT booting support from efi system =
table")
> Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
> ---
>  arch/loongarch/kernel/smp.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c
> index 0dfe2388ef41..866757b76ecb 100644
> --- a/arch/loongarch/kernel/smp.c
> +++ b/arch/loongarch/kernel/smp.c
> @@ -273,7 +273,6 @@ static void __init fdt_smp_setup(void)
>
>                 if (cpuid =3D=3D loongson_sysconf.boot_cpu_id) {
>                         cpu =3D 0;
> -                       numa_add_cpu(cpu);
>                 } else {
>                         cpu =3D cpumask_next_zero(-1, cpu_present_mask);
>                 }
> @@ -283,6 +282,10 @@ static void __init fdt_smp_setup(void)
>                 set_cpu_present(cpu, true);
>                 __cpu_number_map[cpuid] =3D cpu;
>                 __cpu_logical_map[cpu] =3D cpuid;
> +
> +               early_numa_add_cpu(cpu, 0);
> +               set_cpuid_to_node(cpuid, 0);
> +               numa_add_cpu(cpu);
What's wrong exactly? Real machine has no problem here, and at least
numa_add_cpu() should not be called for non-zero cpu so early, because
it need per-cpu area be setup. I guess the root cause is that there is
something wrong and "cpuid =3D=3D loongson_sysconf.boot_cpu_id" is
skipped.

Huacai

>         }
>
>         loongson_sysconf.nr_cpus =3D num_processors;
>
> --
> 2.43.0
>