| Message ID | 1546940318-9752-6-git-send-email-atish.patra@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Various SMP related fixes | expand |
On Tue, Jan 8, 2019 at 3:08 PM Atish Patra <atish.patra@wdc.com> wrote: > > We should never have a cpuid greater that NR_CPUS. Compare > with NR_CPUS before creating the mapping between logical > and physical CPU ids. This is also mandatory as NR_CPUS > check is removed from riscv_of_processor_hartid. > > Signed-off-by: Atish Patra <atish.patra@wdc.com> > --- > arch/riscv/kernel/smpboot.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c > index 32e14572..7954470b 100644 > --- a/arch/riscv/kernel/smpboot.c > +++ b/arch/riscv/kernel/smpboot.c > @@ -69,6 +69,11 @@ void __init setup_smp(void) > of_node_put(dn); > continue; > } > + if (cpuid >= NR_CPUS) { > + pr_warn("Invalid cpuid [%d] for hartid [%d]\n", > + cpuid, hart); > + break; > + } > > cpuid_to_hartid_map(cpuid) = hart; > set_cpu_possible(cpuid, true); > -- > 2.7.4 > Looks good to me. Reviewed-by: Anup Patel <anup@brainfault.org> Regards, Anup
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c index 32e14572..7954470b 100644 --- a/arch/riscv/kernel/smpboot.c +++ b/arch/riscv/kernel/smpboot.c @@ -69,6 +69,11 @@ void __init setup_smp(void) of_node_put(dn); continue; } + if (cpuid >= NR_CPUS) { + pr_warn("Invalid cpuid [%d] for hartid [%d]\n", + cpuid, hart); + break; + } cpuid_to_hartid_map(cpuid) = hart; set_cpu_possible(cpuid, true);
We should never have a cpuid greater that NR_CPUS. Compare with NR_CPUS before creating the mapping between logical and physical CPU ids. This is also mandatory as NR_CPUS check is removed from riscv_of_processor_hartid. Signed-off-by: Atish Patra <atish.patra@wdc.com> --- arch/riscv/kernel/smpboot.c | 5 +++++ 1 file changed, 5 insertions(+)