All of lore.kernel.org
 help / color / mirror / Atom feed
From: Anton Blanchard <anton@samba.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org,
	Andrew Morton <akpm@linux-foundation.org>,
	Rusty Russell <rusty@rustcorp.com.au>,
	linux-kernel@vger.kernel.org
Subject: [patch 1/6] powerpc: cpumask_of_node() should handle -1 as a node
Date: Wed, 06 Jan 2010 15:55:10 +1100	[thread overview]
Message-ID: <20100106045524.853685851@samba.org> (raw)
In-Reply-To: 20100106045509.245662398@samba.org

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: linux-cpumask/arch/powerpc/include/asm/topology.h
===================================================================
--- linux-cpumask.orig/arch/powerpc/include/asm/topology.h	2010-01-06 15:20:22.992583563 +1100
+++ linux-cpumask/arch/powerpc/include/asm/topology.h	2010-01-06 15:27:24.058833128 +1100
@@ -17,7 +17,9 @@ static inline int cpu_to_node(int cpu)
 
 #define parent_node(node)	(node)
 
-#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node])
+#define cpumask_of_node(node) ((node) == -1 ?				\
+			       cpu_all_mask :				\
+			       &numa_cpumask_lookup_table[node])
 
 int of_node_to_nid(struct device_node *device);
 

-- 

WARNING: multiple messages have this Message-ID (diff)
From: Anton Blanchard <anton@samba.org>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org, linux-kernel@vger.kernel.org,
	Rusty Russell <rusty@rustcorp.com.au>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [patch 1/6] powerpc: cpumask_of_node() should handle -1 as a node
Date: Wed, 06 Jan 2010 15:55:10 +1100	[thread overview]
Message-ID: <20100106045524.853685851@samba.org> (raw)
In-Reply-To: 20100106045509.245662398@samba.org

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard <anton@samba.org>
---

Index: linux-cpumask/arch/powerpc/include/asm/topology.h
===================================================================
--- linux-cpumask.orig/arch/powerpc/include/asm/topology.h	2010-01-06 15:20:22.992583563 +1100
+++ linux-cpumask/arch/powerpc/include/asm/topology.h	2010-01-06 15:27:24.058833128 +1100
@@ -17,7 +17,9 @@ static inline int cpu_to_node(int cpu)
 
 #define parent_node(node)	(node)
 
-#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node])
+#define cpumask_of_node(node) ((node) == -1 ?				\
+			       cpu_all_mask :				\
+			       &numa_cpumask_lookup_table[node])
 
 int of_node_to_nid(struct device_node *device);
 

-- 


  reply	other threads:[~2010-01-06  4:55 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-06  4:55 [patch 0/6] cpumask_of_node() should handle -1 as a node Anton Blanchard
2010-01-06  4:55 ` Anton Blanchard [this message]
2010-01-06  4:55   ` [patch 1/6] powerpc: " Anton Blanchard
2010-01-06  4:55 ` [patch 2/6] alpha: " Anton Blanchard
2010-01-14 18:24   ` Matt Turner
2010-01-14 18:24     ` Matt Turner
2010-01-06  4:55 ` [patch 3/6] ia64: " Anton Blanchard
2010-01-06  4:55   ` Anton Blanchard
2010-01-06  4:55 ` [patch 4/6] mips: " Anton Blanchard
2010-01-06  4:55   ` Anton Blanchard
2010-01-11 10:42   ` Ralf Baechle
2010-01-06  4:55 ` [patch 5/6] sparc: " Anton Blanchard
2010-01-06  4:55   ` Anton Blanchard
2010-01-07  4:22   ` David Miller
2010-01-07  4:22     ` David Miller
2010-01-06  4:55 ` [patch 6/6] x86: " Anton Blanchard
2010-01-06  6:36   ` Rusty Russell
2010-01-06 23:00     ` David Rientjes
2010-01-06 23:31       ` Anton Blanchard
2010-01-06 23:51         ` David Rientjes
2010-01-07  0:01           ` Anton Blanchard
2010-01-07  0:25             ` David Rientjes
2010-01-07  0:39           ` Rusty Russell
2010-01-07  8:04             ` David Rientjes
2010-01-06 23:20     ` Anton Blanchard
2010-01-11 22:11 ` [patch 0/6] " Andrew Morton
2010-01-12  1:07   ` Anton Blanchard
2010-01-12  2:04   ` Anton Blanchard

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=20100106045524.853685851@samba.org \
    --to=anton@samba.org \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=rusty@rustcorp.com.au \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.