mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Petr Holasek <pholasek@redhat.com>
To: David Rientjes <rientjes@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	linux-kernel@vger.kernel.org, Anton Arapov <anton@redhat.com>
Subject: [PATCH v3] NUMA x86: add constraints check for nid parameters
Date: Thu, 8 Dec 2011 13:16:41 +0100	[thread overview]
Message-ID: <20111208121640.GA2229@dhcp-27-244.brq.redhat.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1112071342450.27360@chino.kir.corp.google.com>

This patch adds constraints checks for numa_set_distance()
function. It emits warning and avoids a store to a negative
index in numa_distance[] array. Negative ids can be passed when
pxm-to-nids mapping is not properly filled while parsing the SRAT.

Signed-off-by: Petr Holasek <pholasek@redhat.com>
---
 arch/x86/mm/numa.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index fbeaaf4..cdc0054 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -430,8 +430,9 @@ static int __init numa_alloc_distance(void)
  * calls are ignored until the distance table is reset with
  * numa_reset_distance().
  *
- * If @from or @to is higher than the highest known node at the time of
- * table creation or @distance doesn't make sense, the call is ignored.
+ * If @from or @to is higher than the highest known node or lower than zero
+ * at the time of table creation or @distance doesn't make sense, the call
+ * is ignored.
  * This is to allow simplification of specific NUMA config implementations.
  */
 void __init numa_set_distance(int from, int to, int distance)
@@ -439,8 +440,9 @@ void __init numa_set_distance(int from, int to, int distance)
 	if (!numa_distance && numa_alloc_distance() < 0)
 		return;
 
-	if (from >= numa_distance_cnt || to >= numa_distance_cnt) {
-		printk_once(KERN_DEBUG "NUMA: Debug: distance out of bound, from=%d to=%d distance=%d\n",
+	if (from >= numa_distance_cnt || to >= numa_distance_cnt ||
+			from < 0 || to < 0) {
+		pr_warn_once("NUMA: Warning: node ids are out of bound, from=%d to=%d distance=%d\n",
 			    from, to, distance);
 		return;
 	}
-- 
1.7.6.4


  reply	other threads:[~2011-12-08 12:16 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-01 11:45 [PATCH RESEND] " Petr Holasek
2011-12-01 21:34 ` Andrew Morton
2011-12-01 23:14   ` Petr Holasek
2011-12-01 23:28     ` Andrew Morton
2011-12-02 10:55       ` Petr Holasek
2011-12-06 20:45         ` David Rientjes
2011-12-07 19:40           ` Petr Holasek
2011-12-07 19:43           ` [PATCH v2] " Petr Holasek
2011-12-07 21:46             ` David Rientjes
2011-12-08 12:16               ` Petr Holasek [this message]
2011-12-08 21:09                 ` [PATCH v3] " David Rientjes
2011-12-09  7:10                   ` Ingo Molnar
2011-12-09 10:44                     ` David Rientjes
2011-12-09 20:08                 ` [tip:x86/mm] x86/numa: Add " tip-bot for Petr Holasek
2011-12-08 18:58             ` [PATCH v2] NUMA x86: add " Andi Kleen
2011-12-08 21:12               ` David Rientjes
2011-12-09  7:11               ` Ingo Molnar

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=20111208121640.GA2229@dhcp-27-244.brq.redhat.com \
    --to=pholasek@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=anton@redhat.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=rientjes@google.com \
    --cc=tglx@linutronix.de \
    /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

all inboxes | Powered by JetHome®