linux-riscv.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Atish Patra <atish.patra@wdc.com>
To: linux-riscv@lists.infradead.org
Cc: "Patrick Stählin" <me@packi.ch>,
	"Albert Ou" <aou@eecs.berkeley.edu>,
	"Jason Cooper" <jason@lakedaemon.net>,
	"Alan Kao" <alankao@andestech.com>,
	"Dmitriy Cherkasov" <dmitriy@oss-tech.org>,
	"Anup Patel" <anup@brainfault.org>,
	"Daniel Lezcano" <daniel.lezcano@linaro.org>,
	linux-kernel@vger.kernel.org,
	"Michael Clark" <michaeljclark@mac.com>,
	"Atish Patra" <atish.patra@wdc.com>,
	"Palmer Dabbelt" <palmer@sifive.com>,
	"Andreas Schwab" <schwab@suse.de>,
	"Marc Zyngier" <marc.zyngier@arm.com>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Zong Li" <zongbox@gmail.com>
Subject: [PATCH v2 5/8] RISC-V: Compare cpuid with NR_CPUS before mapping.
Date: Tue,  8 Jan 2019 01:38:35 -0800	[thread overview]
Message-ID: <1546940318-9752-6-git-send-email-atish.patra@wdc.com> (raw)
In-Reply-To: <1546940318-9752-1-git-send-email-atish.patra@wdc.com>

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


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

  parent reply	other threads:[~2019-01-08  9:39 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-08  9:38 [PATCH v2 0/8] Various SMP related fixes Atish Patra
2019-01-08  9:38 ` [PATCH v2 1/8] RISC-V: Do not wait indefinitely in __cpu_up Atish Patra
2019-01-15 13:51   ` Christoph Hellwig
2019-01-18  2:35     ` Atish Patra
2019-01-18  7:20       ` Christoph Hellwig
2019-01-08  9:38 ` [PATCH v2 2/8] RISC-V: Move cpuid to hartid mapping to SMP Atish Patra
2019-01-15 13:52   ` Christoph Hellwig
2019-01-18  2:08     ` Atish Patra
2019-01-08  9:38 ` [PATCH v2 3/8] RISC-V: Remove NR_CPUs check during hartid search from DT Atish Patra
2019-01-08 11:48   ` Anup Patel
2019-01-15 13:52   ` Christoph Hellwig
2019-01-08  9:38 ` [PATCH v2 4/8] RISC-V: Allow hartid-to-cpuid function to fail Atish Patra
2019-01-08 11:49   ` Anup Patel
2019-01-15 13:53   ` Christoph Hellwig
2019-01-08  9:38 ` Atish Patra [this message]
2019-01-08 11:49   ` [PATCH v2 5/8] RISC-V: Compare cpuid with NR_CPUS before mapping Anup Patel
2019-01-15 13:53   ` Christoph Hellwig
2019-01-08  9:38 ` [PATCH v2 6/8] RISC-V: Add required checks during clock source init Atish Patra
2019-01-08 11:56   ` Anup Patel
2019-01-18  2:10     ` Atish Patra
2019-01-15 13:54   ` Christoph Hellwig
2019-01-08  9:38 ` [PATCH v2 7/8] RISC-V: Check and continue in case of an invalid cpuid Atish Patra
2019-01-08 11:59   ` Anup Patel
2019-01-18  2:10     ` Atish Patra
2019-01-15 13:55   ` Christoph Hellwig
2019-01-08  9:38 ` [PATCH v2 8/8] RISC-V: Assign hwcap only according to current cpu Atish Patra
2019-01-08 10:33   ` Atish Patra
2019-01-08 12:01   ` Anup Patel
2019-01-15 13:56   ` Christoph Hellwig
2019-01-18  2:13     ` Atish Patra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1546940318-9752-6-git-send-email-atish.patra@wdc.com \
    --to=atish.patra@wdc.com \
    --cc=alankao@andestech.com \
    --cc=anup@brainfault.org \
    --cc=aou@eecs.berkeley.edu \
    --cc=daniel.lezcano@linaro.org \
    --cc=dmitriy@oss-tech.org \
    --cc=jason@lakedaemon.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-riscv@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=me@packi.ch \
    --cc=michaeljclark@mac.com \
    --cc=palmer@sifive.com \
    --cc=schwab@suse.de \
    --cc=tglx@linutronix.de \
    --cc=zongbox@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).